diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 48bbf82e58..ff53f4004f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,15 +1,16 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="AUTODETECT_INDENTS" value="false" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
     </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="METHOD_ANNOTATION_WRAP" value="0" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -129,6 +130,8 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="METHOD_ANNOTATION_WRAP" value="5" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/app/build.gradle b/app/build.gradle
index 6d781a8962..88e2b42202 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,6 +13,7 @@ buildscript {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'io.fabric'
 apply plugin: 'jacoco-android'
@@ -24,10 +25,11 @@ jacoco {
 }
 
 ext {
-    supportLibraryVersion = "28.0.0"
     ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
+    retrofit2Version = '2.8.1'
+    okhttp3Version="4.4.1"
 }
 
 
@@ -109,7 +111,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6-dev"
+        version "2.6.1-dagger3"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -125,12 +127,6 @@ android {
         jvmTarget = '1.8'
     }
     lintOptions {
-        // TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0
-        // has been upgraded (requiring significant code changes), which currently fails release
-        // build with a deprecation warning
-        // abortOnError false
-        // (disabled entirely to avoid reports on the error, which would still be displayed
-        //  and it's easy to overlook that it's ignored)
         checkReleaseBuilds false
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
@@ -208,6 +204,10 @@ android {
     }
 
     useLibrary "org.apache.http.legacy"
+
+    configurations.all {
+        resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
+    }
 }
 
 allprojects {
@@ -225,9 +225,10 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
-    implementation 'com.google.firebase:firebase-core:17.2.1'
-    implementation 'com.google.firebase:firebase-auth:19.2.0'
-    implementation 'com.google.firebase:firebase-database:19.2.0'
+    implementation "com.google.android.gms:play-services-location:17.0.0"
+    implementation 'com.google.firebase:firebase-core:17.2.3'
+    implementation 'com.google.firebase:firebase-auth:19.3.0'
+    implementation 'com.google.firebase:firebase-database:19.2.1'
     implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true;
     }
@@ -236,10 +237,12 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.biometric:biometric:1.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
@@ -250,12 +253,11 @@ dependencies {
         exclude group: "com.google.android", module: "android"
     }
     implementation "org.apache.commons:commons-lang3:3.9"
-    implementation "org.slf4j:slf4j-api:1.7.29"
+    implementation 'org.slf4j:slf4j-api:1.7.30'
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
     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.google.android:flexbox:0.3.0") {
@@ -277,6 +279,9 @@ dependencies {
 
     implementation 'com.github.DavidProdinger:weekdays-selector:1.1.0'
 
+    implementation 'com.github.kenglxn.QRGen:android:2.6.0'
+    implementation 'com.eatthepath:java-otp:0.2.0'
+
     testImplementation "junit:junit:4.12"
     testImplementation "org.json:json:20190722"
     testImplementation "org.mockito:mockito-core:2.8.47"
@@ -285,33 +290,45 @@ dependencies {
     testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
     testImplementation "joda-time:joda-time:2.10.5"
-    testImplementation("com.google.truth:truth:0.39") {
+    testImplementation('com.google.truth:truth:1.0.1') {
         exclude group: "com.google.guava", module: "guava"
         exclude group: "com.google.code.findbugs", module: "jsr305"
     }
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
-/*
-    testImplementation("uk.org.lidalia:slf4j-test:1.2.0") {
-        exclude group: "com.google.guava", module: "guava"
-    }
-*/
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
 
     // new for tidepool
-    implementation 'com.squareup.okhttp3:okhttp:4.2.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
-    implementation "com.squareup.retrofit2:retrofit:2.6.2"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.2"
-    implementation "com.squareup.retrofit2:converter-gson:2.6.2"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp3Version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp3Version"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2Version"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit2Version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit2Version"
 
+    // Phone checker
+    implementation 'com.scottyab:rootbeer-lib:0.0.7'
+    
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.3.0-alpha03'
     androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+
+    /* Dagger2 - We are going to use dagger.android which includes
+    * support for Activity and fragment injection so we need to include
+    * the following dependencies */
+    implementation 'com.google.dagger:dagger-android:2.25.2'
+    implementation 'com.google.dagger:dagger-android-support:2.25.2'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
+    annotationProcessor 'com.google.dagger:dagger-android-processor:2.25.2'
+    kapt 'com.google.dagger:dagger-android-processor:2.25.2'
+
+    /* Dagger2 - default dependency */
+    kapt 'com.google.dagger:dagger-compiler:2.25.2'
+
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 
 
@@ -338,7 +355,37 @@ task copyLibs(dependsOn: downloadAndUnzipFile, type: Copy) {
 task full_clean(type: Delete) {
     delete file("src/main/jniLibs")
 }
-
+/*
+// Run 'adb' shell command to clear application data of main app for 'debug' variant
+task clearMainAppData(type: Exec) {
+    // we have to iterate to find the 'debug' variant to obtain a variant reference
+    android.applicationVariants.all { variant ->
+        if (variant.name == "fullDebug") {
+            def applicationId = [variant.mergedFlavor.applicationId, variant.buildType.applicationIdSuffix].findAll().join()
+            def clearDataCommand = ['adb', 'shell', 'pm', 'clear', applicationId]
+            println "Clearing application data of ${variant.name} variant: [${clearDataCommand}]"
+            def stdout = new ByteArrayOutputStream()
+            exec {
+                commandLine clearDataCommand
+                standardOutput = stdout
+            }
+            String result = stdout.toString().trim()
+            if (!result.startsWith("Success")) {
+                println result
+                throw new GradleException(clearDataCommand.join(" "))
+            }
+        }
+    }
+}
+// Clear Application Data (once) before running instrumentation test
+tasks.whenTaskAdded { task ->
+    // Both of these targets are equivalent today, although in future connectedCheck
+    // will also include connectedUiAutomatorTest (not implemented yet)
+    if(task.name == "connectedAndroidTest" || task.name == "connectedCheck"){
+        task.dependsOn(clearMainAppData)
+    }
+}
+*/
 clean.dependsOn full_clean
 preBuild.dependsOn copyLibs
 
diff --git a/app/libs/ustwo-clockwise-debug.aar b/app/libs/ustwo-clockwise-debug.aar
new file mode 100644
index 0000000000..8257a991be
Binary files /dev/null and b/app/libs/ustwo-clockwise-debug.aar differ
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt b/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
index b50bb746fb..cf7118ebd2 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
@@ -4,6 +4,9 @@ import androidx.test.espresso.ViewAction
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 
 fun ViewInteraction.isDisplayed(): Boolean {
     try {
@@ -25,3 +28,8 @@ fun ViewInteraction.waitAndPerform(viewActions: ViewAction): ViewInteraction? {
     return perform(viewActions)
 }
 
+fun clickOkInDialog() {
+    val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    val button = uiDevice.findObject(UiSelector().clickable(true).checkable(false).index(1))
+    if (button.exists() && button.isEnabled) button.click()
+}
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
new file mode 100644
index 0000000000..a327989975
--- /dev/null
+++ b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
@@ -0,0 +1,130 @@
+package info.nightscout.androidaps
+
+import android.os.SystemClock
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.source.RandomBgPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.extensions.isRunningTest
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class RealPumpTest {
+
+    companion object {
+        const val R_PASSWORD = 1234
+        const val R_SERIAL = "PBB00013LR_P"
+    }
+
+    private val validProfile = "{\"dia\":\"6\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"10\"},{\"time\":\"2:00\",\"value\":\"11\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+
+    @Inject lateinit var pump : DanaRv2Plugin
+    @Inject lateinit var randomBgPlugin :RandomBgPlugin
+    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var insulinOrefUltraRapidActingPlugin: InsulinOrefUltraRapidActingPlugin
+    @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+    @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var actionsPlugin: ActionsPlugin
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var objectivesPlugin: ObjectivesPlugin
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var sp: SP
+
+    @Rule
+    @JvmField
+    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+
+    @Rule
+    @JvmField
+    var mGrantPermissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(
+            android.Manifest.permission.ACCESS_FINE_LOCATION,
+            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        )
+
+    @Before
+    fun clear() {
+        sp.clear()
+        sp.putBoolean(R.string.key_setupwizard_processed, true)
+        sp.putString(R.string.key_aps_mode, "closed")
+        MainApp.getDbHelper().resetDatabases()
+        MainApp.devBranch = false
+    }
+
+    private fun preparePlugins() {
+        // Source
+        configBuilderPlugin.performPluginSwitch(randomBgPlugin,true, PluginType.BGSOURCE)
+        // Profile
+        configBuilderPlugin.performPluginSwitch(localProfilePlugin, true, PluginType.PROFILE)
+        val profile = Profile(JSONObject(validProfile), Constants.MGDL)
+        Assert.assertTrue(profile.isValid("Test"))
+        localProfilePlugin.profiles.clear()
+        localProfilePlugin.numOfProfiles = 0
+        val singleProfile = LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "TestProfile")
+        localProfilePlugin.addProfile(singleProfile)
+        val profileSwitch = profileFunction.prepareProfileSwitch(localProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, DateUtil.now())
+        treatmentsPlugin.addToHistoryProfileSwitch(profileSwitch)
+        // Insulin
+        configBuilderPlugin.performPluginSwitch(insulinOrefUltraRapidActingPlugin, true, PluginType.INSULIN)
+        // Pump
+        sp.putInt(R.string.key_danar_password, R_PASSWORD)
+        sp.putString(R.string.key_danar_bt_name, R_SERIAL)
+        configBuilderPlugin.performPluginSwitch((pump as PluginBase), true, PluginType.PUMP)
+        // Sensitivity
+        configBuilderPlugin.performPluginSwitch(sensitivityOref1Plugin, true, PluginType.SENSITIVITY)
+        // APS
+        configBuilderPlugin.performPluginSwitch(openAPSSMBPlugin, true, PluginType.APS)
+        configBuilderPlugin.performPluginSwitch(loopPlugin, true, PluginType.LOOP)
+
+        // Enable common
+        configBuilderPlugin.performPluginSwitch(actionsPlugin, true, PluginType.GENERAL)
+
+        // Disable unneeded
+        MainApp.getPluginsList().remove(objectivesPlugin)
+    }
+
+    @Test
+    fun doTest() {
+        Assert.assertTrue(isRunningTest())
+        preparePlugins()
+
+        while (!pump.isInitialized) {
+            //log.debug("Waiting for initialization")
+            SystemClock.sleep(1000)
+        }
+
+        while (true) {
+            //log.debug("Tick")
+            SystemClock.sleep(1000)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
index dd1c0b12bc..6b094db210 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps
 
-
 import android.os.SystemClock
 import android.view.View
 import android.view.ViewGroup
@@ -9,12 +8,15 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withTagValue
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
@@ -27,7 +29,7 @@ import info.nightscout.androidaps.plugins.source.RandomBgPlugin
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.SP
-import info.nightscout.androidaps.utils.isRunningTest
+import info.nightscout.androidaps.utils.extensions.isRunningTest
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Description
 import org.hamcrest.Matcher
@@ -39,7 +41,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class SetupWizardActivityTest {
@@ -50,12 +51,12 @@ class SetupWizardActivityTest {
 
     @Rule
     @JvmField
-    var mGrantPermissionRule =
-            GrantPermissionRule.grant(
-                    android.Manifest.permission.ACCESS_FINE_LOCATION,
-                    android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                    android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-            )
+    var mGrantPermissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(
+            android.Manifest.permission.ACCESS_FINE_LOCATION,
+            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        )
 
     @Before
     fun clear() {
@@ -74,9 +75,9 @@ adb shell settings put global transition_animation_scale 0 &
 adb shell settings put global animator_duration_scale 0 &
  */
 
-
     @Test
     fun setupWizardActivityTest() {
+        SP.clear()
         Assert.assertTrue(isRunningTest())
         // Welcome page
         onView(withId(R.id.next_button)).perform(click())
@@ -86,7 +87,7 @@ adb shell settings put global animator_duration_scale 0 &
         // Agreement page
         onView(withText("I UNDERSTAND AND AGREE")).perform(scrollTo(), click())
         onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Loction permission
+        // Location permission
         var askButton = onView(withText("Ask for permission"))
         if (askButton.isDisplayed()) {
             askButton.perform(scrollTo(), click())
@@ -99,6 +100,11 @@ adb shell settings put global animator_duration_scale 0 &
             onView(withText("OK")).perform(click())
             onView(withId(R.id.next_button)).waitAndPerform(click())
         }
+        // Import settings : skip of found
+        askButton = onView(withText("IMPORT SETTINGS"))
+        if (askButton.isDisplayed()) {
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+        }
         // Units selection
         onView(withText("mmol/L")).perform(scrollTo(), click())
         onView(withId(R.id.next_button)).perform(click())
@@ -125,41 +131,44 @@ adb shell settings put global animator_duration_scale 0 &
         // Local profile - IC
         onView(withId(R.id.ic_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("IC-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
         // Local profile - ISF
         onView(withId(R.id.isf_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("ISF-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
         // Local profile - BAS
         onView(withId(R.id.basal_tab)).perform(scrollTo(), click())
         onView(childAtPosition(Matchers.allOf(withId(R.id.localprofile_basal), childAtPosition(withClassName(Matchers.`is`("android.widget.LinearLayout")), 6)), 2))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-1")), isDisplayed()))
-                .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withId(R.id.timelistedit_time), childAtPosition(childAtPosition(withId(R.id.localprofile_basal), 2), 0)))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onData(Matchers.anything()).inAdapterView(childAtPosition(withClassName(Matchers.`is`("android.widget.PopupWindow\$PopupBackgroundView")), 0)).atPosition(13)
-                .perform(click())
+            .perform(click())
         // Local profile - TARGET
         onView(withId(R.id.target_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-2-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
         onView(withText("Save")).perform(scrollTo(), click())
         onView(Matchers.allOf(withId(R.id.localprofile_profileswitch), isDisplayed()))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-        onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click())
+        // confirm dialog
+        //onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+        clickOkInDialog()
         onView(withId(R.id.next_button)).waitAndPerform(click())
         // Profile switch
         askButton = onView(withText("Do Profile Switch"))
         if (askButton.isDisplayed()) {
             askButton.perform(scrollTo(), click())
             onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-            onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click())
+            // onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+            clickOkInDialog()
             while (ProfileFunctions.getInstance().profile == null) SystemClock.sleep(100)
             onView(withId(R.id.next_button)).waitAndPerform(click())
         }
@@ -204,7 +213,7 @@ adb shell settings put global animator_duration_scale 0 &
     }
 
     private fun childAtPosition(
-            parentMatcher: Matcher<View>, position: Int): Matcher<View> {
+        parentMatcher: Matcher<View>, position: Int): Matcher<View> {
 
         return object : TypeSafeMatcher<View>() {
             override fun describeTo(description: Description) {
@@ -215,7 +224,7 @@ adb shell settings put global animator_duration_scale 0 &
             public override fun matchesSafely(view: View): Boolean {
                 val parent = view.parent
                 return parent is ViewGroup && parentMatcher.matches(parent)
-                        && view == parent.getChildAt(position)
+                    && view == parent.getChildAt(position)
             }
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b571e247c2..caf37d462d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="com.dexcom.cgm.EXTERNAL_PERMISSION" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
@@ -37,7 +38,14 @@
         android:roundIcon="${appIconRound}"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Launcher"
-        android:fullBackupContent="true">
+        android:fullBackupOnly="false"
+        android:backupAgent=".utils.SPBackupAgent"
+        android:restoreAnyVersion="true">
+
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAI3JiApyMrbP2QFzZ2fYfCPsgjkRp53Dm2S1-zPQ" />
+
         <meta-data
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc" />
@@ -74,7 +82,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".plugins.pump.danaRS.activities.PairingHelperActivity" />
-        <activity android:name=".activities.HistoryBrowseActivity" />
+        <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
         <activity android:name=".activities.StatsActivity" />
 
@@ -123,14 +131,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- Network change local receiver -->
-        <receiver android:name=".receivers.NetworkChangeReceiver">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -264,12 +264,21 @@
         <activity
             android:name=".plugins.pump.insight.activities.InsightAlertActivity"
             android:label="@string/pump_alert"
+            android:excludeFromRecents="true"
+            android:launchMode="singleInstance"
             android:theme="@style/InsightAlertDialog" />
         <activity
             android:name=".plugins.pump.insight.activities.InsightPairingInformationActivity"
             android:label="@string/pairing_information"
             android:theme="@style/AppTheme" />
         <activity android:name=".activities.RequestDexcomPermissionActivity" />
+        <activity android:name=".plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- Medtronic service and activities -->
         <service
diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index c2db0f270b..00a9c1d0a2 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -31,14 +31,13 @@ function calculate_expected_delta(target_bg, eventual_bg, bgi) {
     // (hours * mins_per_hour) / 5 = how many 5 minute periods in 2h = 24
     var five_min_blocks = (2 * 60) / 5;
     var target_delta = target_bg - eventual_bg;
-    var expectedDelta = round(bgi + (target_delta / five_min_blocks), 1);
-    return expectedDelta;
+    return /* expectedDelta */ round(bgi + (target_delta / five_min_blocks), 1);
 }
 
 
 function convert_bg(value, profile)
 {
-    if (profile.out_units == "mmol/L")
+    if (profile.out_units === "mmol/L")
     {
         return round(value / 18, 1).toFixed(1);
     }
@@ -48,10 +47,76 @@ function convert_bg(value, profile)
     }
 }
 
-var determine_basal = function determine_basal(glucose_status, currenttemp, iob_data, profile, autosens_data, meal_data, tempBasalFunctions, microBolusAllowed, reservoir_data) {
+function enable_smb(
+    profile,
+    microBolusAllowed,
+    meal_data,
+    target_bg
+) {
+    // disable SMB when a high temptarget is set
+    if (! microBolusAllowed) {
+        console.error("SMB disabled (!microBolusAllowed)");
+        return false;
+    } else if (! profile.allowSMB_with_high_temptarget && profile.temptargetSet && target_bg > 100) {
+        console.error("SMB disabled due to high temptarget of",target_bg);
+        return false;
+    } else if (meal_data.bwFound === true && profile.A52_risk_enable === false) {
+        console.error("SMB disabled due to Bolus Wizard activity in the last 6 hours.");
+        return false;
+    }
+
+    // enable SMB/UAM if always-on (unless previously disabled for high temptarget)
+    if (profile.enableSMB_always === true) {
+        if (meal_data.bwFound) {
+            console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard");
+        } else {
+            console.error("SMB enabled due to enableSMB_always");
+        }
+        return true;
+    }
+
+    // enable SMB/UAM (if enabled in preferences) while we have COB
+    if (profile.enableSMB_with_COB === true && meal_data.mealCOB) {
+        if (meal_data.bwCarbs) {
+            console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard");
+        } else {
+            console.error("SMB enabled for COB of",meal_data.mealCOB);
+        }
+        return true;
+    }
+
+    // enable SMB/UAM (if enabled in preferences) for a full 6 hours after any carb entry
+    // (6 hours is defined in carbWindow in lib/meal/total.js)
+    if (profile.enableSMB_after_carbs === true && meal_data.carbs ) {
+        if (meal_data.bwCarbs) {
+            console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard");
+        } else {
+            console.error("SMB enabled for 6h after carb entry");
+        }
+        return true;
+    }
+
+    // enable SMB/UAM (if enabled in preferences) if a low temptarget is set
+    if (profile.enableSMB_with_temptarget === true && (profile.temptargetSet && target_bg < 100)) {
+        if (meal_data.bwFound) {
+            console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard");
+        } else {
+            console.error("SMB enabled for temptarget of",convert_bg(target_bg, profile));
+        }
+        return true;
+    }
+
+    console.error("SMB disabled (no enableSMB preferences active or no condition satisfied)");
+    return false;
+}
+
+var determine_basal = function determine_basal(glucose_status, currenttemp, iob_data, profile, autosens_data, meal_data, tempBasalFunctions, microBolusAllowed, reservoir_data, currentTime) {
     var rT = {}; //short for requestedTemp
 
     var deliverAt = new Date();
+    if (currentTime) {
+        deliverAt = new Date(currentTime);
+    }
 
     if (typeof profile === 'undefined' || typeof profile.current_basal === 'undefined') {
         rT.error ='Error: could not get current basal rate';
@@ -61,26 +126,41 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     var basal = profile_current_basal;
 
     var systemTime = new Date();
+    if (currentTime) {
+        systemTime = currentTime;
+    }
     var bgTime = new Date(glucose_status.date);
     var minAgo = round( (systemTime - bgTime) / 60 / 1000 ,1);
 
     var bg = glucose_status.glucose;
-    if (bg < 39) {  //Dexcom is in ??? mode or calibrating
-        rT.reason = "CGM is calibrating or in ??? state";
+    var noise = glucose_status.noise;
+    // 38 is an xDrip error state that usually indicates sensor failure
+    // all other BG values between 11 and 37 mg/dL reflect non-error-code BG values, so we should zero temp for those
+    if (bg <= 10 || bg === 38 || noise >= 3) {  //Dexcom is in ??? mode or calibrating, or xDrip reports high noise
+        rT.reason = "CGM is calibrating, in ??? state, or noise is high";
     }
     if (minAgo > 12 || minAgo < -5) { // Dexcom data is too old, or way in the future
         rT.reason = "If current system time "+systemTime+" is correct, then BG data is too old. The last BG data was read "+minAgo+"m ago at "+bgTime;
+    // if BG is too old/noisy, or is changing less than 1 mg/dL/5m for 45m, cancel any high temps and shorten any long zero temps
+    //cherry pick from oref upstream dev cb8e94990301277fb1016c778b4e9efa55a6edbc
+    } else if ( bg > 60 && glucose_status.delta == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) {
+        if ( glucose_status.last_cal && glucose_status.last_cal < 3 ) {
+            rT.reason = "CGM was just calibrated";
+        } else {
+            rT.reason = "Error: CGM data is unchanged for the past ~45m";
+        }
     }
-    if (bg < 39 || minAgo > 12 || minAgo < -5) {
-        if (currenttemp.rate >= basal) { // high temp is running
-            rT.reason += ". Canceling high temp basal of "+currenttemp.rate;
+    //cherry pick from oref upstream dev cb8e94990301277fb1016c778b4e9efa55a6edbc
+    if (bg <= 10 || bg === 38 || noise >= 3 || minAgo > 12 || minAgo < -5 || ( bg > 60 && glucose_status.delta == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) ) {
+        if (currenttemp.rate > basal) { // high temp is running
+            rT.reason += ". Replacing high temp basal of "+currenttemp.rate+" with neutral temp of "+basal;
             rT.deliverAt = deliverAt;
             rT.temp = 'absolute';
-            rT.duration = 0;
-            rT.rate = 0;
+            rT.duration = 30;
+            rT.rate = basal;
             return rT;
             //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
-        } else if ( currenttemp.rate == 0 && currenttemp.duration > 30 ) { //shorten long zero temps to 30m
+        } else if ( currenttemp.rate === 0 && currenttemp.duration > 30 ) { //shorten long zero temps to 30m
             rT.reason += ". Shortening " + currenttemp.duration + "m long zero temp to 30m. ";
             rT.deliverAt = deliverAt;
             rT.temp = 'absolute';
@@ -115,14 +195,14 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     var sensitivityRatio;
     var high_temptarget_raises_sensitivity = profile.exercise_mode || profile.high_temptarget_raises_sensitivity;
-    var normalTarget = 100; // evaluate high/low temptarget against 100, not scheduled basal (which might change)
+    var normalTarget = 100; // evaluate high/low temptarget against 100, not scheduled target (which might change)
     if ( profile.half_basal_exercise_target ) {
         var halfBasalTarget = profile.half_basal_exercise_target;
     } else {
-        var halfBasalTarget = 160; // when temptarget is 160 mg/dL, run 50% basal (120 = 75%; 140 = 60%)
+        halfBasalTarget = 160; // when temptarget is 160 mg/dL, run 50% basal (120 = 75%; 140 = 60%)
         // 80 mg/dL with low_temptarget_lowers_sensitivity would give 1.5x basal, but is limited to autosens_max (1.2x by default)
     }
-    if ( high_temptarget_raises_sensitivity && profile.temptargetSet && target_bg > normalTarget + 10
+    if ( high_temptarget_raises_sensitivity && profile.temptargetSet && target_bg > normalTarget
         || profile.low_temptarget_lowers_sensitivity && profile.temptargetSet && target_bg < normalTarget ) {
         // w/ target 100, temp target 110 = .89, 120 = 0.8, 140 = 0.67, 160 = .57, and 200 = .44
         // e.g.: Sensitivity ratio set to 0.8 based on temp target of 120; Adjusting basal from 1.65 to 1.35; ISF from 58.9 to 73.6
@@ -132,36 +212,36 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         // limit sensitivityRatio to profile.autosens_max (1.2x by default)
         sensitivityRatio = Math.min(sensitivityRatio, profile.autosens_max);
         sensitivityRatio = round(sensitivityRatio,2);
-        console.error("Sensitivity ratio set to "+sensitivityRatio+" based on temp target of "+target_bg+"; ");
-    } else if (typeof autosens_data !== 'undefined' ) {
+        console.log("Sensitivity ratio set to "+sensitivityRatio+" based on temp target of "+target_bg+"; ");
+    } else if (typeof autosens_data !== 'undefined' && autosens_data) {
         sensitivityRatio = autosens_data.ratio;
-        console.error("Autosens ratio: "+sensitivityRatio+"; ");
+        console.log("Autosens ratio: "+sensitivityRatio+"; ");
     }
     if (sensitivityRatio) {
         basal = profile.current_basal * sensitivityRatio;
         basal = round_basal(basal, profile);
-        if (basal != profile_current_basal) {
-            console.error("Adjusting basal from "+profile_current_basal+" to "+basal+"; ");
+        if (basal !== profile_current_basal) {
+            console.log("Adjusting basal from "+profile_current_basal+" to "+basal+"; ");
         } else {
-            console.error("Basal unchanged: "+basal+"; ");
+            console.log("Basal unchanged: "+basal+"; ");
         }
     }
 
     // adjust min, max, and target BG for sensitivity, such that 50% increase in ISF raises target from 100 to 120
     if (profile.temptargetSet) {
-        //console.error("Temp Target set, not adjusting with autosens; ");
-    } else if (typeof autosens_data !== 'undefined' ) {
+        //console.log("Temp Target set, not adjusting with autosens; ");
+    } else if (typeof autosens_data !== 'undefined' && autosens_data) {
         if ( profile.sensitivity_raises_target && autosens_data.ratio < 1 || profile.resistance_lowers_target && autosens_data.ratio > 1 ) {
             // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 93-117 target range
             min_bg = round((min_bg - 60) / autosens_data.ratio) + 60;
             max_bg = round((max_bg - 60) / autosens_data.ratio) + 60;
-            new_target_bg = round((target_bg - 60) / autosens_data.ratio) + 60;
+            var new_target_bg = round((target_bg - 60) / autosens_data.ratio) + 60;
             // don't allow target_bg below 80
             new_target_bg = Math.max(80, new_target_bg);
-            if (target_bg == new_target_bg) {
-                console.error("target_bg unchanged: "+new_target_bg+"; ");
+            if (target_bg === new_target_bg) {
+                console.log("target_bg unchanged: "+new_target_bg+"; ");
             } else {
-                console.error("target_bg from "+target_bg+" to "+new_target_bg+"; ");
+                console.log("target_bg from "+target_bg+" to "+new_target_bg+"; ");
             }
             target_bg = new_target_bg;
         }
@@ -197,34 +277,33 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     var profile_sens = round(profile.sens,1)
     var sens = profile.sens;
-    if (typeof autosens_data !== 'undefined' ) {
+    if (typeof autosens_data !== 'undefined' && autosens_data) {
         sens = profile.sens / sensitivityRatio;
         sens = round(sens, 1);
-        if (sens != profile_sens) {
-            console.error("ISF from "+profile_sens+" to "+sens);
+        if (sens !== profile_sens) {
+            console.log("ISF from "+profile_sens+" to "+sens);
         } else {
-            console.error("ISF unchanged: "+sens);
+            console.log("ISF unchanged: "+sens);
         }
-        //console.error(" (autosens ratio "+sensitivityRatio+")");
+        //console.log(" (autosens ratio "+sensitivityRatio+")");
     }
     console.error("; CR:",profile.carb_ratio);
 
     // compare currenttemp to iob_data.lastTemp and cancel temp if they don't match
     var lastTempAge;
     if (typeof iob_data.lastTemp !== 'undefined' ) {
-        lastTempAge = round(( new Date().getTime() - iob_data.lastTemp.date ) / 60000); // in minutes
-    // }  ---- added to not produce errors
+        lastTempAge = round(( new Date(systemTime).getTime() - iob_data.lastTemp.date ) / 60000); // in minutes
     } else {
         lastTempAge = 0;
     }
     //console.error("currenttemp:",currenttemp,"lastTemp:",JSON.stringify(iob_data.lastTemp),"lastTempAge:",lastTempAge,"m");
-    tempModulus = (lastTempAge + currenttemp.duration) % 30;
+    var tempModulus = (lastTempAge + currenttemp.duration) % 30;
     console.error("currenttemp:",currenttemp,"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
     rT.temp = 'absolute';
     rT.deliverAt = deliverAt;
-    if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate != iob_data.lastTemp.rate ) {
-        rT.reason = "Warning: currenttemp rate "+currenttemp.rate+" != lastTemp rate "+iob_data.lastTemp.rate+" from pumphistory; setting neutral temp of "+basal+".";
-        return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+    if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate !== iob_data.lastTemp.rate && lastTempAge > 10 && currenttemp.duration ) {
+        rT.reason = "Warning: currenttemp rate "+currenttemp.rate+" != lastTemp rate "+iob_data.lastTemp.rate+" from pumphistory; canceling temp";
+        return tempBasalFunctions.setTempBasal(0, 0, profile, rT, currenttemp);
     }
     if ( currenttemp && iob_data.lastTemp && currenttemp.duration > 0 ) {
         // TODO: fix this (lastTemp.duration is how long it has run; currenttemp.duration is time left
@@ -234,10 +313,10 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         //}
         //console.error(lastTempAge, round(iob_data.lastTemp.duration,1), round(lastTempAge - iob_data.lastTemp.duration,1));
         var lastTempEnded = lastTempAge - iob_data.lastTemp.duration
-        if ( lastTempEnded > 5 ) {
-            rT.reason = "Warning: currenttemp running but lastTemp from pumphistory ended "+lastTempEnded+"m ago; setting neutral temp of "+basal+".";
+        if ( lastTempEnded > 5 && lastTempAge > 10 ) {
+            rT.reason = "Warning: currenttemp running but lastTemp from pumphistory ended "+lastTempEnded+"m ago; canceling temp";
             //console.error(currenttemp, round(iob_data.lastTemp,1), round(lastTempAge,1));
-            return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+            return tempBasalFunctions.setTempBasal(0, 0, profile, rT, currenttemp);
         }
         // TODO: figure out a way to do this check that doesn't fail across basal schedule boundaries
         //if ( tempModulus < 25 && tempModulus > 5 ) {
@@ -264,37 +343,44 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     if (iob_data.iob > 0) {
         var naive_eventualBG = round( bg - (iob_data.iob * sens) );
     } else { // if IOB is negative, be more conservative and use the lower of sens, profile.sens
-        var naive_eventualBG = round( bg - (iob_data.iob * Math.min(sens, profile.sens) ) );
+        naive_eventualBG = round( bg - (iob_data.iob * Math.min(sens, profile.sens) ) );
     }
     // and adjust it for the deviation above
     var eventualBG = naive_eventualBG + deviation;
-    // calculate what portion of that is due to bolussnooze
-    //var bolusContrib = iob_data.bolussnooze * sens;
-    // and add it back in to get snoozeBG, plus another 50% to avoid low-temping at mealtime
-    //var naive_snoozeBG = round( naive_eventualBG + 1.5 * bolusContrib );
-    // adjust that for deviation like we did eventualBG
-    //var snoozeBG = naive_snoozeBG + deviation;
 
-    // adjust target BG range if needed to safely bring down high BG faster without causing lows
-    if ( bg > max_bg && profile.adv_target_adjustments && ! profile.temptargetSet ) {
+    // raise target for noisy / raw CGM data
+    if (glucose_status.noise >= 2) {
+        // increase target at least 10% (default 30%) for raw / noisy data
+        var noisyCGMTargetMultiplier = Math.max( 1.1, profile.noisyCGMTargetMultiplier );
+        // don't allow maxRaw above 250
+        var maxRaw = Math.min( 250, profile.maxRaw );
+        var adjustedMinBG = round(Math.min(200, min_bg * noisyCGMTargetMultiplier ));
+        var adjustedTargetBG = round(Math.min(200, target_bg * noisyCGMTargetMultiplier ));
+        var adjustedMaxBG = round(Math.min(200, max_bg * noisyCGMTargetMultiplier ));
+        console.log("Raising target_bg for noisy / raw CGM data, from "+target_bg+" to "+adjustedTargetBG+"; ");
+        min_bg = adjustedMinBG;
+        target_bg = adjustedTargetBG;
+        max_bg = adjustedMaxBG;
+    // adjust target BG range if configured to bring down high BG faster
+    } else if ( bg > max_bg && profile.adv_target_adjustments && ! profile.temptargetSet ) {
         // with target=100, as BG rises from 100 to 160, adjustedTarget drops from 100 to 80
-        var adjustedMinBG = round(Math.max(80, min_bg - (bg - min_bg)/3 ),0);
-        var adjustedTargetBG =round( Math.max(80, target_bg - (bg - target_bg)/3 ),0);
-        var adjustedMaxBG = round(Math.max(80, max_bg - (bg - max_bg)/3 ),0);
+        adjustedMinBG = round(Math.max(80, min_bg - (bg - min_bg)/3 ),0);
+        adjustedTargetBG =round( Math.max(80, target_bg - (bg - target_bg)/3 ),0);
+        adjustedMaxBG = round(Math.max(80, max_bg - (bg - max_bg)/3 ),0);
         // if eventualBG, naive_eventualBG, and target_bg aren't all above adjustedMinBG, don’t use it
         //console.error("naive_eventualBG:",naive_eventualBG+", eventualBG:",eventualBG);
         if (eventualBG > adjustedMinBG && naive_eventualBG > adjustedMinBG && min_bg > adjustedMinBG) {
-            console.error("Adjusting targets for high BG: min_bg from "+min_bg+" to "+adjustedMinBG+"; ");
+            console.log("Adjusting targets for high BG: min_bg from "+min_bg+" to "+adjustedMinBG+"; ");
             min_bg = adjustedMinBG;
         } else {
-            console.error("min_bg unchanged: "+min_bg+"; ");
+            console.log("min_bg unchanged: "+min_bg+"; ");
         }
         // if eventualBG, naive_eventualBG, and target_bg aren't all above adjustedTargetBG, don’t use it
         if (eventualBG > adjustedTargetBG && naive_eventualBG > adjustedTargetBG && target_bg > adjustedTargetBG) {
-            console.error("target_bg from "+target_bg+" to "+adjustedTargetBG+"; ");
+            console.log("target_bg from "+target_bg+" to "+adjustedTargetBG+"; ");
             target_bg = adjustedTargetBG;
         } else {
-            console.error("target_bg unchanged: "+target_bg+"; ");
+            console.log("target_bg unchanged: "+target_bg+"; ");
         }
         // if eventualBG, naive_eventualBG, and max_bg aren't all above adjustedMaxBG, don’t use it
         if (eventualBG > adjustedMaxBG && naive_eventualBG > adjustedMaxBG && max_bg > adjustedMaxBG) {
@@ -321,7 +407,6 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         , 'bg': bg
         , 'tick': tick
         , 'eventualBG': eventualBG
-        //, 'snoozeBG': snoozeBG
         , 'insulinReq': 0
         , 'reservoir' : reservoir_data // The expected reservoir volume at which to deliver the microbolus (the reservoir volume from right before the last pumphistory run)
         , 'deliverAt' : deliverAt // The time at which the microbolus should be delivered
@@ -341,71 +426,13 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     ZTpredBGs.push(bg);
     UAMpredBGs.push(bg);
 
-    // enable SMB whenever we have COB or UAM is enabled
-    // SMB is disabled by default, unless explicitly enabled in preferences.json
-    var enableSMB=false;
-    // disable SMB when a high temptarget is set
-    if (! microBolusAllowed) {
-        console.error("SMB disabled (!microBolusAllowed)")
-    } else if (! profile.allowSMB_with_high_temptarget && profile.temptargetSet && target_bg > 100) {
-        console.error("SMB disabled due to high temptarget of",target_bg);
-        enableSMB=false;
-    // enable SMB/UAM (if enabled in preferences) while we have COB
-    } else if (profile.enableSMB_with_COB === true && meal_data.mealCOB) {
-        if (meal_data.bwCarbs) {
-            if (profile.A52_risk_enable) {
-                console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard")
-                enableSMB=true;
-            } else {
-                console.error("SMB not enabled for Bolus Wizard COB");
-            }
-        } else {
-            console.error("SMB enabled for COB of",meal_data.mealCOB);
-            enableSMB=true;
-        }
-    // enable SMB/UAM (if enabled in preferences) for a full 6 hours after any carb entry
-    // (6 hours is defined in carbWindow in lib/meal/total.js)
-    } else if (profile.enableSMB_after_carbs === true && meal_data.carbs ) {
-        if (meal_data.bwCarbs) {
-            if (profile.A52_risk_enable) {
-            console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard")
-            enableSMB=true;
-            } else {
-                console.error("SMB not enabled for Bolus Wizard carbs");
-            }
-        } else {
-            console.error("SMB enabled for 6h after carb entry");
-            enableSMB=true;
-        }
-    // enable SMB/UAM (if enabled in preferences) if a low temptarget is set
-    } else if (profile.enableSMB_with_temptarget === true && (profile.temptargetSet && target_bg < 100)) {
-        if (meal_data.bwFound) {
-            if (profile.A52_risk_enable) {
-                console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard")
-                enableSMB=true;
-            } else {
-                console.error("enableSMB_with_temptarget not supported within 6h of using Bolus Wizard");
-            }
-        } else {
-            console.error("SMB enabled for temptarget of",convert_bg(target_bg, profile));
-            enableSMB=true;
-        }
-    // enable SMB/UAM if always-on (unless previously disabled for high temptarget)
-    } else if (profile.enableSMB_always === true) {
-        if (meal_data.bwFound) {
-            if (profile.A52_risk_enable === true) {
-                console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard")
-                enableSMB=true;
-            } else {
-                console.error("enableSMB_always not supported within 6h of using Bolus Wizard");
-            }
-        } else {
-            console.error("SMB enabled due to enableSMB_always");
-            enableSMB=true;
-        }
-    } else {
-        console.error("SMB disabled (no enableSMB preferences active)");
-    }
+    var enableSMB = enable_smb(
+        profile,
+        microBolusAllowed,
+        meal_data,
+        target_bg
+    );
+
     // enable UAM (if enabled in preferences)
     var enableUAM=(profile.enableUAM);
 
@@ -417,43 +444,48 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     // calculate current carb absorption rate, and how long to absorb all carbs
     // CI = current carb impact on BG in mg/dL/5m
     ci = round((minDelta - bgi),1);
-    uci = round((minDelta - bgi),1);
+    var uci = round((minDelta - bgi),1);
     // ISF (mg/dL/U) / CR (g/U) = CSF (mg/dL/g)
-    if (profile.temptargetSet) {
+
+    // TODO: remove commented-out code for old behavior
+    //if (profile.temptargetSet) {
         // if temptargetSet, use unadjusted profile.sens to allow activity mode sensitivityRatio to adjust CR
-        var csf = profile.sens / profile.carb_ratio;
-    } else {
+        //var csf = profile.sens / profile.carb_ratio;
+    //} else {
         // otherwise, use autosens-adjusted sens to counteract autosens meal insulin dosing adjustments
         // so that autotuned CR is still in effect even when basals and ISF are being adjusted by autosens
-        var csf = sens / profile.carb_ratio;
-    }
+        //var csf = sens / profile.carb_ratio;
+    //}
+    // use autosens-adjusted sens to counteract autosens meal insulin dosing adjustments so that
+    // autotuned CR is still in effect even when basals and ISF are being adjusted by TT or autosens
+    // this avoids overdosing insulin for large meals when low temp targets are active
+    csf = sens / profile.carb_ratio;
+    console.error("profile.sens:",profile.sens,"sens:",sens,"CSF:",csf);
+
     var maxCarbAbsorptionRate = 30; // g/h; maximum rate to assume carbs will absorb if no CI observed
     // limit Carb Impact to maxCarbAbsorptionRate * csf in mg/dL per 5m
-    maxCI = round(maxCarbAbsorptionRate*csf*5/60,1)
+    var maxCI = round(maxCarbAbsorptionRate*csf*5/60,1)
     if (ci > maxCI) {
         console.error("Limiting carb impact from",ci,"to",maxCI,"mg/dL/5m (",maxCarbAbsorptionRate,"g/h )");
         ci = maxCI;
     }
-    // set meal_carbimpact high enough to absorb all meal carbs over 6 hours
-    // total_impact (mg/dL) = CSF (mg/dL/g) * carbs (g)
-    //console.error(csf * meal_data.carbs);
-    // meal_carbimpact (mg/dL/5m) = CSF (mg/dL/g) * carbs (g) / 6 (h) * (1h/60m) * 5 (m/5m) * 2 (for linear decay)
-    //var meal_carbimpact = round((csf * meal_data.carbs / 6 / 60 * 5 * 2),1)
-    var remainingCATimeMin = 3; // h; before carb absorption starts
-    // adjust remainingCATime (instead of CR) for autosens
-    remainingCATimeMin = remainingCATimeMin / sensitivityRatio;
+    var remainingCATimeMin = 3; // h; duration of expected not-yet-observed carb absorption
+    // adjust remainingCATime (instead of CR) for autosens if sensitivityRatio defined
+    if (sensitivityRatio){
+        remainingCATimeMin = remainingCATimeMin / sensitivityRatio;
+    }
     // 20 g/h means that anything <= 60g will get a remainingCATimeMin, 80g will get 4h, and 120g 6h
     // when actual absorption ramps up it will take over from remainingCATime
     var assumedCarbAbsorptionRate = 20; // g/h; maximum rate to assume carbs will absorb if no CI observed
-    var remainingCATime = remainingCATimeMin; // added by mike https://github.com/openaps/oref0/issues/884
+    var remainingCATime = remainingCATimeMin;
     if (meal_data.carbs) {
         // if carbs * assumedCarbAbsorptionRate > remainingCATimeMin, raise it
         // so <= 90g is assumed to take 3h, and 120g=4h
         remainingCATimeMin = Math.max(remainingCATimeMin, meal_data.mealCOB/assumedCarbAbsorptionRate);
-        var lastCarbAge = round(( new Date().getTime() - meal_data.lastCarbTime ) / 60000);
+        var lastCarbAge = round(( new Date(systemTime).getTime() - meal_data.lastCarbTime ) / 60000);
         //console.error(meal_data.lastCarbTime, lastCarbAge);
 
-        fractionCOBAbsorbed = ( meal_data.carbs - meal_data.mealCOB ) / meal_data.carbs;
+        var fractionCOBAbsorbed = ( meal_data.carbs - meal_data.mealCOB ) / meal_data.carbs;
         remainingCATime = remainingCATimeMin + 1.5 * lastCarbAge/60;
         remainingCATime = round(remainingCATime,1);
         //console.error(fractionCOBAbsorbed, remainingCATimeAdjustment, remainingCATime)
@@ -478,7 +510,6 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     // remainingCIpeak (mg/dL/5m) = remainingCarbs (g) * CSF (mg/dL/g) * 5 (m/5m) * 1h/60m / (remainingCATime/2) (h)
     var remainingCIpeak = remainingCarbs * csf * 5 / 60 / (remainingCATime/2);
     //console.error(profile.min_5m_carbimpact,ci,totalCI,totalCA,remainingCarbs,remainingCI,remainingCATime);
-    //if (meal_data.mealCOB * 3 > meal_data.carbs) { }
 
     // calculate peak deviation in last hour, and slope from that to current deviation
     var slopeFromMaxDeviation = round(meal_data.slopeFromMaxDeviation,2);
@@ -488,17 +519,17 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     var slopeFromDeviations = Math.min(slopeFromMaxDeviation,-slopeFromMinDeviation/3);
     //console.error(slopeFromMaxDeviation);
 
-    aci = 10;
+    var aci = 10;
     //5m data points = g * (1U/10g) * (40mg/dL/1U) / (mg/dL/5m)
     // duration (in 5m data points) = COB (g) * CSF (mg/dL/g) / ci (mg/dL/5m)
     // limit cid to remainingCATime hours: the reset goes to remainingCI
-    if (ci == 0) {
+    if (ci === 0) {
         // avoid divide by zero
         cid = 0;
     } else {
         cid = Math.min(remainingCATime*60/5/2,Math.max(0, meal_data.mealCOB * csf / ci ));
     }
-    acid = Math.max(0, meal_data.mealCOB * csf / aci );
+    var acid = Math.max(0, meal_data.mealCOB * csf / aci );
     // duration (hours) = duration (5m) * 5 / 60 * 2 (to account for linear decay)
     console.error("Carb Impact:",ci,"mg/dL per 5m; CI Duration:",round(cid*5/60*2,1),"hours; remaining CI (~2h peak):",round(remainingCIpeak,1),"mg/dL per 5m");
     //console.error("Accel. Carb Impact:",aci,"mg/dL per 5m; ACI Duration:",round(acid*5/60*2,1),"hours");
@@ -529,18 +560,18 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     try {
         iobArray.forEach(function(iobTick) {
             //console.error(iobTick);
-            predBGI = round(( -iobTick.activity * sens * 5 ), 2);
-            predZTBGI = round(( -iobTick.iobWithZeroTemp.activity * sens * 5 ), 2);
+            var predBGI = round(( -iobTick.activity * sens * 5 ), 2);
+            var predZTBGI = round(( -iobTick.iobWithZeroTemp.activity * sens * 5 ), 2);
             // for IOBpredBGs, predicted deviation impact drops linearly from current deviation down to zero
             // over 60 minutes (data points every 5m)
-            predDev = ci * ( 1 - Math.min(1,IOBpredBGs.length/(60/5)) );
+            var predDev = ci * ( 1 - Math.min(1,IOBpredBGs.length/(60/5)) );
             IOBpredBG = IOBpredBGs[IOBpredBGs.length-1] + predBGI + predDev;
             // calculate predBGs with long zero temp without deviations
-            ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + predZTBGI;
+            var ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + predZTBGI;
             // for COBpredBGs, predicted carb impact drops linearly from current carb impact down to zero
             // eventually accounting for all carbs (if they can be absorbed over DIA)
-            predCI = Math.max(0, Math.max(0,ci) * ( 1 - COBpredBGs.length/Math.max(cid*2,1) ) );
-            predACI = Math.max(0, Math.max(0,aci) * ( 1 - COBpredBGs.length/Math.max(acid*2,1) ) );
+            var predCI = Math.max(0, Math.max(0,ci) * ( 1 - COBpredBGs.length/Math.max(cid*2,1) ) );
+            var predACI = Math.max(0, Math.max(0,aci) * ( 1 - COBpredBGs.length/Math.max(acid*2,1) ) );
             // if any carbs aren't absorbed after remainingCATime hours, assume they'll absorb in a /\ shaped
             // bilinear curve peaking at remainingCIpeak at remainingCATime/2 hours (remainingCATime/2*12 * 5m)
             // and ending at remainingCATime h (remainingCATime*12 * 5m intervals)
@@ -549,18 +580,18 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             remainingCItotal += predCI+remainingCI;
             remainingCIs.push(round(remainingCI,0));
             predCIs.push(round(predCI,0));
-            //console.error(round(predCI,1)+"+"+round(remainingCI,1)+" ");
+            //console.log(round(predCI,1)+"+"+round(remainingCI,1)+" ");
             COBpredBG = COBpredBGs[COBpredBGs.length-1] + predBGI + Math.min(0,predDev) + predCI + remainingCI;
-            aCOBpredBG = aCOBpredBGs[aCOBpredBGs.length-1] + predBGI + Math.min(0,predDev) + predACI;
+            var aCOBpredBG = aCOBpredBGs[aCOBpredBGs.length-1] + predBGI + Math.min(0,predDev) + predACI;
             // for UAMpredBGs, predicted carb impact drops at slopeFromDeviations
             // calculate predicted CI from UAM based on slopeFromDeviations
-            predUCIslope = Math.max(0, uci + ( UAMpredBGs.length*slopeFromDeviations ) );
+            var predUCIslope = Math.max(0, uci + ( UAMpredBGs.length*slopeFromDeviations ) );
             // if slopeFromDeviations is too flat, predicted deviation impact drops linearly from
             // current deviation down to zero over 3h (data points every 5m)
-            predUCImax = Math.max(0, uci * ( 1 - UAMpredBGs.length/Math.max(3*60/5,1) ) );
+            var predUCImax = Math.max(0, uci * ( 1 - UAMpredBGs.length/Math.max(3*60/5,1) ) );
             //console.error(predUCIslope, predUCImax);
             // predicted CI from UAM is the lesser of CI based on deviationSlope or DIA
-            predUCI = Math.min(predUCIslope, predUCImax);
+            var predUCI = Math.min(predUCIslope, predUCImax);
             if(predUCI>0) {
                 //console.error(UAMpredBGs.length,slopeFromDeviations, predUCI);
                 UAMduration=round((UAMpredBGs.length+1)*5/60,1);
@@ -582,7 +613,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             // set minPredBGs starting when currently-dosed insulin activity will peak
             // look ahead 60m (regardless of insulin type) so as to be less aggressive on slower insulins
             var insulinPeakTime = 60;
-            // add 30m to allow for insluin delivery (SMBs or temps)
+            // add 30m to allow for insulin delivery (SMBs or temps)
             insulinPeakTime = 90;
             var insulinPeak5m = (insulinPeakTime/60)*12;
             //console.error(insulinPeakTime, insulinPeak5m, profile.insulinPeakTime, profile.curve);
@@ -599,19 +630,18 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         // set eventualBG to include effect of carbs
         //console.error("PredBGs:",JSON.stringify(predBGs));
     } catch (e) {
-        console.error("Problem with iobArray.  Optional feature Advanced Meal Assist disabled:",e);
+        console.error("Problem with iobArray.  Optional feature Advanced Meal Assist disabled");
     }
     if (meal_data.mealCOB) {
         console.error("predCIs (mg/dL/5m):",predCIs.join(" "));
         console.error("remainingCIs:      ",remainingCIs.join(" "));
     }
-    //,"totalCA:",round(totalCA,2),"remainingCItotal/csf+totalCA:",round(remainingCItotal/csf+totalCA,2));
     rT.predBGs = {};
     IOBpredBGs.forEach(function(p, i, theArray) {
         theArray[i] = round(Math.min(401,Math.max(39,p)));
     });
     for (var i=IOBpredBGs.length-1; i > 12; i--) {
-        if (IOBpredBGs[i-1] != IOBpredBGs[i]) { break; }
+        if (IOBpredBGs[i-1] !== IOBpredBGs[i]) { break; }
         else { IOBpredBGs.pop(); }
     }
     rT.predBGs.IOB = IOBpredBGs;
@@ -619,10 +649,9 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     ZTpredBGs.forEach(function(p, i, theArray) {
         theArray[i] = round(Math.min(401,Math.max(39,p)));
     });
-    for (var i=ZTpredBGs.length-1; i > 6; i--) {
-        //if (ZTpredBGs[i-1] != ZTpredBGs[i]) { break; }
+    for (i=ZTpredBGs.length-1; i > 6; i--) {
         // stop displaying ZTpredBGs once they're rising and above target
-        if (ZTpredBGs[i-1] >= ZTpredBGs[i] || ZTpredBGs[i] < target_bg) { break; }
+        if (ZTpredBGs[i-1] >= ZTpredBGs[i] || ZTpredBGs[i] <= target_bg) { break; }
         else { ZTpredBGs.pop(); }
     }
     rT.predBGs.ZT = ZTpredBGs;
@@ -631,19 +660,17 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         aCOBpredBGs.forEach(function(p, i, theArray) {
             theArray[i] = round(Math.min(401,Math.max(39,p)));
         });
-        for (var i=aCOBpredBGs.length-1; i > 12; i--) {
-            if (aCOBpredBGs[i-1] != aCOBpredBGs[i]) { break; }
+        for (i=aCOBpredBGs.length-1; i > 12; i--) {
+            if (aCOBpredBGs[i-1] !== aCOBpredBGs[i]) { break; }
             else { aCOBpredBGs.pop(); }
         }
-        // disable for now.  may want to add a preference to re-enable
-        //rT.predBGs.aCOB = aCOBpredBGs;
     }
     if (meal_data.mealCOB > 0 && ( ci > 0 || remainingCIpeak > 0 )) {
         COBpredBGs.forEach(function(p, i, theArray) {
             theArray[i] = round(Math.min(401,Math.max(39,p)));
         });
-        for (var i=COBpredBGs.length-1; i > 12; i--) {
-            if (COBpredBGs[i-1] != COBpredBGs[i]) { break; }
+        for (i=COBpredBGs.length-1; i > 12; i--) {
+            if (COBpredBGs[i-1] !== COBpredBGs[i]) { break; }
             else { COBpredBGs.pop(); }
         }
         rT.predBGs.COB = COBpredBGs;
@@ -655,8 +682,8 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             UAMpredBGs.forEach(function(p, i, theArray) {
                 theArray[i] = round(Math.min(401,Math.max(39,p)));
             });
-            for (var i=UAMpredBGs.length-1; i > 12; i--) {
-                if (UAMpredBGs[i-1] != UAMpredBGs[i]) { break; }
+            for (i=UAMpredBGs.length-1; i > 12; i--) {
+                if (UAMpredBGs[i-1] !== UAMpredBGs[i]) { break; }
                 else { UAMpredBGs.pop(); }
             }
             rT.predBGs.UAM = UAMpredBGs;
@@ -666,7 +693,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             }
         }
 
-        // set eventualBG and snoozeBG based on COB or UAM predBGs
+        // set eventualBG based on COB or UAM predBGs
         rT.eventualBG = eventualBG;
     }
 
@@ -733,14 +760,6 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     //console.error("minUAMPredBG:",minUAMPredBG,"minZTGuardBG:",minZTGuardBG,"minZTUAMPredBG:",minZTUAMPredBG);
     // if any carbs have been entered recently
     if (meal_data.carbs) {
-        // average the minIOBPredBG and minUAMPredBG if available
-        /*
-        if ( minUAMPredBG < 999 ) {
-            avgMinPredBG = round( (minIOBPredBG+minUAMPredBG)/2 );
-        } else {
-            avgMinPredBG = minIOBPredBG;
-        }
-        */
 
         // if UAM is disabled, use max of minIOBPredBG, minCOBPredBG
         if ( ! enableUAM && minCOBPredBG < 999 ) {
@@ -748,30 +767,29 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         // if we have COB, use minCOBPredBG, or blendedMinPredBG if it's higher
         } else if ( minCOBPredBG < 999 ) {
             // calculate blendedMinPredBG based on how many carbs remain as COB
-            //blendedMinPredBG = fractionCarbsLeft*minCOBPredBG + (1-fractionCarbsLeft)*minUAMPredBG;
-            blendedMinPredBG = fractionCarbsLeft*minCOBPredBG + (1-fractionCarbsLeft)*minZTUAMPredBG;
+            var blendedMinPredBG = fractionCarbsLeft*minCOBPredBG + (1-fractionCarbsLeft)*minZTUAMPredBG;
             // if blendedMinPredBG > minCOBPredBG, use that instead
             minPredBG = round(Math.max(minIOBPredBG, minCOBPredBG, blendedMinPredBG));
         // if carbs have been entered, but have expired, use minUAMPredBG
-        } else {
-            //minPredBG = minUAMPredBG;
+        } else if ( enableUAM ) {
             minPredBG = minZTUAMPredBG;
+        } else {
+            minPredBG = minGuardBG;
         }
     // in pure UAM mode, use the higher of minIOBPredBG,minUAMPredBG
     } else if ( enableUAM ) {
-        //minPredBG = round(Math.max(minIOBPredBG,minUAMPredBG));
         minPredBG = round(Math.max(minIOBPredBG,minZTUAMPredBG));
     }
 
     // make sure minPredBG isn't higher than avgPredBG
     minPredBG = Math.min( minPredBG, avgPredBG );
 
-    console.error("minPredBG: "+minPredBG+" minIOBPredBG: "+minIOBPredBG+" minZTGuardBG: "+minZTGuardBG);
+    console.log("minPredBG: "+minPredBG+" minIOBPredBG: "+minIOBPredBG+" minZTGuardBG: "+minZTGuardBG);
     if (minCOBPredBG < 999) {
-        console.error(" minCOBPredBG: "+minCOBPredBG);
+        console.log(" minCOBPredBG: "+minCOBPredBG);
     }
     if (minUAMPredBG < 999) {
-        console.error(" minUAMPredBG: "+minUAMPredBG);
+        console.log(" minUAMPredBG: "+minUAMPredBG);
     }
     console.error(" avgPredBG:",avgPredBG,"COB:",meal_data.mealCOB,"/",meal_data.carbs);
     // But if the COB line falls off a cliff, don't trust UAM too much:
@@ -790,9 +808,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         rT.reason += ", UAMpredBG " + convert_bg(lastUAMpredBG, profile)
     }
     rT.reason += "; ";
-    //var bgUndershoot = threshold - Math.min(minGuardBG, Math.max( naive_eventualBG, eventualBG ));
     // use naive_eventualBG if above 40, but switch to minGuardBG if both eventualBGs hit floor of 39
-    //var carbsReqBG = Math.max( naive_eventualBG, eventualBG );
     var carbsReqBG = naive_eventualBG;
     if ( carbsReqBG < 40 ) {
         carbsReqBG = Math.min( minGuardBG, carbsReqBG );
@@ -802,14 +818,14 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     var minutesAboveMinBG = 240;
     var minutesAboveThreshold = 240;
     if (meal_data.mealCOB > 0 && ( ci > 0 || remainingCIpeak > 0 )) {
-        for (var i=0; i<COBpredBGs.length; i++) {
+        for (i=0; i<COBpredBGs.length; i++) {
             //console.error(COBpredBGs[i], min_bg);
             if ( COBpredBGs[i] < min_bg ) {
                 minutesAboveMinBG = 5*i;
                 break;
             }
         }
-        for (var i=0; i<COBpredBGs.length; i++) {
+        for (i=0; i<COBpredBGs.length; i++) {
             //console.error(COBpredBGs[i], threshold);
             if ( COBpredBGs[i] < threshold ) {
                 minutesAboveThreshold = 5*i;
@@ -817,14 +833,14 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             }
         }
     } else {
-        for (var i=0; i<IOBpredBGs.length; i++) {
+        for (i=0; i<IOBpredBGs.length; i++) {
             //console.error(IOBpredBGs[i], min_bg);
             if ( IOBpredBGs[i] < min_bg ) {
                 minutesAboveMinBG = 5*i;
                 break;
             }
         }
-        for (var i=0; i<IOBpredBGs.length; i++) {
+        for (i=0; i<IOBpredBGs.length; i++) {
             //console.error(IOBpredBGs[i], threshold);
             if ( IOBpredBGs[i] < threshold ) {
                 minutesAboveThreshold = 5*i;
@@ -848,9 +864,8 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     if ( minutesAboveThreshold < 240 || minutesAboveMinBG < 60 ) {
         console.error("BG projected to remain above",convert_bg(threshold,profile),"for",minutesAboveThreshold,"minutes");
     }
-    // include at least minutesAboveMinBG worth of zero temps in calculating carbsReq
+    // include at least minutesAboveThreshold worth of zero temps in calculating carbsReq
     // always include at least 30m worth of zero temp (carbs to 80, low temp up to target)
-    //var zeroTempDuration = Math.max(30,minutesAboveMinBG);
     var zeroTempDuration = minutesAboveThreshold;
     // BG undershoot, minus effect of zero temps until hitting min_bg, converted to grams, minus COB
     var zeroTempEffect = profile.current_basal*sens*zeroTempDuration/60;
@@ -871,7 +886,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     // predictive low glucose suspend mode: BG is / is projected to be < threshold
     } else if ( bg < threshold || minGuardBG < threshold ) {
         rT.reason += "minGuardBG " + convert_bg(minGuardBG, profile) + "<" + convert_bg(threshold, profile);
-        var bgUndershoot = target_bg - minGuardBG;
+        bgUndershoot = target_bg - minGuardBG;
         var worstCaseInsulinReq = bgUndershoot / sens;
         var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
         durationReq = round(durationReq/30)*30;
@@ -880,6 +895,13 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         return tempBasalFunctions.setTempBasal(0, durationReq, profile, rT, currenttemp);
     }
 
+    // if not in LGS mode, cancel temps before the top of the hour to reduce beeping/vibration
+    // console.error(profile.skip_neutral_temps, rT.deliverAt.getMinutes());
+    if ( profile.skip_neutral_temps && rT.deliverAt.getMinutes() >= 55 ) {
+        rT.reason += "; Canceling temp at " + rT.deliverAt.getMinutes() + "m past the hour. ";
+        return tempBasalFunctions.setTempBasal(0, 0, profile, rT, currenttemp);
+    }
+
     if (eventualBG < min_bg) { // if eventual BG is below target:
         rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " < " + convert_bg(min_bg, profile);
         // if 5m or 30m avg BG is rising faster than expected delta
@@ -904,9 +926,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         }
 
         // calculate 30m low-temp required to get projected BG up to target
-        // use snoozeBG to more gradually ramp in any counteraction of the user's boluses
         // multiply by 2 to low-temp faster for increased hypo safety
-        //var insulinReq = 2 * Math.min(0, (snoozeBG - target_bg) / sens);
         var insulinReq = 2 * Math.min(0, (eventualBG - target_bg) / sens);
         insulinReq = round( insulinReq , 2);
         // calculate naiveInsulinReq based on naive_eventualBG
@@ -914,7 +934,6 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         naiveInsulinReq = round( naiveInsulinReq , 2);
         if (minDelta < 0 && minDelta > expectedDelta) {
             // if we're barely falling, newinsulinReq should be barely negative
-            //rT.reason += ", Snooze BG " + convert_bg(snoozeBG, profile);
             var newinsulinReq = round(( insulinReq * (minDelta / expectedDelta) ), 2);
             //console.error("Increasing insulinReq from " + insulinReq + " to " + newinsulinReq);
             insulinReq = newinsulinReq;
@@ -922,6 +941,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         // rate required to deliver insulinReq less insulin over 30m:
         var rate = basal + (2 * insulinReq);
         rate = round_basal(rate, profile);
+
         // if required temp < existing temp basal
         var insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
         // if current temp would deliver a lot (30% of basal) less than the required insulin,
@@ -937,18 +957,17 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         } else {
             // calculate a long enough zero temp to eventually correct back up to target
             if ( rate <=0 ) {
-                var bgUndershoot = target_bg - naive_eventualBG;
-                var worstCaseInsulinReq = bgUndershoot / sens;
-                var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
+                bgUndershoot = target_bg - naive_eventualBG;
+                worstCaseInsulinReq = bgUndershoot / sens;
+                durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
                 if (durationReq < 0) {
                     durationReq = 0;
-                // don't set an SMB zero temp longer than 60 minutess
+                // don't set a temp longer than 120 minutes
                 } else {
                     durationReq = round(durationReq/30)*30;
-                    durationReq = Math.min(60,Math.max(0,durationReq));
+                    durationReq = Math.min(120,Math.max(0,durationReq));
                 }
                 //console.error(durationReq);
-                //rT.reason += "insulinReq " + insulinReq + "; "
                 if (durationReq > 0) {
                     rT.reason += ", setting " + durationReq + "m zero temp. ";
                     return tempBasalFunctions.setTempBasal(rate, durationReq, profile, rT, currenttemp);
@@ -995,8 +1014,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     // eventual BG is at/above target
     // if iob is over max, just cancel any temps
-    // if we're not here because of SMB, eventual BG is at/above target
-    if (! (microBolusAllowed && rT.COB)) {
+    if ( eventualBG >= max_bg ) {
         rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " >= " +  convert_bg(max_bg, profile) + ", ";
     }
     if (iob_data.iob > max_iob) {
@@ -1012,15 +1030,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
         // insulinReq is the additional insulin required to get minPredBG down to target_bg
         //console.error(minPredBG,eventualBG);
-        //var insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / sens, 2);
-        var insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / sens, 2);
-        // when dropping, but not as fast as expected, reduce insulinReq proportionally
-        // to the what fraction of expectedDelta we're dropping at
-        //if (minDelta < 0 && minDelta > expectedDelta) {
-            //var newinsulinReq = round(( insulinReq * (1 - (minDelta / expectedDelta)) ), 2);
-            //console.error("Reducing insulinReq from " + insulinReq + " to " + newinsulinReq + " for minDelta " + minDelta + " vs. expectedDelta " + expectedDelta);
-            //insulinReq = newinsulinReq;
-        //}
+        insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / sens, 2);
         // if that would put us over max_iob, then reduce accordingly
         if (insulinReq > max_iob-iob_data.iob) {
             rT.reason += "max_iob " + max_iob + ", ";
@@ -1028,49 +1038,56 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         }
 
         // rate required to deliver insulinReq more insulin over 30m:
-        var rate = basal + (2 * insulinReq);
+        rate = basal + (2 * insulinReq);
         rate = round_basal(rate, profile);
         insulinReq = round(insulinReq,3);
         rT.insulinReq = insulinReq;
         //console.error(iob_data.lastBolusTime);
         // minutes since last bolus
-        var lastBolusAge = round(( new Date().getTime() - iob_data.lastBolusTime ) / 60000,1);
+        var lastBolusAge = round(( new Date(systemTime).getTime() - iob_data.lastBolusTime ) / 60000,1);
         //console.error(lastBolusAge);
         //console.error(profile.temptargetSet, target_bg, rT.COB);
         // only allow microboluses with COB or low temp targets, or within DIA hours of a bolus
         if (microBolusAllowed && enableSMB && bg > threshold) {
             // never bolus more than maxSMBBasalMinutes worth of basal
-            mealInsulinReq = round( meal_data.mealCOB / profile.carb_ratio ,3);
-            if (typeof profile.maxSMBBasalMinutes == 'undefined' ) {
-                maxBolus = round( profile.current_basal * 30 / 60 ,1);
+            var mealInsulinReq = round( meal_data.mealCOB / profile.carb_ratio ,3);
+            if (typeof profile.maxSMBBasalMinutes === 'undefined' ) {
+                var maxBolus = round( profile.current_basal * 30 / 60 ,1);
                 console.error("profile.maxSMBBasalMinutes undefined: defaulting to 30m");
             // if IOB covers more than COB, limit maxBolus to 30m of basal
             } else if ( iob_data.iob > mealInsulinReq && iob_data.iob > 0 ) {
                 console.error("IOB",iob_data.iob,"> COB",meal_data.mealCOB+"; mealInsulinReq =",mealInsulinReq);
-                maxBolus = round( profile.current_basal * 30 / 60 ,1);
+                if (profile.maxUAMSMBBasalMinutes) {
+                    console.error("profile.maxUAMSMBBasalMinutes:",profile.maxUAMSMBBasalMinutes,"profile.current_basal:",profile.current_basal);
+                    maxBolus = round( profile.current_basal * profile.maxUAMSMBBasalMinutes / 60 ,1);
+                } else {
+                    console.error("profile.maxUAMSMBBasalMinutes undefined: defaulting to 30m");
+                    maxBolus = round( profile.current_basal * 30 / 60 ,1);
+                }
             } else {
                 console.error("profile.maxSMBBasalMinutes:",profile.maxSMBBasalMinutes,"profile.current_basal:",profile.current_basal);
                 maxBolus = round( profile.current_basal * profile.maxSMBBasalMinutes / 60 ,1);
             }
-            // bolus 1/2 the insulinReq, up to maxBolus, rounding down to nearest 0.1U
-            microBolus = Math.floor(Math.min(insulinReq/2,maxBolus)*10)/10;
+            // bolus 1/2 the insulinReq, up to maxBolus, rounding down to nearest bolus increment
+            var roundSMBTo = 1 / profile.bolus_increment;
+            var microBolus = Math.floor(Math.min(insulinReq/2,maxBolus)*roundSMBTo)/roundSMBTo;
             // calculate a long enough zero temp to eventually correct back up to target
             var smbTarget = target_bg;
-            var worstCaseInsulinReq = (smbTarget - (naive_eventualBG + minIOBPredBG)/2 ) / sens;
-            var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
+            worstCaseInsulinReq = (smbTarget - (naive_eventualBG + minIOBPredBG)/2 ) / sens;
+            durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
 
             // if insulinReq > 0 but not enough for a microBolus, don't set an SMB zero temp
-            if (insulinReq > 0 && microBolus < 0.1) {
+            if (insulinReq > 0 && microBolus < profile.bolus_increment) {
                 durationReq = 0;
             }
 
             var smbLowTempReq = 0;
             if (durationReq <= 0) {
                 durationReq = 0;
-            // don't set a temp longer than 120 minutes
+            // don't set an SMB zero temp longer than 60 minutes
             } else if (durationReq >= 30) {
                 durationReq = round(durationReq/30)*30;
-                durationReq = Math.min(120,Math.max(0,durationReq));
+                durationReq = Math.min(60,Math.max(0,durationReq));
             } else {
                 // if SMB durationReq is less than 30m, set a nonzero low temp
                 smbLowTempReq = round( basal * durationReq/30 ,2);
@@ -1085,17 +1102,23 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             }
             rT.reason += ". ";
 
-            //allow SMBs every 3 minutes
-            var nextBolusMins = round(3-lastBolusAge,1);
+            //allow SMBs every 3 minutes by default
+            var SMBInterval = 3;
+            if (profile.SMBInterval) {
+                // allow SMBIntervals between 1 and 10 minutes
+                SMBInterval = Math.min(10,Math.max(1,profile.SMBInterval));
+            }
+            var nextBolusMins = round(SMBInterval-lastBolusAge,0);
+            var nextBolusSeconds = round((SMBInterval - lastBolusAge) * 60, 0) % 60;
             //console.error(naive_eventualBG, insulinReq, worstCaseInsulinReq, durationReq);
             console.error("naive_eventualBG",naive_eventualBG+",",durationReq+"m "+smbLowTempReq+"U/h temp needed; last bolus",lastBolusAge+"m ago; maxBolus: "+maxBolus);
-            if (lastBolusAge > 3) {
+            if (lastBolusAge > SMBInterval) {
                 if (microBolus > 0) {
                     rT.units = microBolus;
                     rT.reason += "Microbolusing " + microBolus + "U. ";
                 }
             } else {
-                rT.reason += "Waiting " + nextBolusMins + "m to microbolus again. ";
+                rT.reason += "Waiting " + nextBolusMins + "m " + nextBolusSeconds + "s to microbolus again. ";
             }
             //rT.reason += ". ";
 
@@ -1106,11 +1129,6 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
                 return rT;
             }
 
-            // if insulinReq is negative, snoozeBG > target_bg, and lastCOBpredBG > target_bg, set a neutral temp
-            //if (insulinReq < 0 && snoozeBG > target_bg && lastCOBpredBG > target_bg) {
-                //rT.reason += "; SMB bolus snooze: setting current basal of " + basal + " as temp. ";
-                //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
-            //}
         }
 
         var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile);
@@ -1120,13 +1138,13 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             rate = round_basal(maxSafeBasal, profile);
         }
 
-        var insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
+        insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
         if (insulinScheduled >= insulinReq * 2) { // if current temp would deliver >2x more than the required insulin, lower the rate
             rT.reason += currenttemp.duration + "m@" + (currenttemp.rate).toFixed(2) + " > 2 * insulinReq. Setting temp basal of " + rate + "U/hr. ";
             return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
         }
 
-        if (typeof currenttemp.duration == 'undefined' || currenttemp.duration == 0) { // no temp is set
+        if (typeof currenttemp.duration === 'undefined' || currenttemp.duration === 0) { // no temp is set
             rT.reason += "no temp, setting " + rate + "U/hr. ";
             return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
         }
diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml
index ae1594f639..5329eb18d0 100644
--- a/app/src/main/assets/logback.xml
+++ b/app/src/main/assets/logback.xml
@@ -18,7 +18,7 @@
             <maxHistory>120</maxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %.-1level/%logger: [%class{0}.%M\(\):%line]: %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %.-1level/%logger: %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -27,7 +27,7 @@
             <pattern>%logger{0}</pattern>
         </tagEncoder>
         <encoder>
-            <pattern>[%thread] [%class{0}.%M\(\):%line]: %msg%n</pattern>
+            <pattern>[%thread]: %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/app/src/main/assets/revoked_certs.txt b/app/src/main/assets/revoked_certs.txt
index 59a55d9e42..41177d5667 100644
--- a/app/src/main/assets/revoked_certs.txt
+++ b/app/src/main/assets/revoked_certs.txt
@@ -1,2 +1,4 @@
 #Demo certificate
-51:6D:12:67:4C:27:F4:9B:9F:E5:42:9B:01:B3:98:E4:66:2B:85:B7:A8:DD:70:32:B7:6A:D7:97:9A:0D:97:10
\ No newline at end of file
+51:6D:12:67:4C:27:F4:9B:9F:E5:42:9B:01:B3:98:E4:66:2B:85:B7:A8:DD:70:32:B7:6A:D7:97:9A:0D:97:10
+#Leaked
+55:5D:70:C9:BE:10:41:7E:4B:01:A9:C4:C6:44:4A:F8:69:71:35:25:ED:95:23:16:C7:15:E8:EB:C6:08:FC:B1
diff --git a/app/src/main/java/info/nightscout/androidaps/Constants.java b/app/src/main/java/info/nightscout/androidaps/Constants.java
index fb322a8239..38767ebfb9 100644
--- a/app/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/app/src/main/java/info/nightscout/androidaps/Constants.java
@@ -87,4 +87,20 @@ public class Constants {
     public static final double STATS_RANGE_HIGH_MMOL = 10.0;
 
 
+    // One Time Password
+
+    /**
+     * Size of generated key for TOTP Authenticator token, in bits
+     * rfc6238 suggest at least 160 for SHA1 based TOTP, but it ts too weak
+     * with 512 generated QRCode to provision authenticator is too detailed
+     * 256 is chosen as both secure enough and small enough for easy-scannable QRCode
+     */
+    public static final int OTP_GENERATED_KEY_LENGTH_BITS = 256;
+
+    /**
+     * How many old TOTP tokens still accept.
+     * Each token is 30s valid, but copying and SMS transmision of it can take additional seconds,
+     * so we add leeway to still accept given amount of older tokens
+     */
+    public static final int OTP_ACCEPT_OLD_TOKENS_COUNT = 1;
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
deleted file mode 100644
index 8fa855cd7b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package info.nightscout.androidaps;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.viewpager.widget.ViewPager;
-
-import com.google.android.material.navigation.NavigationView;
-import com.google.android.material.tabs.TabLayout;
-import com.joanzapata.iconify.Iconify;
-import com.joanzapata.iconify.fonts.FontAwesomeModule;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.activities.HistoryBrowseActivity;
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.activities.PreferencesActivity;
-import info.nightscout.androidaps.activities.SingleFragmentActivity;
-import info.nightscout.androidaps.activities.StatsActivity;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtilsKt;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.setupwizard.SetupWizardActivity;
-import info.nightscout.androidaps.tabs.TabPageAdapter;
-import info.nightscout.androidaps.utils.AndroidPermission;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.LocaleHelper;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.PasswordProtection;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class MainActivity extends NoSplashAppCompatActivity {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private ActionBarDrawerToggle actionBarDrawerToggle;
-
-    private MenuItem pluginPreferencesMenuItem;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Iconify.with(new FontAwesomeModule());
-        LocaleHelper.INSTANCE.update(getApplicationContext());
-
-        setContentView(R.layout.activity_main);
-        setSupportActionBar(findViewById(R.id.toolbar));
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
-
-        DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
-        actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.open_navigation, R.string.close_navigation);
-        drawerLayout.addDrawerListener(actionBarDrawerToggle);
-        actionBarDrawerToggle.syncState();
-
-        // initialize screen wake lock
-        processPreferenceChange(new EventPreferenceChange(R.string.key_keep_screen_on));
-
-        final ViewPager viewPager = findViewById(R.id.pager);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                checkPluginPreferences(viewPager);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-            }
-        });
-
-        //Check here if loop plugin is disabled. Else check via constraints
-        if (!LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-            VersionCheckerUtilsKt.triggerCheckVersion();
-
-        FabricPrivacy.setUserStats();
-
-        setupTabs();
-        setupViews();
-
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventRebuildTabs.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> {
-                    LocaleHelper.INSTANCE.update(getApplicationContext());
-                    if (event.getRecreate()) {
-                        recreate();
-                    } else {
-                        setupTabs();
-                        setupViews();
-                    }
-                    setWakeLock();
-                }, FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::processPreferenceChange, FabricPrivacy::logException)
-        );
-
-        if (!SP.getBoolean(R.string.key_setupwizard_processed, false)) {
-            Intent intent = new Intent(this, SetupWizardActivity.class);
-            startActivity(intent);
-        }
-
-        AndroidPermission.notifyForStoragePermission(this);
-        AndroidPermission.notifyForBatteryOptimizationPermission(this);
-        if (Config.PUMPDRIVERS) {
-            AndroidPermission.notifyForLocationPermissions(this);
-            AndroidPermission.notifyForSMSPermissions(this);
-        }
-    }
-
-    private void checkPluginPreferences(ViewPager viewPager) {
-        if (pluginPreferencesMenuItem == null) return;
-        if (((TabPageAdapter) viewPager.getAdapter()).getPluginAt(viewPager.getCurrentItem()).getPreferencesId() != -1)
-            pluginPreferencesMenuItem.setEnabled(true);
-        else pluginPreferencesMenuItem.setEnabled(false);
-    }
-
-    @Override
-    public void onPostCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-        actionBarDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        disposable.clear();
-    }
-
-    private void setWakeLock() {
-        boolean keepScreenOn = SP.getBoolean(R.string.key_keep_screen_on, false);
-        if (keepScreenOn)
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        else
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-    }
-
-    public void processPreferenceChange(final EventPreferenceChange ev) {
-        if (ev.isChanged(R.string.key_keep_screen_on))
-            setWakeLock();
-    }
-
-    private void setupViews() {
-        TabPageAdapter pageAdapter = new TabPageAdapter(getSupportFragmentManager(), this);
-        NavigationView navigationView = findViewById(R.id.navigation_view);
-        navigationView.setNavigationItemSelectedListener(menuItem -> true);
-        Menu menu = navigationView.getMenu();
-        menu.clear();
-        for (PluginBase p : MainApp.getPluginsList()) {
-            pageAdapter.registerNewFragment(p);
-            if (p.hasFragment() && !p.isFragmentVisible() && p.isEnabled(p.pluginDescription.getType()) && !p.pluginDescription.neverVisible) {
-                MenuItem menuItem = menu.add(p.getName());
-                menuItem.setCheckable(true);
-                menuItem.setOnMenuItemClickListener(item -> {
-                    Intent intent = new Intent(this, SingleFragmentActivity.class);
-                    intent.putExtra("plugin", MainApp.getPluginsList().indexOf(p));
-                    startActivity(intent);
-                    ((DrawerLayout) findViewById(R.id.drawer_layout)).closeDrawers();
-                    return true;
-                });
-            }
-        }
-        ViewPager mPager = findViewById(R.id.pager);
-        mPager.setAdapter(pageAdapter);
-        //if (switchToLast)
-        //    mPager.setCurrentItem(pageAdapter.getCount() - 1, false);
-        checkPluginPreferences(mPager);
-    }
-
-    private void setupTabs() {
-        ViewPager viewPager = findViewById(R.id.pager);
-        TabLayout normalTabs = findViewById(R.id.tabs_normal);
-        normalTabs.setupWithViewPager(viewPager, true);
-        TabLayout compactTabs = findViewById(R.id.tabs_compact);
-        compactTabs.setupWithViewPager(viewPager, true);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        if (SP.getBoolean("short_tabtitles", false)) {
-            normalTabs.setVisibility(View.GONE);
-            compactTabs.setVisibility(View.VISIBLE);
-            toolbar.setLayoutParams(new LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, (int) getResources().getDimension(R.dimen.compact_height)));
-        } else {
-            normalTabs.setVisibility(View.VISIBLE);
-            compactTabs.setVisibility(View.GONE);
-            TypedValue typedValue = new TypedValue();
-            if (getTheme().resolveAttribute(R.attr.actionBarSize, typedValue, true)) {
-                toolbar.setLayoutParams(new LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT,
-                        TypedValue.complexToDimensionPixelSize(typedValue.data, getResources().getDisplayMetrics())));
-            }
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (permissions.length != 0) {
-            if (ActivityCompat.checkSelfPermission(this, permissions[0]) == PackageManager.PERMISSION_GRANTED) {
-                switch (requestCode) {
-                    case AndroidPermission.CASE_STORAGE:
-                        //show dialog after permission is granted
-                        OKDialog.show(this, "", MainApp.gs(R.string.alert_dialog_storage_permission_text));
-                        break;
-                    case AndroidPermission.CASE_LOCATION:
-                    case AndroidPermission.CASE_SMS:
-                    case AndroidPermission.CASE_BATTERY:
-                    case AndroidPermission.CASE_PHONE_STATE:
-                        break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            View v = getCurrentFocus();
-            if (v instanceof EditText) {
-                Rect outRect = new Rect();
-                v.getGlobalVisibleRect(outRect);
-                if (!outRect.contains((int) event.getRawX(), (int) event.getRawY())) {
-                    v.clearFocus();
-                    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
-                }
-            }
-        }
-        return super.dispatchTouchEvent(event);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences);
-        checkPluginPreferences(findViewById(R.id.pager));
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch (id) {
-            case R.id.nav_preferences:
-                PasswordProtection.QueryPassword(this, R.string.settings_password, "settings_password", () -> {
-                    Intent i = new Intent(this, PreferencesActivity.class);
-                    i.putExtra("id", -1);
-                    startActivity(i);
-                }, null);
-                return true;
-            case R.id.nav_historybrowser:
-                startActivity(new Intent(this, HistoryBrowseActivity.class));
-                return true;
-            case R.id.nav_setupwizard:
-                startActivity(new Intent(this, SetupWizardActivity.class));
-                return true;
-            case R.id.nav_about:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(MainApp.gs(R.string.app_name) + " " + BuildConfig.VERSION);
-                builder.setIcon(MainApp.getIcon());
-                String message = "Build: " + BuildConfig.BUILDVERSION + "\n";
-                message += "Flavor: " + BuildConfig.FLAVOR + BuildConfig.BUILD_TYPE + "\n";
-                message += MainApp.gs(R.string.configbuilder_nightscoutversion_label) + " " + NSSettingsStatus.getInstance().nightscoutVersionName;
-                if (MainApp.engineeringMode)
-                    message += "\n" + MainApp.gs(R.string.engineering_mode_enabled);
-                message += MainApp.gs(R.string.about_link_urls);
-                final SpannableString messageSpanned = new SpannableString(message);
-                Linkify.addLinks(messageSpanned, Linkify.WEB_URLS);
-                builder.setMessage(messageSpanned);
-                builder.setPositiveButton(MainApp.gs(R.string.ok), null);
-                AlertDialog alertDialog = builder.create();
-                alertDialog.show();
-                ((TextView) alertDialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-                return true;
-            case R.id.nav_exit:
-                log.debug("Exiting");
-                RxBus.INSTANCE.send(new EventAppExit());
-                finish();
-                System.runFinalization();
-                System.exit(0);
-                return true;
-            case R.id.nav_plugin_preferences:
-                ViewPager viewPager = findViewById(R.id.pager);
-                final PluginBase plugin = ((TabPageAdapter) viewPager.getAdapter()).getPluginAt(viewPager.getCurrentItem());
-                PasswordProtection.QueryPassword(this, R.string.settings_password, "settings_password", () -> {
-                    Intent i = new Intent(this, PreferencesActivity.class);
-                    i.putExtra("id", plugin.getPreferencesId());
-                    startActivity(i);
-                }, null);
-                return true;
-/*
-            case R.id.nav_survey:
-                startActivity(new Intent(this, SurveyActivity.class));
-                return true;
-*/
-            case R.id.nav_stats:
-                startActivity(new Intent(this, StatsActivity.class));
-                return true;
-        }
-        return actionBarDrawerToggle.onOptionsItemSelected(item);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
new file mode 100644
index 0000000000..90cf353d13
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -0,0 +1,333 @@
+package info.nightscout.androidaps
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Rect
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.text.SpannableString
+import android.text.method.LinkMovementMethod
+import android.text.util.Linkify
+import android.util.TypedValue
+import android.view.Menu
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.Toolbar
+import androidx.core.app.ActivityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.tabs.TabLayout
+import com.joanzapata.iconify.Iconify
+import com.joanzapata.iconify.fonts.FontAwesomeModule
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.activities.PreferencesActivity
+import info.nightscout.androidaps.activities.SingleFragmentActivity
+import info.nightscout.androidaps.activities.StatsActivity
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.events.EventRebuildTabs
+import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.setupwizard.SetupWizardActivity
+import info.nightscout.androidaps.tabs.TabPageAdapter
+import info.nightscout.androidaps.utils.AndroidPermission
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.LocaleHelper.update
+import info.nightscout.androidaps.utils.OKDialog.show
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.activity_main.*
+import javax.inject.Inject
+import kotlin.system.exitProcess
+
+class MainActivity : NoSplashAppCompatActivity() {
+    private val disposable = CompositeDisposable()
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var androidPermission: AndroidPermission
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var versionCheckerUtils: VersionCheckerUtils
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var nsSettingsStatus: NSSettingsStatus
+    @Inject lateinit var buildHelper: BuildHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var protectionCheck: ProtectionCheck
+
+    private lateinit var actionBarDrawerToggle: ActionBarDrawerToggle
+    private var pluginPreferencesMenuItem: MenuItem? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Iconify.with(FontAwesomeModule())
+        update(applicationContext)
+        setContentView(R.layout.activity_main)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeButtonEnabled(true)
+        actionBarDrawerToggle = ActionBarDrawerToggle(this, drawer_layout, R.string.open_navigation, R.string.close_navigation).also {
+            drawer_layout.addDrawerListener(it)
+            it.syncState()
+        }
+
+        // initialize screen wake lock
+        processPreferenceChange(EventPreferenceChange(resourceHelper.gs(R.string.key_keep_screen_on)))
+        pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+            override fun onPageSelected(position: Int) {
+                checkPluginPreferences(pager)
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+
+        //Check here if loop plugin is disabled. Else check via constraints
+        if (!loopPlugin.isEnabled(PluginType.LOOP)) versionCheckerUtils.triggerCheckVersion()
+        fabricPrivacy.setUserStats()
+        setupTabs()
+        setupViews()
+        disposable.add(rxBus
+            .toObservable(EventRebuildTabs::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                update(applicationContext)
+                if (it.recreate) recreate()
+                else {
+                    setupTabs()
+                    setupViews()
+                }
+                setWakeLock()
+            }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ processPreferenceChange(it) }) { fabricPrivacy.logException(it) }
+        )
+        if (!sp.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) {
+            val intent = Intent(this, SetupWizardActivity::class.java)
+            startActivity(intent)
+        }
+        androidPermission.notifyForStoragePermission(this)
+        androidPermission.notifyForBatteryOptimizationPermission(this)
+        if (Config.PUMPDRIVERS) {
+            androidPermission.notifyForLocationPermissions(this)
+            androidPermission.notifyForSMSPermissions(this, smsCommunicatorPlugin)
+            androidPermission.notifyForSystemWindowPermissions(this)
+        }
+    }
+
+    private fun checkPluginPreferences(viewPager: ViewPager) {
+        pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
+    }
+
+    override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onPostCreate(savedInstanceState, persistentState)
+        actionBarDrawerToggle.syncState()
+    }
+
+    public override fun onDestroy() {
+        super.onDestroy()
+        disposable.clear()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        protectionCheck.queryProtection(this, ProtectionCheck.Protection.APPLICATION, null, Runnable { finish() }, Runnable { finish() })
+    }
+
+    private fun setWakeLock() {
+        val keepScreenOn = sp.getBoolean(R.string.key_keep_screen_on, false)
+        if (keepScreenOn) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    private fun processPreferenceChange(ev: EventPreferenceChange) {
+        if (ev.isChanged(resourceHelper, R.string.key_keep_screen_on)) setWakeLock()
+    }
+
+    private fun setupViews() {
+        val pageAdapter = TabPageAdapter(supportFragmentManager, this)
+        val navigationView = findViewById<NavigationView>(R.id.navigation_view)
+        navigationView.setNavigationItemSelectedListener { true }
+        val menu = navigationView.menu.also { it.clear() }
+        for (p in activePlugin.pluginsList) {
+            pageAdapter.registerNewFragment(p)
+            if (p.hasFragment() && !p.isFragmentVisible() && p.isEnabled(p.pluginDescription.type) && !p.pluginDescription.neverVisible) {
+                val menuItem = menu.add(p.name)
+                menuItem.isCheckable = true
+                menuItem.setOnMenuItemClickListener {
+                    val intent = Intent(this, SingleFragmentActivity::class.java)
+                    intent.putExtra("plugin", activePlugin.pluginsList.indexOf(p))
+                    startActivity(intent)
+                    (findViewById<View>(R.id.drawer_layout) as DrawerLayout).closeDrawers()
+                    true
+                }
+            }
+        }
+        val mPager = findViewById<ViewPager>(R.id.pager)
+        mPager.adapter = pageAdapter
+        //if (switchToLast)
+        //    mPager.setCurrentItem(pageAdapter.getCount() - 1, false);
+        checkPluginPreferences(mPager)
+    }
+
+    private fun setupTabs() {
+        val viewPager = findViewById<ViewPager>(R.id.pager)
+        val normalTabs = findViewById<TabLayout>(R.id.tabs_normal)
+        normalTabs.setupWithViewPager(viewPager, true)
+        val compactTabs = findViewById<TabLayout>(R.id.tabs_compact)
+        compactTabs.setupWithViewPager(viewPager, true)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        if (sp.getBoolean(R.string.key_short_tabtitles, false)) {
+            normalTabs.visibility = View.GONE
+            compactTabs.visibility = View.VISIBLE
+            toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, resources.getDimension(R.dimen.compact_height).toInt())
+        } else {
+            normalTabs.visibility = View.VISIBLE
+            compactTabs.visibility = View.GONE
+            val typedValue = TypedValue()
+            if (theme.resolveAttribute(R.attr.actionBarSize, typedValue, true)) {
+                toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT,
+                    TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics))
+            }
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (permissions.isNotEmpty()) {
+            if (ActivityCompat.checkSelfPermission(this, permissions[0]) == PackageManager.PERMISSION_GRANTED) {
+                when (requestCode) {
+                    AndroidPermission.CASE_STORAGE                                                                                                                                        ->                         //show dialog after permission is granted
+                        show(this, "", resourceHelper.gs(R.string.alert_dialog_storage_permission_text))
+
+                    AndroidPermission.CASE_LOCATION, AndroidPermission.CASE_SMS, AndroidPermission.CASE_BATTERY, AndroidPermission.CASE_PHONE_STATE, AndroidPermission.CASE_SYSTEM_WINDOW -> {
+                    }
+                }
+            }
+        }
+    }
+
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+        if (event.action == MotionEvent.ACTION_DOWN) {
+            val v = currentFocus
+            if (v is EditText) {
+                val outRect = Rect()
+                v.getGlobalVisibleRect(outRect)
+                if (!outRect.contains(event.rawX.toInt(), event.rawY.toInt())) {
+                    v.clearFocus()
+                    val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0)
+                }
+            }
+        }
+        return super.dispatchTouchEvent(event)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences)
+        checkPluginPreferences(findViewById(R.id.pager))
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.nav_preferences        -> {
+                protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(this, PreferencesActivity::class.java)
+                    i.putExtra("id", -1)
+                    startActivity(i)
+                })
+                return true
+            }
+
+            R.id.nav_historybrowser     -> {
+                startActivity(Intent(this, HistoryBrowseActivity::class.java))
+                return true
+            }
+
+            R.id.nav_setupwizard        -> {
+                startActivity(Intent(this, SetupWizardActivity::class.java))
+                return true
+            }
+
+            R.id.nav_about              -> {
+                var message = "Build: ${BuildConfig.BUILDVERSION}\n"
+                message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n"
+                message += "${resourceHelper.gs(R.string.configbuilder_nightscoutversion_label)} ${nsSettingsStatus.nightscoutVersionName}"
+                if (buildHelper.isEngineeringMode()) message += "\n${resourceHelper.gs(R.string.engineering_mode_enabled)}"
+                message += resourceHelper.gs(R.string.about_link_urls)
+                val messageSpanned = SpannableString(message)
+                Linkify.addLinks(messageSpanned, Linkify.WEB_URLS)
+                AlertDialog.Builder(this)
+                    .setTitle(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION)
+                    .setIcon(resourceHelper.getIcon())
+                    .setMessage(messageSpanned)
+                    .setPositiveButton(resourceHelper.gs(R.string.ok), null)
+                    .create().also {
+                        it.show()
+                        (it.findViewById<View>(android.R.id.message) as TextView).movementMethod = LinkMovementMethod.getInstance()
+                    }
+                return true
+            }
+
+            R.id.nav_exit               -> {
+                aapsLogger.debug(LTag.CORE, "Exiting")
+                rxBus.send(EventAppExit())
+                finish()
+                System.runFinalization()
+                exitProcess(0)
+            }
+
+            R.id.nav_plugin_preferences -> {
+                val viewPager = findViewById<ViewPager>(R.id.pager)
+                val plugin = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem)
+                protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(this, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    startActivity(i)
+                })
+                return true
+            }
+/*
+            R.id.nav_survey             -> {
+                startActivity(Intent(this, SurveyActivity::class.java))
+                return true
+            }
+*/
+            R.id.nav_stats              -> {
+                startActivity(Intent(this, StatsActivity::class.java))
+                return true
+            }
+        }
+        return actionBarDrawerToggle.onOptionsItemSelected(item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 0506f461be..22b278abba 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -1,13 +1,20 @@
 package info.nightscout.androidaps;
 
-import android.app.Application;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.os.SystemClock;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
 
 import androidx.annotation.ColorRes;
-import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
 import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -18,115 +25,77 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 import net.danlew.android.joda.JodaTimeAndroid;
 
 import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
 
-import info.nightscout.androidaps.data.ConstraintChecker;
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DaggerApplication;
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-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.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.constraints.dstHelper.DstHelperPlugin;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
-import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
-import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin;
-import info.nightscout.androidaps.plugins.constraints.storage.StorageConstraintPlugin;
-import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerPlugin;
-import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin;
-import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin;
-import info.nightscout.androidaps.plugins.general.food.FoodPlugin;
-import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils;
-import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
-import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
-import info.nightscout.androidaps.plugins.general.xdripStatusline.StatuslinePlugin;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-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.RandomBgPlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
-import info.nightscout.androidaps.plugins.source.SourceEversensePlugin;
-import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
-import info.nightscout.androidaps.plugins.source.SourceMM640gPlugin;
-import info.nightscout.androidaps.plugins.source.SourceNSClientPlugin;
-import info.nightscout.androidaps.plugins.source.SourcePoctechPlugin;
-import info.nightscout.androidaps.plugins.source.SourceTomatoPlugin;
-import info.nightscout.androidaps.plugins.source.SourceXdripPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.receivers.BTReceiver;
+import info.nightscout.androidaps.receivers.ChargingStateReceiver;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
-import info.nightscout.androidaps.receivers.NSAlarmReceiver;
+import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
+import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.ActivityMonitor;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.LocaleHelper;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.fabric.sdk.android.Fabric;
 
-import static info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtilsKt.triggerCheckVersion;
+public class MainApp extends DaggerApplication {
 
+    static MainApp sInstance;
+    private static Resources sResources;
 
-public class MainApp extends Application {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
+    static FirebaseAnalytics firebaseAnalytics;
 
-    private static MainApp sInstance;
-    public static Resources sResources;
+    static DatabaseHelper sDatabaseHelper = null;
 
-    private static FirebaseAnalytics mFirebaseAnalytics;
+    private String CHANNEL_ID = "AndroidAPS-Ongoing"; // TODO: move to OngoingNotificationProvider (and dagger)
+    private int ONGOING_NOTIFICATION_ID = 4711; // TODO: move to OngoingNotificationProvider (and dagger)
+    private Notification notification; // TODO: move to OngoingNotificationProvider (and dagger)
 
-    private static DatabaseHelper sDatabaseHelper = null;
-    private static ConstraintChecker sConstraintsChecker = null;
+    @Inject PluginStore pluginStore;
+    @Inject public HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject ReceiverStatusStore receiverStatusStore;
+    @Inject ActivityMonitor activityMonitor;
+    @Inject FabricPrivacy fabricPrivacy;
+    @Inject ResourceHelper resourceHelper;
+    @Inject VersionCheckerUtils versionCheckersUtils;
+    @Inject SP sp;
+    @Inject ProfileFunction profileFunction;
 
-    private static ArrayList<PluginBase> pluginsList = null;
-
-    private static DataReceiver dataReceiver = new DataReceiver();
-    private static NSAlarmReceiver alarmReceiver = new NSAlarmReceiver();
-    TimeDateOrTZChangeReceiver timeDateOrTZChangeReceiver;
-
-    public static boolean devBranch;
-    public static boolean engineeringMode;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject KeepAliveReceiver.KeepAliveManager keepAliveManager;
+    @Inject List<PluginBase> plugins;
 
     @Override
     public void onCreate() {
         super.onCreate();
-        log.debug("onCreate");
+
+        aapsLogger.debug("onCreate");
         sInstance = this;
         sResources = getResources();
         LocaleHelper.INSTANCE.update(this);
-        sConstraintsChecker = new ConstraintChecker();
+        generateEmptyNotification();
         sDatabaseHelper = OpenHelperManager.getHelper(sInstance, DatabaseHelper.class);
 
         Thread.setDefaultUncaughtExceptionHandler((thread, ex) -> {
@@ -134,184 +103,132 @@ public class MainApp extends Application {
                 // usually the app trying to spawn a thread while being killed
                 return;
             }
-
-            log.error("Uncaught exception crashing app", ex);
+            aapsLogger.error("Uncaught exception crashing app", ex);
         });
 
         try {
-            if (FabricPrivacy.fabricEnabled()) {
+            if (fabricPrivacy.fabricEnabled()) {
                 Fabric.with(this, new Crashlytics());
             }
         } catch (Exception e) {
-            log.error("Error with Fabric init! " + e);
+            aapsLogger.error("Error with Fabric init! " + e);
         }
 
-        registerActivityLifecycleCallbacks(ActivityMonitor.INSTANCE);
+        registerActivityLifecycleCallbacks(activityMonitor);
 
-        mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
-        mFirebaseAnalytics.setAnalyticsCollectionEnabled(!Boolean.getBoolean("disableFirebase"));
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this);
+        firebaseAnalytics.setAnalyticsCollectionEnabled(!Boolean.getBoolean("disableFirebase") && fabricPrivacy.fabricEnabled());
 
         JodaTimeAndroid.init(this);
 
-        log.info("Version: " + BuildConfig.VERSION_NAME);
-        log.info("BuildVersion: " + BuildConfig.BUILDVERSION);
-        log.info("Remote: " + BuildConfig.REMOTE);
-
-        String extFilesDir = LoggerUtils.getLogDirectory();
-        File engineeringModeSemaphore = new File(extFilesDir, "engineering_mode");
-
-        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile();
-        devBranch = BuildConfig.VERSION.contains("-") || BuildConfig.VERSION.matches(".*[a-zA-Z]+.*");
+        aapsLogger.debug("Version: " + BuildConfig.VERSION_NAME);
+        aapsLogger.debug("BuildVersion: " + BuildConfig.BUILDVERSION);
+        aapsLogger.debug("Remote: " + BuildConfig.REMOTE);
 
         registerLocalBroadcastReceiver();
 
         //trigger here to see the new version on app start after an update
-        triggerCheckVersion();
+        versionCheckersUtils.triggerCheckVersion();
 
-        if (pluginsList == null) {
-            pluginsList = new ArrayList<>();
-            // Register all tabs in app here
-            pluginsList.add(OverviewPlugin.INSTANCE);
-            pluginsList.add(IobCobCalculatorPlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(ActionsPlugin.INSTANCE);
-            pluginsList.add(InsulinOrefRapidActingPlugin.getPlugin());
-            pluginsList.add(InsulinOrefUltraRapidActingPlugin.getPlugin());
-            pluginsList.add(InsulinOrefFreePeakPlugin.getPlugin());
-            pluginsList.add(SensitivityOref0Plugin.getPlugin());
-            pluginsList.add(SensitivityAAPSPlugin.getPlugin());
-            pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
-            pluginsList.add(SensitivityOref1Plugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(DanaRPlugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(DanaRKoreanPlugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(DanaRv2Plugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(DanaRSPlugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(LocalInsightPlugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(ComboPlugin.getPlugin());
-            if (Config.PUMPDRIVERS) pluginsList.add(MedtronicPumpPlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(MDIPlugin.getPlugin());
-            pluginsList.add(VirtualPumpPlugin.getPlugin());
-            pluginsList.add(CareportalPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(OpenAPSSMBPlugin.getPlugin());
-            pluginsList.add(NSProfilePlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(LocalProfilePlugin.INSTANCE);
-            pluginsList.add(TreatmentsPlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(SafetyPlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(VersionCheckerPlugin.INSTANCE);
-            if (Config.APS) pluginsList.add(StorageConstraintPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(SignatureVerifierPlugin.getPlugin());
-            if (Config.APS) pluginsList.add(ObjectivesPlugin.INSTANCE);
-            pluginsList.add(SourceXdripPlugin.getPlugin());
-            pluginsList.add(SourceNSClientPlugin.getPlugin());
-            pluginsList.add(SourceMM640gPlugin.getPlugin());
-            pluginsList.add(SourceGlimpPlugin.getPlugin());
-            pluginsList.add(SourceDexcomPlugin.INSTANCE);
-            pluginsList.add(SourcePoctechPlugin.getPlugin());
-            pluginsList.add(SourceTomatoPlugin.getPlugin());
-            pluginsList.add(SourceEversensePlugin.getPlugin());
-            pluginsList.add(RandomBgPlugin.INSTANCE);
-            if (!Config.NSCLIENT) pluginsList.add(SmsCommunicatorPlugin.INSTANCE);
-            pluginsList.add(FoodPlugin.getPlugin());
-
-            pluginsList.add(WearPlugin.initPlugin(this));
-            pluginsList.add(StatuslinePlugin.initPlugin(this));
-            pluginsList.add(PersistentNotificationPlugin.getPlugin());
-            pluginsList.add(NSClientPlugin.getPlugin());
-//            if (engineeringMode) pluginsList.add(TidepoolPlugin.INSTANCE);
-            pluginsList.add(MaintenancePlugin.initPlugin(this));
-            pluginsList.add(AutomationPlugin.INSTANCE);
-
-            pluginsList.add(ConfigBuilderPlugin.getPlugin());
-
-            pluginsList.add(DstHelperPlugin.getPlugin());
-
-
-            ConfigBuilderPlugin.getPlugin().initialize();
-        }
+        // Register all tabs in app here
+        pluginStore.setPlugins(plugins);
+        configBuilderPlugin.initialize();
 
         NSUpload.uploadAppStart();
 
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump != null) {
-            new Thread(() -> {
-                SystemClock.sleep(5000);
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Initialization", null);
-            }).start();
-        }
-
-        new Thread(() -> KeepAliveReceiver.setAlarm(this)).start();
+        new Thread(() -> keepAliveManager.setAlarm(this)).start();
         doMigrations();
     }
 
+
     private void doMigrations() {
 
         // guarantee that the unreachable threshold is at least 30 and of type String
         // Added in 1.57 at 21.01.2018
-        int unreachable_threshold = SP.getInt(R.string.key_pump_unreachable_threshold, 30);
-        SP.remove(R.string.key_pump_unreachable_threshold);
+        int unreachable_threshold = sp.getInt(R.string.key_pump_unreachable_threshold, 30);
+        sp.remove(R.string.key_pump_unreachable_threshold);
         if (unreachable_threshold < 30) unreachable_threshold = 30;
-        SP.putString(R.string.key_pump_unreachable_threshold, Integer.toString(unreachable_threshold));
+        sp.putString(R.string.key_pump_unreachable_threshold, Integer.toString(unreachable_threshold));
 
         // 2.5 -> 2.6
-        if (!SP.contains(R.string.key_units)) {
+        if (!sp.contains(R.string.key_units)) {
             String newUnits = Constants.MGDL;
-            Profile p = ProfileFunctions.getInstance().getProfile();
+            Profile p = profileFunction.getProfile();
             if (p != null && p.getData() != null && p.getData().has("units")) {
                 try {
                     newUnits = p.getData().getString("units");
                 } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error("Unhandled exception", e);
                 }
             }
-            SP.putString(R.string.key_units, newUnits);
+            sp.putString(R.string.key_units, newUnits);
         }
     }
 
-
-    private void registerLocalBroadcastReceiver() {
-        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_TREATMENT));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_CHANGED_TREATMENT));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_REMOVED_TREATMENT));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_FOOD));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_CHANGED_FOOD));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_REMOVED_FOOD));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_SGV));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_PROFILE));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_STATUS));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_MBG));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_DEVICESTATUS));
-        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_CAL));
-
-        //register alarms
-        lbm.registerReceiver(alarmReceiver, new IntentFilter(Intents.ACTION_ALARM));
-        lbm.registerReceiver(alarmReceiver, new IntentFilter(Intents.ACTION_ANNOUNCEMENT));
-        lbm.registerReceiver(alarmReceiver, new IntentFilter(Intents.ACTION_CLEAR_ALARM));
-        lbm.registerReceiver(alarmReceiver, new IntentFilter(Intents.ACTION_URGENT_ALARM));
-
-        this.timeDateOrTZChangeReceiver = new TimeDateOrTZChangeReceiver();
-        this.timeDateOrTZChangeReceiver.registerBroadcasts(this);
-
+    @Override
+    protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
+        return DaggerAppComponent
+                .builder()
+                .application(this)
+                .build();
     }
 
+    private void registerLocalBroadcastReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intents.ACTION_NEW_TREATMENT);
+        filter.addAction(Intents.ACTION_CHANGED_TREATMENT);
+        filter.addAction(Intents.ACTION_REMOVED_TREATMENT);
+        filter.addAction(Intents.ACTION_NEW_SGV);
+        filter.addAction(Intents.ACTION_NEW_PROFILE);
+        filter.addAction(Intents.ACTION_NEW_MBG);
+        filter.addAction(Intents.ACTION_NEW_CAL);
+        LocalBroadcastManager.getInstance(this).registerReceiver(new DataReceiver(), filter);
+
+        filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_TIME_CHANGED);
+        filter.addAction(Intent.ACTION_DATE_CHANGED);
+        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        registerReceiver(new TimeDateOrTZChangeReceiver(), filter);
+
+        filter = new IntentFilter();
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        registerReceiver(new NetworkChangeReceiver(), filter);
+
+        filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_POWER_CONNECTED);
+        filter.addAction(Intent.ACTION_POWER_DISCONNECTED);
+        filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        registerReceiver(new ChargingStateReceiver(), filter);
+
+        filter = new IntentFilter();
+        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        registerReceiver(new BTReceiver(), filter);
+    }
+
+    @Deprecated
     public static String gs(@StringRes int id) {
         return sResources.getString(id);
     }
 
+    @Deprecated
     public static String gs(@StringRes int id, Object... args) {
         return sResources.getString(id, args);
     }
 
-    public static String gq(@PluralsRes int id, int quantity, Object... args) {
-        return sResources.getQuantityString(id, quantity, args);
-    }
-
+    @Deprecated
     public static int gc(@ColorRes int id) {
         return ContextCompat.getColor(instance(), id);
     }
 
+    @Deprecated
+    public static Resources resources() {
+        return sResources;
+    }
+
+    @Deprecated
     public static MainApp instance() {
         return sInstance;
     }
@@ -320,118 +237,51 @@ public class MainApp extends Application {
         return sDatabaseHelper;
     }
 
-    public static FirebaseAnalytics getFirebaseAnalytics() {
-        return mFirebaseAnalytics;
+    public FirebaseAnalytics getFirebaseAnalytics() {
+        return firebaseAnalytics;
     }
 
-    public static ConstraintChecker getConstraintChecker() {
-        return sConstraintsChecker;
+    // global Notification has been moved to MainApp because PersistentNotificationPlugin is initialized too late
+    private void generateEmptyNotification() {
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID);
+        builder.setOngoing(true)
+                .setOnlyAlertOnce(true)
+                .setCategory(NotificationCompat.CATEGORY_STATUS)
+                .setSmallIcon(resourceHelper.getNotificationIcon())
+                .setLargeIcon(resourceHelper.decodeResource(resourceHelper.getIcon()));
+        builder.setContentTitle(resourceHelper.gs(R.string.loading));
+        Intent resultIntent = new Intent(this, MainApp.class);
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        stackBuilder.addParentStack(MainActivity.class);
+        stackBuilder.addNextIntent(resultIntent);
+        PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(resultPendingIntent);
+        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notification = builder.build();
+        mNotificationManager.notify(ONGOING_NOTIFICATION_ID, notification);
     }
 
-    public static ArrayList<PluginBase> getPluginsList() {
-        return pluginsList;
+    public int notificationId() {
+        return ONGOING_NOTIFICATION_ID;
     }
 
-    public static ArrayList<PluginBase> getSpecificPluginsList(PluginType type) {
-        ArrayList<PluginBase> newList = new ArrayList<>();
-
-        if (pluginsList != null) {
-            for (PluginBase p : pluginsList) {
-                if (p.getType() == type)
-                    newList.add(p);
-            }
-        } else {
-            log.error("pluginsList=null");
-        }
-        return newList;
+    public String channelId() {
+        return CHANNEL_ID;
     }
 
-    public static ArrayList<PluginBase> getSpecificPluginsVisibleInList(PluginType type) {
-        ArrayList<PluginBase> newList = new ArrayList<>();
-
-        if (pluginsList != null) {
-            for (PluginBase p : pluginsList) {
-                if (p.getType() == type)
-                    if (p.showInList(type))
-                        newList.add(p);
-            }
-        } else {
-            log.error("pluginsList=null");
-        }
-        return newList;
+    public void setNotification(Notification notification) {
+        this.notification = notification;
     }
 
-    public static ArrayList<PluginBase> getSpecificPluginsListByInterface(Class interfaceClass) {
-        ArrayList<PluginBase> newList = new ArrayList<>();
-
-        if (pluginsList != null) {
-            for (PluginBase p : pluginsList) {
-                if (p.getClass() != ConfigBuilderPlugin.class && interfaceClass.isAssignableFrom(p.getClass()))
-                    newList.add(p);
-            }
-        } else {
-            log.error("pluginsList=null");
-        }
-        return newList;
-    }
-
-    public static ArrayList<PluginBase> getSpecificPluginsVisibleInListByInterface(Class interfaceClass, PluginType type) {
-        ArrayList<PluginBase> newList = new ArrayList<>();
-
-        if (pluginsList != null) {
-            for (PluginBase p : pluginsList) {
-                if (p.getClass() != ConfigBuilderPlugin.class && interfaceClass.isAssignableFrom(p.getClass()))
-                    if (p.showInList(type))
-                        newList.add(p);
-            }
-        } else {
-            log.error("pluginsList=null");
-        }
-        return newList;
-    }
-
-    public static boolean isEngineeringModeOrRelease() {
-        if (!Config.APS)
-            return true;
-        return engineeringMode || !devBranch;
-    }
-
-    public static boolean isDev() {
-        return devBranch;
-    }
-
-    public static int getIcon() {
-        if (Config.NSCLIENT)
-            return R.mipmap.ic_yellowowl;
-        else if (Config.PUMPCONTROL)
-            return R.mipmap.ic_pumpcontrol;
-        else
-            return R.mipmap.ic_launcher;
-    }
-
-    public static int getNotificationIcon() {
-        if (Config.NSCLIENT)
-            return R.drawable.ic_notif_nsclient;
-        else if (Config.PUMPCONTROL)
-            return R.drawable.ic_notif_pumpcontrol;
-        else
-            return R.drawable.ic_notif_aaps;
+    public Notification getNotification() {
+        return notification;
     }
 
     @Override
     public void onTerminate() {
-        if (L.isEnabled(L.CORE))
-            log.debug("onTerminate");
-
-        if (timeDateOrTZChangeReceiver != null)
-            unregisterReceiver(timeDateOrTZChangeReceiver);
-        unregisterActivityLifecycleCallbacks(ActivityMonitor.INSTANCE);
-        KeepAliveReceiver.cancelAlarm(this);
+        aapsLogger.debug(LTag.CORE, "onTerminate");
+        unregisterActivityLifecycleCallbacks(activityMonitor);
+        keepAliveManager.cancelAlarm(this);
         super.onTerminate();
     }
-
-    public static int dpToPx(int dp) {
-        float scale = sResources.getDisplayMetrics().density;
-        return (int) (dp * scale + 0.5f);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
index 93a0725aaf..fe55cdcdf2 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
@@ -3,12 +3,12 @@ package info.nightscout.androidaps.activities
 import android.os.Bundle
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 
-class BolusProgressHelperActivity : NoSplashAppCompatActivity() {
+class BolusProgressHelperActivity : DialogAppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         BolusProgressDialog()
-                .setHelperActivity(this)
-                .setInsulin(intent.getDoubleExtra("insulin", 0.0))
-                .show(supportFragmentManager, "BolusProgress")
+            .setHelperActivity(this)
+            .setInsulin(intent.getDoubleExtra("insulin", 0.0))
+            .show(supportFragmentManager, "BolusProgress")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
new file mode 100644
index 0000000000..e2aa70d960
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.activities
+
+import android.content.Context
+import dagger.android.support.DaggerAppCompatActivity
+import info.nightscout.androidaps.utils.LocaleHelper
+
+open class DialogAppCompatActivity : DaggerAppCompatActivity() {
+    public override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(LocaleHelper.wrap(newBase))
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
index 8ab5c05425..ce02742381 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
@@ -4,9 +4,11 @@ import android.os.Bundle
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.ErrorDialog
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
 
-class ErrorHelperActivity : NoSplashAppCompatActivity() {
+class ErrorHelperActivity : DialogAppCompatActivity() {
+    @Inject lateinit var sp : SP
 
     @Override
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -18,7 +20,7 @@ class ErrorHelperActivity : NoSplashAppCompatActivity() {
         errorDialog.title = intent.getStringExtra("title")
         errorDialog.show(supportFragmentManager, "Error")
 
-        if (SP.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
+        if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
             NSUpload.uploadError(intent.getStringExtra("status"))
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
new file mode 100644
index 0000000000..187ab7b33d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -0,0 +1,349 @@
+package info.nightscout.androidaps.activities
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.os.Bundle
+import androidx.annotation.XmlRes
+import androidx.preference.*
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
+import dagger.android.support.AndroidSupportInjection
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.events.EventRebuildTabs
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+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.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin
+import info.nightscout.androidaps.plugins.general.wear.WearPlugin
+import info.nightscout.androidaps.plugins.general.xdripStatusline.StatusLinePlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
+import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.androidaps.plugins.source.EversensePlugin
+import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.androidaps.plugins.source.PoctechPlugin
+import info.nightscout.androidaps.plugins.source.TomatoPlugin
+import info.nightscout.androidaps.utils.OKDialog.show
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.protection.PasswordCheck
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener, HasAndroidInjector {
+    private var pluginId = -1
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var pluginStore: PluginStore
+
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var danaRPlugin: DanaRPlugin
+    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var careportalPlugin: CareportalPlugin
+    @Inject lateinit var comboPlugin: ComboPlugin
+    @Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var localInsightPlugin: LocalInsightPlugin
+    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
+    @Inject lateinit var nsClientPlugin: NSClientPlugin
+    @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
+    @Inject lateinit var openAPSMAPlugin: OpenAPSMAPlugin
+    @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+    @Inject lateinit var safetyPlugin: SafetyPlugin
+    @Inject lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
+    @Inject lateinit var sensitivityOref0Plugin: SensitivityOref1Plugin
+    @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+    @Inject lateinit var sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin
+    @Inject lateinit var dexcomPlugin: DexcomPlugin
+    @Inject lateinit var eversensePlugin: EversensePlugin
+    @Inject lateinit var glimpPlugin: GlimpPlugin
+    @Inject lateinit var poctechPlugin: PoctechPlugin
+    @Inject lateinit var tomatoPlugin: TomatoPlugin
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var statusLinePlugin: StatusLinePlugin
+    @Inject lateinit var tidepoolPlugin: TidepoolPlugin
+    @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Inject lateinit var wearPlugin: WearPlugin
+    @Inject lateinit var maintenancePlugin: MaintenancePlugin
+
+    @Inject lateinit var passwordCheck: PasswordCheck
+
+    @Inject lateinit var androidInjector: DispatchingAndroidInjector<Any>
+
+    override fun androidInjector(): AndroidInjector<Any> = androidInjector
+
+    override fun onAttach(context: Context) {
+        AndroidSupportInjection.inject(this)
+        super.onAttach(context)
+    }
+
+    override fun setArguments(args: Bundle?) {
+        super.setArguments(args)
+        pluginId = args?.getInt("id") ?: -1
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt("id", pluginId)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    private fun addPreferencesFromResourceIfEnabled(p: PluginBase?, rootKey: String?, enabled: Boolean) {
+        if (enabled) addPreferencesFromResourceIfEnabled(p, rootKey)
+    }
+
+    private fun addPreferencesFromResourceIfEnabled(p: PluginBase?, rootKey: String?) {
+        if (p!!.isEnabled() && p.preferencesId != -1)
+            addPreferencesFromResource(p.preferencesId, rootKey)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        PreferenceManager
+            .getDefaultSharedPreferences(context)
+            .registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        (savedInstanceState ?: arguments)?.let { bundle ->
+            if (bundle.containsKey("id")) {
+                pluginId = bundle.getInt("id")
+            }
+        }
+        if (pluginId != -1) {
+            addPreferencesFromResource(pluginId, rootKey)
+        } else {
+            addPreferencesFromResource(R.xml.pref_general, rootKey)
+            addPreferencesFromResource(R.xml.pref_overview, rootKey)
+            addPreferencesFromResourceIfEnabled(safetyPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(eversensePlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(dexcomPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(tomatoPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(careportalPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, Config.APS)
+            addPreferencesFromResourceIfEnabled(openAPSMAPlugin, rootKey, Config.APS)
+            addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, Config.APS)
+            addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, Config.APS)
+            addPreferencesFromResourceIfEnabled(sensitivityAAPSPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(sensitivityWeightedAveragePlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(sensitivityOref0Plugin, rootKey)
+            addPreferencesFromResourceIfEnabled(sensitivityOref1Plugin, rootKey)
+            addPreferencesFromResourceIfEnabled(danaRPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRKoreanPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRv2Plugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRSPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, Config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey, !Config.NSCLIENT)
+            addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(nsClientPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(tidepoolPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(smsCommunicatorPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(automationPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(wearPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(statusLinePlugin, rootKey)
+            addPreferencesFromResource(R.xml.pref_alerts, rootKey) // TODO not organized well
+            addPreferencesFromResource(R.xml.pref_datachoices, rootKey)
+            addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey)
+        }
+        initSummary(preferenceScreen, pluginId != -1)
+        for (plugin in pluginStore.plugins) {
+            plugin.preprocessPreferences(this)
+        }
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        rxBus.send(EventPreferenceChange(key))
+        if (key == resourceHelper.gs(R.string.key_language)) {
+            rxBus.send(EventRebuildTabs(true))
+            //recreate() does not update language so better close settings
+            activity?.finish()
+        }
+        if (key == resourceHelper.gs(R.string.key_short_tabtitles)) {
+            rxBus.send(EventRebuildTabs())
+        }
+        if (key == resourceHelper.gs(R.string.key_units)) {
+            activity?.recreate()
+            return
+        }
+        if (key == resourceHelper.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false))
+            activity?.let {
+                show(it, resourceHelper.gs(R.string.configbuilder_sensitivity), resourceHelper.gs(R.string.sensitivity_warning))
+            }
+
+        updatePrefSummary(findPreference(key))
+    }
+
+    @SuppressLint("RestrictedApi")
+    private fun addPreferencesFromResource(@XmlRes preferencesResId: Int, key: String?) {
+        val xmlRoot = preferenceManager.inflateFromResource(context,
+            preferencesResId, null)
+        val root: Preference?
+        if (key != null) {
+            root = xmlRoot.findPreference(key)
+            if (root == null) return
+            require(root is PreferenceScreen) {
+                ("Preference object with key " + key
+                    + " is not a PreferenceScreen")
+            }
+            preferenceScreen = root
+        } else {
+            addPreferencesFromResource(preferencesResId)
+        }
+    }
+
+    private fun adjustUnitDependentPrefs(pref: Preference) { // convert preferences values to current units
+        val unitDependent = arrayOf(
+            resourceHelper.gs(R.string.key_hypo_target),
+            resourceHelper.gs(R.string.key_activity_target),
+            resourceHelper.gs(R.string.key_eatingsoon_target),
+            resourceHelper.gs(R.string.key_high_mark),
+            resourceHelper.gs(R.string.key_low_mark)
+        )
+        if (listOf(*unitDependent).contains(pref.key)) {
+            val editTextPref = pref as EditTextPreference
+            val converted = Profile.toCurrentUnitsString(profileFunction, SafeParse.stringToDouble(editTextPref.text))
+            editTextPref.summary = converted
+            editTextPref.text = converted
+        }
+    }
+
+    private fun updatePrefSummary(pref: Preference?) {
+        if (pref is ListPreference) {
+            pref.setSummary(pref.entry)
+            // Preferences
+            // Preferences
+            if (pref.getKey() == resourceHelper.gs(R.string.key_settings_protection)) {
+                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_settings_password))
+                if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
+            }
+            // Application
+            // Application
+            if (pref.getKey() == resourceHelper.gs(R.string.key_application_protection)) {
+                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_application_password))
+                if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
+            }
+            // Bolus
+            // Bolus
+            if (pref.getKey() == resourceHelper.gs(R.string.key_bolus_protection)) {
+                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_bolus_password))
+                if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
+            }
+        }
+        if (pref is EditTextPreference) {
+            if (pref.getKey().contains("password") || pref.getKey().contains("secret")) {
+                pref.setSummary("******")
+            } else if (pref.text != null) {
+                pref.dialogMessage = pref.dialogMessage
+                pref.setSummary(pref.text)
+            } else {
+                for (plugin in pluginStore.plugins) {
+                    plugin.updatePreferenceSummary(pref)
+                }
+            }
+        }
+
+        val hmacPasswords = arrayOf(
+            resourceHelper.gs(R.string.key_bolus_password),
+            resourceHelper.gs(R.string.key_master_password),
+            resourceHelper.gs(R.string.key_application_password),
+            resourceHelper.gs(R.string.key_settings_password)
+        )
+
+        if (pref is Preference) {
+            if ((pref.key != null) && (hmacPasswords.contains(pref.key))) {
+                if (sp.getString(pref.key, "").startsWith("hmac:")) {
+                    pref.summary = "******"
+                } else {
+                    pref.summary = resourceHelper.gs(R.string.password_not_set)
+                }
+            }
+        }
+        pref?.let { adjustUnitDependentPrefs(it) }
+    }
+
+    private fun initSummary(p: Preference, isSinglePreference: Boolean) {
+        p.isIconSpaceReserved = false // remove extra spacing on left after migration to androidx
+        // expand single plugin preference by default
+        if (p is PreferenceScreen && isSinglePreference) {
+            if (p.size > 0 && p.getPreference(0) is PreferenceCategory)
+                (p.getPreference(0) as PreferenceCategory).initialExpandedChildrenCount = Int.MAX_VALUE
+        }
+        if (p is PreferenceGroup) {
+            for (i in 0 until p.preferenceCount) {
+                initSummary(p.getPreference(i), isSinglePreference)
+            }
+        } else {
+            updatePrefSummary(p)
+        }
+    }
+
+    // We use Preference and custom editor instead of EditTextPreference
+    // to hash password while it is saved and never have to show it, even hashed
+
+    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+        context?.let { context ->
+            if (preference != null) {
+                if (preference.key == resourceHelper.gs(R.string.key_master_password)) {
+                    passwordCheck.setPassword(context, R.string.master_password, R.string.key_master_password)
+                    return true
+                }
+                if (preference.key == resourceHelper.gs(R.string.key_settings_password)) {
+                    passwordCheck.setPassword(context, R.string.settings_password, R.string.key_settings_password)
+                    return true
+                }
+                if (preference.key == resourceHelper.gs(R.string.key_bolus_password)) {
+                    passwordCheck.setPassword(context, R.string.bolus_password, R.string.key_bolus_password)
+                    return true
+                }
+                if (preference.key == resourceHelper.gs(R.string.key_application_password)) {
+                    passwordCheck.setPassword(context, R.string.application_password, R.string.key_application_password)
+                    return true
+                }
+            }
+        }
+        return super.onPreferenceTreeClick(preference)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
index 3f59cd56ef..aaf85c6adf 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
@@ -2,14 +2,16 @@ package info.nightscout.androidaps.activities
 
 import android.content.Context
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.utils.LocaleHelper
 
-open class NoSplashAppCompatActivity : AppCompatActivity() {
+@Suppress("registered")
+open class NoSplashAppCompatActivity : DaggerAppCompatActivity() {
+
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme_NoActionBar)
         super.onCreate(savedInstanceState)
+        setTheme(R.style.AppTheme_NoActionBar)
     }
 
     public override fun attachBaseContext(newBase: Context) {
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
deleted file mode 100644
index 328f143836..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package info.nightscout.androidaps.activities;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceManager;
-
-import java.util.Arrays;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-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.bus.RxBus;
-import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
-import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin;
-import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
-import info.nightscout.androidaps.plugins.general.xdripStatusline.StatuslinePlugin;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin;
-import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-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.SourceDexcomPlugin;
-import info.nightscout.androidaps.utils.LocaleHelper;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SafeParse;
-
-public class PreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
-    MyPreferenceFragment myPreferenceFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        setTheme(R.style.AppTheme_NoActionBar);
-        super.onCreate(savedInstanceState);
-        myPreferenceFragment = new MyPreferenceFragment();
-        Bundle args = new Bundle();
-        args.putInt("id", getIntent().getIntExtra("id", -1));
-        myPreferenceFragment.setArguments(args);
-        getFragmentManager().beginTransaction().replace(android.R.id.content, myPreferenceFragment).commit();
-        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void attachBaseContext(Context newBase) {
-        super.attachBaseContext(LocaleHelper.INSTANCE.wrap(newBase));
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        RxBus.INSTANCE.send(new EventPreferenceChange(key));
-        if (key.equals(MainApp.gs(R.string.key_language))) {
-            RxBus.INSTANCE.send(new EventRebuildTabs(true));
-            //recreate() does not update language so better close settings
-            finish();
-        }
-        if (key.equals(MainApp.gs(R.string.key_short_tabtitles))) {
-            RxBus.INSTANCE.send(new EventRebuildTabs());
-        }
-        if (key.equals(MainApp.gs(R.string.key_units))) {
-            recreate();
-            return;
-        }
-        if (key.equals(MainApp.gs(R.string.key_openapsama_useautosens)) && SP.getBoolean(R.string.key_openapsama_useautosens, false)) {
-            OKDialog.show(this, MainApp.gs(R.string.configbuilder_sensitivity), MainApp.gs(R.string.sensitivity_warning));
-        }
-        updatePrefSummary(myPreferenceFragment.findPreference(key));
-    }
-
-    private static void adjustUnitDependentPrefs(Preference pref) {
-        // convert preferences values to current units
-        String[] unitDependent = new String[]{
-                MainApp.gs(R.string.key_hypo_target),
-                MainApp.gs(R.string.key_activity_target),
-                MainApp.gs(R.string.key_eatingsoon_target),
-                MainApp.gs(R.string.key_high_mark),
-                MainApp.gs(R.string.key_low_mark)
-        };
-        if (Arrays.asList(unitDependent).contains(pref.getKey())) {
-            EditTextPreference editTextPref = (EditTextPreference) pref;
-            String converted = Profile.toCurrentUnitsString(SafeParse.stringToDouble(editTextPref.getText()));
-            editTextPref.setSummary(converted);
-            editTextPref.setText(converted);
-        }
-    }
-
-    private static void updatePrefSummary(Preference pref) {
-        if (pref instanceof ListPreference) {
-            ListPreference listPref = (ListPreference) pref;
-            pref.setSummary(listPref.getEntry());
-        }
-        if (pref instanceof EditTextPreference) {
-            EditTextPreference editTextPref = (EditTextPreference) pref;
-            if (pref.getKey().contains("password") || pref.getKey().contains("secret")) {
-                pref.setSummary("******");
-            } else if (editTextPref.getText() != null) {
-                ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
-                pref.setSummary(editTextPref.getText());
-            } else {
-                for (PluginBase plugin : MainApp.getPluginsList()) {
-                    plugin.updatePreferenceSummary(pref);
-                }
-            }
-        }
-        if (pref != null)
-            adjustUnitDependentPrefs(pref);
-    }
-
-    public static void initSummary(Preference p) {
-        if (p instanceof PreferenceGroup) {
-            PreferenceGroup pGrp = (PreferenceGroup) p;
-            for (int i = 0; i < pGrp.getPreferenceCount(); i++) {
-                initSummary(pGrp.getPreference(i));
-            }
-        } else {
-            updatePrefSummary(p);
-        }
-    }
-
-    public static class MyPreferenceFragment extends PreferenceFragment {
-        private Integer id;
-
-        @Override
-        public void setArguments(Bundle args) {
-            super.setArguments(args);
-            id = args.getInt("id");
-        }
-
-        void addPreferencesFromResourceIfEnabled(PluginBase p, PluginType type) {
-            if (p.isEnabled(type) && p.getPreferencesId() != -1)
-                addPreferencesFromResource(p.getPreferencesId());
-        }
-
-        @Override
-        public void onCreate(final Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            if (savedInstanceState != null && savedInstanceState.containsKey("id")) {
-                id = savedInstanceState.getInt("id");
-            }
-
-            if (id != -1) {
-                addPreferencesFromResource(id);
-            } else {
-
-                if (!Config.NSCLIENT) {
-                    addPreferencesFromResource(R.xml.pref_password);
-                }
-                addPreferencesFromResource(R.xml.pref_general);
-                addPreferencesFromResource(R.xml.pref_age);
-
-                addPreferencesFromResource(R.xml.pref_overview);
-
-                addPreferencesFromResourceIfEnabled(SourceDexcomPlugin.INSTANCE, PluginType.BGSOURCE);
-                addPreferencesFromResourceIfEnabled(CareportalPlugin.getPlugin(), PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(SafetyPlugin.getPlugin(), PluginType.CONSTRAINTS);
-                if (Config.APS) {
-                    addPreferencesFromResourceIfEnabled(LoopPlugin.getPlugin(), PluginType.LOOP);
-                    addPreferencesFromResourceIfEnabled(OpenAPSMAPlugin.getPlugin(), PluginType.APS);
-                    addPreferencesFromResourceIfEnabled(OpenAPSAMAPlugin.getPlugin(), PluginType.APS);
-                    addPreferencesFromResourceIfEnabled(OpenAPSSMBPlugin.getPlugin(), PluginType.APS);
-                }
-
-                addPreferencesFromResourceIfEnabled(SensitivityAAPSPlugin.getPlugin(), PluginType.SENSITIVITY);
-                addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginType.SENSITIVITY);
-                addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginType.SENSITIVITY);
-                addPreferencesFromResourceIfEnabled(SensitivityOref1Plugin.getPlugin(), PluginType.SENSITIVITY);
-
-                if (Config.PUMPDRIVERS) {
-                    addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(DanaRv2Plugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(DanaRSPlugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(LocalInsightPlugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(ComboPlugin.getPlugin(), PluginType.PUMP);
-                    addPreferencesFromResourceIfEnabled(MedtronicPumpPlugin.getPlugin(), PluginType.PUMP);
-
-                    if (DanaRPlugin.getPlugin().isEnabled(PluginType.PROFILE)
-                            || DanaRKoreanPlugin.getPlugin().isEnabled(PluginType.PROFILE)
-                            || DanaRv2Plugin.getPlugin().isEnabled(PluginType.PROFILE)
-                            || DanaRSPlugin.getPlugin().isEnabled(PluginType.PROFILE)) {
-                        addPreferencesFromResource(R.xml.pref_danarprofile);
-                    }
-                }
-
-                if (!Config.NSCLIENT) {
-                    addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginType.PUMP);
-                }
-
-                addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginType.INSULIN);
-
-                addPreferencesFromResourceIfEnabled(NSClientPlugin.getPlugin(), PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(TidepoolPlugin.INSTANCE, PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.INSTANCE, PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(AutomationPlugin.INSTANCE, PluginType.GENERAL);
-
-                addPreferencesFromResource(R.xml.pref_others);
-                addPreferencesFromResource(R.xml.pref_datachoices);
-
-                addPreferencesFromResourceIfEnabled(WearPlugin.getPlugin(), PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(StatuslinePlugin.getPlugin(), PluginType.GENERAL);
-            }
-
-            initSummary(getPreferenceScreen());
-
-            for (PluginBase plugin : MainApp.getPluginsList()) {
-                plugin.preprocessPreferences(this);
-            }
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            outState.putInt("id", id);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
new file mode 100644
index 0000000000..ad3961c883
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.activities
+
+import android.content.Context
+import android.os.Bundle
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceScreen
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
+
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var preferenceId = 0
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_single_fragment)
+        title = resourceHelper.gs(R.string.nav_preferences)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        val myPreferenceFragment = MyPreferenceFragment()
+        preferenceId = intent.getIntExtra("id", -1)
+        val args = Bundle()
+        args.putInt("id", preferenceId)
+        myPreferenceFragment.arguments = args
+        supportFragmentManager.beginTransaction().replace(R.id.frame_layout, myPreferenceFragment).commit()
+    }
+
+    override fun onPreferenceStartScreen(caller: PreferenceFragmentCompat, pref: PreferenceScreen): Boolean {
+        val fragment = MyPreferenceFragment()
+        val args = Bundle()
+        args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, pref.key)
+        args.putInt("id", preferenceId)
+        fragment.arguments = args
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.frame_layout, fragment, pref.key)
+            .addToBackStack(pref.key)
+            .commit()
+        return true
+    }
+
+    override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(LocaleHelper.wrap(newBase))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
index 96a399a299..a87224dc30 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
@@ -1,15 +1,17 @@
 package info.nightscout.androidaps.activities
 
 import android.os.Bundle
-import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin
+import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import javax.inject.Inject
 
-class RequestDexcomPermissionActivity : NoSplashAppCompatActivity() {
+class RequestDexcomPermissionActivity : DialogAppCompatActivity() {
+    @Inject lateinit var dexcomPlugin: DexcomPlugin
 
     private val requestCode = "AndroidAPS <3".map { it.toInt() }.sum()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        requestPermissions(arrayOf(SourceDexcomPlugin.PERMISSION), requestCode)
+        requestPermissions(arrayOf(DexcomPlugin.PERMISSION), requestCode)
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
index 3bf329debe..9e62f16c97 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
@@ -5,19 +5,24 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.utils.LocaleHelper
-import info.nightscout.androidaps.utils.PasswordProtection
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import javax.inject.Inject
+
+class SingleFragmentActivity : DaggerAppCompatActivity() {
+    @Inject lateinit var pluginStore: PluginStore
+    @Inject lateinit var protectionCheck: ProtectionCheck
 
-class SingleFragmentActivity : AppCompatActivity() {
     private var plugin: PluginBase? = null
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single_fragment)
-        plugin = MainApp.getPluginsList()[intent.getIntExtra("plugin", -1)]
+        plugin = pluginStore.plugins[intent.getIntExtra("plugin", -1)]
         title = plugin?.name
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -32,7 +37,7 @@ class SingleFragmentActivity : AppCompatActivity() {
             finish()
             return true
         } else if (item.itemId == R.id.nav_plugin_preferences) {
-            PasswordProtection.QueryPassword(this, R.string.settings_password, "settings_password", Runnable {
+            protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, Runnable {
                 val i = Intent(this, PreferencesActivity::class.java)
                 i.putExtra("id", plugin?.preferencesId)
                 startActivity(i)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
index d0ac8e3f6f..cde6a5ce67 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
@@ -1,28 +1,33 @@
 package info.nightscout.androidaps.activities
 
 import android.os.Bundle
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.TddCalculator
-import info.nightscout.androidaps.utils.TirCalculator
-import kotlinx.android.synthetic.main.stats_activity.*
+import info.nightscout.androidaps.utils.stats.TddCalculator
+import info.nightscout.androidaps.utils.stats.TirCalculator
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.activity_stats.*
+import javax.inject.Inject
 
 class StatsActivity : NoSplashAppCompatActivity() {
+    @Inject lateinit var tddCalculator: TddCalculator
+    @Inject lateinit var tirCalculator: TirCalculator
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activityMonitor: ActivityMonitor
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.stats_activity)
+        setContentView(R.layout.activity_stats)
 
-        stats_tdds.text = TddCalculator.stats()
-        stats_tir.text = TirCalculator.stats()
-        stats_activity.text = ActivityMonitor.stats()
+        stats_tdds.text = tddCalculator.stats()
+        stats_tir.text = tirCalculator.stats()
+        stats_activity.text = activityMonitor.stats()
 
         ok.setOnClickListener { finish() }
         stats_reset.setOnClickListener {
-            OKDialog.showConfirmation(this, MainApp.gs(R.string.doyouwantresetstats), Runnable {
-                ActivityMonitor.reset()
+            OKDialog.showConfirmation(this, resourceHelper.gs(R.string.doyouwantresetstats), Runnable {
+                activityMonitor.reset()
                 recreate()
             })
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index bf07eda9af..2a5e8bcecd 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -6,15 +6,31 @@ import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.database.FirebaseDatabase
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.ActivityMonitor
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.InstanceId
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.stats.TddCalculator
+import info.nightscout.androidaps.utils.stats.TirCalculator
 import kotlinx.android.synthetic.main.survey_activity.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
 class SurveyActivity : NoSplashAppCompatActivity() {
-    private val log = LoggerFactory.getLogger(SurveyActivity::class.java)
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var tddCalculator: TddCalculator
+    @Inject lateinit var tirCalculator: TirCalculator
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var activityMonitor: ActivityMonitor
+    @Inject lateinit var defaultProfile: DefaultProfile
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -22,13 +38,13 @@ class SurveyActivity : NoSplashAppCompatActivity() {
 
         survey_id.text = InstanceId.instanceId()
 
-        val profileStore = ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile
+        val profileStore = activePlugin.activeProfileInterface.profile
         val profileList = profileStore?.getProfileList() ?: return
         survey_spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, profileList)
 
-        survey_tdds.text = TddCalculator.stats()
-        survey_tir.text = TirCalculator.stats()
-        survey_activity.text = ActivityMonitor.stats()
+        survey_tdds.text = tddCalculator.stats()
+        survey_tir.text = tirCalculator.stats()
+        survey_activity.text = activityMonitor.stats()
 
         survey_profile.setOnClickListener {
             val age = SafeParse.stringToDouble(survey_age.text.toString())
@@ -46,7 +62,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
                 ToastUtils.showToastInUiThread(this, R.string.invalidweight)
                 return@setOnClickListener
             }
-            val profile = DefaultProfile().profile(age, tdd, weight, ProfileFunctions.getSystemUnits())
+            val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
             val args = Bundle()
             args.putLong("time", DateUtil.now())
             args.putInt("mode", ProfileViewerDialog.Mode.CUSTOM_PROFILE.ordinal)
@@ -83,13 +99,13 @@ class SurveyActivity : NoSplashAppCompatActivity() {
             auth.signInAnonymously()
                 .addOnCompleteListener(this) { task ->
                     if (task.isSuccessful) {
-                        log.debug("signInAnonymously:success")
-                        val user = auth.currentUser // TODO: do we need this, seems unused?
+                        aapsLogger.debug(LTag.CORE, "signInAnonymously:success")
+                        //val user = auth.currentUser // TODO: do we need this, seems unused?
 
                         val database = FirebaseDatabase.getInstance().reference
                         database.child("survey").child(r.id).setValue(r)
                     } else {
-                        log.error("signInAnonymously:failure", task.exception)
+                        aapsLogger.error("signInAnonymously:failure", task.exception!!)
                         ToastUtils.showToastInUiThread(this, "Authentication failed.")
                         //updateUI(null)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index 03fb034c5c..ae337b8e59 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -4,7 +4,6 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -18,28 +17,29 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
+
+import javax.inject.Inject;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
@@ -47,15 +47,29 @@ import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
 public class TDDStatsActivity extends NoSplashAppCompatActivity {
-    private static Logger log = LoggerFactory.getLogger(TDDStatsActivity.class);
+    @Inject AAPSLogger aapsLogger;
+    @Inject ResourceHelper resourceHelper;
+    @Inject RxBusWrapper rxBus;
+    @Inject SP sp;
+    @Inject ProfileFunction profileFunction;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject DanaRSPlugin danaRSPlugin;
+    @Inject DanaRPlugin danaRPlugin;
+    @Inject DanaRv2Plugin danaRv2Plugin;
+    @Inject DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject LocalInsightPlugin localInsightPlugin;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject CommandQueueProvider commandQueue;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     TextView statusView, statsMessage, totalBaseBasal2;
@@ -77,18 +91,18 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPumpStatusChanged.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> statusView.setText(event.getStatus()), FabricPrivacy::logException)
+                .subscribe(event -> statusView.setText(event.getStatus(resourceHelper)), exception -> fabricPrivacy.logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventDanaRSyncStatus.class)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(event -> {
-                    log.debug("EventDanaRSyncStatus: " + event.getMessage());
+                    aapsLogger.debug("EventDanaRSyncStatus: " + event.getMessage());
                     statusView.setText(event.getMessage());
-                }, FabricPrivacy::logException)
+                }, exception -> fabricPrivacy.logException(exception))
         );
     }
 
@@ -118,11 +132,11 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.danar_statsactivity);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-        statusView = (TextView) findViewById(R.id.danar_stats_connection_status);
-        reloadButton = (Button) findViewById(R.id.danar_statsreload);
-        totalBaseBasal = (EditText) findViewById(R.id.danar_stats_editTotalBaseBasal);
-        totalBaseBasal2 = (TextView) findViewById(R.id.danar_stats_editTotalBaseBasal2);
-        statsMessage = (TextView) findViewById(R.id.danar_stats_Message);
+        statusView = findViewById(R.id.danar_stats_connection_status);
+        reloadButton = findViewById(R.id.danar_statsreload);
+        totalBaseBasal = findViewById(R.id.danar_stats_editTotalBaseBasal);
+        totalBaseBasal2 = findViewById(R.id.danar_stats_editTotalBaseBasal2);
+        statsMessage = findViewById(R.id.danar_stats_Message);
 
         statusView.setVisibility(View.GONE);
         statsMessage.setVisibility(View.GONE);
@@ -135,21 +149,21 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
         decimalFormat = new DecimalFormat("0.000");
         llm = new LinearLayoutManager(this);
 
-        TBB = SP.getString("TBB", "10.00");
+        TBB = sp.getString("TBB", "10.00");
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
         if (profile != null) {
             double cppTBB = profile.baseBasalSum();
             TBB = decimalFormat.format(cppTBB);
-            SP.putString("TBB", TBB);
+            sp.putString("TBB", TBB);
         }
         totalBaseBasal.setText(TBB);
 
-        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().needsManualTDDLoad)
+        if (!activePlugin.getActivePump().getPumpDescription().needsManualTDDLoad)
             reloadButton.setVisibility(View.GONE);
 
         // stats table
-        tl = (TableLayout) findViewById(R.id.main_table);
+        tl = findViewById(R.id.main_table);
         TableRow tr_head = new TableRow(this);
         tr_head.setBackgroundColor(Color.DKGRAY);
         tr_head.setLayoutParams(new TableLayout.LayoutParams(
@@ -157,27 +171,27 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_date = new TextView(this);
-        label_date.setText(MainApp.gs(R.string.danar_stats_date));
+        label_date.setText(resourceHelper.gs(R.string.danar_stats_date));
         label_date.setTextColor(Color.WHITE);
         tr_head.addView(label_date);
 
         TextView label_basalrate = new TextView(this);
-        label_basalrate.setText(MainApp.gs(R.string.danar_stats_basalrate));
+        label_basalrate.setText(resourceHelper.gs(R.string.danar_stats_basalrate));
         label_basalrate.setTextColor(Color.WHITE);
         tr_head.addView(label_basalrate);
 
         TextView label_bolus = new TextView(this);
-        label_bolus.setText(MainApp.gs(R.string.danar_stats_bolus));
+        label_bolus.setText(resourceHelper.gs(R.string.danar_stats_bolus));
         label_bolus.setTextColor(Color.WHITE);
         tr_head.addView(label_bolus);
 
         TextView label_tdd = new TextView(this);
-        label_tdd.setText(MainApp.gs(R.string.danar_stats_tdd));
+        label_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
         label_tdd.setTextColor(Color.WHITE);
         tr_head.addView(label_tdd);
 
         TextView label_ratio = new TextView(this);
-        label_ratio.setText(MainApp.gs(R.string.danar_stats_ratio));
+        label_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
         label_ratio.setTextColor(Color.WHITE);
         tr_head.addView(label_ratio);
 
@@ -187,7 +201,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         // cumulative table
-        ctl = (TableLayout) findViewById(R.id.cumulative_table);
+        ctl = findViewById(R.id.cumulative_table);
         TableRow ctr_head = new TableRow(this);
         ctr_head.setBackgroundColor(Color.DKGRAY);
         ctr_head.setLayoutParams(new TableLayout.LayoutParams(
@@ -195,17 +209,17 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_cum_amount_days = new TextView(this);
-        label_cum_amount_days.setText(MainApp.gs(R.string.danar_stats_amount_days));
+        label_cum_amount_days.setText(resourceHelper.gs(R.string.danar_stats_amount_days));
         label_cum_amount_days.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_amount_days);
 
         TextView label_cum_tdd = new TextView(this);
-        label_cum_tdd.setText(MainApp.gs(R.string.danar_stats_tdd));
+        label_cum_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
         label_cum_tdd.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_tdd);
 
         TextView label_cum_ratio = new TextView(this);
-        label_cum_ratio.setText(MainApp.gs(R.string.danar_stats_ratio));
+        label_cum_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
         label_cum_ratio.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_ratio);
 
@@ -215,7 +229,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         // expontial table
-        etl = (TableLayout) findViewById(R.id.expweight_table);
+        etl = findViewById(R.id.expweight_table);
         TableRow etr_head = new TableRow(this);
         etr_head.setBackgroundColor(Color.DKGRAY);
         etr_head.setLayoutParams(new TableLayout.LayoutParams(
@@ -223,17 +237,17 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_exp_weight = new TextView(this);
-        label_exp_weight.setText(MainApp.gs(R.string.danar_stats_weight));
+        label_exp_weight.setText(resourceHelper.gs(R.string.danar_stats_weight));
         label_exp_weight.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_weight);
 
         TextView label_exp_tdd = new TextView(this);
-        label_exp_tdd.setText(MainApp.gs(R.string.danar_stats_tdd));
+        label_exp_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
         label_exp_tdd.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_tdd);
 
         TextView label_exp_ratio = new TextView(this);
-        label_exp_ratio.setText(MainApp.gs(R.string.danar_stats_ratio));
+        label_exp_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
         label_exp_ratio.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_ratio);
 
@@ -242,58 +256,43 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.MATCH_PARENT,
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
-        reloadButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        reloadButton.setVisibility(View.GONE);
-                        statusView.setVisibility(View.VISIBLE);
-                        statsMessage.setVisibility(View.VISIBLE);
-                        statsMessage.setText(MainApp.gs(R.string.danar_stats_warning_Message));
-                    }
-                });
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().loadTDDs(new Callback() {
-                    @Override
-                    public void run() {
-                        loadDataFromDB();
-                        runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                reloadButton.setVisibility(View.VISIBLE);
-                                statusView.setVisibility(View.GONE);
-                                statsMessage.setVisibility(View.GONE);
-                            }
-                        });
-                    }
-                });
-            }
-        });
-
-        totalBaseBasal.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    totalBaseBasal.clearFocus();
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        totalBaseBasal.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    totalBaseBasal.getText().clear();
-                } else {
-                    SP.putString("TBB", totalBaseBasal.getText().toString());
-                    TBB = SP.getString("TBB", "");
+        reloadButton.setOnClickListener(v -> {
+            runOnUiThread(() -> {
+                reloadButton.setVisibility(View.GONE);
+                statusView.setVisibility(View.VISIBLE);
+                statsMessage.setVisibility(View.VISIBLE);
+                statsMessage.setText(resourceHelper.gs(R.string.danar_stats_warning_Message));
+            });
+            commandQueue.loadTDDs(new Callback() {
+                @Override
+                public void run() {
                     loadDataFromDB();
-                    InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(totalBaseBasal.getWindowToken(), 0);
+                    runOnUiThread(() -> {
+                        reloadButton.setVisibility(View.VISIBLE);
+                        statusView.setVisibility(View.GONE);
+                        statsMessage.setVisibility(View.GONE);
+                    });
                 }
+            });
+        });
+
+        totalBaseBasal.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                totalBaseBasal.clearFocus();
+                return true;
+            }
+            return false;
+        });
+
+        totalBaseBasal.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus) {
+                totalBaseBasal.getText().clear();
+            } else {
+                sp.putString("TBB", totalBaseBasal.getText().toString());
+                TBB = sp.getString("TBB", "");
+                loadDataFromDB();
+                InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(totalBaseBasal.getWindowToken(), 0);
             }
         });
 
@@ -308,7 +307,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
 
         //fill single gaps
         dummies = new LinkedList();
-        DateFormat df = new SimpleDateFormat("dd.MM.");
+        DateFormat df = new SimpleDateFormat("dd.MM.", Locale.getDefault());
         for (int i = 0; i < historyList.size() - 1; i++) {
             TDD elem1 = historyList.get(i);
             TDD elem2 = historyList.get(i + 1);
@@ -324,205 +323,197 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
             }
         }
         historyList.addAll(dummies);
-        Collections.sort(historyList, new Comparator<TDD>() {
-            @Override
-            public int compare(TDD lhs, TDD rhs) {
-                return (int) (rhs.date - lhs.date);
+        Collections.sort(historyList, (lhs, rhs) -> (int) (rhs.date - lhs.date));
+
+        runOnUiThread(() -> {
+            cleanTable(tl);
+            cleanTable(ctl);
+            cleanTable(etl);
+            DateFormat df1 = new SimpleDateFormat("dd.MM.", Locale.getDefault());
+
+            if (TextUtils.isEmpty(TBB)) {
+                totalBaseBasal.setError("Please Enter Total Base Basal");
+                return;
+            } else {
+                magicNumber = SafeParse.stringToDouble(TBB);
             }
-        });
 
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                cleanTable(tl);
-                cleanTable(ctl);
-                cleanTable(etl);
-                DateFormat df = new SimpleDateFormat("dd.MM.");
+            magicNumber *= 2;
+            totalBaseBasal2.setText(decimalFormat.format(magicNumber));
 
-                if (TextUtils.isEmpty(TBB)) {
-                    totalBaseBasal.setError("Please Enter Total Base Basal");
-                    return;
-                } else {
-                    magicNumber = SafeParse.stringToDouble(TBB);
+            int i = 0;
+            double sum = 0d;
+            double weighted03 = 0d;
+            double weighted05 = 0d;
+            double weighted07 = 0d;
+
+
+            //TDD table
+            for (TDD record : historyList) {
+                double tdd = record.getTotal();
+
+                // Create the table row
+                TableRow tr = new TableRow(TDDStatsActivity.this);
+                if (i % 2 != 0) tr.setBackgroundColor(Color.DKGRAY);
+                if (dummies.contains(record)) {
+                    tr.setBackgroundColor(Color.argb(125, 255, 0, 0));
                 }
-
-                magicNumber *= 2;
-                totalBaseBasal2.setText(decimalFormat.format(magicNumber));
-
-                int i = 0;
-                double sum = 0d;
-                double weighted03 = 0d;
-                double weighted05 = 0d;
-                double weighted07 = 0d;
-
-
-                //TDD table
-                for (TDD record : historyList) {
-                    double tdd = record.getTotal();
-
-                    // Create the table row
-                    TableRow tr = new TableRow(TDDStatsActivity.this);
-                    if (i % 2 != 0) tr.setBackgroundColor(Color.DKGRAY);
-                    if (dummies.contains(record)) {
-                        tr.setBackgroundColor(Color.argb(125, 255, 0, 0));
-                    }
-                    tr.setId(100 + i);
-                    tr.setLayoutParams(new TableLayout.LayoutParams(
-                            TableLayout.LayoutParams.MATCH_PARENT,
-                            TableLayout.LayoutParams.WRAP_CONTENT));
-
-                    // Here create the TextView dynamically
-                    TextView labelDATE = new TextView(TDDStatsActivity.this);
-                    labelDATE.setId(200 + i);
-                    labelDATE.setText(df.format(new Date(record.date)));
-                    labelDATE.setTextColor(Color.WHITE);
-                    tr.addView(labelDATE);
-
-                    TextView labelBASAL = new TextView(TDDStatsActivity.this);
-                    labelBASAL.setId(300 + i);
-                    labelBASAL.setText(DecimalFormatter.to2Decimal(record.basal) + " U");
-                    labelBASAL.setTextColor(Color.WHITE);
-                    tr.addView(labelBASAL);
-
-                    TextView labelBOLUS = new TextView(TDDStatsActivity.this);
-                    labelBOLUS.setId(400 + i);
-                    labelBOLUS.setText(DecimalFormatter.to2Decimal(record.bolus) + " U");
-                    labelBOLUS.setTextColor(Color.WHITE);
-                    tr.addView(labelBOLUS);
-
-                    TextView labelTDD = new TextView(TDDStatsActivity.this);
-                    labelTDD.setId(500 + i);
-                    labelTDD.setText(DecimalFormatter.to2Decimal(tdd) + " U");
-                    labelTDD.setTextColor(Color.WHITE);
-                    tr.addView(labelTDD);
-
-                    TextView labelRATIO = new TextView(TDDStatsActivity.this);
-                    labelRATIO.setId(600 + i);
-                    labelRATIO.setText(Math.round(100 * tdd / magicNumber) + " %");
-                    labelRATIO.setTextColor(Color.WHITE);
-                    tr.addView(labelRATIO);
-
-                    // add stats rows to tables
-                    tl.addView(tr, new TableLayout.LayoutParams(
-                            TableLayout.LayoutParams.MATCH_PARENT,
-                            TableLayout.LayoutParams.WRAP_CONTENT));
-
-                    i++;
-                }
-
-                i = 0;
-
-                //cumulative TDDs
-                for (TDD record : historyList) {
-                    if (!historyList.isEmpty() && df.format(new Date(record.date)).equals(df.format(new Date()))) {
-                        //Today should not be included
-                        continue;
-                    }
-                    i++;
-
-                    sum = sum + record.getTotal();
-
-                    // Create the cumtable row
-                    TableRow ctr = new TableRow(TDDStatsActivity.this);
-                    if (i % 2 == 0) ctr.setBackgroundColor(Color.DKGRAY);
-                    ctr.setId(700 + i);
-                    ctr.setLayoutParams(new TableLayout.LayoutParams(
-                            TableLayout.LayoutParams.MATCH_PARENT,
-                            TableLayout.LayoutParams.WRAP_CONTENT));
-
-                    // Here create the TextView dynamically
-                    TextView labelDAYS = new TextView(TDDStatsActivity.this);
-                    labelDAYS.setId(800 + i);
-                    labelDAYS.setText("" + i);
-                    labelDAYS.setTextColor(Color.WHITE);
-                    ctr.addView(labelDAYS);
-
-                    TextView labelCUMTDD = new TextView(TDDStatsActivity.this);
-                    labelCUMTDD.setId(900 + i);
-                    labelCUMTDD.setText(DecimalFormatter.to2Decimal(sum / i) + " U");
-                    labelCUMTDD.setTextColor(Color.WHITE);
-                    ctr.addView(labelCUMTDD);
-
-                    TextView labelCUMRATIO = new TextView(TDDStatsActivity.this);
-                    labelCUMRATIO.setId(1000 + i);
-                    labelCUMRATIO.setText(Math.round(100 * sum / i / magicNumber) + " %");
-                    labelCUMRATIO.setTextColor(Color.WHITE);
-                    ctr.addView(labelCUMRATIO);
-
-                    // add cummulative rows to tables
-                    ctl.addView(ctr, new TableLayout.LayoutParams(
-                            TableLayout.LayoutParams.MATCH_PARENT,
-                            TableLayout.LayoutParams.WRAP_CONTENT));
-                }
-
-                if (isOldData(historyList) && ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().needsManualTDDLoad) {
-                    statsMessage.setVisibility(View.VISIBLE);
-                    statsMessage.setText(MainApp.gs(R.string.danar_stats_olddata_Message));
-
-                } else {
-                    tl.setBackgroundColor(Color.TRANSPARENT);
-                }
-
-                if (!historyList.isEmpty() && df.format(new Date(historyList.get(0).date)).equals(df.format(new Date()))) {
-                    //Today should not be included
-                    historyList.remove(0);
-                }
-
-                Collections.reverse(historyList);
-
-                i = 0;
-
-                for (TDD record : historyList) {
-                    double tdd = record.getTotal();
-                    if (i == 0) {
-                        weighted03 = tdd;
-                        weighted05 = tdd;
-                        weighted07 = tdd;
-
-                    } else {
-                        weighted07 = (weighted07 * 0.3 + tdd * 0.7);
-                        weighted05 = (weighted05 * 0.5 + tdd * 0.5);
-                        weighted03 = (weighted03 * 0.7 + tdd * 0.3);
-                    }
-                    i++;
-                }
-
-                // Create the exptable row
-                TableRow etr = new TableRow(TDDStatsActivity.this);
-                if (i % 2 != 0) etr.setBackgroundColor(Color.DKGRAY);
-                etr.setId(1100 + i);
-                etr.setLayoutParams(new TableLayout.LayoutParams(
+                tr.setId(100 + i);
+                tr.setLayoutParams(new TableLayout.LayoutParams(
                         TableLayout.LayoutParams.MATCH_PARENT,
                         TableLayout.LayoutParams.WRAP_CONTENT));
 
                 // Here create the TextView dynamically
-                TextView labelWEIGHT = new TextView(TDDStatsActivity.this);
-                labelWEIGHT.setId(1200 + i);
-                labelWEIGHT.setText("0.3\n" + "0.5\n" + "0.7");
-                labelWEIGHT.setTextColor(Color.WHITE);
-                etr.addView(labelWEIGHT);
+                TextView labelDATE = new TextView(TDDStatsActivity.this);
+                labelDATE.setId(200 + i);
+                labelDATE.setText(df1.format(new Date(record.date)));
+                labelDATE.setTextColor(Color.WHITE);
+                tr.addView(labelDATE);
 
-                TextView labelEXPTDD = new TextView(TDDStatsActivity.this);
-                labelEXPTDD.setId(1300 + i);
-                labelEXPTDD.setText(DecimalFormatter.to2Decimal(weighted03)
-                        + " U\n" + DecimalFormatter.to2Decimal(weighted05)
-                        + " U\n" + DecimalFormatter.to2Decimal(weighted07) + " U");
-                labelEXPTDD.setTextColor(Color.WHITE);
-                etr.addView(labelEXPTDD);
+                TextView labelBASAL = new TextView(TDDStatsActivity.this);
+                labelBASAL.setId(300 + i);
+                labelBASAL.setText(resourceHelper.gs(R.string.formatinsulinunits, record.basal));
+                labelBASAL.setTextColor(Color.WHITE);
+                tr.addView(labelBASAL);
 
-                TextView labelEXPRATIO = new TextView(TDDStatsActivity.this);
-                labelEXPRATIO.setId(1400 + i);
-                labelEXPRATIO.setText(Math.round(100 * weighted03 / magicNumber) + " %\n"
-                        + Math.round(100 * weighted05 / magicNumber) + " %\n"
-                        + Math.round(100 * weighted07 / magicNumber) + " %");
-                labelEXPRATIO.setTextColor(Color.WHITE);
-                etr.addView(labelEXPRATIO);
+                TextView labelBOLUS = new TextView(TDDStatsActivity.this);
+                labelBOLUS.setId(400 + i);
+                labelBOLUS.setText(resourceHelper.gs(R.string.formatinsulinunits, record.bolus));
+                labelBOLUS.setTextColor(Color.WHITE);
+                tr.addView(labelBOLUS);
 
-                // add exponentail rows to tables
-                etl.addView(etr, new TableLayout.LayoutParams(
+                TextView labelTDD = new TextView(TDDStatsActivity.this);
+                labelTDD.setId(500 + i);
+                labelTDD.setText(resourceHelper.gs(R.string.formatinsulinunits, tdd));
+                labelTDD.setTextColor(Color.WHITE);
+                tr.addView(labelTDD);
+
+                TextView labelRATIO = new TextView(TDDStatsActivity.this);
+                labelRATIO.setId(600 + i);
+                labelRATIO.setText(Math.round(100 * tdd / magicNumber) + "%");
+                labelRATIO.setTextColor(Color.WHITE);
+                tr.addView(labelRATIO);
+
+                // add stats rows to tables
+                tl.addView(tr, new TableLayout.LayoutParams(
+                        TableLayout.LayoutParams.MATCH_PARENT,
+                        TableLayout.LayoutParams.WRAP_CONTENT));
+
+                i++;
+            }
+
+            i = 0;
+
+            //cumulative TDDs
+            for (TDD record : historyList) {
+                if (!historyList.isEmpty() && df1.format(new Date(record.date)).equals(df1.format(new Date()))) {
+                    //Today should not be included
+                    continue;
+                }
+                i++;
+
+                sum = sum + record.getTotal();
+
+                // Create the cumtable row
+                TableRow ctr = new TableRow(TDDStatsActivity.this);
+                if (i % 2 == 0) ctr.setBackgroundColor(Color.DKGRAY);
+                ctr.setId(700 + i);
+                ctr.setLayoutParams(new TableLayout.LayoutParams(
+                        TableLayout.LayoutParams.MATCH_PARENT,
+                        TableLayout.LayoutParams.WRAP_CONTENT));
+
+                // Here create the TextView dynamically
+                TextView labelDAYS = new TextView(TDDStatsActivity.this);
+                labelDAYS.setId(800 + i);
+                labelDAYS.setText("" + i);
+                labelDAYS.setTextColor(Color.WHITE);
+                ctr.addView(labelDAYS);
+
+                TextView labelCUMTDD = new TextView(TDDStatsActivity.this);
+                labelCUMTDD.setId(900 + i);
+                labelCUMTDD.setText(resourceHelper.gs(R.string.formatinsulinunits, sum / i));
+                labelCUMTDD.setTextColor(Color.WHITE);
+                ctr.addView(labelCUMTDD);
+
+                TextView labelCUMRATIO = new TextView(TDDStatsActivity.this);
+                labelCUMRATIO.setId(1000 + i);
+                labelCUMRATIO.setText(Math.round(100 * sum / i / magicNumber) + "%");
+                labelCUMRATIO.setTextColor(Color.WHITE);
+                ctr.addView(labelCUMRATIO);
+
+                // add cummulative rows to tables
+                ctl.addView(ctr, new TableLayout.LayoutParams(
                         TableLayout.LayoutParams.MATCH_PARENT,
                         TableLayout.LayoutParams.WRAP_CONTENT));
             }
+
+            if (isOldData(historyList) && activePlugin.getActivePump().getPumpDescription().needsManualTDDLoad) {
+                statsMessage.setVisibility(View.VISIBLE);
+                statsMessage.setText(resourceHelper.gs(R.string.danar_stats_olddata_Message));
+
+            } else {
+                tl.setBackgroundColor(Color.TRANSPARENT);
+            }
+
+            if (!historyList.isEmpty() && df1.format(new Date(historyList.get(0).date)).equals(df1.format(new Date()))) {
+                //Today should not be included
+                historyList.remove(0);
+            }
+
+            Collections.reverse(historyList);
+
+            i = 0;
+
+            for (TDD record : historyList) {
+                double tdd = record.getTotal();
+                if (i == 0) {
+                    weighted03 = tdd;
+                    weighted05 = tdd;
+                    weighted07 = tdd;
+
+                } else {
+                    weighted07 = (weighted07 * 0.3 + tdd * 0.7);
+                    weighted05 = (weighted05 * 0.5 + tdd * 0.5);
+                    weighted03 = (weighted03 * 0.7 + tdd * 0.3);
+                }
+                i++;
+            }
+
+            // Create the exptable row
+            TableRow etr = new TableRow(TDDStatsActivity.this);
+            if (i % 2 != 0) etr.setBackgroundColor(Color.DKGRAY);
+            etr.setId(1100 + i);
+            etr.setLayoutParams(new TableLayout.LayoutParams(
+                    TableLayout.LayoutParams.MATCH_PARENT,
+                    TableLayout.LayoutParams.WRAP_CONTENT));
+
+            // Here create the TextView dynamically
+            TextView labelWEIGHT = new TextView(TDDStatsActivity.this);
+            labelWEIGHT.setId(1200 + i);
+            labelWEIGHT.setText("0.3\n" + "0.5\n" + "0.7");
+            labelWEIGHT.setTextColor(Color.WHITE);
+            etr.addView(labelWEIGHT);
+
+            TextView labelEXPTDD = new TextView(TDDStatsActivity.this);
+            labelEXPTDD.setId(1300 + i);
+            labelEXPTDD.setText(resourceHelper.gs(R.string.formatinsulinunits, weighted03) + "\n" +
+                    resourceHelper.gs(R.string.formatinsulinunits, weighted05) + "\n" +
+                    resourceHelper.gs(R.string.formatinsulinunits, weighted07));
+            labelEXPTDD.setTextColor(Color.WHITE);
+            etr.addView(labelEXPTDD);
+
+            TextView labelEXPRATIO = new TextView(TDDStatsActivity.this);
+            labelEXPRATIO.setId(1400 + i);
+            labelEXPRATIO.setText(Math.round(100 * weighted03 / magicNumber) + "%\n"
+                    + Math.round(100 * weighted05 / magicNumber) + "%\n"
+                    + Math.round(100 * weighted07 / magicNumber) + "%");
+            labelEXPRATIO.setTextColor(Color.WHITE);
+            etr.addView(labelEXPRATIO);
+
+            // add exponentail rows to tables
+            etl.addView(etr, new TableLayout.LayoutParams(
+                    TableLayout.LayoutParams.MATCH_PARENT,
+                    TableLayout.LayoutParams.WRAP_CONTENT));
         });
     }
 
@@ -534,17 +525,11 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
         }
     }
 
-    public static boolean isOldData(List<TDD> historyList) {
-        Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        PumpInterface dana = DanaRPlugin.getPlugin();
-        PumpInterface danaRS = DanaRSPlugin.getPlugin();
-        PumpInterface danaV2 = DanaRv2Plugin.getPlugin();
-        PumpInterface danaKorean = DanaRKoreanPlugin.getPlugin();
-        PumpInterface insight = LocalInsightPlugin.getPlugin();
+    public boolean isOldData(List<TDD> historyList) {
 
-        boolean startsYesterday = activePump == dana || activePump == danaRS || activePump == danaV2 || activePump == danaKorean || activePump == insight;
+        boolean startsYesterday = danaRPlugin.isEnabled() || danaRSPlugin.isEnabled() || danaRv2Plugin.isEnabled() || danaRKoreanPlugin.isEnabled() || localInsightPlugin.isEnabled();
 
-        DateFormat df = new SimpleDateFormat("dd.MM.");
+        DateFormat df = new SimpleDateFormat("dd.MM.", Locale.getDefault());
         return (historyList.size() < 3 || !(df.format(new Date(historyList.get(0).date)).equals(df.format(new Date(System.currentTimeMillis() - (startsYesterday ? 1000 * 60 * 60 * 24 : 0))))));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java b/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java
deleted file mode 100644
index 9d7a49493b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-
-/**
- * Created by mike on 19.03.2018.
- */
-
-public class ConstraintChecker implements ConstraintsInterface {
-
-    public Constraint<Boolean> isLoopInvokationAllowed() {
-        return isLoopInvocationAllowed(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isClosedLoopAllowed() {
-        return isClosedLoopAllowed(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isAutosensModeEnabled() {
-        return isAutosensModeEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isAMAModeEnabled() {
-        return isAMAModeEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isSMBModeEnabled() {
-        return isSMBModeEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isUAMEnabled() {
-        return isUAMEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isAdvancedFilteringEnabled() {
-        return isAdvancedFilteringEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Boolean> isSuperBolusEnabled() {
-        return isSuperBolusEnabled(new Constraint<>(true));
-    }
-
-    public Constraint<Double> getMaxBasalAllowed(Profile profile) {
-        return applyBasalConstraints(new Constraint<>(Constants.REALLYHIGHBASALRATE), profile);
-    }
-
-    public Constraint<Integer> getMaxBasalPercentAllowed(Profile profile) {
-        return applyBasalPercentConstraints(new Constraint<>(Constants.REALLYHIGHPERCENTBASALRATE), profile);
-    }
-
-    public Constraint<Double> getMaxBolusAllowed() {
-        return applyBolusConstraints(new Constraint<>(Constants.REALLYHIGHBOLUS));
-    }
-
-    public Constraint<Double> getMaxExtendedBolusAllowed() {
-        return applyExtendedBolusConstraints(new Constraint<>(Constants.REALLYHIGHBOLUS));
-    }
-
-    public Constraint<Integer> getMaxCarbsAllowed() {
-        return applyCarbsConstraints(new Constraint<>(Constants.REALLYHIGHCARBS));
-    }
-
-    public Constraint<Double> getMaxIOBAllowed() {
-        return applyMaxIOBConstraints(new Constraint<>(Constants.REALLYHIGHIOB));
-    }
-
-    @Override
-    public Constraint<Boolean> isLoopInvocationAllowed(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isLoopInvocationAllowed(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isClosedLoopAllowed(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isClosedLoopAllowed(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isAutosensModeEnabled(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isAutosensModeEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isAMAModeEnabled(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.isAMAModeEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isSMBModeEnabled(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isSMBModeEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isUAMEnabled(@NonNull Constraint<Boolean> value) {
-
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isUAMEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isAdvancedFilteringEnabled(@NonNull Constraint<Boolean> value) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isAdvancedFilteringEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Boolean> isSuperBolusEnabled(@NonNull Constraint<Boolean> value) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.isSuperBolusEnabled(value);
-        }
-        return value;
-    }
-
-    @Override
-    public Constraint<Double> applyBasalConstraints(@NonNull Constraint<Double> absoluteRate, Profile profile) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constraint = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constraint.applyBasalConstraints(absoluteRate, profile);
-        }
-        return absoluteRate;
-    }
-
-    @Override
-    public Constraint<Integer> applyBasalPercentConstraints(@NonNull Constraint<Integer> percentRate, Profile profile) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.applyBasalPercentConstraints(percentRate, profile);
-        }
-        return percentRate;
-    }
-
-    @Override
-    public Constraint<Double> applyBolusConstraints(@NonNull Constraint<Double> insulin) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.applyBolusConstraints(insulin);
-        }
-        return insulin;
-    }
-
-    @Override
-    public Constraint<Double> applyExtendedBolusConstraints(@NonNull Constraint<Double> insulin) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.applyExtendedBolusConstraints(insulin);
-        }
-        return insulin;
-    }
-
-    @Override
-    public Constraint<Integer> applyCarbsConstraints(@NonNull Constraint<Integer> carbs) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.applyCarbsConstraints(carbs);
-        }
-        return carbs;
-    }
-
-    @Override
-    public Constraint<Double> applyMaxIOBConstraints(@NonNull Constraint<Double> maxIob) {
-        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
-        for (PluginBase p : constraintsPlugins) {
-            ConstraintsInterface constrain = (ConstraintsInterface) p;
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
-            constrain.applyMaxIOBConstraints(maxIob);
-        }
-        return maxIob;
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index 60e1b21048..7538cfa9ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -7,13 +7,14 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.Round;
 
 public class IobTotal implements DataPointWithLabelInterface {
-    private static Logger log = LoggerFactory.getLogger(IobTotal.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(IobTotal.class);
 
     public double iob;
     public double activity;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index 6ac3517054..b6f22aae07 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -2,33 +2,43 @@ package info.nightscout.androidaps.data;
 
 import androidx.collection.LongSparseArray;
 
+import org.joda.time.DateTime;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.TimeZone;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.MidnightTime;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class Profile {
-    private static Logger log = LoggerFactory.getLogger(Profile.class);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public ActivePluginProvider activePlugin;
+    @Inject public ResourceHelper resourceHelper;
+    @Inject public RxBusWrapper rxBus;
+    @Inject public FabricPrivacy fabricPrivacy;
+
+    private HasAndroidInjector injector;
 
     private JSONObject json;
     private String units;
@@ -51,8 +61,14 @@ public class Profile {
     protected boolean isValid;
     protected boolean isValidated;
 
-    // Default constructor for tests
-    protected Profile() {
+    // Default constructor for DB
+    public Profile() {
+        MainApp.instance().injector.androidInjector().inject(this);
+    }
+
+    protected Profile(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+        this.injector = injector;
     }
 
     @Override
@@ -64,24 +80,27 @@ public class Profile {
     }
 
     // Constructor from profileStore JSON
-    public Profile(JSONObject json, String units) {
+    public Profile(HasAndroidInjector injector, JSONObject json, String units) {
+        this(injector);
         init(json, 100, 0);
         if (this.units == null) {
             if (units != null)
                 this.units = units;
             else {
-                FabricPrivacy.log("Profile failover failed too");
+                fabricPrivacy.log("Profile failover failed too");
                 this.units = Constants.MGDL;
             }
         }
     }
 
     // Constructor from profileStore JSON
-    public Profile(JSONObject json) {
+    public Profile(HasAndroidInjector injector, JSONObject json) {
+        this(injector);
         init(json, 100, 0);
     }
 
-    public Profile(JSONObject json, int percentage, int timeshift) {
+    public Profile(HasAndroidInjector injector, JSONObject json, int percentage, int timeshift) {
+        this(injector);
         init(json, percentage, timeshift);
     }
 
@@ -114,7 +133,7 @@ public class Profile {
             targetLow = json.getJSONArray("target_low");
             targetHigh = json.getJSONArray("target_high");
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             isValid = false;
             isValidated = true;
         }
@@ -135,7 +154,7 @@ public class Profile {
             try {
                 json.put("units", units);
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception", e);
             }
         return json;
     }
@@ -180,9 +199,9 @@ public class Profile {
                 double value = o.getDouble("value") * multiplier;
                 sparse.put(tas, value);
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
-                log.error(json.toString());
-                FabricPrivacy.logException(e);
+                aapsLogger.error("Unhandled exception", e);
+                aapsLogger.error(json.toString());
+                fabricPrivacy.logException(e);
             }
         }
 
@@ -228,38 +247,31 @@ public class Profile {
 
         if (isValid) {
             // Check for hours alignment
-            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (pump != null && !pump.getPumpDescription().is30minBasalRatesCapable) {
+            PumpInterface pump = activePlugin.getActivePump();
+            if (!pump.getPumpDescription().is30minBasalRatesCapable) {
                 for (int index = 0; index < basal_v.size(); index++) {
                     long secondsFromMidnight = basal_v.keyAt(index);
                     if (notify && secondsFromMidnight % 3600 != 0) {
                         if (Config.APS) {
-                            Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, String.format(MainApp.gs(R.string.basalprofilenotaligned), from), Notification.NORMAL);
-                            RxBus.INSTANCE.send(new EventNewNotification(notification));
+                            Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, resourceHelper.gs(R.string.basalprofilenotaligned, from), Notification.NORMAL);
+                            rxBus.send(new EventNewNotification(notification));
                         }
                     }
                 }
             }
 
             // Check for minimal basal value
-            if (pump != null) {
-                PumpDescription description = pump.getPumpDescription();
-                for (int i = 0; i < basal_v.size(); i++) {
-                    if (basal_v.valueAt(i) < description.basalMinimumRate) {
-                        basal_v.setValueAt(i, description.basalMinimumRate);
-                        if (notify)
-                            sendBelowMinimumNotification(from);
-                    } else if (basal_v.valueAt(i) > description.basalMaximumRate) {
-                        basal_v.setValueAt(i, description.basalMaximumRate);
-                        if (notify)
-                            sendAboveMaximumNotification(from);
-                    }
+            PumpDescription description = pump.getPumpDescription();
+            for (int i = 0; i < basal_v.size(); i++) {
+                if (basal_v.valueAt(i) < description.basalMinimumRate) {
+                    basal_v.setValueAt(i, description.basalMinimumRate);
+                    if (notify)
+                        sendBelowMinimumNotification(from);
+                } else if (basal_v.valueAt(i) > description.basalMaximumRate) {
+                    basal_v.setValueAt(i, description.basalMaximumRate);
+                    if (notify)
+                        sendAboveMaximumNotification(from);
                 }
-            } else {
-                // if pump not available (at start)
-                // do not store converted array
-                basal_v = null;
-                isValidated = false;
             }
 
         }
@@ -267,11 +279,11 @@ public class Profile {
     }
 
     protected void sendBelowMinimumNotification(String from) {
-        RxBus.INSTANCE.send(new EventNewNotification(new Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.minimalbasalvaluereplaced), from), Notification.NORMAL)));
+        rxBus.send(new EventNewNotification(new Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, resourceHelper.gs(R.string.minimalbasalvaluereplaced, from), Notification.NORMAL)));
     }
 
     protected void sendAboveMaximumNotification(String from) {
-        RxBus.INSTANCE.send(new EventNewNotification(new Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.maximumbasalvaluereplaced), from), Notification.NORMAL)));
+        rxBus.send(new EventNewNotification(new Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, resourceHelper.gs(R.string.maximumbasalvaluereplaced, from), Notification.NORMAL)));
     }
 
     private void validate(LongSparseArray array) {
@@ -325,7 +337,7 @@ public class Profile {
         else if (array == basal_v)
             multiplier = percentage / 100d;
         else
-            log.error("Unknown array type");
+            aapsLogger.error("Unknown array type");
         return multiplier;
     }
 
@@ -343,7 +355,7 @@ public class Profile {
         else if (array == targetHigh)
             multiplier = 1d;
         else
-            log.error("Unknown array type");
+            aapsLogger.error("Unknown array type");
         return multiplier;
     }
 
@@ -406,7 +418,7 @@ public class Profile {
     public String getIsfList() {
         if (isf_v == null)
             isf_v = convertToSparseArray(isf);
-        return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + MainApp.gs(R.string.profile_per_unit));
+        return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + resourceHelper.gs(R.string.profile_per_unit));
     }
 
     public ProfileValue[] getIsfsMgdl() {
@@ -439,7 +451,7 @@ public class Profile {
     public String getIcList() {
         if (ic_v == null)
             ic_v = convertToSparseArray(ic);
-        return getValuesList(ic_v, null, new DecimalFormat("0.0"), MainApp.gs(R.string.profile_carbs_per_unit));
+        return getValuesList(ic_v, null, new DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit));
     }
 
     public ProfileValue[] getIcs() {
@@ -473,7 +485,7 @@ public class Profile {
     public String getBasalList() {
         if (basal_v == null)
             basal_v = convertToSparseArray(basal);
-        return getValuesList(basal_v, null, new DecimalFormat("0.00"), MainApp.gs(R.string.profile_ins_units_per_hour));
+        return getValuesList(basal_v, null, new DecimalFormat("0.00"), resourceHelper.gs(R.string.profile_ins_units_per_hour));
     }
 
     public class ProfileValue {
@@ -596,13 +608,15 @@ public class Profile {
     }
 
     public static int secondsFromMidnight() {
-        long passed = DateUtil.now() - MidnightTime.calc();
+        // long passed = DateUtil.now() - MidnightTime.calc();
+        long passed = new DateTime().getMillisOfDay();
         return (int) (passed / 1000);
     }
 
     public static int secondsFromMidnight(long date) {
-        long midnight = MidnightTime.calc(date);
-        long passed = date - midnight;
+        //long midnight = MidnightTime.calc(date);
+        //long passed = date - midnight;
+        long passed = new DateTime(date).getMillisOfDay();
         return (int) (passed / 1000);
     }
 
@@ -642,16 +656,21 @@ public class Profile {
         else return (valueInMmol > 0 ? "+" : "") + DecimalFormatter.to1Decimal(valueInMmol);
     }
 
-    public static double toCurrentUnits(double anyBg) {
-        if (anyBg < 32) return fromMmolToUnits(anyBg, ProfileFunctions.getSystemUnits());
-        else return fromMgdlToUnits(anyBg, ProfileFunctions.getSystemUnits());
+    public static double toCurrentUnits(ProfileFunction profileFunction, double anyBg) {
+        if (anyBg < 32) return fromMmolToUnits(anyBg, profileFunction.getUnits());
+        else return fromMgdlToUnits(anyBg, profileFunction.getUnits());
     }
 
-    public static String toCurrentUnitsString(double anyBg) {
+    public static double toCurrentUnits(String units, double anyBg) {
+        if (anyBg < 32) return fromMmolToUnits(anyBg, units);
+        else return fromMgdlToUnits(anyBg, units);
+    }
+
+    public static String toCurrentUnitsString(ProfileFunction profileFunction, double anyBg) {
         if (anyBg < 32)
-            return toUnitsString(anyBg * Constants.MMOLL_TO_MGDL, anyBg, ProfileFunctions.getSystemUnits());
+            return toUnitsString(anyBg * Constants.MMOLL_TO_MGDL, anyBg, profileFunction.getUnits());
         else
-            return toUnitsString(anyBg, anyBg * Constants.MGDL_TO_MMOLL, ProfileFunctions.getSystemUnits());
+            return toUnitsString(anyBg, anyBg * Constants.MGDL_TO_MMOLL, profileFunction.getUnits());
     }
 
     // targets are stored in mg/dl but profile vary
@@ -795,8 +814,8 @@ public class Profile {
             o.put("target_high", target_high);
 
         } catch (JSONException e) {
-            log.error("Unhandled exception" + e);
+            aapsLogger.error("Unhandled exception" + e);
         }
-        return new Profile(o);
+        return new Profile(injector, o);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
index 37be1dc6e9..c93c549afc 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.interfaces.Interval;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 09.05.2017.
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.interfaces.Interval;
 // When no interval match the lastest record without duration is used
 
 public class ProfileIntervals<T extends Interval> {
-    private static Logger log = LoggerFactory.getLogger(ProfileIntervals.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(ProfileIntervals.class);
 
     private LongSparseArray<T> rawData; // oldest at index 0
 
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
index 9415a25f2c..751067a27a 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
@@ -1,14 +1,20 @@
 package info.nightscout.androidaps.data
 
 import androidx.collection.ArrayMap
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.utils.JsonHelper
 import org.json.JSONException
 import org.json.JSONObject
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
 
-class ProfileStore(val data: JSONObject) {
-    private val log = LoggerFactory.getLogger(ProfileStore::class.java)
+class ProfileStore(val injector: HasAndroidInjector, val data: JSONObject) {
+    @Inject lateinit var aapsLogger: AAPSLogger
+
+    init {
+        injector.androidInjector().inject(this)
+    }
 
     private val cachedObjects = ArrayMap<String, Profile>()
 
@@ -16,7 +22,7 @@ class ProfileStore(val data: JSONObject) {
         try {
             if (data.has("store")) return data.getJSONObject("store")
         } catch (e: JSONException) {
-            log.error("Unhandled exception", e)
+            aapsLogger.error("Unhandled exception", e)
         }
         return null
     }
@@ -48,7 +54,7 @@ class ProfileStore(val data: JSONObject) {
                     JsonHelper.safeGetJSONObject(store, profileName, null)?.let { profileObject ->
                         // take units from profile and if N/A from store
                         JsonHelper.safeGetStringAllowNull(profileObject, "units", JsonHelper.safeGetString(data, "units"))?.let { units ->
-                            profile = Profile(profileObject, units)
+                            profile = Profile(injector, profileObject, units)
                             cachedObjects[profileName] = profile
                         }
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index 461d8faa7b..00cfb1e6bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -2,17 +2,19 @@ package info.nightscout.androidaps.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class PumpEnactResult {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public ResourceHelper resourceHelper;
 
     public boolean success = false;    // request was processed successfully (but possible no change was needed)
     public boolean enacted = false;    // request was processed successfully and change has been made
@@ -30,6 +32,10 @@ public class PumpEnactResult {
 
     public boolean queued = false;
 
+    public PumpEnactResult(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+    }
+
     public PumpEnactResult success(boolean success) {
         this.success = success;
         return this;
@@ -46,7 +52,7 @@ public class PumpEnactResult {
     }
 
     public PumpEnactResult comment(int comment) {
-        this.comment = MainApp.gs(comment);
+        this.comment = resourceHelper.gs(comment);
         return this;
     }
 
@@ -105,66 +111,66 @@ public class PumpEnactResult {
     }
 
     public String toString() {
-        String ret = MainApp.gs(R.string.success) + ": " + success;
+        String ret = resourceHelper.gs(R.string.success) + ": " + success;
         if (enacted) {
             if (bolusDelivered > 0) {
-                ret += "\n" + MainApp.gs(R.string.enacted) + ": " + enacted;
-                ret += "\n" + MainApp.gs(R.string.comment) + ": " + comment;
-                ret += "\n" + MainApp.gs(R.string.configbuilder_insulin)
-                        + ": " + bolusDelivered + " " + MainApp.gs(R.string.insulin_unit_shortname);
+                ret += "\n" + resourceHelper.gs(R.string.enacted) + ": " + enacted;
+                ret += "\n" + resourceHelper.gs(R.string.comment) + ": " + comment;
+                ret += "\n" + resourceHelper.gs(R.string.configbuilder_insulin)
+                        + ": " + bolusDelivered + " " + resourceHelper.gs(R.string.insulin_unit_shortname);
             } else if (isTempCancel) {
-                ret += "\n" + MainApp.gs(R.string.enacted) + ": " + enacted;
+                ret += "\n" + resourceHelper.gs(R.string.enacted) + ": " + enacted;
                 if (!comment.isEmpty())
-                    ret += "\n" + MainApp.gs(R.string.comment) + ": " + comment;
-                ret += "\n" + MainApp.gs(R.string.canceltemp);
+                    ret += "\n" + resourceHelper.gs(R.string.comment) + ": " + comment;
+                ret += "\n" + resourceHelper.gs(R.string.canceltemp);
             } else if (isPercent) {
-                ret += "\n" + MainApp.gs(R.string.enacted) + ": " + enacted;
+                ret += "\n" + resourceHelper.gs(R.string.enacted) + ": " + enacted;
                 if (!comment.isEmpty())
-                    ret += "\n" + MainApp.gs(R.string.comment) + ": " + comment;
-                ret += "\n" + MainApp.gs(R.string.duration) + ": " + duration + " min";
-                ret += "\n" + MainApp.gs(R.string.percent) + ": " + percent + "%";
+                    ret += "\n" + resourceHelper.gs(R.string.comment) + ": " + comment;
+                ret += "\n" + resourceHelper.gs(R.string.duration) + ": " + duration + " min";
+                ret += "\n" + resourceHelper.gs(R.string.percent) + ": " + percent + "%";
             } else {
-                ret += "\n" + MainApp.gs(R.string.enacted) + ": " + enacted;
+                ret += "\n" + resourceHelper.gs(R.string.enacted) + ": " + enacted;
                 if (!comment.isEmpty())
-                    ret += "\n" + MainApp.gs(R.string.comment) + ": " + comment;
-                ret += "\n" + MainApp.gs(R.string.duration) + ": " + duration + " min";
-                ret += "\n" + MainApp.gs(R.string.absolute) + ": " + absolute + " U/h";
+                    ret += "\n" + resourceHelper.gs(R.string.comment) + ": " + comment;
+                ret += "\n" + resourceHelper.gs(R.string.duration) + ": " + duration + " min";
+                ret += "\n" + resourceHelper.gs(R.string.absolute) + ": " + absolute + " U/h";
             }
         } else {
-            ret += "\n" + MainApp.gs(R.string.comment) + ": " + comment;
+            ret += "\n" + resourceHelper.gs(R.string.comment) + ": " + comment;
         }
         return ret;
     }
 
     public String toHtml() {
-        String ret = "<b>" + MainApp.gs(R.string.success) + "</b>: " + success;
+        String ret = "<b>" + resourceHelper.gs(R.string.success) + "</b>: " + success;
         if (queued) {
-            ret = MainApp.gs(R.string.waitingforpumpresult);
+            ret = resourceHelper.gs(R.string.waitingforpumpresult);
         } else if (enacted) {
             if (bolusDelivered > 0) {
-                ret += "<br><b>" + MainApp.gs(R.string.enacted) + "</b>: " + enacted;
+                ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted;
                 if (!comment.isEmpty())
-                    ret += "<br><b>" + MainApp.gs(R.string.comment) + "</b>: " + comment;
-                ret += "<br><b>" + MainApp.gs(R.string.smb_shortname) + "</b>: " + bolusDelivered + " " + MainApp.gs(R.string.insulin_unit_shortname);
+                    ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
+                ret += "<br><b>" + resourceHelper.gs(R.string.smb_shortname) + "</b>: " + bolusDelivered + " " + resourceHelper.gs(R.string.insulin_unit_shortname);
             } else if (isTempCancel) {
-                ret += "<br><b>" + MainApp.gs(R.string.enacted) + "</b>: " + enacted;
-                ret += "<br><b>" + MainApp.gs(R.string.comment) + "</b>: " + comment +
-                        "<br>" + MainApp.gs(R.string.canceltemp);
+                ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted;
+                ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment +
+                        "<br>" + resourceHelper.gs(R.string.canceltemp);
             } else if (isPercent && percent != -1) {
-                ret += "<br><b>" + MainApp.gs(R.string.enacted) + "</b>: " + enacted;
+                ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted;
                 if (!comment.isEmpty())
-                    ret += "<br><b>" + MainApp.gs(R.string.comment) + "</b>: " + comment;
-                ret += "<br><b>" + MainApp.gs(R.string.duration) + "</b>: " + duration + " min";
-                ret += "<br><b>" + MainApp.gs(R.string.percent) + "</b>: " + percent + "%";
+                    ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
+                ret += "<br><b>" + resourceHelper.gs(R.string.duration) + "</b>: " + duration + " min";
+                ret += "<br><b>" + resourceHelper.gs(R.string.percent) + "</b>: " + percent + "%";
             } else if (absolute != -1) {
-                ret += "<br><b>" + MainApp.gs(R.string.enacted) + "</b>: " + enacted;
+                ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted;
                 if (!comment.isEmpty())
-                    ret += "<br><b>" + MainApp.gs(R.string.comment) + "</b>: " + comment;
-                ret += "<br><b>" + MainApp.gs(R.string.duration) + "</b>: " + duration + " min";
-                ret += "<br><b>" + MainApp.gs(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h";
+                    ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
+                ret += "<br><b>" + resourceHelper.gs(R.string.duration) + "</b>: " + duration + " min";
+                ret += "<br><b>" + resourceHelper.gs(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h";
             }
         } else {
-            ret += "<br><b>" + MainApp.gs(R.string.comment) + "</b>: " + comment;
+            ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment;
         }
         return ret;
     }
@@ -187,7 +193,7 @@ public class PumpEnactResult {
                 result.put("duration", duration);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return result;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java b/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java
deleted file mode 100644
index 66123e1ce9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-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.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.BolusWizard;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 25.12.2017.
- */
-
-public class QuickWizardEntry {
-    private static Logger log = LoggerFactory.getLogger(QuickWizardEntry.class);
-
-    public JSONObject storage;
-    public int position;
-
-    public static final int YES = 0;
-    public static final int NO = 1;
-    public static final int POSITIVE_ONLY = 2;
-    public static final int NEGATIVE_ONLY = 3;
-
-    /*
-        {
-            buttonText: "Meal",
-            carbs: 36,
-            validFrom: 8 * 60 * 60, // seconds from midnight
-            validTo: 9 * 60 * 60,   // seconds from midnight
-            useBG: 0,
-            useCOB: 0,
-            useBolusIOB: 0,
-            useBasalIOB: 0,
-            useTrend: 0,
-            useSuperBolus: 0,
-            useTemptarget: 0
-        }
-     */
-    QuickWizardEntry() {
-        String emptyData = "{\"buttonText\":\"\",\"carbs\":0,\"validFrom\":0,\"validTo\":86340}";
-        try {
-            storage = new JSONObject(emptyData);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        position = -1;
-    }
-
-    QuickWizardEntry(JSONObject entry, int position) {
-        storage = entry;
-        this.position = position;
-    }
-
-    Boolean isActive() {
-        return Profile.secondsFromMidnight() >= validFrom() && Profile.secondsFromMidnight() <= validTo();
-    }
-
-    public BolusWizard doCalc(Profile profile, String profileName, BgReading lastBG, boolean _synchronized) {
-        final TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
-        //BG
-        double bg = 0;
-        if (lastBG != null && useBG() == YES) {
-            bg = lastBG.valueToUnits(ProfileFunctions.getSystemUnits());
-        }
-
-        // COB
-        double cob = 0d;
-        if (useCOB() == YES) {
-            CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(_synchronized, "QuickWizard COB");
-            if (cobInfo.displayCob != null)
-                cob = cobInfo.displayCob;
-        }
-
-        // Bolus IOB
-        boolean bolusIOB = false;
-        if (useBolusIOB() == YES) {
-            bolusIOB = true;
-        }
-
-        // Basal IOB
-        TreatmentsInterface treatments = TreatmentsPlugin.getPlugin();
-        treatments.updateTotalIOBTempBasals();
-        IobTotal basalIob = treatments.getLastCalculationTempBasals().round();
-        boolean basalIOB = false;
-        if (useBasalIOB() == YES) {
-            basalIOB = true;
-        } else if (useBasalIOB() == POSITIVE_ONLY && basalIob.iob > 0) {
-            basalIOB = true;
-        } else if (useBasalIOB() == NEGATIVE_ONLY && basalIob.iob < 0) {
-            basalIOB = true;
-        }
-
-        // SuperBolus
-        boolean superBolus = false;
-        if (useSuperBolus() == YES && SP.getBoolean(R.string.key_usesuperbolus, false)) {
-            superBolus = true;
-        }
-        final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-        if (loopPlugin.isEnabled(loopPlugin.getType()) && loopPlugin.isSuperBolus())
-            superBolus = false;
-
-        // Trend
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        boolean trend = false;
-        if (useTrend() == YES) {
-            trend = true;
-        } else if (useTrend() == POSITIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta > 0) {
-            trend = true;
-        } else if (useTrend() == NEGATIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta < 0) {
-            trend = true;
-        }
-
-        double percentage = SP.getDouble(R.string.key_boluswizard_percentage, 100.0);
-        return new BolusWizard(profile, profileName, tempTarget, carbs(), cob, bg, 0d, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, "QuickWizard");
-    }
-
-    public String buttonText() {
-        try {
-            return storage.getString("buttonText");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return "";
-    }
-
-    public Integer carbs() {
-        try {
-            return storage.getInt("carbs");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return 0;
-    }
-
-    public Date validFromDate() {
-        return DateUtil.toDate(validFrom());
-    }
-
-    public Date validToDate() {
-        return DateUtil.toDate(validTo());
-    }
-
-    public Integer validFrom() {
-        try {
-            return storage.getInt("validFrom");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return 0;
-    }
-
-    public Integer validTo() {
-        try {
-            return storage.getInt("validTo");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return 0;
-    }
-
-    public int useBG() {
-        try {
-            return storage.getInt("useBG");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return YES;
-    }
-
-    public int useCOB() {
-        try {
-            return storage.getInt("useCOB");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return NO;
-    }
-
-    public int useBolusIOB() {
-        try {
-            return storage.getInt("useBolusIOB");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return YES;
-    }
-
-    public int useBasalIOB() {
-        try {
-            return storage.getInt("useBasalIOB");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return YES;
-    }
-
-    public int useTrend() {
-        try {
-            return storage.getInt("useTrend");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return NO;
-    }
-
-    public int useSuperBolus() {
-        try {
-            return storage.getInt("useSuperBolus");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return NO;
-    }
-
-    public int useTempTarget() {
-        try {
-            return storage.getInt("useTempTarget");
-        } catch (JSONException e) {
-            //log.error("Unhandled exception", e);
-        }
-        return NO;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index b121dbee02..536c5ed68f 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -1,13 +1,17 @@
 package info.nightscout.androidaps.data.defaultProfile
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.Round
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
+class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
 
-class DefaultProfile {
     var oneToFive: TreeMap<Double, Array<Double>> = TreeMap()
     var sixToEleven: TreeMap<Double, Array<Double>> = TreeMap()
     var twelveToSeventeen: TreeMap<Double, Array<Double>> = TreeMap()
@@ -18,24 +22,24 @@ class DefaultProfile {
         if (age >= 1 && age < 6) {
             val _tdd = if (tdd == 0.0) 0.6 * weight else tdd
             closest(oneToFive, _tdd * 0.3)?.let { array -> profile.put("basal", arrayToJson(array)) }
-            val ic =  Round.roundTo(250.0 / _tdd, 1.0)
-            profile.put("carbratio", singleValueArray(ic, arrayOf( 0.0, -4.0, -1.0, -2.0, -4.0, 0.0, -4.0)))
+            val ic = Round.roundTo(250.0 / _tdd, 1.0)
+            profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -4.0, -1.0, -2.0, -4.0, 0.0, -4.0)))
             val isf = Round.roundTo(200.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf( 0.0, -2.0, -0.0, -0.0, -2.0, 0.0, -2.0)))
+            profile.put("sens", singleValueArray(isf, arrayOf(0.0, -2.0, -0.0, -0.0, -2.0, 0.0, -2.0)))
         } else if (age >= 6 && age < 12) {
             val _tdd = if (tdd == 0.0) 0.8 * weight else tdd
             closest(sixToEleven, _tdd * 0.4)?.let { array -> profile.put("basal", arrayToJson(array)) }
-            val ic =  Round.roundTo(375.0 / _tdd, 1.0)
-            profile.put("carbratio", singleValueArray(ic, arrayOf( 0.0, -3.0, 0.0, -1.0, -3.0, 0.0, -2.0)))
+            val ic = Round.roundTo(375.0 / _tdd, 1.0)
+            profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -3.0, 0.0, -1.0, -3.0, 0.0, -2.0)))
             val isf = Round.roundTo(170.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf( 0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0)))
+            profile.put("sens", singleValueArray(isf, arrayOf(0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0)))
         } else if (age >= 12 && age < 17) {
             val _tdd = if (tdd == 0.0) 1.0 * weight else tdd
             closest(twelveToSeventeen, _tdd * 0.5)?.let { array -> profile.put("basal", arrayToJson(array)) }
-            val ic =  Round.roundTo(500.0 / _tdd, 1.0)
-            profile.put("carbratio", singleValueArray(ic, arrayOf( 0.0, -1.0, 0.0, 0.0, -1.0, 0.0, -1.0)))
+            val ic = Round.roundTo(500.0 / _tdd, 1.0)
+            profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -1.0, 0.0, 0.0, -1.0, 0.0, -1.0)))
             val isf = Round.roundTo(100.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf( 0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2)))
+            profile.put("sens", singleValueArray(isf, arrayOf(0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2)))
         } else if (age >= 18) {
 
         }
@@ -45,7 +49,7 @@ class DefaultProfile {
         profile.put("timezone", TimeZone.getDefault().getID())
         profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
         profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
-        return Profile(profile, units)
+        return Profile(injector, profile, units)
     }
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
index abac9e08c0..b15d92a851 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -1,30 +1,38 @@
 package info.nightscout.androidaps.db;
 
+import androidx.annotation.NonNull;
+
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_BGREADINGS)
 public class BgReading implements DataPointWithLabelInterface {
-    private static Logger log = LoggerFactory.getLogger(L.GLUCOSE);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public DefaultValueHelper defaultValueHelper;
+    @Inject public ProfileFunction profileFunction;
+    @Inject public ResourceHelper resourceHelper;
 
     @DatabaseField(id = true)
     public long date;
@@ -51,6 +59,11 @@ public class BgReading implements DataPointWithLabelInterface {
     public boolean isZTPrediction = false; // true when drawing predictions as bg points (ZT)
 
     public BgReading() {
+        MainApp.instance().androidInjector().inject(this);
+    }
+
+    public BgReading(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
     }
 
     public BgReading(NSSgv sgv) {
@@ -108,11 +121,11 @@ public class BgReading implements DataPointWithLabelInterface {
     }
 
 
-    @Override
+    @NonNull @Override
     public String toString() {
         return "BgReading{" +
                 "date=" + date +
-                ", date=" + new Date(date).toLocaleString() +
+                ", date=" + DateUtil.dateAndTimeString(date) +
                 ", value=" + value +
                 ", direction=" + direction +
                 ", raw=" + raw +
@@ -121,8 +134,7 @@ public class BgReading implements DataPointWithLabelInterface {
 
     public boolean isDataChanging(BgReading other) {
         if (date != other.date) {
-            if (L.isEnabled(L.GLUCOSE))
-                log.error("Comparing different");
+            aapsLogger.debug(LTag.GLUCOSE, "Comparing different");
             return false;
         }
         if (value != other.value)
@@ -132,8 +144,7 @@ public class BgReading implements DataPointWithLabelInterface {
 
     public boolean isEqual(BgReading other) {
         if (date != other.date) {
-            if (L.isEnabled(L.GLUCOSE))
-                log.error("Comparing different");
+            aapsLogger.debug(LTag.GLUCOSE, "Comparing different");
             return false;
         }
         if (value != other.value)
@@ -149,8 +160,7 @@ public class BgReading implements DataPointWithLabelInterface {
 
     public void copyFrom(BgReading other) {
         if (date != other.date) {
-            if (L.isEnabled(L.GLUCOSE))
-                log.error("Copying different");
+            aapsLogger.error(LTag.GLUCOSE, "Copying different");
             return;
         }
         value = other.value;
@@ -182,7 +192,7 @@ public class BgReading implements DataPointWithLabelInterface {
 
     @Override
     public double getY() {
-        return valueToUnits(ProfileFunctions.getSystemUnits());
+        return valueToUnits(profileFunction.getUnits());
     }
 
     @Override
@@ -215,30 +225,30 @@ public class BgReading implements DataPointWithLabelInterface {
 
     @Override
     public int getColor() {
-        String units = ProfileFunctions.getSystemUnits();
-        Double lowLine = OverviewPlugin.INSTANCE.determineLowLine();
-        Double highLine = OverviewPlugin.INSTANCE.determineHighLine();
-        int color = MainApp.gc(R.color.inrange);
+        String units = profileFunction.getUnits();
+        Double lowLine = defaultValueHelper.determineLowLine();
+        Double highLine = defaultValueHelper.determineHighLine();
+        int color = resourceHelper.gc(R.color.inrange);
         if (isPrediction())
             return getPredectionColor();
         else if (valueToUnits(units) < lowLine)
-            color = MainApp.gc(R.color.low);
+            color = resourceHelper.gc(R.color.low);
         else if (valueToUnits(units) > highLine)
-            color = MainApp.gc(R.color.high);
+            color = resourceHelper.gc(R.color.high);
         return color;
     }
 
     public int getPredectionColor() {
         if (isIOBPrediction)
-            return MainApp.gc(R.color.iob);
+            return resourceHelper.gc(R.color.iob);
         if (isCOBPrediction)
-            return MainApp.gc(R.color.cob);
+            return resourceHelper.gc(R.color.cob);
         if (isaCOBPrediction)
-            return 0x80FFFFFF & MainApp.gc(R.color.cob);
+            return 0x80FFFFFF & resourceHelper.gc(R.color.cob);
         if (isUAMPrediction)
-            return MainApp.gc(R.color.uam);
+            return resourceHelper.gc(R.color.uam);
         if (isZTPrediction)
-            return MainApp.gc(R.color.zt);
+            return resourceHelper.gc(R.color.zt);
         return R.color.mdtp_white;
     }
 
@@ -270,8 +280,7 @@ public class BgReading implements DataPointWithLabelInterface {
         else
             slope = (previous.value - current.value) / (previous.date - current.date);
 
-        if (L.isEnabled(L.GLUCOSE))
-            log.debug("Slope is :" + slope + " delta " + (previous.value - current.value) + " date difference " + (current.date - previous.date));
+        aapsLogger.error(LTag.GLUCOSE, "Slope is :" + slope + " delta " + (previous.value - current.value) + " date difference " + (current.date - previous.date));
 
         double slope_by_minute = slope * 60000;
         String arrow = "NONE";
@@ -291,8 +300,7 @@ public class BgReading implements DataPointWithLabelInterface {
         } else if (slope_by_minute <= (40)) {
             arrow = "DoubleUp";
         }
-        if (L.isEnabled(L.GLUCOSE))
-            log.debug("Direction set to: " + arrow);
+        aapsLogger.error(LTag.GLUCOSE, "Direction set to: " + arrow);
         return arrow;
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index c2dc6f737e..9912644797 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,7 +24,8 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
 import info.nightscout.androidaps.plugins.general.overview.OverviewFragment;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
@@ -36,7 +36,7 @@ import info.nightscout.androidaps.utils.Translator;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_CAREPORTALEVENTS)
 public class CareportalEvent implements DataPointWithLabelInterface, Interval {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
@@ -149,7 +149,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
             CareportalEvent event = list.get(i);
             if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
                 if (L.isEnabled(L.DATABASE))
-                    log.debug("Found event for time: " + DateUtil.dateAndTimeFullString(time) + " " + event.toString());
+                    log.debug("Found event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
                 return true;
             }
         }
@@ -167,7 +167,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
 
     @Override
     public double getY() {
-        String units = ProfileFunctions.getSystemUnits();
+        String units = ConfigBuilderPlugin.getPlugin().getProfileFunction().getUnits();
         if (eventType.equals(MBG)) {
             double mbg = 0d;
             try {
@@ -260,7 +260,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
 
     @Override
     public float getSize() {
-        boolean isTablet = MainApp.sResources.getBoolean(R.bool.isTablet);
+        boolean isTablet = MainApp.resources().getBoolean(R.bool.isTablet);
         return isTablet ? 12 : 10;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index cd83c79f8e..0d65d80f6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -18,7 +18,6 @@ import com.j256.ormlite.table.TableUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -32,8 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.data.OverlappingIntervals;
+import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
@@ -48,11 +46,12 @@ import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
@@ -71,7 +70,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
  * direct calls to the corresponding methods (eg. resetDatabases) should be done by a central service.
  */
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     public static final String DATABASE_NAME = "AndroidAPSDb";
     public static final String DATABASE_BGREADINGS = "BgReadings";
@@ -224,7 +223,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        VirtualPumpPlugin.getPlugin().setFakingStatus(true);
+        VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
         scheduleBgChange(null); // trigger refresh
         scheduleTemporaryBasalChange();
         scheduleExtendedBolusChange();
@@ -235,7 +234,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 new java.util.TimerTask() {
                     @Override
                     public void run() {
-                        RxBus.INSTANCE.send(new EventRefreshOverview("resetDatabases"));
+                        RxBus.Companion.getINSTANCE().send(new EventRefreshOverview("resetDatabases"));
                     }
                 },
                 3000
@@ -260,7 +259,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        VirtualPumpPlugin.getPlugin().setFakingStatus(false);
+        VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(false);
         scheduleTemporaryBasalChange();
     }
 
@@ -404,7 +403,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing EventNewBg");
-                RxBus.INSTANCE.send(new EventNewBG(bgReading));
+                RxBus.Companion.getINSTANCE().send(new EventNewBG(bgReading));
                 scheduledBgPost = null;
             }
         }
@@ -418,40 +417,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     }
 
-    /*
-     * Return last BgReading from database or null if db is empty
-     */
-    @Nullable
-    public static BgReading lastBg() {
-        List<BgReading> bgList = IobCobCalculatorPlugin.getPlugin().getBgReadings();
-
-        if (bgList == null)
-            return null;
-
-        for (int i = 0; i < bgList.size(); i++)
-            if (bgList.get(i).value >= 39)
-                return bgList.get(i);
-        return null;
-    }
-
-    /*
-     * Return bg reading if not old ( <9 min )
-     * or null if older
-     */
-    @Nullable
-    public static BgReading actualBg() {
-        BgReading lastBg = lastBg();
-
-        if (lastBg == null)
-            return null;
-
-        if (lastBg.date > System.currentTimeMillis() - 9 * 60 * 1000)
-            return lastBg;
-
-        return null;
-    }
-
-
     public List<BgReading> getBgreadingsDataFromTime(long mills, boolean ascending) {
         try {
             Dao<BgReading, Long> daoBgreadings = getDaoBgReadings();
@@ -550,12 +515,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     // ------------- DbRequests handling -------------------
 
-    public void create(DbRequest dbr) {
-        try {
-            getDaoDbRequest().create(dbr);
-        } catch (SQLException e) {
-            log.error("Unhandled exception", e);
-        }
+    public void create(DbRequest dbr) throws SQLException {
+        getDaoDbRequest().create(dbr);
     }
 
     public int delete(DbRequest dbr) {
@@ -729,7 +690,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing EventTempTargetChange");
-                RxBus.INSTANCE.send(new EventTempTargetChange());
+                RxBus.Companion.getINSTANCE().send(new EventTempTargetChange());
                 scheduledTemTargetPost = null;
             }
         }
@@ -836,31 +797,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return historyList;
     }
 
-    public void updateDanaRHistoryRecordId(JSONObject trJson) {
-        try {
-            QueryBuilder<DanaRHistoryRecord, String> queryBuilder = getDaoDanaRHistory().queryBuilder();
-            Where where = queryBuilder.where();
-            where.ge("bytes", trJson.get(DanaRNSHistorySync.DANARSIGNATURE));
-            PreparedQuery<DanaRHistoryRecord> preparedQuery = queryBuilder.prepare();
-            List<DanaRHistoryRecord> list = getDaoDanaRHistory().query(preparedQuery);
-            if (list.size() == 0) {
-                // Record does not exists. Ignore
-            } else if (list.size() == 1) {
-                DanaRHistoryRecord record = list.get(0);
-                if (record._id == null || !record._id.equals(trJson.getString("_id"))) {
-                    if (L.isEnabled(L.DATABASE))
-                        log.debug("Updating _id in DanaR history database: " + trJson.getString("_id"));
-                    record._id = trJson.getString("_id");
-                    getDaoDanaRHistory().update(record);
-                } else {
-                    // already set
-                }
-            }
-        } catch (SQLException | JSONException e) {
-            log.error("Unhandled exception: " + trJson.toString(), e);
-        }
-    }
-
     // ------------ TemporaryBasal handling ---------------
 
     //return true if new record was created
@@ -1026,10 +962,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing EventTempBasalChange");
-                RxBus.INSTANCE.send(new EventReloadTempBasalData());
-                RxBus.INSTANCE.send(new EventTempBasalChange());
+                RxBus.Companion.getINSTANCE().send(new EventReloadTempBasalData());
+                RxBus.Companion.getINSTANCE().send(new EventTempBasalChange());
                 if (earliestDataChange != null)
-                    RxBus.INSTANCE.send(new EventNewHistoryData(earliestDataChange));
+                    RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(earliestDataChange));
                 earliestDataChange = null;
                 scheduledTemBasalsPost = null;
             }
@@ -1071,8 +1007,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         .insulin(trJson.getDouble("originalExtendedAmount"))
                         ._id(trJson.getString("_id"));
                 // if faking found in NS, adapt AAPS to use it too
-                if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
-                    VirtualPumpPlugin.getPlugin().setFakingStatus(true);
+                if (!VirtualPumpPlugin.Companion.getPlugin().getFakingStatus()) {
+                    VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
                     updateEarliestDataChange(0);
                     scheduleTemporaryBasalChange();
                 }
@@ -1086,8 +1022,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 extendedBolus.insulin = 0;
                 extendedBolus._id = trJson.getString("_id");
                 // if faking found in NS, adapt AAPS to use it too
-                if (!VirtualPumpPlugin.getPlugin().getFakingStatus()) {
-                    VirtualPumpPlugin.getPlugin().setFakingStatus(true);
+                if (!VirtualPumpPlugin.Companion.getPlugin().getFakingStatus()) {
+                    VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
                     updateEarliestDataChange(0);
                     scheduleTemporaryBasalChange();
                 }
@@ -1362,9 +1298,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing EventExtendedBolusChange");
-                RxBus.INSTANCE.send(new EventReloadTreatmentData(new EventExtendedBolusChange()));
+                RxBus.Companion.getINSTANCE().send(new EventReloadTreatmentData(new EventExtendedBolusChange()));
                 if (earliestDataChange != null)
-                    RxBus.INSTANCE.send(new EventNewHistoryData(earliestDataChange));
+                    RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(earliestDataChange));
                 earliestDataChange = null;
                 scheduledExtendedBolusPost = null;
             }
@@ -1417,7 +1353,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
             queryBuilder.orderBy("date", false);
             Where where = queryBuilder.where();
-            where.eq("eventType", event);
+            where.eq("eventType", event).and().isNotNull("json");
             queryBuilder.limit(1L);
             PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
@@ -1437,10 +1373,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
             queryBuilder.orderBy("date", ascending);
             Where where = queryBuilder.where();
-            where.ge("date", mills);
+            where.ge("date", mills).and().isNotNull("json").and().isNotNull("eventType");
             PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
-            preprocessOpenAPSOfflineEvents(careportalEvents);
+            careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
@@ -1454,10 +1390,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
             queryBuilder.orderBy("date", ascending);
             Where where = queryBuilder.where();
-            where.between("date", start, end);
+            where.between("date", start, end).and().isNotNull("json").and().isNotNull("eventType");
             PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
-            preprocessOpenAPSOfflineEvents(careportalEvents);
+            careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
@@ -1465,14 +1401,16 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return new ArrayList<>();
     }
 
-    public void preprocessOpenAPSOfflineEvents(List<CareportalEvent> list) {
-        OverlappingIntervals offlineEvents = new OverlappingIntervals();
+    public List<CareportalEvent> preprocessOpenAPSOfflineEvents(List<CareportalEvent> list) {
+        NonOverlappingIntervals offlineEvents = new NonOverlappingIntervals();
+        List<CareportalEvent> other = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             CareportalEvent event = list.get(i);
-            if (!event.eventType.equals(CareportalEvent.OPENAPSOFFLINE)) continue;
-            offlineEvents.add(event);
+            if (event.eventType.equals(CareportalEvent.OPENAPSOFFLINE)) offlineEvents.add(event);
+            else other.add(event);
         }
-
+        other.addAll(offlineEvents.getList());
+        return other;
     }
 
     public List<CareportalEvent> getCareportalEventsFromTime(long mills, String type, boolean ascending) {
@@ -1481,10 +1419,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
             queryBuilder.orderBy("date", ascending);
             Where where = queryBuilder.where();
-            where.ge("date", mills).and().eq("eventType", type);
+            where.ge("date", mills).and().eq("eventType", type).and().isNotNull("json");
             PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
-            preprocessOpenAPSOfflineEvents(careportalEvents);
+            careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
@@ -1497,9 +1435,11 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             List<CareportalEvent> careportalEvents;
             QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
             queryBuilder.orderBy("date", ascending);
+            Where where = queryBuilder.where();
+            where.isNotNull("json").and().isNotNull("eventType");
             PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
             careportalEvents = getDaoCareportalEvents().query(preparedQuery);
-            preprocessOpenAPSOfflineEvents(careportalEvents);
+            careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
@@ -1568,7 +1508,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing scheduleCareportalEventChange");
-                RxBus.INSTANCE.send(new EventCareportalEventChange());
+                RxBus.Companion.getINSTANCE().send(new EventCareportalEventChange());
                 scheduledCareportalEventPost = null;
             }
         }
@@ -1741,8 +1681,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             public void run() {
                 if (L.isEnabled(L.DATABASE))
                     log.debug("Firing EventProfileNeedsUpdate");
-                RxBus.INSTANCE.send(new EventReloadProfileSwitchData());
-                RxBus.INSTANCE.send(new EventProfileNeedsUpdate());
+                RxBus.Companion.getINSTANCE().send(new EventReloadProfileSwitchData());
+                RxBus.Companion.getINSTANCE().send(new EventProfileNeedsUpdate());
                 scheduledProfileSwitchEventPost = null;
             }
         }
@@ -1770,7 +1710,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public void createProfileSwitchFromJsonIfNotExists(JSONObject trJson) {
         try {
-            ProfileSwitch profileSwitch = new ProfileSwitch();
+            ProfileSwitch profileSwitch = new ProfileSwitch(MainApp.instance().injector);
             profileSwitch.date = trJson.getLong("mills");
             if (trJson.has("duration"))
                 profileSwitch.durationInMinutes = trJson.getInt("duration");
@@ -1785,30 +1725,24 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             if (trJson.has("profileJson"))
                 profileSwitch.profileJson = trJson.getString("profileJson");
             else {
-                ProfileInterface profileInterface = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-                if (profileInterface != null) {
-                    ProfileStore store = profileInterface.getProfile();
-                    if (store != null) {
-                        Profile profile = store.getSpecificProfile(profileSwitch.profileName);
-                        if (profile != null) {
-                            profileSwitch.profileJson = profile.getData().toString();
-                            if (L.isEnabled(L.DATABASE))
-                                log.debug("Profile switch prefilled with JSON from local store");
-                            // Update data in NS
-                            NSUpload.updateProfileSwitch(profileSwitch);
-                        } else {
-                            if (L.isEnabled(L.DATABASE))
-                                log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
-                            return;
-                        }
+                ProfileInterface profileInterface = PluginStore.Companion.getInstance().getActiveProfileInterface();
+                ProfileStore store = profileInterface.getProfile();
+                if (store != null) {
+                    Profile profile = store.getSpecificProfile(profileSwitch.profileName);
+                    if (profile != null) {
+                        profileSwitch.profileJson = profile.getData().toString();
+                        if (L.isEnabled(L.DATABASE))
+                            log.debug("Profile switch prefilled with JSON from local store");
+                        // Update data in NS
+                        NSUpload.updateProfileSwitch(profileSwitch);
                     } else {
                         if (L.isEnabled(L.DATABASE))
-                            log.debug("Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
+                            log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
                         return;
                     }
                 } else {
                     if (L.isEnabled(L.DATABASE))
-                        log.debug("No active profile interface. Ignoring: " + trJson.toString());
+                        log.debug("Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
                     return;
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index bec190a353..2754bd1f8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.DateUtil;
 
 /**
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.utils.DateUtil;
  */
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_DBREQUESTS)
 public class DbRequest {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public String nsClientID = null;
@@ -41,79 +42,55 @@ public class DbRequest {
     }
 
     // dbAdd
-    public DbRequest(String action, String collection, JSONObject data) {
+    public DbRequest(String action, String collection, JSONObject json) {
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = "";
     }
 
     // dbUpdate, dbUpdateUnset
-    public DbRequest(String action, String collection, String _id, JSONObject data) {
+    public DbRequest(String action, String collection, String _id, JSONObject json) {
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = _id;
     }
 
     // dbRemove
     public DbRequest(String action, String collection,
                      String _id) {
-        JSONObject data = new JSONObject();
+        JSONObject json = new JSONObject();
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = _id;
     }
 
-    public JSONObject toJSON() {
-        JSONObject object = new JSONObject();
-        try {
-            object.put("action", action);
-            object.put("collection", collection);
-            object.put("data", new JSONObject(data));
-            if (_id != null) object.put("_id", _id);
-            if (nsClientID != null) object.put("nsClientID", nsClientID);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return object;
-    }
-
-    public static DbRequest fromJSON(JSONObject jsonObject) {
-        DbRequest result = new DbRequest();
-        try {
-            if (jsonObject.has("action"))
-                result.action = jsonObject.getString("action");
-            if (jsonObject.has("collection"))
-                result.collection = jsonObject.getString("collection");
-            if (jsonObject.has("data"))
-                result.data = jsonObject.getJSONObject("data").toString();
-            if (jsonObject.has("_id"))
-                result._id = jsonObject.getString("_id");
-            if (jsonObject.has("nsClientID"))
-                result.nsClientID = jsonObject.getString("nsClientID");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return result;
+    public String log() {
+        return
+                "\nnsClientID:" + nsClientID +
+                "\naction:" + action +
+                "\ncollection:" + collection +
+                "\ndata:" + data +
+                "\n_id:" + _id;
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 5c865a331c..cd26b960f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -11,7 +11,6 @@ import com.j256.ormlite.table.DatabaseTable;
 
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
@@ -22,7 +21,8 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -38,7 +38,7 @@ import info.nightscout.androidaps.utils.Round;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_EXTENDEDBOLUSES)
 public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
@@ -219,7 +219,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     public IobTotal iobCalc(long time) {
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+        InsulinInterface insulinInterface = PluginStore.Companion.getInstance().getActiveInsulin();
 
         double realDuration = getDurationToTime(time);
 
@@ -251,7 +251,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     public IobTotal iobCalc(long time, Profile profile, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+        InsulinInterface insulinInterface = PluginStore.Companion.getInstance().getActiveInsulin();
 
         double realDuration = getDurationToTime(time);
         double netBasalAmount = 0d;
@@ -325,8 +325,8 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
     }
 
     public String toStringMedium() {
-        return "E " + DecimalFormatter.to2Decimal(absoluteRate()) + "U/h ("
-                + getRealDuration() + "/" + durationInMinutes + ") ";
+        return DecimalFormatter.to2Decimal(absoluteRate()) + "U/h "
+                + getRealDuration() + "/" + durationInMinutes + "'";
     }
 
     public String toStringTotal() {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index 62b963e9ef..c16b34d96a 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -9,18 +9,20 @@ import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Objects;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
@@ -30,10 +32,10 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_PROFILESWITCHES)
 public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
@@ -67,6 +69,22 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
 
     private Profile profile = null;
 
+    HasAndroidInjector injector;
+    @Inject public TreatmentsPlugin treatmentsPlugin;
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public RxBusWrapper rxBus;
+    @Inject public ResourceHelper resourceHelper;
+
+    public ProfileSwitch() {
+        this.injector = MainApp.instance().injector;
+        injector.androidInjector().inject(this);
+    }
+
+    public ProfileSwitch(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+        this.injector = injector;
+    }
+
     public ProfileSwitch date(long date) {
         this.date = date;
         return this;
@@ -96,10 +114,10 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     public Profile getProfileObject() {
         if (profile == null)
             try {
-                profile = new Profile(new JSONObject(profileJson), percentage, timeshift);
+                profile = new Profile(injector, new JSONObject(profileJson), percentage, timeshift);
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
-                log.error("Unhandled exception", profileJson);
+                aapsLogger.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception: " + profileJson);
             }
         return profile;
     }
@@ -111,7 +129,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
      */
     public String getCustomizedName() {
         String name = profileName;
-        if (LocalProfilePlugin.LOCAL_PROFILE.equals(name)) {
+        if (LocalProfilePlugin.Companion.getLOCAL_PROFILE().equals(name)) {
             name = DecimalFormatter.to2Decimal(getProfileObject().percentageBasalSum()) + "U ";
         }
         if (isCPP) {
@@ -217,7 +235,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     @Override
     public boolean isValid() {
         boolean isValid = getProfileObject() != null && getProfileObject().isValid(DateUtil.dateAndTimeString(date));
-        ProfileSwitch active = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(DateUtil.now());
+        ProfileSwitch active = treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now());
         long activeProfileSwitchDate = active != null ? active.date : -1L;
         if (!isValid && date == activeProfileSwitchDate)
             createNotificationInvalidProfile(DateUtil.dateAndTimeString(date));
@@ -225,23 +243,23 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     }
 
     private void createNotificationInvalidProfile(String detail) {
-        Notification notification = new Notification(Notification.ZERO_VALUE_IN_PROFILE, String.format(MainApp.gs(R.string.zerovalueinprofile), detail), Notification.LOW, 5);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
+        Notification notification = new Notification(Notification.ZERO_VALUE_IN_PROFILE, resourceHelper.gs(R.string.zerovalueinprofile, detail), Notification.LOW, 5);
+        rxBus.send(new EventNewNotification(notification));
     }
 
-    public static boolean isEvent5minBack(List<ProfileSwitch> list, long time, boolean zeroDurationOnly) {
+    public static boolean isEvent5minBack(AAPSLogger aapsLogger, List<ProfileSwitch> list, long time, boolean zeroDurationOnly) {
         for (int i = 0; i < list.size(); i++) {
             ProfileSwitch event = list.get(i);
             if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
                 if (zeroDurationOnly) {
                     if (event.durationInMinutes == 0) {
                         if (L.isEnabled(L.DATABASE))
-                            log.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeFullString(time) + " " + event.toString());
+                            aapsLogger.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
                         return true;
                     }
                 } else {
                     if (L.isEnabled(L.DATABASE))
-                        log.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeFullString(time) + " " + event.toString());
+                        aapsLogger.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
                     return true;
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TDD.java b/app/src/main/java/info/nightscout/androidaps/db/TDD.java
index be81e36ba3..3b4727a100 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.utils.DateUtil;
 
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.utils.DateUtil;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_TDDS)
 public class TDD {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index ef60d02911..9966425260 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -14,12 +14,13 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPTARGETS)
 public class TempTarget implements Interval {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index cf0eeab462..84aecfb5e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -4,7 +4,6 @@ import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
@@ -15,8 +14,9 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.utils.SP;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPORARYBASALS)
 public class TemporaryBasal implements Interval, DbObjectBase {
-    private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
@@ -95,7 +95,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     }
 
     public TemporaryBasal(ExtendedBolus extendedBolus) {
-        double basal = ProfileFunctions.getInstance().getProfile(extendedBolus.date).getBasal(extendedBolus.date);
+        double basal = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile(extendedBolus.date).getBasal(extendedBolus.date);
         this.date = extendedBolus.date;
         this.isValid = extendedBolus.isValid;
         this.source = extendedBolus.source;
@@ -236,7 +236,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
         }
 
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+        InsulinInterface insulinInterface = PluginStore.Companion.getInstance().getActiveInsulin();
 
         int realDuration = getDurationToTime(time);
         double netBasalAmount = 0d;
@@ -291,7 +291,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
         }
 
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+        InsulinInterface insulinInterface = PluginStore.Companion.getInstance().getActiveInsulin();
 
         double realDuration = getDurationToTime(time);
         double netBasalAmount = 0d;
@@ -404,7 +404,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     public String toStringFull() {
         if (isFakeExtended) {
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
+            Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile();
             if (profile == null)
                 return "null";
             Double currentBasalRate = profile.getBasal();
@@ -428,7 +428,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
 
             double rate;
             if (isFakeExtended) {
-                Profile profile = ProfileFunctions.getInstance().getProfile();
+                Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile();
                 if (profile == null)
                     return "null";
                 double currentBasalRate = profile.getBasal();
@@ -438,7 +438,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
             }
 
             if (SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false) && SP.getBoolean(R.string.key_danar_useextended, false)) {
-                Profile profile = ProfileFunctions.getInstance().getProfile();
+                Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile();
                 if (profile != null) {
                     double basal = profile.getBasal();
                     if (basal != 0) {
@@ -453,7 +453,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     }
 
     private String getCalcuatedPercentageIfNeeded() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile();
 
         if (profile == null)
             return "null";
@@ -479,7 +479,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     }
 
     public String toStringVeryShort() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile();
 
         if (profile == null)
             return "null";
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
new file mode 100644
index 0000000000..e7411ad56b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.MainActivity
+import info.nightscout.androidaps.activities.*
+import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
+import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
+import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
+import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
+import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
+import info.nightscout.androidaps.setupwizard.SetupWizardActivity
+
+@Module
+@Suppress("unused")
+abstract class ActivitiesModule {
+
+    @ContributesAndroidInjector abstract fun contributesBLEScanActivity(): BLEScanActivity
+    @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
+    @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
+    @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity
+    @ContributesAndroidInjector abstract fun contributesInsightPairingActivity(): InsightPairingActivity
+    @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity
+    @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
+    @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity
+    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
+    @ContributesAndroidInjector abstract fun contributesPairingHelperActivity(): PairingHelperActivity
+    @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
+    @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
+    @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEScanActivity(): RileyLinkBLEScanActivity
+    @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
+    @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
+    @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity
+    @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
+    @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
+    @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
new file mode 100644
index 0000000000..68c95efe66
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -0,0 +1,192 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.BindsInstance
+import dagger.Component
+import dagger.android.AndroidInjectionModule
+import dagger.android.AndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
+import info.nightscout.androidaps.plugins.aps.openAPSMA.DetermineBasalResultMA
+import info.nightscout.androidaps.plugins.aps.openAPSMA.LoggerCallback
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
+import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
+import info.nightscout.androidaps.plugins.general.automation.actions.*
+import info.nightscout.androidaps.plugins.general.automation.elements.*
+import info.nightscout.androidaps.plugins.general.automation.triggers.*
+import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.androidaps.plugins.general.smsCommunicator.AuthRequest
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.queue.commands.*
+import info.nightscout.androidaps.setupwizard.SWEventListener
+import info.nightscout.androidaps.setupwizard.SWScreen
+import info.nightscout.androidaps.setupwizard.elements.*
+import info.nightscout.androidaps.utils.wizard.BolusWizard
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import javax.inject.Singleton
+
+@Singleton
+@Component(
+    modules = [
+        AndroidInjectionModule::class,
+        ActivitiesModule::class,
+        FragmentsModule::class,
+        AppModule::class,
+        ReceiversModule::class,
+        ServicesModule::class
+    ]
+)
+interface AppComponent : AndroidInjector<MainApp> {
+
+    fun injectProfileStore(profileStore: ProfileStore)
+    fun injectPumpEnactResult(pumpEnactResult: PumpEnactResult)
+    fun injectAPSResult(apsResult: APSResult)
+    fun injectDetermineBasalResultSMB(determineBasalResultSMB: DetermineBasalResultSMB)
+    fun injectDetermineBasalResultMA(determineBasalResultMA: DetermineBasalResultMA)
+    fun injectDetermineBasalResultAMA(determineBasalResultAMA: DetermineBasalResultAMA)
+    fun injectDetermineBasalAdapterSMBJS(determineBasalAdapterSMBJS: DetermineBasalAdapterSMBJS)
+
+    fun injectCommandQueue(commandQueue: CommandQueue)
+    fun injectCommandBolus(commandBolus: CommandBolus)
+    fun injectCommandCancelExtendedBolus(commandCancelExtendedBolus: CommandCancelExtendedBolus)
+    fun injectCommandCancelTempBasal(commandCancelTempBasal: CommandCancelTempBasal)
+    fun injectCommandExtendedBolus(commandExtendedBolus: CommandExtendedBolus)
+    fun injectCommandInsightSetTBROverNotification(commandInsightSetTBROverNotification: CommandInsightSetTBROverNotification)
+    fun injectCommandLoadEvents(commandLoadEvents: CommandLoadEvents)
+    fun injectCommandLoadHistory(commandLoadHistory: CommandLoadHistory)
+    fun injectCommandLoadTDDs(commandLoadTDDs: CommandLoadTDDs)
+    fun injectCommandReadStatus(commandReadStatus: CommandReadStatus)
+    fun injectCommandSetProfile(commandSetProfile: CommandSetProfile)
+    fun injectCommandCommandSMBBolus(commandSMBBolus: CommandSMBBolus)
+    fun injectCommandStartPump(commandStartPump: CommandStartPump)
+    fun injectCommandStopPump(commandStopPump: CommandStopPump)
+    fun injectCommandTempBasalAbsolute(commandTempBasalAbsolute: CommandTempBasalAbsolute)
+    fun injectCommandTempBasalPercent(commandTempBasalPercent: CommandTempBasalPercent)
+    fun injectCommandSetUserSettings(commandSetUserSettings: CommandSetUserSettings)
+
+    fun injectObjective(objective: Objective)
+    fun injectObjective0(objective0: Objective0)
+    fun injectObjective1(objective1: Objective1)
+    fun injectObjective2(objective2: Objective2)
+    fun injectObjective3(objective3: Objective3)
+    fun injectObjective3(objective4: Objective4)
+    fun injectObjective5(objective5: Objective5)
+    fun injectObjective6(objective6: Objective6)
+    fun injectObjective6(objective7: Objective7)
+    fun injectObjective6(objective8: Objective8)
+    fun injectObjective6(objective9: Objective9)
+
+    fun injectAutomationEvent(automationEvent: AutomationEvent)
+
+    fun injectTrigger(trigger: Trigger)
+    fun injectTrigger(triggerAutosensValue: TriggerAutosensValue)
+    fun injectTrigger(triggerBg: TriggerBg)
+    fun injectTrigger(triggerBolusAgo: TriggerBolusAgo)
+    fun injectTrigger(triggerBTDevice: TriggerBTDevice)
+    fun injectTrigger(triggerCOB: TriggerCOB)
+    fun injectTrigger(triggerConnector: TriggerConnector)
+    fun injectTrigger(triggerDelta: TriggerDelta)
+    fun injectTrigger(triggerDummy: TriggerDummy)
+    fun injectTrigger(triggerIob: TriggerIob)
+    fun injectTrigger(triggerLocation: TriggerLocation)
+    fun injectTrigger(triggerProfilePercent: TriggerProfilePercent)
+    fun injectTrigger(triggerPumpLastConnection: TriggerPumpLastConnection)
+    fun injectTrigger(triggerRecurringTime: TriggerRecurringTime)
+    fun injectTrigger(triggerTempTarget: TriggerTempTarget)
+    fun injectTrigger(triggerTime: TriggerTime)
+    fun injectTrigger(triggerTimeRange: TriggerTimeRange)
+    fun injectTrigger(triggerWifiSsid: TriggerWifiSsid)
+
+    fun injectAction(action: Action)
+    fun injectActionDummy(action: ActionDummy)
+    fun injectActionLoopDisable(action: ActionLoopDisable)
+    fun injectActionLoopEnable(action: ActionLoopEnable)
+    fun injectActionLoopResume(action: ActionLoopResume)
+    fun injectAction(action: ActionLoopSuspend)
+    fun injectActionLoopSuspend(action: ActionNotification)
+    fun injectActionProfileSwitch(action: ActionProfileSwitch)
+    fun injectAction(action: ActionProfileSwitchPercent)
+    fun injectActionProfileSwitchPercent(action: ActionSendSMS)
+    fun injectActionStartTempTarget(action: ActionStartTempTarget)
+    fun injectActionStopTempTarget(action: ActionStopTempTarget)
+
+    fun injectElement(element: Element)
+    fun injectElement(inputBg: InputBg)
+    fun injectElement(inputButton: InputButton)
+    fun injectElement(comparator: Comparator)
+    fun injectElement(comparatorExists: ComparatorExists)
+    fun injectElement(comparatorConnect: ComparatorConnect)
+    fun injectElement(inputDateTime: InputDateTime)
+    fun injectElement(inputDelta: InputDelta)
+    fun injectElement(inputDropdownMenu: InputDropdownMenu)
+    fun injectElement(inputDouble: InputDouble)
+    fun injectElement(inputDuration: InputDuration)
+    fun injectElement(inputInsulin: InputInsulin)
+    fun injectElement(inputLocationMode: InputLocationMode)
+    fun injectElement(inputPercent: InputPercent)
+    fun injectElement(inputProfileName: InputProfileName)
+    fun injectElement(inputString: InputString)
+    fun injectElement(inputTempTarget: InputTempTarget)
+    fun injectElement(inputTimeRange: InputTimeRange)
+    fun injectElement(inputTime: InputTime)
+    fun injectElement(inputWeekDay: InputWeekDay)
+    fun injectElement(labelWithElement: LabelWithElement)
+    fun injectElement(staticLabel: StaticLabel)
+
+    fun injectAutosensDate(autosensData: AutosensData)
+    fun injectIobCobThread(iobCobThread: IobCobThread)
+    fun injectIobCobOref1Thread(iobCobOref1Thread: IobCobOref1Thread)
+
+    fun injectTreatment(treatment: Treatment)
+    fun injectBgReading(bgReading: BgReading)
+    fun injectProfileSwitch(profileSwitch: ProfileSwitch)
+
+    fun injectNotification(notificationWithAction: NotificationWithAction)
+
+    fun injectLoggerCallback(loggerCallback: LoggerCallback)
+    fun injectBolusWizard(bolusWizard: BolusWizard)
+    fun injectQuickWizardEntry(quickWizardEntry: QuickWizardEntry)
+
+    fun injectAuthRequest(authRequest: AuthRequest)
+
+    fun injectSWBreak(swBreak: SWBreak)
+    fun injectSWButton(swButton: SWButton)
+    fun injectSWEditNumberWithUnits(swEditNumberWithUnits: SWEditNumberWithUnits)
+    fun injectSWEditString(swEditString: SWEditString)
+    fun injectSWEditUrl(swEditUrl: SWEditUrl)
+    fun injectSWFragment(swFragment: SWFragment)
+    fun injectSSWHtmlLink(swHtmlLink: SWHtmlLink)
+    fun injectSWInfotext(swInfotext: SWInfotext)
+    fun injectSWItem(swItem: SWItem)
+    fun injectSWPlugin(swPlugin: SWPlugin)
+    fun injectSWRadioButton(swRadioButton: SWRadioButton)
+    fun injectSWScreen(swScreen: SWScreen)
+    fun injectSWEventListener(swEventListener: SWEventListener)
+
+    fun injectProfile(profile: Profile)
+    fun injectGlucoseStatus(glucoseStatus: GlucoseStatus)
+
+    fun injectGraphData(graphData: GraphData)
+
+    @Component.Builder
+    interface Builder {
+
+        @BindsInstance
+        fun application(mainApp: MainApp): Builder
+
+        fun build(): AppComponent
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
new file mode 100644
index 0000000000..933873bc5e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -0,0 +1,277 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import dagger.Binds
+import dagger.Lazy
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.AAPSLoggerProduction
+import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
+import info.nightscout.androidaps.plugins.aps.openAPSMA.DetermineBasalResultMA
+import info.nightscout.androidaps.plugins.aps.openAPSMA.LoggerCallback
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
+import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
+import info.nightscout.androidaps.plugins.general.automation.actions.*
+import info.nightscout.androidaps.plugins.general.automation.elements.*
+import info.nightscout.androidaps.plugins.general.automation.triggers.*
+import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
+import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
+import info.nightscout.androidaps.plugins.general.maintenance.formats.ClassicPrefsFormat
+import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.androidaps.plugins.general.smsCommunicator.AuthRequest
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.queue.commands.*
+import info.nightscout.androidaps.setupwizard.SWEventListener
+import info.nightscout.androidaps.setupwizard.SWScreen
+import info.nightscout.androidaps.setupwizard.elements.*
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelperImplementation
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.sharedPreferences.SPImplementation
+import info.nightscout.androidaps.utils.storage.FileStorage
+import info.nightscout.androidaps.utils.storage.Storage
+import info.nightscout.androidaps.utils.wizard.BolusWizard
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import javax.inject.Singleton
+
+@Module(includes = [AppModule.AppBindings::class, PluginsModule::class])
+open class AppModule {
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(context: Context, resourceHelper: ResourceHelper): SP {
+        return SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), resourceHelper)
+    }
+
+    @Provides
+    @Singleton
+    fun provideProfileFunction(injector: HasAndroidInjector, aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePluginProvider, fabricPrivacy: FabricPrivacy): ProfileFunction {
+        return ProfileFunctionImplementation(injector, aapsLogger, sp, resourceHelper, activePlugin, fabricPrivacy)
+    }
+
+    @Provides
+    @Singleton
+    fun provideResources(mainApp: MainApp): ResourceHelper {
+        return ResourceHelperImplementation(mainApp)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAAPSLogger(): AAPSLogger {
+        return AAPSLoggerProduction()
+/*        if (BuildConfig.DEBUG) {
+            AAPSLoggerDebug()
+        } else {
+            AAPSLoggerProduction()
+        }
+ */
+    }
+
+    @Provides
+    fun providesPlugins(@PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
+                        @PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
+                        @PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
+                        @PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>): List<@JvmSuppressWildcards PluginBase> {
+        val plugins = allConfigs.toMutableMap()
+        if (Config.PUMPDRIVERS) plugins += pumpDrivers.get()
+        if (Config.APS) plugins += aps.get()
+        if (!Config.NSCLIENT) plugins += notNsClient.get()
+        return plugins.toList().sortedBy { it.first }.map { it.second }
+    }
+
+    @Provides
+    @Singleton
+    fun provideStorage(): Storage {
+        return FileStorage()
+    }
+
+    @Module
+    interface AppBindings {
+
+        @ContributesAndroidInjector fun profileStoreInjector(): ProfileStore
+
+        @ContributesAndroidInjector fun pumpEnactResultInjector(): PumpEnactResult
+
+        @ContributesAndroidInjector fun apsResultInjector(): APSResult
+        @ContributesAndroidInjector fun determineBasalResultSMBInjector(): DetermineBasalResultSMB
+        @ContributesAndroidInjector fun determineBasalResultMAInjector(): DetermineBasalResultMA
+        @ContributesAndroidInjector fun determineBasalResultAMAInjector(): DetermineBasalResultAMA
+
+        @ContributesAndroidInjector
+        fun determineBasalAdapterSMBJSInjector(): DetermineBasalAdapterSMBJS
+
+        @ContributesAndroidInjector fun commandQueueInjector(): CommandQueue
+        @ContributesAndroidInjector fun commandBolusInjector(): CommandBolus
+
+        @ContributesAndroidInjector
+        fun commandCancelExtendedBolusInjector(): CommandCancelExtendedBolus
+
+        @ContributesAndroidInjector fun commandCancelTempBasalInjector(): CommandCancelTempBasal
+        @ContributesAndroidInjector fun commandExtendedBolusInjector(): CommandExtendedBolus
+
+        @ContributesAndroidInjector
+        fun commandInsightSetTBROverNotificationInjector(): CommandInsightSetTBROverNotification
+
+        @ContributesAndroidInjector fun commandLoadEventsInjector(): CommandLoadEvents
+        @ContributesAndroidInjector fun commandLoadHistoryInjector(): CommandLoadHistory
+        @ContributesAndroidInjector fun commandLoadTDDsInjector(): CommandLoadTDDs
+        @ContributesAndroidInjector fun commandReadStatusInjector(): CommandReadStatus
+        @ContributesAndroidInjector fun commandSetProfileInjector(): CommandSetProfile
+        @ContributesAndroidInjector fun commandCommandSMBBolusInjector(): CommandSMBBolus
+        @ContributesAndroidInjector fun commandStartPumpInjector(): CommandStartPump
+        @ContributesAndroidInjector fun commandStopPumpInjector(): CommandStopPump
+        @ContributesAndroidInjector fun commandTempBasalAbsoluteInjector(): CommandTempBasalAbsolute
+        @ContributesAndroidInjector fun commandTempBasalPercentInjector(): CommandTempBasalPercent
+        @ContributesAndroidInjector fun commandSetUserSettingsInjector(): CommandSetUserSettings
+
+        @ContributesAndroidInjector fun objectiveInjector(): Objective
+        @ContributesAndroidInjector fun objective0Injector(): Objective0
+        @ContributesAndroidInjector fun objective1Injector(): Objective1
+        @ContributesAndroidInjector fun objective2Injector(): Objective2
+        @ContributesAndroidInjector fun objective3Injector(): Objective3
+        @ContributesAndroidInjector fun objective4Injector(): Objective4
+        @ContributesAndroidInjector fun objective5Injector(): Objective5
+        @ContributesAndroidInjector fun objective6Injector(): Objective6
+        @ContributesAndroidInjector fun objective7Injector(): Objective7
+        @ContributesAndroidInjector fun objective8Injector(): Objective8
+        @ContributesAndroidInjector fun objective9Injector(): Objective9
+
+        @ContributesAndroidInjector fun automationEventInjector(): AutomationEvent
+
+        @ContributesAndroidInjector fun triggerInjector(): Trigger
+        @ContributesAndroidInjector fun triggerAutosensValueInjector(): TriggerAutosensValue
+        @ContributesAndroidInjector fun triggerBgInjector(): TriggerBg
+        @ContributesAndroidInjector fun triggerBolusAgoInjector(): TriggerBolusAgo
+        @ContributesAndroidInjector fun triggerCOBInjector(): TriggerCOB
+        @ContributesAndroidInjector fun triggerConnectorInjector(): TriggerConnector
+        @ContributesAndroidInjector fun triggerDeltaInjector(): TriggerDelta
+        @ContributesAndroidInjector fun triggerDummyInjector(): TriggerDummy
+        @ContributesAndroidInjector fun triggerIobInjector(): TriggerIob
+        @ContributesAndroidInjector fun triggerLocationInjector(): TriggerLocation
+        @ContributesAndroidInjector fun triggerProfilePercentInjector(): TriggerProfilePercent
+
+        @ContributesAndroidInjector
+        fun triggerPumpLastConnectionInjector(): TriggerPumpLastConnection
+
+        @ContributesAndroidInjector fun triggerBTDeviceInjector(): TriggerBTDevice
+        @ContributesAndroidInjector fun triggerRecurringTimeInjector(): TriggerRecurringTime
+        @ContributesAndroidInjector fun triggerTempTargetInjector(): TriggerTempTarget
+        @ContributesAndroidInjector fun triggerTime(): TriggerTime
+        @ContributesAndroidInjector fun triggerTimeRangeInjector(): TriggerTimeRange
+        @ContributesAndroidInjector fun triggerWifiSsidInjector(): TriggerWifiSsid
+
+        @ContributesAndroidInjector fun actionInjector(): Action
+        @ContributesAndroidInjector fun actionLoopDisableInjector(): ActionLoopDisable
+        @ContributesAndroidInjector fun actionLoopEnableInjector(): ActionLoopEnable
+        @ContributesAndroidInjector fun actionLoopResumeInjector(): ActionLoopResume
+        @ContributesAndroidInjector fun actionLoopSuspendInjector(): ActionLoopSuspend
+        @ContributesAndroidInjector fun actionNotificationInjector(): ActionNotification
+        @ContributesAndroidInjector fun actionProfileSwitchInjector(): ActionProfileSwitch
+
+        @ContributesAndroidInjector
+        fun actionProfileSwitchPercentInjector(): ActionProfileSwitchPercent
+
+        @ContributesAndroidInjector fun actionSendSMSInjector(): ActionSendSMS
+        @ContributesAndroidInjector fun actionStartTempTargetInjector(): ActionStartTempTarget
+        @ContributesAndroidInjector fun actionStopTempTargetInjector(): ActionStopTempTarget
+        @ContributesAndroidInjector fun actionDummyInjector(): ActionDummy
+
+        @ContributesAndroidInjector fun elementInjector(): Element
+        @ContributesAndroidInjector fun inputBgInjector(): InputBg
+        @ContributesAndroidInjector fun inputButtonInjector(): InputButton
+        @ContributesAndroidInjector fun comparatorInjector(): Comparator
+        @ContributesAndroidInjector fun comparatorConnectInjector(): ComparatorConnect
+        @ContributesAndroidInjector fun comparatorExistsInjector(): ComparatorExists
+        @ContributesAndroidInjector fun inputDateTimeInjector(): InputDateTime
+        @ContributesAndroidInjector fun inputDeltaInjector(): InputDelta
+        @ContributesAndroidInjector fun inputDoubleInjector(): InputDouble
+        @ContributesAndroidInjector fun inputDropdownMenuInjector(): InputDropdownMenu
+        @ContributesAndroidInjector fun inputDurationInjector(): InputDuration
+        @ContributesAndroidInjector fun inputInsulinInjector(): InputInsulin
+        @ContributesAndroidInjector fun inputLocationModeInjector(): InputLocationMode
+        @ContributesAndroidInjector fun inputPercentInjector(): InputPercent
+        @ContributesAndroidInjector fun inputProfileNameInjector(): InputProfileName
+        @ContributesAndroidInjector fun inputStringInjector(): InputString
+        @ContributesAndroidInjector fun inputTempTargetInjector(): InputTempTarget
+        @ContributesAndroidInjector fun inputTimeRangeInjector(): InputTimeRange
+        @ContributesAndroidInjector fun inputTimeInjector(): InputTime
+        @ContributesAndroidInjector fun inputWeekDayInjector(): InputWeekDay
+        @ContributesAndroidInjector fun labelWithElementInjector(): LabelWithElement
+        @ContributesAndroidInjector fun staticLabelInjector(): StaticLabel
+
+        @ContributesAndroidInjector fun autosensDataInjector(): AutosensData
+        @ContributesAndroidInjector fun iobCobThreadInjector(): IobCobThread
+        @ContributesAndroidInjector fun iobCobOref1ThreadInjector(): IobCobOref1Thread
+
+        @ContributesAndroidInjector fun bgReadingInjector(): BgReading
+        @ContributesAndroidInjector fun treatmentInjector(): Treatment
+        @ContributesAndroidInjector fun profileSwitchInjector(): ProfileSwitch
+
+        @ContributesAndroidInjector fun notificationWithActionInjector(): NotificationWithAction
+
+        @ContributesAndroidInjector fun loggerCallbackInjector(): LoggerCallback
+        @ContributesAndroidInjector fun loggerBolusWizard(): BolusWizard
+        @ContributesAndroidInjector fun loggerQuickWizardEntry(): QuickWizardEntry
+
+        @ContributesAndroidInjector fun authRequestInjector(): AuthRequest
+
+        @ContributesAndroidInjector fun swBreakInjector(): SWBreak
+        @ContributesAndroidInjector fun swButtonInjector(): SWButton
+        @ContributesAndroidInjector fun swEditNumberWithUnitsInjector(): SWEditNumberWithUnits
+        @ContributesAndroidInjector fun swEditStringInjector(): SWEditString
+        @ContributesAndroidInjector fun swEditUrlInjector(): SWEditUrl
+        @ContributesAndroidInjector fun swFragmentInjector(): SWFragment
+        @ContributesAndroidInjector fun swHtmlLinkInjector(): SWHtmlLink
+        @ContributesAndroidInjector fun swInfotextInjector(): SWInfotext
+        @ContributesAndroidInjector fun swItemInjector(): SWItem
+        @ContributesAndroidInjector fun swPluginInjector(): SWPlugin
+        @ContributesAndroidInjector fun swRadioButtonInjector(): SWRadioButton
+        @ContributesAndroidInjector fun swScreenInjector(): SWScreen
+        @ContributesAndroidInjector fun swEventListenerInjector(): SWEventListener
+
+        @ContributesAndroidInjector fun profileInjector(): Profile
+        @ContributesAndroidInjector fun glucoseStatusInjector(): GlucoseStatus
+
+        @ContributesAndroidInjector fun graphDataInjector(): GraphData
+
+        @ContributesAndroidInjector fun importExportPrefsInjector(): ImportExportPrefs
+        @ContributesAndroidInjector fun encryptedPrefsFormatInjector(): EncryptedPrefsFormat
+        @ContributesAndroidInjector fun classicPrefsFormatInjector(): ClassicPrefsFormat
+
+        @Binds fun bindContext(mainApp: MainApp): Context
+        @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
+
+        @Binds
+        fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
+
+        @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
+
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
new file mode 100644
index 0000000000..d151912151
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -0,0 +1,118 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.activities.MyPreferenceFragment
+import info.nightscout.androidaps.dialogs.*
+import info.nightscout.androidaps.plugins.aps.loop.LoopFragment
+import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAFragment
+import info.nightscout.androidaps.plugins.aps.openAPSMA.OpenAPSMAFragment
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBFragment
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
+import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
+import info.nightscout.androidaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
+import info.nightscout.androidaps.plugins.general.actions.ActionsFragment
+import info.nightscout.androidaps.plugins.general.automation.AutomationFragment
+import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseActionDialog
+import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTriggerDialog
+import info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog
+import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
+import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTriggerDialog
+import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
+import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
+import info.nightscout.androidaps.plugins.general.food.FoodFragment
+import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
+import info.nightscout.androidaps.plugins.general.overview.OverviewFragment
+import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorFragment
+import info.nightscout.androidaps.plugins.general.tidepool.TidepoolFragment
+import info.nightscout.androidaps.plugins.general.wear.WearFragment
+import info.nightscout.androidaps.plugins.insulin.InsulinFragment
+import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
+import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
+import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
+import info.nightscout.androidaps.plugins.source.BGSourceFragment
+import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
+import info.nightscout.androidaps.plugins.treatments.fragments.*
+import info.nightscout.androidaps.utils.protection.PasswordCheck
+
+@Module
+@Suppress("unused")
+abstract class FragmentsModule {
+
+    @ContributesAndroidInjector abstract fun contributesPreferencesFragment(): MyPreferenceFragment
+
+    @ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
+    @ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
+    @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
+    @ContributesAndroidInjector abstract fun contributesCareportalFragment(): CareportalFragment
+    @ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
+
+    @ContributesAndroidInjector
+    abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
+
+    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaRFragment
+    @ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
+    @ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
+    @ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
+    @ContributesAndroidInjector abstract fun contributesObjectivesFragment(): ObjectivesFragment
+    @ContributesAndroidInjector abstract fun contributesOpenAPSAMAFragment(): OpenAPSAMAFragment
+    @ContributesAndroidInjector abstract fun contributesOpenAPSMAFragment(): OpenAPSMAFragment
+    @ContributesAndroidInjector abstract fun contributesOpenAPSSMBFragment(): OpenAPSSMBFragment
+    @ContributesAndroidInjector abstract fun contributesOverviewFragment(): OverviewFragment
+    @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment
+    @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
+    @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
+    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
+    @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
+    @ContributesAndroidInjector abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment
+    @ContributesAndroidInjector abstract fun contributesWearFragment(): WearFragment
+
+    @ContributesAndroidInjector abstract fun contributesTidepoolFragment(): TidepoolFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsFragment(): TreatmentsFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsBolusFragment(): TreatmentsBolusFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsTemporaryBasalsFragment(): TreatmentsTemporaryBasalsFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsTempTargetFragment(): TreatmentsTempTargetFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsExtendedBolusesFragment(): TreatmentsExtendedBolusesFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsCareportalFragment(): TreatmentsCareportalFragment
+    @ContributesAndroidInjector abstract fun contributesTreatmentsProfileSwitchFragment(): TreatmentsProfileSwitchFragment
+
+    @ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
+
+    @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
+    @ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
+    @ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
+    @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog
+    @ContributesAndroidInjector abstract fun contributesEditActionDialog(): EditActionDialog
+    @ContributesAndroidInjector abstract fun contributesEditEventDialog(): EditEventDialog
+    @ContributesAndroidInjector abstract fun contributesEditTriggerDialog(): EditTriggerDialog
+
+    @ContributesAndroidInjector
+    abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
+
+    @ContributesAndroidInjector abstract fun contributesErrorDialog(): ErrorDialog
+    @ContributesAndroidInjector abstract fun contributesExtendedBolusDialog(): ExtendedBolusDialog
+    @ContributesAndroidInjector abstract fun contributesFillDialog(): FillDialog
+    @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
+    @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
+    @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
+    @ContributesAndroidInjector abstract fun contributesNewNSTreatmentDialog(): NewNSTreatmentDialog
+    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
+    @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
+    @ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
+    @ContributesAndroidInjector abstract fun contributesProfileViewerDialog(): ProfileViewerDialog
+    @ContributesAndroidInjector abstract fun contributesTempBasalDialog(): TempBasalDialog
+    @ContributesAndroidInjector abstract fun contributesTempTargetDialog(): TempTargetDialog
+    @ContributesAndroidInjector abstract fun contributesTreatmentDialog(): TreatmentDialog
+    @ContributesAndroidInjector abstract fun contributesWizardDialog(): WizardDialog
+    @ContributesAndroidInjector abstract fun contributesWizardInfoDialog(): WizardInfoDialog
+
+    @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
new file mode 100644
index 0000000000..cc3694874f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -0,0 +1,379 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Binds
+import dagger.Lazy
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntKey
+import dagger.multibindings.IntoMap
+import dagger.multibindings.IntoSet
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+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.constraints.dstHelper.DstHelperPlugin
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
+import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
+import info.nightscout.androidaps.plugins.constraints.storage.StorageConstraintPlugin
+import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerPlugin
+import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
+import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastPlugin
+import info.nightscout.androidaps.plugins.general.food.FoodPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
+import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin
+import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.plugins.general.wear.WearPlugin
+import info.nightscout.androidaps.plugins.general.xdripStatusline.StatusLinePlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+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.*
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import javax.inject.Qualifier
+
+@Module
+abstract class PluginsModule {
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(0)
+    abstract fun bindOverviewPlugin(plugin: OverviewPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(10)
+    abstract fun bindIobCobCalculatorPlugin(plugin: IobCobCalculatorPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(20)
+    abstract fun bindActionsPlugin(plugin: ActionsPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(30)
+    abstract fun bindInsulinOrefRapidActingPlugin(plugin: InsulinOrefRapidActingPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(40)
+    abstract fun bindInsulinOrefUltraRapidActingPlugin(plugin: InsulinOrefUltraRapidActingPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(50)
+    abstract fun bindInsulinOrefFreePeakPlugin(plugin: InsulinOrefFreePeakPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(60)
+    abstract fun bindSensitivityOref0Plugin(plugin: SensitivityOref0Plugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(70)
+    abstract fun bindSensitivityAAPSPlugin(plugin: SensitivityAAPSPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(80)
+    abstract fun bindSensitivityWeightedAveragePlugin(plugin: SensitivityWeightedAveragePlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(90)
+    abstract fun bindSensitivityOref1Plugin(plugin: SensitivityOref1Plugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(100)
+    abstract fun bindDanaRPlugin(plugin: DanaRPlugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(110)
+    abstract fun bindDanaRKoreanPlugin(plugin: DanaRKoreanPlugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(120)
+    abstract fun bindDanaRv2Plugin(plugin: DanaRv2Plugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(130)
+    abstract fun bindDanaRSPlugin(plugin: DanaRSPlugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(140)
+    abstract fun bindLocalInsightPlugin(plugin: LocalInsightPlugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(150)
+    abstract fun bindComboPlugin(plugin: ComboPlugin): PluginBase
+
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(160)
+    abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(170)
+    abstract fun bindMDIPlugin(plugin: MDIPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(180)
+    abstract fun bindVirtualPumpPlugin(plugin: VirtualPumpPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(190)
+    abstract fun bindCareportalPlugin(plugin: CareportalPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(200)
+    abstract fun bindLoopPlugin(plugin: LoopPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(210)
+    abstract fun bindOpenAPSMAPlugin(plugin: OpenAPSMAPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(220)
+    abstract fun bindOpenAPSAMAPlugin(plugin: OpenAPSAMAPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(230)
+    abstract fun bindOpenAPSSMBPlugin(plugin: OpenAPSSMBPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(240)
+    abstract fun bindNSProfilePlugin(plugin: NSProfilePlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(250)
+    abstract fun bindLocalProfilePlugin(plugin: LocalProfilePlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(255)
+    abstract fun bindAutomationPlugin(plugin: AutomationPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(260)
+    abstract fun bindTreatmentsPlugin(plugin: TreatmentsPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoSet
+    abstract fun bindSafetyPlugin(plugin: SafetyPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(270)
+    abstract fun bindVersionCheckerPlugin(plugin: VersionCheckerPlugin): PluginBase
+
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(280)
+    abstract fun bindSmsCommunicatorPlugin(plugin: SmsCommunicatorPlugin): PluginBase
+
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(290)
+    abstract fun bindStorageConstraintPlugin(plugin: StorageConstraintPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(300)
+    abstract fun bindSignatureVerifierPlugin(plugin: SignatureVerifierPlugin): PluginBase
+
+    @Binds
+    @APS
+    @IntoMap
+    @IntKey(310)
+    abstract fun bindObjectivesPlugin(plugin: ObjectivesPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(320)
+    abstract fun bindFoodPlugin(plugin: FoodPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(330)
+    abstract fun bindWearPlugin(plugin: WearPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(340)
+    abstract fun bindStatusLinePlugin(plugin: StatusLinePlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(350)
+    abstract fun bindPersistentNotificationPlugin(plugin: PersistentNotificationPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(360)
+    abstract fun bindNSClientPlugin(plugin: NSClientPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(370)
+    abstract fun bindMaintenancePlugin(plugin: MaintenancePlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(380)
+    abstract fun bindDstHelperPlugin(plugin: DstHelperPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(390)
+    abstract fun bindDataBroadcastPlugin(plugin: DataBroadcastPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(400)
+    abstract fun bindXdripPlugin(plugin: XdripPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(410)
+    abstract fun bindNSClientSourcePlugin(plugin: NSClientSourcePlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(420)
+    abstract fun bindMM640gPlugin(plugin: MM640gPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(430)
+    abstract fun bindGlimpPlugin(plugin: GlimpPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(440)
+    abstract fun bindDexcomPlugin(plugin: DexcomPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(450)
+    abstract fun bindPoctechPlugin(plugin: PoctechPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(460)
+    abstract fun bindTomatoPlugin(plugin: TomatoPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(470)
+    abstract fun bindRandomBgPlugin(plugin: RandomBgPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(480)
+    abstract fun bindConfigBuilderPlugin(plugin: ConfigBuilderPlugin): PluginBase
+
+    @Qualifier
+    annotation class AllConfigs
+
+    @Qualifier
+    annotation class PumpDriver
+
+    @Qualifier
+    annotation class NotNSClient
+
+    @Qualifier
+    annotation class APS
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
new file mode 100644
index 0000000000..85e4850391
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
+import info.nightscout.androidaps.receivers.*
+
+@Module
+@Suppress("unused")
+abstract class ReceiversModule {
+
+    @ContributesAndroidInjector abstract fun contributesBTReceiver(): BTReceiver
+    @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
+    @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
+    @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
+    @ContributesAndroidInjector abstract fun contributesNetworkChangeReceiver(): NetworkChangeReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
+    @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
new file mode 100644
index 0000000000..c43a8dfb7d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService
+import info.nightscout.androidaps.plugins.general.overview.notifications.DismissNotificationService
+import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
+import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService
+import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService
+import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService
+import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService
+import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService
+import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
+import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
+import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.androidaps.services.DataService
+import info.nightscout.androidaps.services.LocationService
+
+@Module
+@Suppress("unused")
+abstract class ServicesModule {
+
+    @ContributesAndroidInjector abstract fun contributesAbstractDanaRExecutionService(): AbstractDanaRExecutionService
+    @ContributesAndroidInjector abstract fun contributesAlarmSoundService(): AlarmSoundService
+    @ContributesAndroidInjector abstract fun contributesDataService(): DataService
+    @ContributesAndroidInjector abstract fun contributesDismissNotificationService(): DismissNotificationService
+    @ContributesAndroidInjector abstract fun contributesDummyService(): DummyService
+    @ContributesAndroidInjector abstract fun contributesLocationService(): LocationService
+    @ContributesAndroidInjector abstract fun contributesNSClientService(): NSClientService
+    @ContributesAndroidInjector abstract fun contributesDanaRSService(): DanaRSService
+    @ContributesAndroidInjector abstract fun contributesDanaRv2ExecutionService(): DanaRv2ExecutionService
+    @ContributesAndroidInjector abstract fun contributesDanaRExecutionService(): DanaRExecutionService
+    @ContributesAndroidInjector abstract fun contributesDanaRKoreanExecutionService(): DanaRKoreanExecutionService
+    @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService
+    @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
+    @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt
new file mode 100644
index 0000000000..6ee0c902dc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt
@@ -0,0 +1,16 @@
+PreferenceActivity is an Example how to make an Activity injectable.
+We might undo that as we don't actually have us inject things.
+
+MyPreferencesFragment is an injectable Fragment. Here we actually have Dagger2 provide us an InsulinOrefFreePeakPlugin instance.
+
+If we use multiple Fragments, we should generate a base-class. Then we only have to add a "provides***Fragment" to the FragmentsModule and derive from that class.
+
+InsulinOrefFreePeakPlugin is an example how to get things injected via the constructor.
+You could call "new InsulinOrefFreePeakPlugin(new SPImpl(SPImpl(PreferenceManager.getDefaultSharedPreferences(context))), new ResourceHelper())"... but Dagger will resolve that for you in MainApp. :)
+
+SPImpl is an example how to bind an implementation to an Interface via Dagger.
+
+ResourceHelper is an example how to generate simple classes that Dagger can auto-resolve how to inject them. No need for a provider here.
+ResourceHelper might have a weak reference at some point and not a static dependency on MainApp... but at least we reduced the static dependencies within a plugin.
+
+In order to Test: Any dependency of InsulinOrefFreePeakPlugin is passed via the constructor. Instead of static mocking MainApp you now can Mock ResourceHelper with a very small interface.
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 6f3c048aa8..8152c25ab0 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -8,30 +8,36 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import androidx.fragment.app.DialogFragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.BolusProgressHelperActivity
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.dialog_bolusprogress.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+class BolusProgressDialog : DaggerDialogFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
 
-class BolusProgressDialog : DialogFragment() {
-    private val log = LoggerFactory.getLogger(L.UI)
     private val disposable = CompositeDisposable()
 
     companion object {
-        private val DEFAULT_STATE = MainApp.gs(R.string.waitingforpump)
         @JvmField
         var bolusEnded = false
+
         @JvmField
         var stopPressed = false
     }
@@ -56,22 +62,26 @@ class BolusProgressDialog : DialogFragment() {
                               savedInstanceState: Bundle?): View? {
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-        isCancelable = true
+        isCancelable = false
         dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.dialog_bolusprogress, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        overview_bolusprogress_title.text = String.format(MainApp.gs(R.string.overview_bolusprogress_goingtodeliver), amount)
+        savedInstanceState?.let {
+            amount = it.getDouble("amount")
+        }
+        overview_bolusprogress_title.text = resourceHelper.gs(R.string.overview_bolusprogress_goingtodeliver, amount)
         overview_bolusprogress_stop.setOnClickListener {
-            if (L.isEnabled(L.UI)) log.debug("Stop bolus delivery button pressed")
+            aapsLogger.debug(LTag.UI, "Stop bolus delivery button pressed")
             stopPressed = true
             overview_bolusprogress_stoppressed.visibility = View.VISIBLE
             overview_bolusprogress_stop.visibility = View.INVISIBLE
-            ConfigBuilderPlugin.getPlugin().commandQueue.cancelAllBoluses()
+            commandQueue.cancelAllBoluses()
         }
+        val defaultState = resourceHelper.gs(R.string.waitingforpump)
         overview_bolusprogress_progressbar.max = 100
-        state = savedInstanceState?.getString("state", DEFAULT_STATE) ?: DEFAULT_STATE
+        state = savedInstanceState?.getString("state", defaultState) ?: defaultState
         overview_bolusprogress_status.text = state
         stopPressed = false
     }
@@ -83,25 +93,28 @@ class BolusProgressDialog : DialogFragment() {
 
     override fun onResume() {
         super.onResume()
-        if (L.isEnabled(L.UI)) log.debug("onResume")
-        if (!ConfigBuilderPlugin.getPlugin().commandQueue.bolusInQueue())
+        aapsLogger.debug(LTag.UI, "onResume")
+        if (!commandQueue.bolusInQueue())
             bolusEnded = true
 
         if (bolusEnded) dismiss()
         else running = true
 
-        disposable.add(toObservable(EventPumpStatusChanged::class.java)
+        disposable.add(rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ overview_bolusprogress_status.text = it.getStatus() }) { FabricPrivacy.logException(it) }
+            .subscribe({ overview_bolusprogress_status.text = it.getStatus(resourceHelper) }) { fabricPrivacy.logException(it) }
         )
-        disposable.add(toObservable(EventDismissBolusProgressIfRunning::class.java)
+        disposable.add(rxBus
+            .toObservable(EventDismissBolusProgressIfRunning::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ if (running) dismiss() }) { FabricPrivacy.logException(it) }
+            .subscribe({ if (running) dismiss() }) { fabricPrivacy.logException(it) }
         )
-        disposable.add(toObservable(EventOverviewBolusProgress::class.java)
+        disposable.add(rxBus
+            .toObservable(EventOverviewBolusProgress::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                if (L.isEnabled(L.UI)) log.debug("Status: " + it.status + " Percent: " + it.percent)
+                aapsLogger.debug(LTag.UI, "Status: ${it.status} Percent: ${it.percent}")
                 overview_bolusprogress_status.text = it.status
                 overview_bolusprogress_progressbar.progress = it.percent
                 if (it.percent == 100) {
@@ -109,26 +122,26 @@ class BolusProgressDialog : DialogFragment() {
                     scheduleDismiss()
                 }
                 state = it.status
-            }) { FabricPrivacy.logException(it) }
+            }) { fabricPrivacy.logException(it) }
         )
     }
 
     override fun dismiss() {
-        if (L.isEnabled(L.UI)) log.debug("dismiss")
+        aapsLogger.debug(LTag.UI, "dismiss")
         try {
             super.dismiss()
         } catch (e: IllegalStateException) {
             // dialog not running yet. onResume will try again. Set bolusEnded to make extra
             // sure onResume will catch this
             bolusEnded = true
-            log.error("Unhandled exception", e)
+            aapsLogger.error("Unhandled exception", e)
         }
         helpActivity?.finish()
     }
 
     override fun onPause() {
         super.onPause()
-        if (L.isEnabled(L.UI)) log.debug("onPause")
+        aapsLogger.debug(LTag.UI, "onPause")
         running = false
         disposable.clear()
     }
@@ -136,24 +149,25 @@ class BolusProgressDialog : DialogFragment() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putString("state", state)
+        outState.putDouble("amount", amount)
     }
 
     private fun scheduleDismiss() {
-        if (L.isEnabled(L.UI)) log.debug("scheduleDismiss")
+        aapsLogger.debug(LTag.UI, "scheduleDismiss")
         Thread(Runnable {
             SystemClock.sleep(5000)
             bolusEnded = true
             val activity: Activity? = activity
             activity?.runOnUiThread {
                 if (running) {
-                    if (L.isEnabled(L.UI)) log.debug("executing")
+                    aapsLogger.debug(LTag.UI, "executing")
                     try {
                         dismiss()
                     } catch (e: Exception) {
-                        log.error("Unhandled exception", e)
+                        aapsLogger.error("Unhandled exception", e)
                     }
                 }
             }
         }).start()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index 949e4e5fef..fa8aedecac 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -5,22 +5,29 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.XdripCalibrations
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_calibration.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 
 class CalibrationDialog : DialogFragmentWithDate() {
 
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var xdripCalibrations: XdripCalibrations
+
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putDouble("overview_calibration_bg", overview_calibration_bg.value)
@@ -35,8 +42,8 @@ class CalibrationDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val units = ProfileFunctions.getSystemUnits()
-        val bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData()?.glucose
+        val units = profileFunction.getUnits()
+        val bg = Profile.fromMgdlToUnits(GlucoseStatus(injector).glucoseStatusData?.glucose
             ?: 0.0, units)
         if (units == Constants.MMOL)
             overview_calibration_bg.setParams(savedInstanceState?.getDouble("overview_calibration_bg")
@@ -44,25 +51,26 @@ class CalibrationDialog : DialogFragmentWithDate() {
         else
             overview_calibration_bg.setParams(savedInstanceState?.getDouble("overview_calibration_bg")
                 ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, ok)
-        overview_calibration_units.text = if (units == Constants.MMOL) MainApp.gs(R.string.mmol) else MainApp.gs(R.string.mgdl)
+        overview_calibration_units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
     }
 
-    override fun submit() :Boolean {
-        val units = ProfileFunctions.getSystemUnits()
-        val unitLabel = if (units == Constants.MMOL) MainApp.gs(R.string.mmol) else MainApp.gs(R.string.mgdl)
+    override fun submit(): Boolean {
+        val units = profileFunction.getUnits()
+        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         val actions: LinkedList<String?> = LinkedList()
         val bg = overview_calibration_bg.value
-        actions.add(MainApp.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(bg) + " " + unitLabel)
+        actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, bg) + " " + unitLabel)
         if (bg > 0) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
-                    XdripCalibrations.confirmAndSendCalibration(bg, context)
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                    aapsLogger.debug("USER ENTRY: CALIBRATION $bg")
+                    xdripCalibrations.sendIntent(bg)
                 })
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, MainApp.gs(R.string.overview_calibration), MainApp.gs(R.string.no_action_selected))
+                OKDialog.show(activity, resourceHelper.gs(R.string.overview_calibration), resourceHelper.gs(R.string.no_action_selected))
             }
         return true
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index de457068c5..490d5c225a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -12,23 +12,34 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 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.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_carbs.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.max
 
 class CarbsDialog : DialogFragmentWithDate() {
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var carbsGenerator: CarbsGenerator
 
     companion object {
         private const val FAV1_DEFAULT = 5
@@ -36,8 +47,6 @@ class CarbsDialog : DialogFragmentWithDate() {
         private const val FAV3_DEFAULT = 20
     }
 
-    private val maxCarbs = MainApp.getConstraintChecker().maxCarbsAllowed.value().toDouble()
-
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {
             validateInputs()
@@ -48,18 +57,19 @@ class CarbsDialog : DialogFragmentWithDate() {
     }
 
     private fun validateInputs() {
+        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
         val time = overview_carbs_time.value.toInt()
         if (time > 12 * 60 || time < -12 * 60) {
             overview_carbs_time.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.constraintapllied))
         }
         if (overview_carbs_duration.value > 10) {
             overview_carbs_duration.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.constraintapllied))
         }
         if (overview_carbs_carbs.value.toInt() > maxCarbs) {
             overview_carbs_carbs.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.carbsconstraintapplied))
         }
     }
 
@@ -79,6 +89,7 @@ class CarbsDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
         overview_carbs_time.setParams(savedInstanceState?.getDouble("overview_carbs_time")
             ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, ok, textWatcher)
 
@@ -88,30 +99,30 @@ class CarbsDialog : DialogFragmentWithDate() {
         overview_carbs_carbs.setParams(savedInstanceState?.getDouble("overview_carbs_carbs")
             ?: 0.0, 0.0, maxCarbs, 1.0, DecimalFormat("0"), false, ok, textWatcher)
 
-        overview_carbs_plus1.text = toSignedString(SP.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
+        overview_carbs_plus1.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
         overview_carbs_plus1.setOnClickListener {
             overview_carbs_carbs.value = max(0.0, overview_carbs_carbs.value
-                + SP.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
+                + sp.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
             validateInputs()
         }
 
-        overview_carbs_plus2.text = toSignedString(SP.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
+        overview_carbs_plus2.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
         overview_carbs_plus2.setOnClickListener {
             overview_carbs_carbs.value = max(0.0, overview_carbs_carbs.value
-                + SP.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
+                + sp.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
             validateInputs()
         }
 
-        overview_carbs_plus3.text = toSignedString(SP.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
+        overview_carbs_plus3.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
         overview_carbs_plus3.setOnClickListener {
             overview_carbs_carbs.value = max(0.0, overview_carbs_carbs.value
-                + SP.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
+                + sp.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
             validateInputs()
         }
 
-        DatabaseHelper.actualBg()?.let { bgReading ->
+        iobCobCalculatorPlugin.actualBg()?.let { bgReading ->
             if (bgReading.value < 72)
-                overview_carbs_hypo_tt.setChecked(true)
+                overview_carbs_hypo_tt.isChecked = true
         }
         overview_carbs_hypo_tt.setOnClickListener {
             overview_carbs_activity_tt.isChecked = false
@@ -133,90 +144,102 @@ class CarbsDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         val carbs = overview_carbs_carbs.value.toInt()
-        val carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(carbs)).value()
-        val units = ProfileFunctions.getSystemUnits()
-        val activityTTDuration = DefaultValueHelper.determineActivityTTDuration()
-        val activityTT = DefaultValueHelper.determineActivityTT()
-        val eatingSoonTTDuration = DefaultValueHelper.determineEatingSoonTTDuration()
-        val eatingSoonTT = DefaultValueHelper.determineEatingSoonTT()
-        val hypoTTDuration = DefaultValueHelper.determineHypoTTDuration()
-        val hypoTT = DefaultValueHelper.determineHypoTT()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+        val units = profileFunction.getUnits()
+        val activityTTDuration = defaultValueHelper.determineActivityTTDuration()
+        val activityTT = defaultValueHelper.determineActivityTT()
+        val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration()
+        val eatingSoonTT = defaultValueHelper.determineEatingSoonTT()
+        val hypoTTDuration = defaultValueHelper.determineHypoTTDuration()
+        val hypoTT = defaultValueHelper.determineHypoTT()
         val actions: LinkedList<String?> = LinkedList()
-        val unitLabel = if (units == Constants.MMOL) MainApp.gs(R.string.mmol) else MainApp.gs(R.string.mgdl)
+        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
 
         val activitySelected = overview_carbs_activity_tt.isChecked
         if (activitySelected)
-            actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " " + MainApp.gs(R.string.unit_minute_short) + ")</font>")
+            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "<font color='" + resourceHelper.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")</font>")
         val eatingSoonSelected = overview_carbs_eating_soon_tt.isChecked
         if (eatingSoonSelected)
-            actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + MainApp.gs(R.string.unit_minute_short) + ")</font>")
+            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "<font color='" + resourceHelper.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")</font>")
         val hypoSelected = overview_carbs_hypo_tt.isChecked
         if (hypoSelected)
-            actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + hypoTTDuration + " " + MainApp.gs(R.string.unit_minute_short) + ")</font>")
+            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "<font color='" + resourceHelper.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + hypoTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")</font>")
 
         val timeOffset = overview_carbs_time.value.toInt()
+        eventTime -= eventTime % 1000
         val time = eventTime + timeOffset * 1000 * 60
         if (timeOffset != 0)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
         val duration = overview_carbs_duration.value.toInt()
         if (duration > 0)
-            actions.add(MainApp.gs(R.string.duration) + ": " + duration + MainApp.gs(R.string.shorthour))
+            actions.add(resourceHelper.gs(R.string.duration) + ": " + duration + resourceHelper.gs(R.string.shorthour))
         if (carbsAfterConstraints > 0) {
-            actions.add(MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + MainApp.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
+            actions.add(resourceHelper.gs(R.string.carbs) + ": " + "<font color='" + resourceHelper.gc(R.color.carbs) + "'>" + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
             if (carbsAfterConstraints != carbs)
-                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.carbsconstraintapplied) + "</font>")
+                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.carbsconstraintapplied) + "</font>")
         }
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
 
         if (eventTimeChanged)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
 
         if (carbsAfterConstraints > 0 || activitySelected || eatingSoonSelected || hypoSelected) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
-                    if (activitySelected) {
-                        val tempTarget = TempTarget()
-                            .date(eventTime)
-                            .duration(activityTTDuration)
-                            .reason(MainApp.gs(R.string.activity))
-                            .source(Source.USER)
-                            .low(Profile.toMgdl(activityTT, ProfileFunctions.getSystemUnits()))
-                            .high(Profile.toMgdl(activityTT, ProfileFunctions.getSystemUnits()))
-                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
-                    } else if (eatingSoonSelected) {
-                        val tempTarget = TempTarget()
-                            .date(eventTime)
-                            .duration(eatingSoonTTDuration)
-                            .reason(MainApp.gs(R.string.eatingsoon))
-                            .source(Source.USER)
-                            .low(Profile.toMgdl(eatingSoonTT, ProfileFunctions.getSystemUnits()))
-                            .high(Profile.toMgdl(eatingSoonTT, ProfileFunctions.getSystemUnits()))
-                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
-                    } else if (hypoSelected) {
-                        val tempTarget = TempTarget()
-                            .date(eventTime)
-                            .duration(hypoTTDuration)
-                            .reason(MainApp.gs(R.string.hypo))
-                            .source(Source.USER)
-                            .low(Profile.toMgdl(hypoTT, ProfileFunctions.getSystemUnits()))
-                            .high(Profile.toMgdl(hypoTT, ProfileFunctions.getSystemUnits()))
-                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                    when {
+                        activitySelected   -> {
+                            aapsLogger.debug("USER ENTRY: TEMPTARGET ACTIVITY $activityTT duration: $activityTTDuration")
+                            val tempTarget = TempTarget()
+                                .date(System.currentTimeMillis())
+                                .duration(activityTTDuration)
+                                .reason(resourceHelper.gs(R.string.activity))
+                                .source(Source.USER)
+                                .low(Profile.toMgdl(activityTT, profileFunction.getUnits()))
+                                .high(Profile.toMgdl(activityTT, profileFunction.getUnits()))
+                            treatmentsPlugin.addToHistoryTempTarget(tempTarget)
+                        }
+
+                        eatingSoonSelected -> {
+                            aapsLogger.debug("USER ENTRY: TEMPTARGET EATING SOON $eatingSoonTT duration: $eatingSoonTTDuration")
+                            val tempTarget = TempTarget()
+                                .date(System.currentTimeMillis())
+                                .duration(eatingSoonTTDuration)
+                                .reason(resourceHelper.gs(R.string.eatingsoon))
+                                .source(Source.USER)
+                                .low(Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()))
+                                .high(Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()))
+                            treatmentsPlugin.addToHistoryTempTarget(tempTarget)
+                        }
+
+                        hypoSelected       -> {
+                            aapsLogger.debug("USER ENTRY: TEMPTARGET HYPO $hypoTT duration: $hypoTTDuration")
+                            val tempTarget = TempTarget()
+                                .date(System.currentTimeMillis())
+                                .duration(hypoTTDuration)
+                                .reason(resourceHelper.gs(R.string.hypo))
+                                .source(Source.USER)
+                                .low(Profile.toMgdl(hypoTT, profileFunction.getUnits()))
+                                .high(Profile.toMgdl(hypoTT, profileFunction.getUnits()))
+                            treatmentsPlugin.addToHistoryTempTarget(tempTarget)
+                        }
                     }
                     if (carbsAfterConstraints > 0) {
                         if (duration == 0) {
-                            CarbsGenerator.createCarb(carbsAfterConstraints, time, CareportalEvent.CARBCORRECTION, notes)
+                            aapsLogger.debug("USER ENTRY: CARBS $carbsAfterConstraints time: $time")
+                            carbsGenerator.createCarb(carbsAfterConstraints, time, CareportalEvent.CARBCORRECTION, notes)
                         } else {
-                            CarbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes)
-                            NSUpload.uploadEvent(CareportalEvent.NOTE, time - 2000, MainApp.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
+                            aapsLogger.debug("USER ENTRY: CARBS $carbsAfterConstraints time: $time duration: $duration")
+                            carbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes)
+                            NSUpload.uploadEvent(CareportalEvent.NOTE, DateUtil.now() - 2000, resourceHelper.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
                         }
                     }
                 }, null)
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, MainApp.gs(R.string.carbs), MainApp.gs(R.string.no_action_selected))
+                OKDialog.show(activity, resourceHelper.gs(R.string.carbs), resourceHelper.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 1881e4fb77..0f05b01317 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -8,34 +8,41 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StringRes
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.SP
 import info.nightscout.androidaps.utils.Translator
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_care.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
-import org.json.JSONException
 import org.json.JSONObject
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 
 class CareDialog : DialogFragmentWithDate() {
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
 
     enum class EventType {
         BGCHECK,
         SENSOR_INSERT,
-        BATTERY_CHANGE
+        BATTERY_CHANGE,
+        NOTE,
+        EXERCISE
     }
 
     private var options: EventType = EventType.BGCHECK
@@ -51,6 +58,9 @@ class CareDialog : DialogFragmentWithDate() {
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putDouble("actions_care_bg", actions_care_bg.value)
+        savedInstanceState.putDouble("actions_care_duration", actions_care_duration.value)
+        savedInstanceState.putInt("event", event)
+        savedInstanceState.putInt("options", options.ordinal)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -62,30 +72,47 @@ class CareDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        savedInstanceState?.let {
+            event = savedInstanceState.getInt("event", R.string.error)
+            options = EventType.values()[savedInstanceState.getInt("options", 0)]
+        }
+
         actions_care_icon.setImageResource(when (options) {
             EventType.BGCHECK        -> R.drawable.icon_cp_bgcheck
             EventType.SENSOR_INSERT  -> R.drawable.icon_cp_cgm_insert
             EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery
+            EventType.NOTE           -> R.drawable.icon_cp_note
+            EventType.EXERCISE       -> R.drawable.icon_cp_exercise
         })
-        actions_care_title.text = MainApp.gs(when (options) {
+        actions_care_title.text = resourceHelper.gs(when (options) {
             EventType.BGCHECK        -> R.string.careportal_bgcheck
             EventType.SENSOR_INSERT  -> R.string.careportal_cgmsensorinsert
             EventType.BATTERY_CHANGE -> R.string.careportal_pumpbatterychange
+            EventType.NOTE           -> R.string.careportal_note
+            EventType.EXERCISE       -> R.string.careportal_exercise
         })
 
         when (options) {
+            EventType.BGCHECK        -> {
+                action_care_duration_layout.visibility = View.GONE
+            }
+
             EventType.SENSOR_INSERT,
             EventType.BATTERY_CHANGE -> {
                 action_care_bg_layout.visibility = View.GONE
                 actions_care_bgsource.visibility = View.GONE
+                action_care_duration_layout.visibility = View.GONE
             }
 
-            else                     -> {
+            EventType.NOTE,
+            EventType.EXERCISE       -> {
+                action_care_bg_layout.visibility = View.GONE
+                actions_care_bgsource.visibility = View.GONE
             }
         }
 
-        val bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData()?.glucose
-            ?: 0.0, ProfileFunctions.getSystemUnits())
+        val bg = Profile.fromMgdlToUnits(GlucoseStatus(injector).getGlucoseStatusData()?.glucose
+            ?: 0.0, profileFunction.getUnits())
         val bgTextWatcher: TextWatcher = object : TextWatcher {
             override fun afterTextChanged(s: Editable) {}
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -94,20 +121,24 @@ class CareDialog : DialogFragmentWithDate() {
             }
         }
 
-        if (ProfileFunctions.getSystemUnits() == Constants.MMOL) {
-            actions_care_bgunits.text = MainApp.gs(R.string.mmol)
+        if (profileFunction.getUnits() == Constants.MMOL) {
+            actions_care_bgunits.text = resourceHelper.gs(R.string.mmol)
             actions_care_bg.setParams(savedInstanceState?.getDouble("actions_care_bg")
                 ?: bg, 2.0, 30.0, 0.1, DecimalFormat("0.0"), false, ok, bgTextWatcher)
         } else {
-            actions_care_bgunits.text = MainApp.gs(R.string.mgdl)
+            actions_care_bgunits.text = resourceHelper.gs(R.string.mgdl)
             actions_care_bg.setParams(savedInstanceState?.getDouble("actions_care_bg")
                 ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, ok, bgTextWatcher)
         }
+        actions_care_duration.setParams(savedInstanceState?.getDouble("actions_care_duration")
+            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
+        if (options == EventType.NOTE)
+            notes_layout?.visibility = View.VISIBLE // independent to preferences
     }
 
     override fun submit(): Boolean {
-        val enteredBy = SP.getString("careportal_enteredby", "")
-        val unitResId = if (ProfileFunctions.getSystemUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
+        val enteredBy = sp.getString("careportal_enteredby", "")
+        val unitResId = if (profileFunction.getUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
 
         val json = JSONObject()
         val actions: LinkedList<String> = LinkedList()
@@ -118,20 +149,24 @@ class CareDialog : DialogFragmentWithDate() {
                     actions_care_sensor.isChecked -> "Sensor"
                     else                          -> "Manual"
                 }
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + Translator.translate(type))
-            actions.add(MainApp.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(actions_care_bg.value) + " " + MainApp.gs(unitResId))
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + Translator.translate(type))
+            actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, actions_care_bg.value) + " " + resourceHelper.gs(unitResId))
             json.put("glucose", actions_care_bg.value)
             json.put("glucoseType", type)
         }
+        if (options == EventType.NOTE || options == EventType.EXERCISE) {
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_duration_label) + ": " + resourceHelper.gs(R.string.format_mins, actions_care_duration.value.toInt()))
+            json.put("duration", actions_care_duration.value.toInt())
+        }
         val notes = notes.text.toString()
         if (notes.isNotEmpty()) {
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
             json.put("notes", notes)
         }
         eventTime -= eventTime % 1000
 
         if (eventTimeChanged)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
 
         json.put("created_at", DateUtil.toISOString(eventTime))
         json.put("mills", eventTime)
@@ -139,13 +174,15 @@ class CareDialog : DialogFragmentWithDate() {
             EventType.BGCHECK        -> CareportalEvent.BGCHECK
             EventType.SENSOR_INSERT  -> CareportalEvent.SENSORCHANGE
             EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
+            EventType.NOTE           -> CareportalEvent.NOTE
+            EventType.EXERCISE       -> CareportalEvent.EXERCISE
         })
-        json.put("units", ProfileFunctions.getSystemUnits())
+        json.put("units", profileFunction.getUnits())
         if (enteredBy.isNotEmpty())
             json.put("enteredBy", enteredBy)
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, MainApp.gs(event), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(event), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                 val careportalEvent = CareportalEvent()
                 careportalEvent.date = eventTime
                 careportalEvent.source = Source.USER
@@ -153,8 +190,11 @@ class CareDialog : DialogFragmentWithDate() {
                     EventType.BGCHECK        -> CareportalEvent.BGCHECK
                     EventType.SENSOR_INSERT  -> CareportalEvent.SENSORCHANGE
                     EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
+                    EventType.NOTE           -> CareportalEvent.NOTE
+                    EventType.EXERCISE       -> CareportalEvent.EXERCISE
                 }
                 careportalEvent.json = json.toString()
+                aapsLogger.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
                 MainApp.getDbHelper().createOrUpdate(careportalEvent)
                 NSUpload.uploadCareportalEntryToNS(json)
             }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index da45e77990..37d08e1d3e 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -8,19 +8,22 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import androidx.fragment.app.DialogFragment
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.toVisibility
 import kotlinx.android.synthetic.main.datetime.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
 
-abstract class DialogFragmentWithDate : DialogFragment() {
-    private val log = LoggerFactory.getLogger(DialogFragmentWithDate::class.java)
+abstract class DialogFragmentWithDate : DaggerDialogFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var sp: SP
 
     var eventTime = DateUtil.now()
     var eventTimeChanged = false
@@ -104,12 +107,12 @@ abstract class DialogFragmentWithDate : DialogFragment() {
             }
         }
 
-        notes_layout?.visibility = SP.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
+        notes_layout?.visibility = sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
 
         ok.setOnClickListener {
             synchronized(okClicked) {
                 if (okClicked) {
-                    log.debug("guarding: ok already clicked")
+                    aapsLogger.warn(LTag.UI, "guarding: ok already clicked")
                 } else {
                     okClicked = true
                     if (submit()) dismiss()
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
index 538a2ca483..07917899bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
@@ -8,16 +8,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import androidx.fragment.app.DialogFragment
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.services.AlarmSoundService
 import kotlinx.android.synthetic.main.dialog_error.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
-class ErrorDialog : DialogFragment() {
-    private val log = LoggerFactory.getLogger(ErrorDialog::class.java)
+class ErrorDialog : DaggerDialogFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var mainApp: MainApp
 
     var helperActivity: ErrorHelperActivity? = null
     var status: String = ""
@@ -36,6 +38,7 @@ class ErrorDialog : DialogFragment() {
             bundle.getString("title")?.let { title = it }
             sound = bundle.getInt("sound", R.raw.error)
         }
+        aapsLogger.debug("Error dialog displayed")
         return inflater.inflate(R.layout.dialog_error, container, false)
     }
 
@@ -44,11 +47,11 @@ class ErrorDialog : DialogFragment() {
 
         error_title.text = title
         overview_error_ok.setOnClickListener {
-            log.debug("Error dialog ok button pressed")
+            aapsLogger.debug("USER ENTRY: Error dialog ok button pressed")
             dismiss()
         }
         overview_error_mute.setOnClickListener {
-            log.debug("Error dialog mute button pressed")
+            aapsLogger.debug("USER ENTRY: Error dialog mute button pressed")
             stopAlarm()
         }
         startAlarm()
@@ -79,16 +82,16 @@ class ErrorDialog : DialogFragment() {
 
     private fun startAlarm() {
         if (sound != 0) {
-            val alarm = Intent(MainApp.instance().applicationContext, AlarmSoundService::class.java)
+            val alarm = Intent(mainApp, AlarmSoundService::class.java)
             alarm.putExtra("soundid", sound)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                MainApp.instance().startForegroundService(alarm)
+                mainApp.startForegroundService(alarm)
             } else {
-                MainApp.instance().startService(alarm)
+                mainApp.startService(alarm)
             }
         }
     }
 
     private fun stopAlarm() =
-        MainApp.instance().stopService(Intent(MainApp.instance().applicationContext, AlarmSoundService::class.java))
+        mainApp.stopService(Intent(mainApp, AlarmSoundService::class.java))
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index a717e79b49..051ec3e6bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -9,19 +9,28 @@ import com.google.common.base.Joiner
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_extendedbolus.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 
 class ExtendedBolusDialog : DialogFragmentWithDate() {
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePluginProvider
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
@@ -38,9 +47,9 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
+        val pumpDescription = activePlugin.activePump.pumpDescription
 
-        val maxInsulin = MainApp.getConstraintChecker().maxExtendedBolusAllowed.value()
+        val maxInsulin = constraintChecker.getMaxExtendedBolusAllowed().value()
         val extendedStep = pumpDescription.extendedBolusStep
         actions_extendedbolus_insulin.setParams(savedInstanceState?.getDouble("actions_extendedbolus_insulin")
             ?: extendedStep, extendedStep, maxInsulin, extendedStep, DecimalFormat("0.00"), false, ok)
@@ -55,23 +64,24 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
         val insulin = SafeParse.stringToDouble(actions_extendedbolus_insulin.text)
         val durationInMinutes = SafeParse.stringToInt(actions_extendedbolus_duration.text)
         val actions: LinkedList<String> = LinkedList()
-        val insulinAfterConstraint = MainApp.getConstraintChecker().applyExtendedBolusConstraints(Constraint(insulin)).value()
-        actions.add(MainApp.gs(R.string.formatinsulinunits, insulinAfterConstraint))
-        actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, durationInMinutes))
+        val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        actions.add(resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraint))
+        actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
         if (abs(insulinAfterConstraint - insulin) > 0.01)
-            actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.constraintapllied) + "</font>")
+            actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.constraintapllied) + "</font>")
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, MainApp.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
-                ConfigBuilderPlugin.getPlugin().commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                aapsLogger.debug("USER ENTRY: EXTENDED BOLUS $insulinAfterConstraint duration: $durationInMinutes")
+                commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
-                            i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror))
+                            i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            MainApp.instance().startActivity(i)
+                            mainApp.startActivity(i)
                         }
                     }
                 })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index 3eb4b0e379..8f84785963 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,24 +13,37 @@ import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_fill.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 
 class FillDialog : DialogFragmentWithDate() {
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var ctx: Context
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePluginProvider
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
-        savedInstanceState.putDouble("fill_insulinamount", fill_insulinamount.value)
+        savedInstanceState.putDouble("fill_insulin_amount", fill_insulinamount.value)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -41,30 +55,30 @@ class FillDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val maxInsulin = MainApp.getConstraintChecker().maxBolusAllowed.value()
-        val bolusStep = ConfigBuilderPlugin.getPlugin().activePump!!.pumpDescription.bolusStep
-        fill_insulinamount.setParams(savedInstanceState?.getDouble("fill_insulinamount")
-            ?: 0.0, 0.0, maxInsulin, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), true, ok)
-        val amount1 = SP.getDouble("fill_button1", 0.3)
+        val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
+        val bolusStep = activePlugin.activePump.pumpDescription.bolusStep
+        fill_insulinamount.setParams(savedInstanceState?.getDouble("fill_insulin_amount")
+            ?: 0.0, 0.0, maxInsulin, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), true, ok)
+        val amount1 = sp.getDouble("fill_button1", 0.3)
         if (amount1 > 0) {
             fill_preset_button1.visibility = View.VISIBLE
-            fill_preset_button1.text = DecimalFormatter.toPumpSupportedBolus(amount1) // + "U");
+            fill_preset_button1.text = DecimalFormatter.toPumpSupportedBolus(amount1, activePlugin.activePump) // + "U");
             fill_preset_button1.setOnClickListener { fill_insulinamount.value = amount1 }
         } else {
             fill_preset_button1.visibility = View.GONE
         }
-        val amount2 = SP.getDouble("fill_button2", 0.0)
+        val amount2 = sp.getDouble("fill_button2", 0.0)
         if (amount2 > 0) {
             fill_preset_button2.visibility = View.VISIBLE
-            fill_preset_button2.text = DecimalFormatter.toPumpSupportedBolus(amount2) // + "U");
+            fill_preset_button2.text = DecimalFormatter.toPumpSupportedBolus(amount2, activePlugin.activePump) // + "U");
             fill_preset_button2.setOnClickListener { fill_insulinamount.value = amount2 }
         } else {
             fill_preset_button2.visibility = View.GONE
         }
-        val amount3 = SP.getDouble("fill_button3", 0.0)
+        val amount3 = sp.getDouble("fill_button3", 0.0)
         if (amount3 > 0) {
             fill_preset_button3.visibility = View.VISIBLE
-            fill_preset_button3.text = DecimalFormatter.toPumpSupportedBolus(amount3) // + "U");
+            fill_preset_button3.text = DecimalFormatter.toPumpSupportedBolus(amount3, activePlugin.activePump) // + "U");
             fill_preset_button3.setOnClickListener { fill_insulinamount.value = amount3 }
         } else {
             fill_preset_button3.visibility = View.GONE
@@ -76,88 +90,97 @@ class FillDialog : DialogFragmentWithDate() {
         val insulin = SafeParse.stringToDouble(fill_insulinamount.text)
         val actions: LinkedList<String?> = LinkedList()
 
-        val insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(insulin)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
         if (insulinAfterConstraints > 0) {
-            actions.add(MainApp.gs(R.string.fillwarning))
+            actions.add(resourceHelper.gs(R.string.fillwarning))
             actions.add("")
-            actions.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.colorInsulinButton) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + MainApp.gs(R.string.insulin_unit_shortname) + "</font>")
+            actions.add(resourceHelper.gs(R.string.bolus) + ": " + "<font color='" + resourceHelper.gc(R.color.colorInsulinButton) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "</font>")
             if (abs(insulinAfterConstraints - insulin) > 0.01)
-                actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
+                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints))
         }
         val siteChange = fill_catheter_change.isChecked
         if (siteChange)
-            actions.add("" + "<font color='" + MainApp.gc(R.color.actionsConfirm) + "'>" + MainApp.gs(R.string.record_pump_site_change) + "</font>")
+            actions.add("" + "<font color='" + resourceHelper.gc(R.color.actionsConfirm) + "'>" + resourceHelper.gs(R.string.record_pump_site_change) + "</font>")
         val insulinChange = fill_cartridge_change.isChecked
         if (insulinChange)
-            actions.add("" + "<font color='" + MainApp.gc(R.color.actionsConfirm) + "'>" + MainApp.gs(R.string.record_insulin_cartridge_change) + "</font>")
+            actions.add("" + "<font color='" + resourceHelper.gc(R.color.actionsConfirm) + "'>" + resourceHelper.gs(R.string.record_insulin_cartridge_change) + "</font>")
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
         eventTime -= eventTime % 1000
 
         if (eventTimeChanged)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
 
         if (insulinAfterConstraints > 0 || fill_catheter_change.isChecked || fill_cartridge_change.isChecked) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     if (insulinAfterConstraints > 0) {
-                        val detailedBolusInfo = DetailedBolusInfo()
-                        detailedBolusInfo.insulin = insulinAfterConstraints
-                        detailedBolusInfo.context = context
-                        detailedBolusInfo.source = Source.USER
-                        detailedBolusInfo.isValid = false // do not count it in IOB (for pump history)
-                        detailedBolusInfo.notes = notes
-                        ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
-                            override fun run() {
-                                if (!result.success) {
-                                    val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
-                                    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)
-                                }
-                            }
-                        })
+                        aapsLogger.debug("USER ENTRY: PRIME BOLUS $insulinAfterConstraints")
+                        requestPrimeBolus(insulinAfterConstraints, notes)
                     }
-                    val careportalEvent = CareportalEvent()
-                    careportalEvent.date  = eventTime
-                    careportalEvent.source = Source.USER
                     if (siteChange) {
-                        careportalEvent.json = generateJson(CareportalEvent.SITECHANGE, eventTime, notes).toString()
-                        careportalEvent.eventType = CareportalEvent.SITECHANGE
-                        NSUpload.uploadEvent(CareportalEvent.SITECHANGE, eventTime, notes)
+                        aapsLogger.debug("USER ENTRY: SITE CHANGE")
+                        generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes)
                     }
                     if (insulinChange) {
                         // add a second for case of both checked
-                        careportalEvent.json = generateJson(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes).toString()
-                        careportalEvent.eventType = CareportalEvent.INSULINCHANGE
-                        NSUpload.uploadEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes)
+                        aapsLogger.debug("USER ENTRY: INSULIN CHANGE")
+                        generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes)
                     }
-                    MainApp.getDbHelper().createOrUpdate(careportalEvent)
                 }, null)
             }
         } else {
             activity?.let { activity ->
-                OKDialog.show(activity, MainApp.gs(R.string.primefill), MainApp.gs(R.string.no_action_selected))
+                OKDialog.show(activity, resourceHelper.gs(R.string.primefill), resourceHelper.gs(R.string.no_action_selected))
             }
         }
         dismiss()
         return true
     }
 
-    fun generateJson(careportalEvent: String, time: Long, notes: String): JSONObject {
+    private fun requestPrimeBolus(insulin: Double, notes: String) {
+        val detailedBolusInfo = DetailedBolusInfo()
+        detailedBolusInfo.insulin = insulin
+        detailedBolusInfo.context = context
+        detailedBolusInfo.source = Source.USER
+        detailedBolusInfo.isValid = false // do not count it in IOB (for pump history)
+        detailedBolusInfo.notes = notes
+        commandQueue.bolus(detailedBolusInfo, object : Callback() {
+            override fun run() {
+                if (!result.success) {
+                    val i = Intent(ctx, ErrorHelperActivity::class.java)
+                    i.putExtra("soundid", R.raw.boluserror)
+                    i.putExtra("status", result.comment)
+                    i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    ctx.startActivity(i)
+                }
+            }
+        })
+    }
+
+    private fun generateCareportalEvent(eventType: String, time: Long, notes: String) {
+        val careportalEvent = CareportalEvent()
+        careportalEvent.source = Source.USER
+        careportalEvent.date = time
+        careportalEvent.json = generateJson(eventType, time, notes).toString()
+        careportalEvent.eventType = eventType
+        MainApp.getDbHelper().createOrUpdate(careportalEvent)
+        NSUpload.uploadEvent(eventType, time, notes)
+    }
+
+    private fun generateJson(careportalEvent: String, time: Long, notes: String): JSONObject {
         val data = JSONObject()
         try {
             data.put("eventType", careportalEvent)
             data.put("created_at", DateUtil.toISOString(time))
             data.put("mills", time)
-            data.put("enteredBy", SP.getString("careportal_enteredby", MainApp.gs(R.string.app_name)))
+            data.put("enteredBy", sp.getString("careportal_enteredby", resourceHelper.gs(R.string.app_name)))
             if (notes.isNotEmpty()) data.put("notes", notes)
         } catch (ignored: JSONException) {
         }
         return data
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index d6f64d87f1..8c3d10bb32 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
@@ -9,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -17,21 +17,32 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.extensions.toSignedString
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_insulin.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.max
 
 class InsulinDialog : DialogFragmentWithDate() {
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var ctx: Context
 
     companion object {
         private const val PLUS1_DEFAULT = 0.5
@@ -39,8 +50,6 @@ class InsulinDialog : DialogFragmentWithDate() {
         private const val PLUS3_DEFAULT = 2.0
     }
 
-    private val maxInsulin = MainApp.getConstraintChecker().maxBolusAllowed.value()
-
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {
             validateInputs()
@@ -51,13 +60,14 @@ class InsulinDialog : DialogFragmentWithDate() {
     }
 
     private fun validateInputs() {
+        val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
         if (abs(overview_insulin_time.value.toInt()) > 12 * 60) {
             overview_insulin_time.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.constraintapllied))
         }
         if (overview_insulin_amount.value > maxInsulin) {
             overview_insulin_amount.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.bolusconstraintapplied))
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.bolusconstraintapplied))
         }
     }
 
@@ -76,27 +86,29 @@ class InsulinDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
+
         overview_insulin_time.setParams(savedInstanceState?.getDouble("overview_insulin_time")
             ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, ok, textWatcher)
         overview_insulin_amount.setParams(savedInstanceState?.getDouble("overview_insulin_amount")
-            ?: 0.0, 0.0, maxInsulin, ConfigBuilderPlugin.getPlugin().activePump!!.pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, ok, textWatcher)
+            ?: 0.0, 0.0, maxInsulin, activePlugin.activePump.pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, ok, textWatcher)
 
-        overview_insulin_plus05.text = toSignedString(SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT))
+        overview_insulin_plus05.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT).toSignedString(activePlugin.activePump)
         overview_insulin_plus05.setOnClickListener {
             overview_insulin_amount.value = max(0.0, overview_insulin_amount.value
-                + SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT))
+                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT))
             validateInputs()
         }
-        overview_insulin_plus10.text = toSignedString(SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT))
+        overview_insulin_plus10.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT).toSignedString(activePlugin.activePump)
         overview_insulin_plus10.setOnClickListener {
             overview_insulin_amount.value = max(0.0, overview_insulin_amount.value
-                + SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT))
+                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT))
             validateInputs()
         }
-        overview_insulin_plus20.text = toSignedString(SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT))
+        overview_insulin_plus20.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT).toSignedString(activePlugin.activePump)
         overview_insulin_plus20.setOnClickListener {
-            overview_insulin_amount.value = Math.max(0.0, overview_insulin_amount.value
-                + SP.getDouble(MainApp.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT))
+            overview_insulin_amount.value = max(0.0, overview_insulin_amount.value
+                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT))
             validateInputs()
         }
 
@@ -106,55 +118,50 @@ class InsulinDialog : DialogFragmentWithDate() {
         }
     }
 
-    private fun toSignedString(value: Double): String {
-        val formatted = DecimalFormatter.toPumpSupportedBolus(value)
-        return if (value > 0) "+$formatted" else formatted
-    }
-
     override fun submit(): Boolean {
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription
-            ?: return false
+        val pumpDescription = activePlugin.activePump.pumpDescription
         val insulin = SafeParse.stringToDouble(overview_insulin_amount.text)
-        val insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(insulin)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
         val actions: LinkedList<String?> = LinkedList()
-        val units = ProfileFunctions.getSystemUnits()
-        val unitLabel = if (units == Constants.MMOL) MainApp.gs(R.string.mmol) else MainApp.gs(R.string.mgdl)
+        val units = profileFunction.getUnits()
+        val unitLabel = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         val recordOnlyChecked = overview_insulin_record_only.isChecked
         val eatingSoonChecked = overview_insulin_start_eating_soon_tt.isChecked
 
         if (insulinAfterConstraints > 0) {
-            actions.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + MainApp.gs(R.string.insulin_unit_shortname) + "</font>")
+            actions.add(resourceHelper.gs(R.string.bolus) + ": " + "<font color='" + resourceHelper.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "</font>")
             if (recordOnlyChecked)
-                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>")
+                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.bolusrecordedonly) + "</font>")
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
+                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints))
         }
-        val eatingSoonTTDuration = DefaultValueHelper.determineEatingSoonTTDuration()
-        val eatingSoonTT = DefaultValueHelper.determineEatingSoonTT()
+        val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration()
+        val eatingSoonTT = defaultValueHelper.determineEatingSoonTT()
         if (eatingSoonChecked)
-            actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + MainApp.gs(R.string.unit_minute_short) + ")</font>")
+            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "<font color='" + resourceHelper.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")</font>")
 
         val timeOffset = overview_insulin_time.value.toInt()
         val time = DateUtil.now() + T.mins(timeOffset.toLong()).msecs()
         if (timeOffset != 0)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
 
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
 
         if (insulinAfterConstraints > 0 || eatingSoonChecked) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     if (eatingSoonChecked) {
+                        aapsLogger.debug("USER ENTRY: TEMPTARGET EATING SOON $eatingSoonTT duration: $eatingSoonTTDuration")
                         val tempTarget = TempTarget()
                             .date(System.currentTimeMillis())
                             .duration(eatingSoonTTDuration)
-                            .reason(MainApp.gs(R.string.eatingsoon))
+                            .reason(resourceHelper.gs(R.string.eatingsoon))
                             .source(Source.USER)
-                            .low(Profile.toMgdl(eatingSoonTT, ProfileFunctions.getSystemUnits()))
-                            .high(Profile.toMgdl(eatingSoonTT, ProfileFunctions.getSystemUnits()))
-                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                            .low(Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()))
+                            .high(Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()))
+                        activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
                     }
                     if (insulinAfterConstraints > 0) {
                         val detailedBolusInfo = DetailedBolusInfo()
@@ -164,19 +171,21 @@ class InsulinDialog : DialogFragmentWithDate() {
                         detailedBolusInfo.source = Source.USER
                         detailedBolusInfo.notes = notes
                         if (recordOnlyChecked) {
+                            aapsLogger.debug("USER ENTRY: BOLUS RECORD ONLY $insulinAfterConstraints")
                             detailedBolusInfo.date = time
-                            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false)
+                            activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                         } else {
+                            aapsLogger.debug("USER ENTRY: BOLUS $insulinAfterConstraints")
                             detailedBolusInfo.date = DateUtil.now()
-                            ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                            commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                                        val i = Intent(ctx, ErrorHelperActivity::class.java)
                                         i.putExtra("soundid", R.raw.boluserror)
                                         i.putExtra("status", result.comment)
-                                        i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror))
+                                        i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
                                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                        MainApp.instance().startActivity(i)
+                                        ctx.startActivity(i)
                                     }
                                 }
                             })
@@ -186,7 +195,7 @@ class InsulinDialog : DialogFragmentWithDate() {
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, MainApp.gs(R.string.bolus), MainApp.gs(R.string.no_action_selected))
+                OKDialog.show(activity, resourceHelper.gs(R.string.bolus), resourceHelper.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 5df248593c..48fe202115 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -7,21 +7,26 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_profileswitch.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 
 class ProfileSwitchDialog : DialogFragmentWithDate() {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
@@ -48,21 +53,21 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
         // profile
         context?.let { context ->
-            val profileStore = ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile
+            val profileStore = activePlugin.activeProfileInterface.profile
                 ?: return
             val profileList = profileStore.getProfileList()
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             overview_profileswitch_profile.adapter = adapter
             // set selected to actual profile
             for (p in profileList.indices)
-                if (profileList[p] == ProfileFunctions.getInstance().getProfileName(false))
+                if (profileList[p] == profileFunction.getProfileName(false))
                     overview_profileswitch_profile.setSelection(p)
         } ?: return
 
-        TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(DateUtil.now())?.let { ps ->
+        treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now())?.let { ps ->
             if (ps.isCPP) {
                 overview_profileswitch_reuselayout.visibility = View.VISIBLE
-                overview_profileswitch_reusebutton.text = MainApp.gs(R.string.reuse) + " " + ps.percentage + "% " + ps.timeshift + "h"
+                overview_profileswitch_reusebutton.text = resourceHelper.gs(R.string.reuse) + " " + ps.percentage + "% " + ps.timeshift + "h"
                 overview_profileswitch_reusebutton.setOnClickListener {
                     overview_profileswitch_percentage.value = ps.percentage.toDouble()
                     overview_profileswitch_timeshift.value = ps.timeshift.toDouble()
@@ -74,30 +79,31 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     }
 
     override fun submit(): Boolean {
-        val profileStore = ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile
+        val profileStore = activePlugin.activeProfileInterface.profile
             ?: return false
 
         val actions: LinkedList<String> = LinkedList()
-        val duration = overview_profileswitch_duration.value
+        val duration = overview_profileswitch_duration.value.toInt()
         if (duration > 0)
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_hours, duration))
+            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
         val profile = overview_profileswitch_profile.selectedItem.toString()
-        actions.add(MainApp.gs(R.string.profile) + ": " + profile)
+        actions.add(resourceHelper.gs(R.string.profile) + ": " + profile)
         val percent = overview_profileswitch_percentage.value.toInt()
         if (percent != 100)
-            actions.add(MainApp.gs(R.string.percent) + ": " + percent + "%")
+            actions.add(resourceHelper.gs(R.string.percent) + ": " + percent + "%")
         val timeShift = overview_profileswitch_timeshift.value.toInt()
         if (timeShift != 0)
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_timeshift_label) + ": " + MainApp.gs(R.string.format_hours, timeShift.toDouble()))
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label) + ": " + resourceHelper.gs(R.string.format_hours, timeShift.toDouble()))
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
+            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
         if (eventTimeChanged)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
-                ProfileFunctions.doProfileSwitch(profileStore, profile, duration.toInt(), percent, timeShift, eventTime)
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                aapsLogger.debug("USER ENTRY: PROFILE SWITCH $profile percent: $percent timeshift: $timeShift duration: $duration")
+                treatmentsPlugin.doProfileSwitch(profileStore, profile, duration, percent, timeShift, eventTime)
             })
         }
         return true
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index ef3b19d4d8..382e6359a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -6,18 +6,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
-import androidx.fragment.app.DialogFragment
+import dagger.android.HasAndroidInjector
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.close.*
 import kotlinx.android.synthetic.main.dialog_profileviewer.*
 import org.json.JSONObject
+import javax.inject.Inject
+
+class ProfileViewerDialog : DaggerDialogFragment() {
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
 
-class ProfileViewerDialog : DialogFragment() {
     private var time: Long = 0
 
     enum class Mode(val i: Int) {
@@ -59,15 +65,15 @@ class ProfileViewerDialog : DialogFragment() {
         val date: String?
         when (mode) {
             Mode.RUNNING_PROFILE -> {
-                profile = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(time)?.profileObject
-                profileName = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(time)?.customizedName
-                date = DateUtil.dateAndTimeString(TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(time)?.date
+                profile = treatmentsPlugin.getProfileSwitchFromHistory(time)?.profileObject
+                profileName = treatmentsPlugin.getProfileSwitchFromHistory(time)?.customizedName
+                date = DateUtil.dateAndTimeString(treatmentsPlugin.getProfileSwitchFromHistory(time)?.date
                     ?: 0)
                 profileview_datelayout.visibility = View.VISIBLE
             }
 
             Mode.CUSTOM_PROFILE  -> {
-                profile = Profile(JSONObject(customProfileJson), customProfileUnits)
+                profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
                 profileName = customProfileName
                 date = ""
                 profileview_datelayout.visibility = View.GONE
@@ -77,7 +83,7 @@ class ProfileViewerDialog : DialogFragment() {
 
         profile?.let {
             profileview_units.text = it.units
-            profileview_dia.text = MainApp.gs(R.string.format_hours, it.dia)
+            profileview_dia.text = resourceHelper.gs(R.string.format_hours, it.dia)
             profileview_activeprofile.text = profileName
             profileview_date.text = date
             profileview_ic.text = it.icList
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index dc31349650..50b1f59284 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -1,29 +1,40 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_tempbasal.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 
 class TempBasalDialog : DialogFragmentWithDate() {
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var ctx: Context
+
     private var isPercentPump = true
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
@@ -42,8 +53,8 @@ class TempBasalDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
-        val profile = ProfileFunctions.getInstance().profile ?: return
+        val pumpDescription = activePlugin.activePump.pumpDescription
+        val profile = profileFunction.getProfile() ?: return
 
         val maxTempPercent = pumpDescription.maxTempPercent.toDouble()
         val tempPercentStep = pumpDescription.tempPercentStep.toDouble()
@@ -73,40 +84,42 @@ class TempBasalDialog : DialogFragmentWithDate() {
         var percent = 0
         var absolute = 0.0
         val durationInMinutes = SafeParse.stringToInt(actions_tempbasal_duration.text)
-        val profile = ProfileFunctions.getInstance().profile ?: return false
+        val profile = profileFunction.getProfile() ?: return false
         val actions: LinkedList<String> = LinkedList()
         if (isPercentPump) {
             val basalPercentInput = SafeParse.stringToInt(actions_tempbasal_basalpercentinput.text)
-            percent = MainApp.getConstraintChecker().applyBasalPercentConstraints(Constraint(basalPercentInput), profile).value()
-            actions.add(MainApp.gs(R.string.pump_tempbasal_label)+ ": $percent%")
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, durationInMinutes))
-            if (percent != basalPercentInput) actions.add(MainApp.gs(R.string.constraintapllied))
+            percent = constraintChecker.applyBasalPercentConstraints(Constraint(basalPercentInput), profile).value()
+            actions.add(resourceHelper.gs(R.string.pump_tempbasal_label) + ": $percent%")
+            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
+            if (percent != basalPercentInput) actions.add(resourceHelper.gs(R.string.constraintapllied))
         } else {
             val basalAbsoluteInput = SafeParse.stringToDouble(actions_tempbasal_basalabsoluteinput.text)
-            absolute = MainApp.getConstraintChecker().applyBasalConstraints(Constraint(basalAbsoluteInput), profile).value()
-            actions.add(MainApp.gs(R.string.pump_tempbasal_label)+ ": " + MainApp.gs(R.string.pump_basebasalrate, absolute))
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, durationInMinutes))
+            absolute = constraintChecker.applyBasalConstraints(Constraint(basalAbsoluteInput), profile).value()
+            actions.add(resourceHelper.gs(R.string.pump_tempbasal_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, absolute))
+            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
             if (abs(absolute - basalAbsoluteInput) > 0.01)
-                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.constraintapllied) + "</font>")
+                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.constraintapllied) + "</font>")
         }
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, MainApp.gs(R.string.pump_tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.pump_tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                 val callback: Callback = object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                            val i = Intent(ctx, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
-                            i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror))
+                            i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            MainApp.instance().startActivity(i)
+                            ctx.startActivity(i)
                         }
                     }
                 }
                 if (isPercentPump) {
-                    ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, callback)
+                    aapsLogger.debug("USER ENTRY: TEMP BASAL $percent% duration: $durationInMinutes")
+                    commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, callback)
                 } else {
-                    ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(absolute, durationInMinutes, true, profile, callback)
+                    aapsLogger.debug("USER ENTRY: TEMP BASAL $absolute duration: $durationInMinutes")
+                    commandQueue.tempBasalAbsolute(absolute, durationInMinutes, true, profile, callback)
                 }
             })
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 5408105a71..f2393e8c53 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -9,24 +9,30 @@ import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import com.google.common.collect.Lists
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TempTarget
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_temptarget.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 
 class TempTargetDialog : DialogFragmentWithDate() {
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
@@ -46,7 +52,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
         overview_temptarget_duration.setParams(savedInstanceState?.getDouble("overview_temptarget_duration")
             ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
 
-        if (ProfileFunctions.getSystemUnits() == Constants.MMOL)
+        if (profileFunction.getUnits() == Constants.MMOL)
             overview_temptarget_temptarget.setParams(
                 savedInstanceState?.getDouble("overview_temptarget_temptarget")
                     ?: Constants.MIN_TT_MMOL,
@@ -57,16 +63,16 @@ class TempTargetDialog : DialogFragmentWithDate() {
                     ?: Constants.MIN_TT_MGDL,
                 Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1.0, DecimalFormat("0"), false, ok)
 
-        val units = ProfileFunctions.getSystemUnits()
-        overview_temptarget_units.text = if (units == Constants.MMOL) MainApp.gs(R.string.mmol) else MainApp.gs(R.string.mgdl)
+        val units = profileFunction.getUnits()
+        overview_temptarget_units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         // temp target
         context?.let { context ->
             val reasonList: List<String> = Lists.newArrayList(
-                MainApp.gs(R.string.manual),
-                MainApp.gs(R.string.cancel),
-                MainApp.gs(R.string.eatingsoon),
-                MainApp.gs(R.string.activity),
-                MainApp.gs(R.string.hypo)
+                resourceHelper.gs(R.string.manual),
+                resourceHelper.gs(R.string.cancel),
+                resourceHelper.gs(R.string.eatingsoon),
+                resourceHelper.gs(R.string.activity),
+                resourceHelper.gs(R.string.hypo)
             )
             val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList)
             overview_temptarget_reason.adapter = adapterReason
@@ -75,27 +81,27 @@ class TempTargetDialog : DialogFragmentWithDate() {
                     val defaultDuration: Double
                     val defaultTarget: Double
                     when (reasonList[position]) {
-                        MainApp.gs(R.string.eatingsoon) -> {
-                            defaultDuration = DefaultValueHelper.determineEatingSoonTTDuration().toDouble()
-                            defaultTarget = DefaultValueHelper.determineEatingSoonTT()
+                        resourceHelper.gs(R.string.eatingsoon) -> {
+                            defaultDuration = defaultValueHelper.determineEatingSoonTTDuration().toDouble()
+                            defaultTarget = defaultValueHelper.determineEatingSoonTT()
                         }
 
-                        MainApp.gs(R.string.activity)   -> {
-                            defaultDuration = DefaultValueHelper.determineActivityTTDuration().toDouble()
-                            defaultTarget = DefaultValueHelper.determineActivityTT()
+                        resourceHelper.gs(R.string.activity)   -> {
+                            defaultDuration = defaultValueHelper.determineActivityTTDuration().toDouble()
+                            defaultTarget = defaultValueHelper.determineActivityTT()
                         }
 
-                        MainApp.gs(R.string.hypo)       -> {
-                            defaultDuration = DefaultValueHelper.determineHypoTTDuration().toDouble()
-                            defaultTarget = DefaultValueHelper.determineHypoTT()
+                        resourceHelper.gs(R.string.hypo)       -> {
+                            defaultDuration = defaultValueHelper.determineHypoTTDuration().toDouble()
+                            defaultTarget = defaultValueHelper.determineHypoTT()
                         }
 
-                        MainApp.gs(R.string.cancel)     -> {
+                        resourceHelper.gs(R.string.cancel)     -> {
                             defaultDuration = 0.0
                             defaultTarget = 0.0
                         }
 
-                        else                            -> {
+                        else                                   -> {
                             defaultDuration = overview_temptarget_duration.value
                             defaultTarget = overview_temptarget_temptarget.value
                         }
@@ -112,39 +118,40 @@ class TempTargetDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         val actions: LinkedList<String> = LinkedList()
         val reason = overview_temptarget_reason.selectedItem.toString()
-        val unitResId = if (ProfileFunctions.getSystemUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
+        val unitResId = if (profileFunction.getUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
         val target = overview_temptarget_temptarget.value
-        val duration = overview_temptarget_duration.value
-        if (target != 0.0 && duration != 0.0) {
-            actions.add(MainApp.gs(R.string.reason) + ": " + reason)
-            actions.add(MainApp.gs(R.string.nsprofileview_target_label) + ": " + Profile.toCurrentUnitsString(target) + " " + MainApp.gs(unitResId))
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_hours, duration))
+        val duration = overview_temptarget_duration.value.toInt()
+        if (target != 0.0 && duration != 0) {
+            actions.add(resourceHelper.gs(R.string.reason) + ": " + reason)
+            actions.add(resourceHelper.gs(R.string.nsprofileview_target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + resourceHelper.gs(unitResId))
+            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
         } else {
-            actions.add(MainApp.gs(R.string.stoptemptarget))
+            actions.add(resourceHelper.gs(R.string.stoptemptarget))
         }
         if (eventTimeChanged)
-            actions.add(MainApp.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
-                if (target == 0.0 || duration == 0.0) {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                aapsLogger.debug("USER ENTRY: TEMP TARGET $target duration: $duration")
+                if (target == 0.0 || duration == 0) {
                     val tempTarget = TempTarget()
                         .date(eventTime)
                         .duration(0)
                         .low(0.0).high(0.0)
                         .source(Source.USER)
-                    TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                    treatmentsPlugin.addToHistoryTempTarget(tempTarget)
                 } else {
                     val tempTarget = TempTarget()
                         .date(eventTime)
-                        .duration(duration.toInt())
+                        .duration(duration)
                         .reason(reason)
                         .source(Source.USER)
-                        .low(Profile.toMgdl(target, ProfileFunctions.getSystemUnits()))
-                        .high(Profile.toMgdl(target, ProfileFunctions.getSystemUnits()))
-                    TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                        .low(Profile.toMgdl(target, profileFunction.getUnits()))
+                        .high(Profile.toMgdl(target, profileFunction.getUnits()))
+                    treatmentsPlugin.addToHistoryTempTarget(tempTarget)
                 }
-                if (duration == 10.0) SP.putBoolean(R.string.key_objectiveusetemptarget, true)
+                if (duration == 10) sp.putBoolean(R.string.key_objectiveusetemptarget, true)
             })
         }
         return true
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index 8667befaf2..3f729fbf3e 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
@@ -8,30 +9,35 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_treatment.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 
 class TreatmentDialog : DialogFragmentWithDate() {
-    private var maxCarbs = MainApp.getConstraintChecker().maxCarbsAllowed.value().toDouble()
-    private var maxInsulin = MainApp.getConstraintChecker().maxBolusAllowed.value()
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var ctx: Context
 
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {}
@@ -42,13 +48,15 @@ class TreatmentDialog : DialogFragmentWithDate() {
     }
 
     private fun validateInputs() {
+        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
+        val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
         if (SafeParse.stringToInt(overview_treatment_carbs.text) > maxCarbs) {
             overview_treatment_carbs.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.carbsconstraintapplied))
         }
         if (SafeParse.stringToDouble(overview_treatment_insulin.text) > maxInsulin) {
             overview_treatment_insulin.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.bolusconstraintapplied))
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.bolusconstraintapplied))
         }
     }
 
@@ -67,38 +75,40 @@ class TreatmentDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
+        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
+        val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
+        val pumpDescription = activePlugin.activePump.pumpDescription
         overview_treatment_carbs.setParams(savedInstanceState?.getDouble("overview_treatment_carbs")
             ?: 0.0, 0.0, maxCarbs, 1.0, DecimalFormat("0"), false, ok, textWatcher)
         overview_treatment_insulin.setParams(savedInstanceState?.getDouble("overview_treatment_insulin")
-            ?: 0.0, 0.0, maxInsulin, pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, ok, textWatcher)
+            ?: 0.0, 0.0, maxInsulin, pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, ok, textWatcher)
     }
 
     override fun submit(): Boolean {
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription
-            ?: return false
+        val pumpDescription = activePlugin.activePump.pumpDescription
         val insulin = SafeParse.stringToDouble(overview_treatment_insulin.text)
         val carbs = SafeParse.stringToInt(overview_treatment_carbs.text)
         val recordOnlyChecked = overview_treatment_record_only.isChecked
         val actions: LinkedList<String?> = LinkedList()
-        val insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(insulin)).value()
-        val carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(carbs)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
 
         if (insulinAfterConstraints > 0) {
-            actions.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + MainApp.gs(R.string.insulin_unit_shortname) + "</font>")
+            actions.add(resourceHelper.gs(R.string.bolus) + ": " + "<font color='" + resourceHelper.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "</font>")
             if (recordOnlyChecked)
-                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>")
+                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.bolusrecordedonly) + "</font>")
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), insulin, insulinAfterConstraints))
+                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints))
         }
         if (carbsAfterConstraints > 0) {
-            actions.add(MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + MainApp.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
+            actions.add(resourceHelper.gs(R.string.carbs) + ": " + "<font color='" + resourceHelper.gc(R.color.carbs) + "'>" + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
             if (carbsAfterConstraints != carbs)
-                actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.carbsconstraintapplied) + "</font>")
+                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.carbsconstraintapplied) + "</font>")
         }
         if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                    aapsLogger.debug("USER ENTRY: BOLUS insulin $insulin carbs: $carbs")
                     val detailedBolusInfo = DetailedBolusInfo()
                     if (insulinAfterConstraints == 0.0) detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION
                     if (carbsAfterConstraints == 0) detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS
@@ -107,25 +117,25 @@ class TreatmentDialog : DialogFragmentWithDate() {
                     detailedBolusInfo.context = context
                     detailedBolusInfo.source = Source.USER
                     if (!(recordOnlyChecked && (detailedBolusInfo.insulin > 0 || pumpDescription.storesCarbInfo))) {
-                        ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                        commandQueue.bolus(detailedBolusInfo, object : Callback() {
                             override fun run() {
                                 if (!result.success) {
-                                    val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                                    val i = Intent(ctx, ErrorHelperActivity::class.java)
                                     i.putExtra("soundid", R.raw.boluserror)
                                     i.putExtra("status", result.comment)
-                                    i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror))
+                                    i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
                                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    MainApp.instance().startActivity(i)
+                                    ctx.startActivity(i)
                                 }
                             }
                         })
                     } else
-                        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false)
+                        activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                 })
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, MainApp.gs(R.string.overview_treatment_label), MainApp.gs(R.string.no_action_selected))
+                OKDialog.show(activity, resourceHelper.gs(R.string.overview_treatment_label), resourceHelper.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index c84bd4a0b6..3f2f3ee8f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -12,31 +12,51 @@ import android.widget.AdapterView
 import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import android.widget.CompoundButton
-import androidx.fragment.app.DialogFragment
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.DatabaseHelper
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 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.utils.*
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.toVisibility
+import info.nightscout.androidaps.utils.wizard.BolusWizard
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.dialog_wizard.*
-import org.slf4j.LoggerFactory
 import java.text.DecimalFormat
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.abs
 
-class WizardDialog : DialogFragment() {
-    private val log = LoggerFactory.getLogger(WizardDialog::class.java)
+class WizardDialog : DaggerDialogFragment() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
 
     private var wizard: BolusWizard? = null
 
@@ -79,29 +99,28 @@ class WizardDialog : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         loadCheckedStates()
         processCobCheckBox()
-        treatments_wizard_sbcheckbox.visibility = SP.getBoolean(R.string.key_usesuperbolus, false).toVisibility()
-        treatments_wizard_notes_layout.visibility = SP.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
+        treatments_wizard_sbcheckbox.visibility = sp.getBoolean(R.string.key_usesuperbolus, false).toVisibility()
+        treatments_wizard_notes_layout.visibility = sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
 
-        val maxCarbs = MainApp.getConstraintChecker().maxCarbsAllowed.value()
-        val maxCorrection = MainApp.getConstraintChecker().maxBolusAllowed.value()
+        val maxCarbs = constraintChecker.getMaxCarbsAllowed().value()
+        val maxCorrection = constraintChecker.getMaxBolusAllowed().value()
 
         treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input")
             ?: 0.0, 0.0, 500.0, 0.1, DecimalFormat("0.0"), false, ok, textWatcher)
         treatments_wizard_carbs_input.setParams(savedInstanceState?.getDouble("treatments_wizard_carbs_input")
             ?: 0.0, 0.0, maxCarbs.toDouble(), 1.0, DecimalFormat("0"), false, ok, textWatcher)
-        val bolusStep = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription?.bolusStep
-            ?: 0.1
+        val bolusStep = activePlugin.activePump.pumpDescription.bolusStep
         treatments_wizard_correction_input.setParams(savedInstanceState?.getDouble("treatments_wizard_correction_input")
-            ?: 0.0, -maxCorrection, maxCorrection, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, ok, textWatcher)
+            ?: 0.0, -maxCorrection, maxCorrection, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, ok, textWatcher)
         treatments_wizard_carb_time_input.setParams(savedInstanceState?.getDouble("treatments_wizard_carb_time_input")
             ?: 0.0, -60.0, 60.0, 5.0, DecimalFormat("0"), false, ok, textWatcher)
         initDialog()
 
-        treatments_wizard_percent_used.text = MainApp.gs(R.string.format_percent, SP.getInt(R.string.key_boluswizard_percentage, 100))
+        treatments_wizard_percent_used.text = resourceHelper.gs(R.string.format_percent, sp.getInt(R.string.key_boluswizard_percentage, 100))
         // ok button
         ok.setOnClickListener {
             if (okClicked) {
-                log.debug("guarding: ok already clicked")
+                aapsLogger.debug(LTag.UI, "guarding: ok already clicked")
             } else {
                 okClicked = true
                 calculateInsulin()
@@ -122,13 +141,13 @@ class WizardDialog : DialogFragment() {
         treatments_wizard_bgtrendcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
         treatments_wizard_sbcheckbox.setOnCheckedChangeListener(::onCheckedChanged)
 
-        val showCalc = SP.getBoolean(MainApp.gs(R.string.key_wizard_calculation_visible), false)
+        val showCalc = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_calculation_visible), false)
         treatments_wizard_delimiter.visibility = showCalc.toVisibility()
         treatments_wizard_resulttable.visibility = showCalc.toVisibility()
         treatments_wizard_calculationcheckbox.isChecked = showCalc
         treatments_wizard_calculationcheckbox.setOnCheckedChangeListener { _, isChecked ->
             run {
-                SP.putBoolean(MainApp.gs(R.string.key_wizard_calculation_visible), isChecked)
+                sp.putBoolean(resourceHelper.gs(R.string.key_wizard_calculation_visible), isChecked)
                 treatments_wizard_delimiter.visibility = isChecked.toVisibility()
                 treatments_wizard_resulttable.visibility = isChecked.toVisibility()
             }
@@ -136,7 +155,7 @@ class WizardDialog : DialogFragment() {
         // profile spinner
         treatments_wizard_profile.onItemSelectedListener = object : OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
-                ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.noprofileselected))
+                ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.noprofileselected))
                 ok.visibility = View.GONE
             }
 
@@ -146,14 +165,12 @@ class WizardDialog : DialogFragment() {
             }
         }
         // bus
-        disposable.add(RxBus
+        disposable.add(rxBus
             .toObservable(EventAutosensCalculationFinished::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 activity?.runOnUiThread { calculateInsulin() }
-            }, {
-                FabricPrivacy.logException(it)
-            })
+            }, { fabricPrivacy.logException(it) })
         )
 
     }
@@ -165,7 +182,7 @@ class WizardDialog : DialogFragment() {
 
     private fun onCheckedChanged(buttonView: CompoundButton, @Suppress("UNUSED_PARAMETER") state: Boolean) {
         saveCheckedStates()
-        treatments_wizard_ttcheckbox.isEnabled = treatments_wizard_bgcheckbox.isChecked && TreatmentsPlugin.getPlugin().tempTargetFromHistory != null
+        treatments_wizard_ttcheckbox.isEnabled = treatments_wizard_bgcheckbox.isChecked && treatmentsPlugin.tempTargetFromHistory != null
         if (buttonView.id == treatments_wizard_cobcheckbox.id)
             processCobCheckBox()
         calculateInsulin()
@@ -184,34 +201,34 @@ class WizardDialog : DialogFragment() {
     }
 
     private fun saveCheckedStates() {
-        SP.putBoolean(MainApp.gs(R.string.key_wizard_include_cob), treatments_wizard_cobcheckbox.isChecked)
-        SP.putBoolean(MainApp.gs(R.string.key_wizard_include_trend_bg), treatments_wizard_bgtrendcheckbox.isChecked)
+        sp.putBoolean(resourceHelper.gs(R.string.key_wizard_include_cob), treatments_wizard_cobcheckbox.isChecked)
+        sp.putBoolean(resourceHelper.gs(R.string.key_wizard_include_trend_bg), treatments_wizard_bgtrendcheckbox.isChecked)
     }
 
     private fun loadCheckedStates() {
-        treatments_wizard_bgtrendcheckbox.isChecked = SP.getBoolean(MainApp.gs(R.string.key_wizard_include_trend_bg), false)
-        treatments_wizard_cobcheckbox.isChecked = SP.getBoolean(MainApp.gs(R.string.key_wizard_include_cob), false)
+        treatments_wizard_bgtrendcheckbox.isChecked = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_include_trend_bg), false)
+        treatments_wizard_cobcheckbox.isChecked = sp.getBoolean(resourceHelper.gs(R.string.key_wizard_include_cob), false)
     }
 
     private fun initDialog() {
-        val profile = ProfileFunctions.getInstance().profile
-        val profileStore = ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile
+        val profile = profileFunction.getProfile()
+        val profileStore = activePlugin.activeProfileInterface.profile
 
         if (profile == null || profileStore == null) {
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.noprofile))
+            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.noprofile))
             dismiss()
             return
         }
 
         val profileList: ArrayList<CharSequence>
         profileList = profileStore.getProfileList()
-        profileList.add(0, MainApp.gs(R.string.active))
+        profileList.add(0, resourceHelper.gs(R.string.active))
         context?.let { context ->
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             treatments_wizard_profile.adapter = adapter
         } ?: return
 
-        val units = ProfileFunctions.getSystemUnits()
+        val units = profileFunction.getUnits()
         treatments_wizard_bgunits.text = units
         if (units == Constants.MGDL)
             treatments_wizard_bg_input.setStep(1.0)
@@ -219,38 +236,38 @@ class WizardDialog : DialogFragment() {
             treatments_wizard_bg_input.setStep(0.1)
 
         // Set BG if not old
-        val lastBg = DatabaseHelper.actualBg()
+        val lastBg = iobCobCalculatorPlugin.actualBg()
 
         if (lastBg != null) {
             treatments_wizard_bg_input.value = lastBg.valueToUnits(units)
         } else {
             treatments_wizard_bg_input.value = 0.0
         }
-        treatments_wizard_ttcheckbox.isEnabled = TreatmentsPlugin.getPlugin().tempTargetFromHistory != null
+        treatments_wizard_ttcheckbox.isEnabled = treatmentsPlugin.tempTargetFromHistory != null
 
         // IOB calculation
-        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments()
-        val bolusIob = TreatmentsPlugin.getPlugin().lastCalculationTreatments.round()
-        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals()
-        val basalIob = TreatmentsPlugin.getPlugin().lastCalculationTempBasals.round()
+        treatmentsPlugin.updateTotalIOBTreatments()
+        val bolusIob = treatmentsPlugin.lastCalculationTreatments.round()
+        treatmentsPlugin.updateTotalIOBTempBasals()
+        val basalIob = treatmentsPlugin.lastCalculationTempBasals.round()
 
-        treatments_wizard_bolusiobinsulin.text = StringUtils.formatInsulin(-bolusIob.iob)
-        treatments_wizard_basaliobinsulin.text = StringUtils.formatInsulin(-basalIob.basaliob)
+        treatments_wizard_bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -bolusIob.iob)
+        treatments_wizard_basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -basalIob.basaliob)
 
         calculateInsulin()
 
-        treatments_wizard_percent_used.visibility = (SP.getInt(R.string.key_boluswizard_percentage, 100) != 100).toVisibility()
+        treatments_wizard_percent_used.visibility = (sp.getInt(R.string.key_boluswizard_percentage, 100) != 100).toVisibility()
     }
 
     private fun calculateInsulin() {
-        val profileStore = ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile
+        val profileStore = activePlugin.activeProfileInterface.profile
         if (treatments_wizard_profile.selectedItem == null || profileStore == null)
             return  // not initialized yet
         var profileName = treatments_wizard_profile.selectedItem.toString()
         val specificProfile: Profile?
-        if (profileName == MainApp.gs(R.string.active)) {
-            specificProfile = ProfileFunctions.getInstance().profile
-            profileName = ProfileFunctions.getInstance().profileName
+        if (profileName == resourceHelper.gs(R.string.active)) {
+            specificProfile = profileFunction.getProfile()
+            profileName = profileFunction.getProfileName()
         } else
             specificProfile = profileStore.getSpecificProfile(profileName)
 
@@ -260,27 +277,27 @@ class WizardDialog : DialogFragment() {
         var bg = SafeParse.stringToDouble(treatments_wizard_bg_input.text)
         val carbs = SafeParse.stringToInt(treatments_wizard_carbs_input.text)
         val correction = SafeParse.stringToDouble(treatments_wizard_correction_input.text)
-        val carbsAfterConstraint = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(carbs)).value()
+        val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
         if (abs(carbs - carbsAfterConstraint) > 0.01) {
             treatments_wizard_carbs_input.value = 0.0
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, MainApp.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.carbsconstraintapplied))
             return
         }
 
         bg = if (treatments_wizard_bgcheckbox.isChecked) bg else 0.0
-        val tempTarget = if (treatments_wizard_ttcheckbox.isChecked) TreatmentsPlugin.getPlugin().tempTargetFromHistory else null
+        val tempTarget = if (treatments_wizard_ttcheckbox.isChecked) treatmentsPlugin.tempTargetFromHistory else null
 
         // COB
         var cob = 0.0
         if (treatments_wizard_cobcheckbox.isChecked) {
-            val cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "Wizard COB")
+            val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "Wizard COB")
             cobInfo.displayCob?.let { cob = it }
         }
 
         val carbTime = SafeParse.stringToInt(treatments_wizard_carb_time_input.text)
 
-        wizard = BolusWizard(specificProfile, profileName, tempTarget, carbsAfterConstraint, cob, bg, correction,
-            SP.getInt(R.string.key_boluswizard_percentage, 100).toDouble(),
+        wizard = BolusWizard(mainApp).doCalc(specificProfile, profileName, tempTarget, carbsAfterConstraint, cob, bg, correction,
+            sp.getInt(R.string.key_boluswizard_percentage, 100).toDouble(),
             treatments_wizard_bgcheckbox.isChecked,
             treatments_wizard_cobcheckbox.isChecked,
             treatments_wizard_bolusiobcheckbox.isChecked,
@@ -291,47 +308,47 @@ class WizardDialog : DialogFragment() {
             treatment_wizard_notes.text.toString(), carbTime)
 
         wizard?.let { wizard ->
-            treatments_wizard_bg.text = String.format(MainApp.gs(R.string.format_bg_isf), BgReading().value(Profile.toMgdl(bg, ProfileFunctions.getSystemUnits())).valueToUnitsToString(ProfileFunctions.getSystemUnits()), wizard.sens)
-            treatments_wizard_bginsulin.text = StringUtils.formatInsulin(wizard.insulinFromBG)
+            treatments_wizard_bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), BgReading().value(Profile.toMgdl(bg, profileFunction.getUnits())).valueToUnitsToString(profileFunction.getUnits()), wizard.sens)
+            treatments_wizard_bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
 
-            treatments_wizard_carbs.text = String.format(MainApp.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
-            treatments_wizard_carbsinsulin.text = StringUtils.formatInsulin(wizard.insulinFromCarbs)
+            treatments_wizard_carbs.text = String.format(resourceHelper.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
+            treatments_wizard_carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCarbs)
 
-            treatments_wizard_bolusiobinsulin.text = StringUtils.formatInsulin(wizard.insulinFromBolusIOB)
-            treatments_wizard_basaliobinsulin.text = StringUtils.formatInsulin(wizard.insulinFromBasalsIOB)
+            treatments_wizard_bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBolusIOB)
+            treatments_wizard_basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBasalsIOB)
 
-            treatments_wizard_correctioninsulin.text = StringUtils.formatInsulin(wizard.insulinFromCorrection)
+            treatments_wizard_correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCorrection)
 
             // Superbolus
-            treatments_wizard_sb.text = if (treatments_wizard_sbcheckbox.isChecked) MainApp.gs(R.string.twohours) else ""
-            treatments_wizard_sbinsulin.text = StringUtils.formatInsulin(wizard.insulinFromSuperBolus)
+            treatments_wizard_sb.text = if (treatments_wizard_sbcheckbox.isChecked) resourceHelper.gs(R.string.twohours) else ""
+            treatments_wizard_sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromSuperBolus)
 
             // Trend
             if (treatments_wizard_bgtrendcheckbox.isChecked && wizard.glucoseStatus != null) {
                 treatments_wizard_bgtrend.text = ((if (wizard.trend > 0) "+" else "")
-                    + Profile.toUnitsString(wizard.trend * 3, wizard.trend * 3 / Constants.MMOLL_TO_MGDL, ProfileFunctions.getSystemUnits())
-                    + " " + ProfileFunctions.getSystemUnits())
+                    + Profile.toUnitsString(wizard.trend * 3, wizard.trend * 3 / Constants.MMOLL_TO_MGDL, profileFunction.getUnits())
+                    + " " + profileFunction.getUnits())
             } else {
                 treatments_wizard_bgtrend.text = ""
             }
-            treatments_wizard_bgtrendinsulin.text = StringUtils.formatInsulin(wizard.insulinFromTrend)
+            treatments_wizard_bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromTrend)
 
             // COB
             if (treatments_wizard_cobcheckbox.isChecked) {
-                treatments_wizard_cob.text = String.format(MainApp.gs(R.string.format_cob_ic), cob, wizard.ic)
-                treatments_wizard_cobinsulin.text = StringUtils.formatInsulin(wizard.insulinFromCOB)
+                treatments_wizard_cob.text = String.format(resourceHelper.gs(R.string.format_cob_ic), cob, wizard.ic)
+                treatments_wizard_cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCOB)
             } else {
                 treatments_wizard_cob.text = ""
                 treatments_wizard_cobinsulin.text = ""
             }
 
             if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) {
-                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) MainApp.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin) else ""
-                val carbsText = if (carbsAfterConstraint > 0.0) MainApp.gs(R.string.format_carbs, carbsAfterConstraint) else ""
-                treatments_wizard_total.text = MainApp.gs(R.string.result_insulin_carbs, insulinText, carbsText)
+                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) resourceHelper.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin) else ""
+                val carbsText = if (carbsAfterConstraint > 0.0) resourceHelper.gs(R.string.format_carbs, carbsAfterConstraint) else ""
+                treatments_wizard_total.text = resourceHelper.gs(R.string.result_insulin_carbs, insulinText, carbsText)
                 ok.visibility = View.VISIBLE
             } else {
-                treatments_wizard_total.text = MainApp.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
+                treatments_wizard_total.text = resourceHelper.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
                 ok.visibility = View.INVISIBLE
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
new file mode 100644
index 0000000000..2c25836f8d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
@@ -0,0 +1,88 @@
+package info.nightscout.androidaps.dialogs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import dagger.android.support.DaggerDialogFragment
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.dialog_wizardinfo.*
+import org.json.JSONObject
+import javax.inject.Inject
+
+class WizardInfoDialog : DaggerDialogFragment() {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    private var json: JSONObject? = null
+
+    fun setData(json: JSONObject) {
+        this.json = json
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
+        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        isCancelable = true
+        dialog?.setCanceledOnTouchOutside(false)
+        return inflater.inflate(R.layout.dialog_wizardinfo, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        close.setOnClickListener { dismiss() }
+        val units = profileFunction.getUnits()
+        val bgString =
+            if (units == Constants.MGDL) DecimalFormatter.to0Decimal(JsonHelper.safeGetDouble(json, "bg"))
+            else DecimalFormatter.to1Decimal(JsonHelper.safeGetDouble(json, "bg"))
+        // BG
+        treatments_wizard_bg.text = resourceHelper.gs(R.string.format_bg_isf, bgString, JsonHelper.safeGetDouble(json, "isf"))
+        treatments_wizard_bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulinbg"))
+        treatments_wizard_bgcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "insulinbgused")
+        treatments_wizard_ttcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "ttused")
+        // Trend
+        treatments_wizard_bgtrend.text = JsonHelper.safeGetString(json, "trend")
+        treatments_wizard_bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulintrend"))
+        treatments_wizard_bgtrendcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "trendused")
+        // COB
+        treatments_wizard_cob.text = resourceHelper.gs(R.string.format_cob_ic, JsonHelper.safeGetDouble(json, "cob"), JsonHelper.safeGetDouble(json, "ic"))
+        treatments_wizard_cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulincob"))
+        treatments_wizard_cobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "cobused")
+        // Bolus IOB
+        treatments_wizard_bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "bolusiob"))
+        treatments_wizard_bolusiobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "bolusiobused")
+        // Basal IOB
+        treatments_wizard_basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "basaliob"))
+        treatments_wizard_basaliobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "basaliobused")
+        // Superbolus
+        treatments_wizard_sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulinsuperbolus"))
+        treatments_wizard_sbcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "superbolusused")
+        // Carbs
+        treatments_wizard_carbs.text = resourceHelper.gs(R.string.format_carbs_ic, JsonHelper.safeGetDouble(json, "carbs"), JsonHelper.safeGetDouble(json, "ic"))
+        treatments_wizard_carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulincarbs"))
+        // Correction
+        treatments_wizard_correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "othercorrection"))
+        // Profile
+        treatments_wizard_profile.text = JsonHelper.safeGetString(json, "profile")
+        // Notes
+        treatments_wizard_notes.text = JsonHelper.safeGetString(json, "notes")
+        // Percentage
+        treatments_wizard_percent_used.text = DecimalFormatter.to0Decimal(JsonHelper.safeGetDouble(json, "percentageCorrection", 100.0)) + "%"
+        // Total
+        treatments_wizard_totalinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, JsonHelper.safeGetDouble(json, "insulin"))
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt b/app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt
new file mode 100644
index 0000000000..0531a4d00d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.events
+
+class EventBTChange constructor(val state: Change, val deviceName: String) : Event() {
+    enum class Change {
+        CONNECT,
+        DISCONNECT
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt b/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
index 62c8bdd13e..87599a9373 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
@@ -6,9 +6,11 @@ class EventNetworkChange : Event() {
 
     var mobileConnected = false
     var wifiConnected = false
+    var vpnConnected = false
 
     var ssid = ""
     var roaming = false
+    var metered = false
 
     fun connectedSsid(): String {
         return StringUtils.removeSurroundingQuotes(ssid)
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNsFood.kt b/app/src/main/java/info/nightscout/androidaps/events/EventNsFood.kt
index 2f34e76c85..67bc23b168 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventNsFood.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventNsFood.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events
 
-import android.os.Bundle
+import org.json.JSONArray
 
 /**
  * Event which is published with data fetched from NightScout specific for the
@@ -10,7 +10,8 @@ import android.os.Bundle
  * subscriber.
  */
 
-class EventNsFood(val mode: Int, val payload: Bundle) : Event() {
+class EventNsFood(val mode: Int, val foods: JSONArray) : Event() {
+
     companion object {
         val ADD = 0
         val UPDATE = 1
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt b/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
index d224d75df1..1f7856b7cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.events
 
+import android.content.res.Resources
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventPreferenceChange : Event {
     private var changedKey: String? = null
@@ -9,11 +11,11 @@ class EventPreferenceChange : Event {
         changedKey = key
     }
 
-    constructor(resourceID: Int) {
-        changedKey = MainApp.gs(resourceID)
+    constructor(resourceHelper: ResourceHelper, resourceID: Int) {
+        changedKey = resourceHelper.gs(resourceID)
     }
 
-    fun isChanged(id: Int): Boolean {
-        return changedKey == MainApp.gs(id)
+    fun isChanged(resourceHelper: ResourceHelper, id: Int): Boolean {
+        return changedKey == resourceHelper.gs(id)
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
index 3d25bc1ca5..cc92defe8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.events
 
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventPumpStatusChanged : EventStatus {
 
@@ -14,49 +14,44 @@ class EventPumpStatusChanged : EventStatus {
         DISCONNECTED
     }
 
-    var sStatus: Status = Status.DISCONNECTED
-    var sSecondsElapsed = 0
-    var sPerfomingAction = ""
+    var status: Status = Status.DISCONNECTED
+    var secondsElapsed = 0
+    private var performingAction = ""
     var error = ""
 
     constructor(status: Status) {
-        sStatus = status
-        sSecondsElapsed = 0
+        this.status = status
+        secondsElapsed = 0
         error = ""
     }
 
     constructor(status: Status, secondsElapsed: Int) {
-        sStatus = status
-        sSecondsElapsed = secondsElapsed
+        this.status = status
+        this.secondsElapsed = secondsElapsed
         error = ""
     }
 
     constructor(status: Status, error: String) {
-        sStatus = status
-        sSecondsElapsed = 0
+        this.status = status
+        secondsElapsed = 0
         this.error = error
     }
 
     constructor(action: String) {
-        sStatus = Status.PERFORMING
-        sSecondsElapsed = 0
-        sPerfomingAction = action
+        status = Status.PERFORMING
+        secondsElapsed = 0
+        performingAction = action
     }
 
     // status for startup wizard
-    override fun getStatus(): String {
-        if (sStatus == Status.CONNECTING)
-            return String.format(MainApp.gs(R.string.danar_history_connectingfor), sSecondsElapsed)
-        else if (sStatus == Status.HANDSHAKING)
-            return MainApp.gs(R.string.handshaking)
-        else if (sStatus == Status.CONNECTED)
-            return MainApp.gs(R.string.connected)
-        else if (sStatus == Status.PERFORMING)
-            return sPerfomingAction
-        else if (sStatus == Status.DISCONNECTING)
-            return MainApp.gs(R.string.disconnecting)
-        else if (sStatus == Status.DISCONNECTED)
-            return ""
-        return ""
+    override fun getStatus(resourceHelper: ResourceHelper): String {
+        return when (status) {
+            Status.CONNECTING    -> String.format(resourceHelper.gs(R.string.danar_history_connectingfor), secondsElapsed)
+            Status.HANDSHAKING   -> resourceHelper.gs(R.string.handshaking)
+            Status.CONNECTED     -> resourceHelper.gs(R.string.connected)
+            Status.PERFORMING    -> performingAction
+            Status.DISCONNECTING -> resourceHelper.gs(R.string.disconnecting)
+            Status.DISCONNECTED  -> ""
+        }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt b/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
index 193c3b1fdb..360b62f0e9 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.events
 
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
 // pass string to startup wizard
 abstract class EventStatus :Event() {
-    abstract fun getStatus() : String
+    abstract fun getStatus(resourceHelper: ResourceHelper) : String
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.java
similarity index 80%
rename from app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java
rename to app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.java
index c0f654bbbb..6a47e3749b 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.activities;
+package info.nightscout.androidaps.historyBrowser;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -18,35 +18,49 @@ import androidx.core.content.res.ResourcesCompat;
 import com.jjoe64.graphview.GraphView;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Calendar;
 import java.util.Date;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.events.EventCustomCalculationFinished;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.OverviewFragment;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData;
-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.utils.DateUtil;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
 public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
-    private static Logger log = LoggerFactory.getLogger(HistoryBrowseActivity.class);
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject SP sp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject DefaultValueHelper defaultValueHelper;
+    @Inject IobCobStaticCalculatorPlugin iobCobStaticCalculatorPlugin;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject BuildHelper buildHelper;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     ImageButton chartButton;
@@ -66,14 +80,9 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
     private int rangeToDisplay = 24; // for graph
     private long start = 0;
 
-    IobCobCalculatorPlugin iobCobCalculatorPlugin;
 
     EventCustomCalculationFinished eventCustomCalculationFinished = new EventCustomCalculationFinished();
 
-    public HistoryBrowseActivity() {
-        iobCobCalculatorPlugin = new IobCobCalculatorPlugin();
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -153,9 +162,9 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             dpd.show(getSupportFragmentManager(), "Datepickerdialog");
         });
 
-        bgGraph.getGridLabelRenderer().setGridColor(MainApp.gc(R.color.graphgrid));
+        bgGraph.getGridLabelRenderer().setGridColor(resourceHelper.gc(R.color.graphgrid));
         bgGraph.getGridLabelRenderer().reloadStyles();
-        iobGraph.getGridLabelRenderer().setGridColor(MainApp.gc(R.color.graphgrid));
+        iobGraph.getGridLabelRenderer().setGridColor(resourceHelper.gc(R.color.graphgrid));
         iobGraph.getGridLabelRenderer().reloadStyles();
         iobGraph.getGridLabelRenderer().setHorizontalLabelsVisible(false);
         bgGraph.getGridLabelRenderer().setLabelVerticalWidth(50);
@@ -169,31 +178,31 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
     public void onPause() {
         super.onPause();
         disposable.clear();
-        iobCobCalculatorPlugin.stopCalculation("onPause");
+        iobCobStaticCalculatorPlugin.stopCalculation("onPause");
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAutosensCalculationFinished.class)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(event -> {
                     if (event.getCause() == eventCustomCalculationFinished) {
-                        log.debug("EventAutosensCalculationFinished");
+                        aapsLogger.debug(LTag.AUTOSENS, "EventAutosensCalculationFinished");
                         synchronized (HistoryBrowseActivity.this) {
                             updateGUI("EventAutosensCalculationFinished");
                         }
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> fabricPrivacy.logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventIobCalculationProgress.class)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(event -> {
                     if (iobCalculationProgressView != null)
                         iobCalculationProgressView.setText(event.getProgress());
-                }, FabricPrivacy::logException)
+                }, exception -> fabricPrivacy.logException(exception))
         );
         // set start of current day
         Calendar calendar = Calendar.getInstance();
@@ -210,19 +219,19 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
 
     private void runCalculation(String from) {
         long end = start + T.hours(rangeToDisplay).msecs();
-        iobCobCalculatorPlugin.stopCalculation(from);
-        iobCobCalculatorPlugin.clearCache();
-        iobCobCalculatorPlugin.runCalculation(from, end, true, false, eventCustomCalculationFinished);
+        iobCobStaticCalculatorPlugin.stopCalculation(from);
+        iobCobStaticCalculatorPlugin.clearCache();
+        iobCobStaticCalculatorPlugin.runCalculation(from, end, true, false, eventCustomCalculationFinished);
     }
 
     void updateGUI(String from) {
-        log.debug("updateGUI from: " + from);
+        aapsLogger.debug(LTag.UI, "updateGUI from: " + from);
 
         if (noProfile == null || buttonDate == null || buttonZoom == null || bgGraph == null || iobGraph == null || seekBar == null)
             return;
 
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
+        final PumpInterface pump = activePlugin.getActivePump();
+        final Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
             noProfile.setVisibility(View.VISIBLE);
@@ -231,24 +240,24 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             noProfile.setVisibility(View.GONE);
         }
 
-        final double lowLine = OverviewPlugin.INSTANCE.determineLowLine();
-        final double highLine = OverviewPlugin.INSTANCE.determineHighLine();
+        final double lowLine = defaultValueHelper.determineLowLine();
+        final double highLine = defaultValueHelper.determineHighLine();
 
         buttonDate.setText(DateUtil.dateAndTimeString(start));
         buttonZoom.setText(String.valueOf(rangeToDisplay));
 
         final boolean showPrediction = false;
 
-        showBasal = SP.getBoolean("hist_showbasals", true);
-        showIob = SP.getBoolean("hist_showiob", true);
-        showCob = SP.getBoolean("hist_showcob", true);
-        showDev = SP.getBoolean("hist_showdeviations", false);
-        showRat = SP.getBoolean("hist_showratios", false);
-        showActPrim = SP.getBoolean("hist_showactivityprimary", false);
-        showActSec = SP.getBoolean("hist_showactivitysecondary", false);
-        showDevslope = SP.getBoolean("hist_showdevslope", false);
+        showBasal = sp.getBoolean("hist_showbasals", true);
+        showIob = sp.getBoolean("hist_showiob", true);
+        showCob = sp.getBoolean("hist_showcob", true);
+        showDev = sp.getBoolean("hist_showdeviations", false);
+        showRat = sp.getBoolean("hist_showratios", false);
+        showActPrim = sp.getBoolean("hist_showactivityprimary", false);
+        showActSec = sp.getBoolean("hist_showactivitysecondary", false);
+        showDevslope = sp.getBoolean("hist_showdevslope", false);
 
-        int hoursToFetch;
+        //int hoursToFetch;
         final long toTime;
         final long fromTime;
         //if (showPrediction) {
@@ -264,13 +273,13 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
         toTime = start + T.hours(rangeToDisplay).msecs();
         //}
 
-        log.debug("Period: " + DateUtil.dateAndTimeString(fromTime) + " - " + DateUtil.dateAndTimeString(toTime));
+        aapsLogger.debug(LTag.UI, "Period: " + DateUtil.dateAndTimeString(fromTime) + " - " + DateUtil.dateAndTimeString(toTime));
 
         final long pointer = System.currentTimeMillis();
 
         //  ------------------ 1st graph
 
-        final GraphData graphData = new GraphData(bgGraph, iobCobCalculatorPlugin);
+        final GraphData graphData = new GraphData(injector, bgGraph, iobCobStaticCalculatorPlugin);
 
         // **** In range Area ****
         graphData.addInRangeArea(fromTime, toTime, lowLine, highLine);
@@ -294,7 +303,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
 
         // add basal data
         if (pump.getPumpDescription().isTempBasalCapable && showBasal) {
-            graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2d);
+            graphData.addBasals(fromTime, toTime, lowLine / graphData.getMaxY() / 1.2d);
         }
 
         // **** NOW line ****
@@ -303,7 +312,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
         // ------------------ 2nd graph
 
         new Thread(() -> {
-            final GraphData secondGraphData = new GraphData(iobGraph, iobCobCalculatorPlugin);
+            final GraphData secondGraphData = new GraphData(injector, iobGraph, iobCobStaticCalculatorPlugin);
 
             boolean useIobForScale = false;
             boolean useCobForScale = false;
@@ -360,7 +369,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
     }
 
     private void setupChartMenu() {
-        chartButton = (ImageButton) findViewById(R.id.overview_chartMenuButton);
+        chartButton = findViewById(R.id.overview_chartMenuButton);
         chartButton.setOnClickListener(v -> {
             MenuItem item, dividerItem;
             CharSequence title;
@@ -369,7 +378,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             PopupMenu popup = new PopupMenu(v.getContext(), v);
 
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.BAS.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_basals));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.BAS.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_basals));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -378,7 +387,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setCheckable(true);
             item.setChecked(showBasal);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_activity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -390,7 +399,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             dividerItem = popup.getMenu().add("");
             dividerItem.setEnabled(false);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.IOB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_iob));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.IOB.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_iob));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -399,7 +408,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setCheckable(true);
             item.setChecked(showIob);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.COB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_cob));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.COB.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_cob));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -408,7 +417,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setCheckable(true);
             item.setChecked(showCob);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.DEV.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_deviations));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.DEV.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_deviations));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -417,7 +426,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setCheckable(true);
             item.setChecked(showDev);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.SEN.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_sensitivity));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.SEN.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_sensitivity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -426,7 +435,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setCheckable(true);
             item.setChecked(showRat);
 
-            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_activity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
@@ -436,7 +445,7 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
             item.setChecked(showActSec);
 
 
-            if (MainApp.devBranch) {
+            if (buildHelper.isDev()) {
                 item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.DEVSLOPE.ordinal(), Menu.NONE, "Deviation slope");
                 title = item.getTitle();
                 if (titleMaxChars < title.length()) titleMaxChars = title.length();
@@ -453,21 +462,21 @@ public class HistoryBrowseActivity extends NoSplashAppCompatActivity {
 
             popup.setOnMenuItemClickListener(item1 -> {
                 if (item1.getItemId() == OverviewFragment.CHARTTYPE.BAS.ordinal()) {
-                    SP.putBoolean("hist_showbasals", !item1.isChecked());
+                    sp.putBoolean("hist_showbasals", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.IOB.ordinal()) {
-                    SP.putBoolean("hist_showiob", !item1.isChecked());
+                    sp.putBoolean("hist_showiob", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.COB.ordinal()) {
-                    SP.putBoolean("hist_showcob", !item1.isChecked());
+                    sp.putBoolean("hist_showcob", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.DEV.ordinal()) {
-                    SP.putBoolean("hist_showdeviations", !item1.isChecked());
+                    sp.putBoolean("hist_showdeviations", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.SEN.ordinal()) {
-                    SP.putBoolean("hist_showratios", !item1.isChecked());
+                    sp.putBoolean("hist_showratios", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.ACTPRIM.ordinal()) {
-                    SP.putBoolean("hist_showactivityprimary", !item1.isChecked());
+                    sp.putBoolean("hist_showactivityprimary", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.ACTSEC.ordinal()) {
-                    SP.putBoolean("hist_showactivitysecondary", !item1.isChecked());
+                    sp.putBoolean("hist_showactivitysecondary", !item1.isChecked());
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.DEVSLOPE.ordinal()) {
-                    SP.putBoolean("hist_showdevslope", !item1.isChecked());
+                    sp.putBoolean("hist_showdevslope", !item1.isChecked());
                 }
                 updateGUI("onGraphCheckboxesCheckedChanged");
                 return true;
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
new file mode 100644
index 0000000000..87276a50a9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.historyBrowser
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+class IobCobStaticCalculatorPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    sp: SP,
+    resourceHelper: ResourceHelper,
+    profileFunction: ProfileFunction,
+    activePlugin: ActivePluginProvider,
+    treatmentsPlugin: TreatmentsPlugin,
+    sensitivityOref1Plugin: SensitivityOref1Plugin,
+    sensitivityAAPSPlugin: SensitivityAAPSPlugin,
+    sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin,
+    fabricPrivacy: FabricPrivacy
+) : IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction,
+    activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy) {
+
+    override fun onStart() { // do not attach to rxbus
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java b/app/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java
new file mode 100644
index 0000000000..16bdb6a677
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.interfaces;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+public interface ActivePluginProvider {
+
+    @NotNull BgSourceInterface getActiveBgSource(); // Forced to Dexcom
+
+    @NotNull ProfileInterface getActiveProfileInterface(); // Forced to LocalProfile if not changed
+
+    @NotNull InsulinInterface getActiveInsulin(); // Forced to RapidActing if not changed
+
+    @NotNull APSInterface getActiveAPS(); // Forced to SMB
+
+    @NotNull PumpInterface getActivePump(); // Use in places not reachable without active pump. Otherwise IllegalStateException is thrown
+
+    @NotNull SensitivityInterface getActiveSensitivity(); // Forced to oref1 if not changed
+
+    @NotNull TreatmentsInterface getActiveTreatments(); // Forced to treatments
+
+    @NotNull ArrayList<PluginBase> getPluginsList();
+
+    @NotNull ArrayList<PluginBase> getSpecificPluginsVisibleInListByInterface(Class interfaceClass, PluginType type);
+
+    @NotNull ArrayList<PluginBase> getSpecificPluginsVisibleInList(PluginType type);
+
+    @NotNull ArrayList<PluginBase> getSpecificPluginsListByInterface(Class interfaceClass);
+
+//    @NotNull ArrayList<PluginBase> getSpecificPluginsVisibleInList(Class interfaceClass);
+
+    void verifySelectionInCategories();
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt b/app/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
new file mode 100644
index 0000000000..a5f9bf21df
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.interfaces
+
+import android.text.Spanned
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.commands.Command
+
+interface CommandQueueProvider {
+
+    fun isRunning(type: Command.CommandType): Boolean
+    fun pickup()
+    fun clear()
+    fun size(): Int
+    fun performing(): Command?
+    fun resetPerforming()
+    fun independentConnect(reason: String, callback: Callback?)
+    fun bolusInQueue(): Boolean
+    fun bolus(detailedBolusInfo: DetailedBolusInfo, callback: Callback?): Boolean
+    fun cancelAllBoluses()
+    fun stopPump(callback: Callback?)
+    fun startPump(callback: Callback?)
+    fun setTBROverNotification(callback: Callback?, enable: Boolean)
+    fun tempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, enforceNew: Boolean, profile: Profile, callback: Callback?): Boolean
+    fun tempBasalPercent(percent: Int, durationInMinutes: Int, enforceNew: Boolean, profile: Profile, callback: Callback?): Boolean
+    fun extendedBolus(insulin: Double, durationInMinutes: Int, callback: Callback?): Boolean
+    fun cancelTempBasal(enforceNew: Boolean, callback: Callback?): Boolean
+    fun cancelExtended(callback: Callback?): Boolean
+    fun setProfile(profile: Profile, callback: Callback?): Boolean
+    fun readStatus(reason: String, callback: Callback?): Boolean
+    fun statusInQueue(): Boolean
+    fun loadHistory(type: Byte, callback: Callback?): Boolean
+    fun setUserOptions(callback: Callback?): Boolean
+    fun loadTDDs(callback: Callback?): Boolean
+    fun loadEvents(callback: Callback?): Boolean
+    fun spannedStatus(): Spanned
+    fun isThisProfileSet(profile: Profile): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java b/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
index 417f02199d..4ce36b6abc 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
@@ -1,25 +1,21 @@
 package info.nightscout.androidaps.interfaces;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 
 /**
  * Created by mike on 19.03.2018.
  */
 
 public class Constraint<T extends Comparable> {
-    private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
+    private T value;
+    private T originalValue;
 
-    T value;
-    T originalValue;
-
-    List<String> reasons = new ArrayList<>();
-    List<String> mostLimiting = new ArrayList<>();
+    private List<String> reasons = new ArrayList<>();
+    private List<String> mostLimiting = new ArrayList<>();
 
     public Constraint(T value) {
         this.value = value;
@@ -34,27 +30,24 @@ public class Constraint<T extends Comparable> {
         return originalValue;
     }
 
-    public Constraint<T> set(T value) {
+    public Constraint<T> set(AAPSLogger aapsLogger, T value) {
         this.value = value;
         this.originalValue = value;
-        if (L.isEnabled(L.CONSTRAINTS))
-            log.debug("Setting value " + value);
+        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value " + value);
         return this;
     }
 
-    public Constraint<T> set(T value, String reason, Object from) {
-        if (L.isEnabled(L.CONSTRAINTS))
-            log.debug("Setting value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
+    public Constraint<T> set(AAPSLogger aapsLogger, T value, String reason, Object from) {
+        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
         this.value = value;
         addReason(reason, from);
         addMostLimingReason(reason, from);
         return this;
     }
 
-    public Constraint<T> setIfDifferent(T value, String reason, Object from) {
+    public Constraint<T> setIfDifferent(AAPSLogger aapsLogger, T value, String reason, Object from) {
         if (!this.value.equals(value)) {
-            if (L.isEnabled(L.CONSTRAINTS))
-                log.debug("Setting because of different value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of different value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
             this.value = value;
             addReason(reason, from);
             addMostLimingReason(reason, from);
@@ -62,10 +55,9 @@ public class Constraint<T extends Comparable> {
         return this;
     }
 
-    public Constraint<T> setIfSmaller(T value, String reason, Object from) {
+    public Constraint<T> setIfSmaller(AAPSLogger aapsLogger, T value, String reason, Object from) {
         if (value.compareTo(this.value) < 0) {
-            if (L.isEnabled(L.CONSTRAINTS))
-                log.debug("Setting because of smaller value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of smaller value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
             this.value = value;
             mostLimiting.clear();
             addMostLimingReason(reason, from);
@@ -76,10 +68,9 @@ public class Constraint<T extends Comparable> {
         return this;
     }
 
-    public Constraint<T> setIfGreater(T value, String reason, Object from) {
+    public Constraint<T> setIfGreater(AAPSLogger aapsLogger, T value, String reason, Object from) {
         if (value.compareTo(this.value) > 0) {
-            if (L.isEnabled(L.CONSTRAINTS))
-                log.debug("Setting because of greater value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of greater value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]");
             this.value = value;
             mostLimiting.clear();
             addMostLimingReason(reason, from);
@@ -104,15 +95,14 @@ public class Constraint<T extends Comparable> {
         return this;
     }
 
-    public String getReasons() {
+    public String getReasons(AAPSLogger aapsLogger) {
         StringBuilder sb = new StringBuilder();
         int count = 0;
         for (String r : reasons) {
             if (count++ != 0) sb.append("\n");
             sb.append(r);
         }
-        if (L.isEnabled(L.CONSTRAINTS))
-            log.debug("Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
         return sb.toString();
     }
 
@@ -120,15 +110,14 @@ public class Constraint<T extends Comparable> {
         return reasons;
     }
 
-    public String getMostLimitedReasons() {
+    public String getMostLimitedReasons(AAPSLogger aapsLogger) {
         StringBuilder sb = new StringBuilder();
         int count = 0;
         for (String r : mostLimiting) {
             if (count++ != 0) sb.append("\n");
             sb.append(r);
         }
-        if (L.isEnabled(L.CONSTRAINTS))
-            log.debug("Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
         return sb.toString();
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
deleted file mode 100644
index 14b2d549af..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import info.nightscout.androidaps.data.Profile;
-
-/**
- * Created by mike on 15.06.2016.
- */
-public interface ConstraintsInterface {
-
-    default Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isUAMEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isAdvancedFilteringEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Boolean> isSuperBolusEnabled(Constraint<Boolean> value) {
-        return value;
-    }
-
-    default Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
-        return absoluteRate;
-    }
-
-    default Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
-        return percentRate;
-    }
-
-    default Constraint<Double>  applyBolusConstraints(Constraint<Double>  insulin) {
-        return insulin;
-    }
-
-    default Constraint<Double>  applyExtendedBolusConstraints(Constraint<Double>  insulin) {
-        return insulin;
-    }
-
-    default Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
-        return carbs;
-    }
-
-    default Constraint<Double> applyMaxIOBConstraints(Constraint<Double> maxIob) {
-        return maxIob;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt
new file mode 100644
index 0000000000..0634bbb139
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt
@@ -0,0 +1,79 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.data.Profile
+
+/**
+ * Created by mike on 15.06.2016.
+ */
+interface ConstraintsInterface {
+
+    @JvmDefault
+    fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        return value
+    }
+
+    @JvmDefault
+    fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
+        return absoluteRate
+    }
+
+    @JvmDefault
+    fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
+        return percentRate
+    }
+
+    @JvmDefault
+    fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        return insulin
+    }
+
+    @JvmDefault
+    fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        return insulin
+    }
+
+    @JvmDefault
+    fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> {
+        return carbs
+    }
+
+    @JvmDefault
+    fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
+        return maxIob
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java b/app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
index 6fac33cba4..0d8b5abb49 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.interfaces;
 
+import dagger.android.HasAndroidInjector;
+
 /**
  * Created by mike on 21.05.2017.
  */
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
deleted file mode 100644
index e236125255..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import android.os.SystemClock;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-
-import androidx.fragment.app.FragmentActivity;
-
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.EventConfigBuilderUpdateGui;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 09.06.2016.
- */
-public abstract class PluginBase {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-
-    public enum State {
-        NOT_INITIALIZED,
-        ENABLED,
-        DISABLED
-    }
-
-    private State state = State.NOT_INITIALIZED;
-    private boolean isFragmentVisible = false;
-    public PluginDescription pluginDescription;
-
-
-    // Specific plugin with more Interfaces
-    protected boolean isProfileInterfaceEnabled = false;
-
-    public PluginBase(PluginDescription pluginDescription) {
-        this.pluginDescription = pluginDescription;
-    }
-
-    // Default always calls invoke
-    // Plugins that have special constraints if they get switched to may override this method
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        performPluginSwitch(newState, type);
-    }
-
-    protected void confirmPumpPluginActivation(boolean newState, FragmentActivity activity, PluginType type) {
-        if (type == PluginType.PUMP) {
-            boolean allowHardwarePump = SP.getBoolean("allow_hardware_pump", false);
-            if (allowHardwarePump || activity == null) {
-                performPluginSwitch(newState, type);
-            } else {
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.allow_hardware_pump_text), () -> {
-                    performPluginSwitch(newState, type);
-                    SP.putBoolean("allow_hardware_pump", true);
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("First time HW pump allowed!");
-                }, () -> {
-                    RxBus.INSTANCE.send(new EventConfigBuilderUpdateGui());
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("User does not allow switching to HW pump!");
-                });
-            }
-        } else {
-            performPluginSwitch(newState, type);
-        }
-    }
-
-    private void performPluginSwitch(boolean enabled, PluginType type) {
-        setPluginEnabled(type, enabled);
-        setFragmentVisible(type, enabled);
-        ConfigBuilderPlugin.getPlugin().processOnEnabledCategoryChanged(this, getType());
-        ConfigBuilderPlugin.getPlugin().storeSettings("CheckedCheckboxEnabled");
-        RxBus.INSTANCE.send(new EventRebuildTabs());
-        RxBus.INSTANCE.send(new EventConfigBuilderChange());
-        RxBus.INSTANCE.send(new EventConfigBuilderUpdateGui());
-        ConfigBuilderPlugin.getPlugin().logPluginStatus();
-    }
-
-    public String getName() {
-        if (pluginDescription.pluginName == -1)
-            return "UKNOWN";
-        else
-            return MainApp.gs(pluginDescription.pluginName);
-    }
-
-    public String getNameShort() {
-        if (pluginDescription.shortName == -1)
-            return getName();
-        String name = MainApp.gs(pluginDescription.shortName);
-        if (!name.trim().isEmpty()) //only if translation exists
-            return name;
-        // use long name as fallback
-        return getName();
-    }
-
-    public String getDescription() {
-        if (pluginDescription.description == -1) return null;
-        else return MainApp.gs(pluginDescription.description);
-    }
-
-    public PluginType getType() {
-        return pluginDescription.mainType;
-    }
-
-    public int getPreferencesId() {
-        return pluginDescription.preferencesId;
-    }
-
-    public boolean isEnabled(PluginType type) {
-        if (pluginDescription.alwaysEnabled && type == pluginDescription.mainType)
-            return true;
-        if (pluginDescription.mainType == PluginType.CONSTRAINTS && type == PluginType.CONSTRAINTS)
-            return true;
-        if (type == pluginDescription.mainType)
-            return state == State.ENABLED && specialEnableCondition();
-        if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.PUMP && isEnabled(PluginType.PUMP))
-            return true;
-        if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.APS && isEnabled(PluginType.APS))
-            return true;
-        if (type == PluginType.PROFILE && pluginDescription.mainType == PluginType.PUMP)
-            return isProfileInterfaceEnabled;
-        return false;
-    }
-
-    public boolean hasFragment() {
-        return pluginDescription.fragmentClass != null;
-    }
-
-
-    /**
-     * So far plugin can have it's main type + ConstraintInterface + ProfileInterface
-     * ConstraintInterface is enabled if main plugin is enabled
-     * ProfileInterface can be enabled only  if main iterface is enable
-     */
-
-    public void setPluginEnabled(PluginType type, boolean newState) {
-        if (type == pluginDescription.mainType) {
-            if (newState == true) { // enabling plugin
-                if (state != State.ENABLED) {
-                    onStateChange(type, state, State.ENABLED);
-                    state = State.ENABLED;
-                    if (L.isEnabled(L.CORE))
-                        log.debug("Starting: " + getName());
-                    onStart();
-                }
-            } else { // disabling plugin
-                if (state == State.ENABLED) {
-                    onStateChange(type, state, State.DISABLED);
-                    state = State.DISABLED;
-                    onStop();
-                    if (L.isEnabled(L.CORE))
-                        log.debug("Stopping: " + getName());
-                }
-            }
-        } else if (type == PluginType.PROFILE) {
-            isProfileInterfaceEnabled = newState;
-        }
-
-    }
-
-    public void setFragmentVisible(PluginType type, boolean fragmentVisible) {
-        if (type == pluginDescription.mainType) {
-            isFragmentVisible = fragmentVisible && specialEnableCondition();
-        }
-    }
-
-    public boolean isFragmentVisible() {
-        if (pluginDescription.alwaysVisible)
-            return true;
-        if (pluginDescription.neverVisible)
-            return false;
-        return isFragmentVisible;
-    }
-
-    public boolean showInList(PluginType type) {
-        if (pluginDescription.mainType == type)
-            return pluginDescription.showInList && specialShowInListCondition();
-
-        if (type == PluginType.PROFILE && pluginDescription.mainType == PluginType.PUMP)
-            return isEnabled(PluginType.PUMP);
-        return false;
-    }
-
-    public boolean specialEnableCondition() {
-        return true;
-    }
-
-    public boolean specialShowInListCondition() {
-        return true;
-    }
-
-    protected void onStart() {
-        if (getType() == PluginType.PUMP) {
-            new Thread(() -> {
-                SystemClock.sleep(3000);
-                CommandQueue commandQueue = ConfigBuilderPlugin.getPlugin().getCommandQueue();
-                if (commandQueue != null)
-                    commandQueue.readStatus("Pump driver changed.", null);
-            }).start();
-        }
-    }
-
-    protected void onStop() {
-    }
-
-    protected void onStateChange(PluginType type, State oldState, State newState) {
-    }
-
-    public void preprocessPreferences(@NotNull final PreferenceFragment preferenceFragment) {
-    }
-
-    public void updatePreferenceSummary(@NotNull final Preference pref) {
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
new file mode 100644
index 0000000000..cf37234a7d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
@@ -0,0 +1,119 @@
+package info.nightscout.androidaps.interfaces
+
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+/**
+ * Created by mike on 09.06.2016.
+ */
+abstract class PluginBase(
+    val pluginDescription: PluginDescription,
+    val aapsLogger: AAPSLogger,
+    val resourceHelper: ResourceHelper,
+    val injector: HasAndroidInjector
+) {
+
+    enum class State {
+        NOT_INITIALIZED, ENABLED, DISABLED
+    }
+
+    private var state = State.NOT_INITIALIZED
+    private var fragmentVisible = false
+
+    open val name: String
+        get() = if (pluginDescription.pluginName == -1) "UNKNOWN" else resourceHelper.gs(pluginDescription.pluginName)
+
+    //only if translation exists
+    // use long name as fallback
+    val nameShort: String
+        get() {
+            if (pluginDescription.shortName == -1) return name
+            val translatedName = resourceHelper.gs(pluginDescription.shortName)
+            return if (!translatedName.trim { it <= ' ' }.isEmpty()) translatedName else name
+            // use long name as fallback
+        }
+
+    val description: String?
+        get() = if (pluginDescription.description == -1) null else resourceHelper.gs(pluginDescription.description)
+
+    fun getType(): PluginType = pluginDescription.mainType
+
+    open val preferencesId: Int
+        get() = pluginDescription.preferencesId
+
+    fun isEnabled() = isEnabled(pluginDescription.mainType)
+
+    fun isEnabled(type: PluginType): Boolean {
+        if (pluginDescription.alwaysEnabled && type == pluginDescription.mainType) return true
+        if (pluginDescription.mainType == PluginType.CONSTRAINTS && type == PluginType.CONSTRAINTS) return true
+        if (type == pluginDescription.mainType) return state == State.ENABLED && specialEnableCondition()
+        if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.PUMP && isEnabled(PluginType.PUMP)) return true
+        if (type == PluginType.CONSTRAINTS && pluginDescription.mainType == PluginType.APS && isEnabled(PluginType.APS)) return true
+        return false
+    }
+
+    fun hasFragment(): Boolean {
+        return pluginDescription.fragmentClass != null
+    }
+
+    fun isDefault() = pluginDescription.defaultPlugin
+
+    /**
+     * So far plugin can have it's main type + ConstraintInterface + ProfileInterface
+     * ConstraintInterface is enabled if main plugin is enabled
+     * ProfileInterface can be enabled only  if main iterface is enable
+     */
+    fun setPluginEnabled(type: PluginType, newState: Boolean) {
+        if (type == pluginDescription.mainType) {
+            if (newState) { // enabling plugin
+                if (state != State.ENABLED) {
+                    onStateChange(type, state, State.ENABLED)
+                    state = State.ENABLED
+                    aapsLogger.debug(LTag.CORE, "Starting: $name")
+                    onStart()
+                }
+            } else { // disabling plugin
+                if (state == State.ENABLED) {
+                    onStateChange(type, state, State.DISABLED)
+                    state = State.DISABLED
+                    onStop()
+                    aapsLogger.debug(LTag.CORE, "Stopping: $name")
+                }
+            }
+        }
+    }
+
+    fun setFragmentVisible(type: PluginType, fragmentVisible: Boolean) {
+        if (type == pluginDescription.mainType) {
+            this.fragmentVisible = fragmentVisible && specialEnableCondition()
+        }
+    }
+
+    fun isFragmentVisible(): Boolean {
+        if (pluginDescription.alwaysVisible) return true
+        return if (pluginDescription.neverVisible) false else fragmentVisible
+    }
+
+    fun showInList(type: PluginType): Boolean {
+        if (pluginDescription.mainType == type) return pluginDescription.showInList && specialShowInListCondition()
+        return if (type == PluginType.PROFILE && pluginDescription.mainType == PluginType.PUMP) isEnabled(PluginType.PUMP) else false
+    }
+
+    open fun specialEnableCondition(): Boolean {
+        return true
+    }
+
+    open fun specialShowInListCondition(): Boolean {
+        return true
+    }
+
+    protected open fun onStart() {}
+    protected open fun onStop() {}
+    protected open fun onStateChange(type: PluginType?, oldState: State?, newState: State?) {}
+    open fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {}
+    open fun updatePreferenceSummary(pref: Preference) {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
index 2929d3f21b..3b753b1743 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
@@ -13,6 +13,7 @@ public class PluginDescription {
     int preferencesId = -1;
     public boolean enableByDefault = false;
     public boolean visibleByDefault = false;
+    boolean defaultPlugin = false;
 
     public PluginDescription mainType(PluginType mainType) {
         this.mainType = mainType;
@@ -74,6 +75,11 @@ public class PluginDescription {
         return this;
     }
 
+    public PluginDescription setDefault() {
+        defaultPlugin = true;
+        return this;
+    }
+
     public String getFragmentClass() {
         return fragmentClass;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index 025f10076d..aab6d4089a 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -1,9 +1,12 @@
 package info.nightscout.androidaps.interfaces;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -40,6 +43,7 @@ public interface PumpInterface {
     void getPumpStatus();
 
     // Upload to pump new basal profile
+    @NotNull
     PumpEnactResult setNewBasalProfile(Profile profile);
 
     boolean isThisProfileSet(Profile profile);
@@ -52,43 +56,57 @@ public interface PumpInterface {
 
     int getBatteryLevel();  // in percent as integer
 
+    @NotNull
     PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo);
 
     void stopBolusDelivering();
 
+    @NotNull
     PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew);
 
+    @NotNull
     PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew);
 
+    @NotNull
     PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes);
 
     //some pumps might set a very short temp close to 100% as cancelling a temp can be noisy
     //when the cancel request is requested by the user (forced), the pump should always do a real cancel
+    @NotNull
     PumpEnactResult cancelTempBasal(boolean enforceNew);
 
+    @NotNull
     PumpEnactResult cancelExtendedBolus();
 
     // Status to be passed to NS
+    @NotNull
     JSONObject getJSONStatus(Profile profile, String profileName);
 
+    @NotNull
     ManufacturerType manufacturer();
 
+    @NotNull
     PumpType model();
 
+    @NotNull
     String serialNumber();
 
     // Pump capabilities
+    @NotNull
     PumpDescription getPumpDescription();
 
     // Short info for SMS, Wear etc
+    @NotNull
     String shortStatus(boolean veryShort);
 
     boolean isFakingTempsByExtendedBoluses();
 
+    @NotNull
     PumpEnactResult loadTDDs();
 
     boolean canHandleDST();
 
+    @Nullable
     List<CustomAction> getCustomActions();
 
     void executeCustomAction(CustomActionType customActionType);
@@ -98,5 +116,4 @@ public interface PumpInterface {
      * example update clock on pump).
      */
     void timeDateOrTimeZoneChanged();
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
new file mode 100644
index 0000000000..c4e2384e90
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.interfaces
+
+import android.os.SystemClock
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+abstract class PumpPluginBase(
+    pluginDescription: PluginDescription,
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    val commandQueue: CommandQueueProvider
+) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector) {
+
+    override fun onStart() {
+        super.onStart()
+        if (getType() == PluginType.PUMP) {
+            Thread(Runnable {
+                SystemClock.sleep(3000)
+                commandQueue.readStatus("Pump driver changed.", null)
+            }).start()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
index cbdd5d696a..98441f8a7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
@@ -1,19 +1,21 @@
 package info.nightscout.androidaps.interfaces;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
-import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileIntervals;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.data.Intervals;
-import info.nightscout.androidaps.data.ProfileIntervals;
 
 /**
  * Created by mike on 14.06.2016.
@@ -28,8 +30,6 @@ public interface TreatmentsInterface {
     IobTotal getLastCalculationTempBasals();
     IobTotal getCalculationToTimeTempBasals(long time);
 
-    MealData getMealData();
-
     List<Treatment> getTreatmentsFromHistory();
     List<Treatment> getCarbTreatments5MinBackFromHistory(long time);
     List<Treatment> getTreatmentsFromHistoryAfterTimestamp(long timestamp);
@@ -62,6 +62,8 @@ public interface TreatmentsInterface {
     ProfileSwitch getProfileSwitchFromHistory(long time);
     ProfileIntervals<ProfileSwitch> getProfileSwitchesFromHistory();
     void addToHistoryProfileSwitch(ProfileSwitch profileSwitch);
+    void doProfileSwitch(@NotNull final ProfileStore profileStore, @NotNull final String profileName, final int duration, final int percentage, final int timeShift, final long date);
+    void doProfileSwitch(final int duration, final int percentage, final int timeShift);
 
     long oldestDataAvailable();
 
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLogger.kt b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLogger.kt
new file mode 100644
index 0000000000..8c24805261
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLogger.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.logging
+
+/**
+ * Created by adrian on 2019-12-27.
+ */
+
+interface AAPSLogger {
+
+    fun debug(message: String)
+    fun debug(enable: Boolean, tag: LTag, message: String)
+    fun debug(tag: LTag, message: String)
+    fun debug(tag: LTag, format: String, vararg arguments: Any?)
+    fun warn(tag: LTag, message: String)
+    fun info(tag: LTag, message: String)
+    fun info(tag: LTag, format: String, vararg arguments: Any?)
+    fun error(tag: LTag, message: String)
+    fun error(tag: LTag, message: String, throwable: Throwable)
+    fun error(tag: LTag, format: String, vararg arguments: Any?)
+    fun error(message: String)
+    fun error(message: String, throwable: Throwable)
+    fun error(format: String, vararg arguments: Any?)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerDebug.kt b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerDebug.kt
new file mode 100644
index 0000000000..b930eb4728
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerDebug.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.logging
+
+import android.util.Log
+
+/**
+ * Created by adrian on 2019-12-27.
+ */
+
+class AAPSLoggerDebug : AAPSLogger {
+
+    override fun debug(message: String) {
+        Log.d(LTag.CORE.tag, message)
+    }
+
+    override fun debug(enable: Boolean, tag: LTag, message: String) {
+        if (enable) Log.d(LTag.CORE.tag, message)
+    }
+
+    override fun debug(tag: LTag, message: String) {
+        Log.d(tag.tag, message)
+    }
+
+    override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
+        Log.d(tag.tag, String.format(format, arguments))
+    }
+
+    override fun warn(tag: LTag, message: String) {
+        Log.w(tag.tag, message)
+    }
+
+    override fun info(tag: LTag, message: String) {
+        Log.i(tag.tag, message)
+    }
+
+    override fun info(tag: LTag, format: String, vararg arguments: Any?) {
+        Log.i(tag.tag, String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String) {
+        Log.e(tag.tag, message)
+
+    }
+
+    override fun error(message: String) {
+        Log.e(LTag.CORE.tag, message)
+    }
+
+    override fun error(message: String, throwable: Throwable) {
+        Log.e(LTag.CORE.tag, message, throwable)
+    }
+
+    override fun error(format: String, vararg arguments: Any?) {
+        Log.e(LTag.CORE.tag, String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String, throwable: Throwable) {
+        Log.e(tag.tag, message, throwable)
+
+    }
+
+    override fun error(tag: LTag, format: String, vararg arguments: Any?) {
+        Log.e(tag.tag, String.format(format, arguments))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt
new file mode 100644
index 0000000000..27b0946749
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt
@@ -0,0 +1,84 @@
+package info.nightscout.androidaps.logging
+
+import org.slf4j.LoggerFactory
+
+/**
+ * Created by adrian on 2019-12-27.
+ */
+
+class AAPSLoggerProduction : AAPSLogger {
+
+    override fun debug(message: String) {
+        LoggerFactory.getLogger(LTag.CORE.tag).debug(stackLogMarker() + message)
+    }
+
+    override fun debug(enable: Boolean, tag: LTag, message: String) {
+        if (enable && L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
+        }
+    }
+
+    override fun debug(tag: LTag, message: String) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
+        }
+    }
+
+    override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
+        if (L.isEnabled(tag.tag))
+            LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + String.format(format, arguments))
+    }
+
+    override fun warn(tag: LTag, message: String) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).warn(stackLogMarker() + message)
+        }
+    }
+
+    override fun info(tag: LTag, message: String) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + message)
+
+        }
+    }
+
+    override fun info(tag: LTag, format: String, vararg arguments: Any?) {
+        LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message)
+        }
+    }
+
+    override fun error(message: String) {
+        LoggerFactory.getLogger(LTag.CORE.tag).error(stackLogMarker() + message)
+    }
+
+    override fun error(message: String, throwable: Throwable) {
+        LoggerFactory.getLogger(LTag.CORE.tag).error(stackLogMarker() + message, throwable)
+    }
+
+    override fun error(format: String, vararg arguments: Any?) {
+        LoggerFactory.getLogger(LTag.CORE.tag).error(stackLogMarker() + String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String, throwable: Throwable) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message, throwable)
+        }
+    }
+
+    override fun error(tag: LTag, format: String, vararg arguments: Any?) {
+        if (L.isEnabled(tag.tag)) {
+            LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + String.format(format, arguments))
+        }
+    }
+}
+
+fun StackTraceElement.toLogString(): String = "[${this.className.substringAfterLast(".")}.${this.methodName}():${this.lineNumber}]: "
+
+/* Needs to be inline. Don't remove even if IDE suggests it. */
+@Suppress("NOTHING_TO_INLINE")
+inline fun stackLogMarker() = Throwable().stackTrace[1].toLogString()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerTest.kt b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerTest.kt
new file mode 100644
index 0000000000..0503db143f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerTest.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.logging
+
+/**
+ * Created by adrian on 2019-12-27.
+ */
+
+class AAPSLoggerTest : AAPSLogger {
+
+    override fun debug(message: String) {
+        println("DEBUG: $message")
+    }
+
+    override fun debug(enable: Boolean, tag: LTag, message: String) {
+        println("DEBUG: " + message)
+    }
+
+    override fun debug(tag: LTag, message: String) {
+        println("DEBUG: : " + tag.tag + " " + message)
+    }
+
+    override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
+        println("DEBUG: : " + tag.tag + " " + String.format(format, arguments))
+    }
+
+    override fun warn(tag: LTag, message: String) {
+        println("WARN: " + tag.tag + " " + message)
+    }
+
+    override fun info(tag: LTag, message: String) {
+        println("INFO: " + tag.tag + " " + message)
+    }
+
+    override fun info(tag: LTag, format: String, vararg arguments: Any?) {
+        println("INFO: : " + tag.tag + " " + String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String) {
+        println("ERROR: " + tag.tag + " " + message)
+    }
+
+    override fun error(message: String) {
+        println("ERROR: " + message)
+    }
+
+    override fun error(message: String, throwable: Throwable) {
+        println("ERROR: " + message + " " + throwable)
+    }
+
+    override fun error(format: String, vararg arguments: Any?) {
+        println("ERROR: : " + String.format(format, arguments))
+    }
+
+    override fun error(tag: LTag, message: String, throwable: Throwable) {
+        println("ERROR: " + tag.tag + " " + message + " " + throwable)
+    }
+
+    override fun error(tag: LTag, format: String, vararg arguments: Any?) {
+        println("ERROR: : " + tag.tag + " " + String.format(format, arguments))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/L.java b/app/src/main/java/info/nightscout/androidaps/logging/L.java
deleted file mode 100644
index 25b6750844..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/logging/L.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package info.nightscout.androidaps.logging;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.utils.SP;
-
-public class L {
-
-    public static class LogElement {
-        public String name;
-        boolean defaultValue;
-        public boolean enabled;
-        boolean requiresRestart = false;
-
-        LogElement(String name, boolean defaultValue) {
-            this.name = name;
-            this.defaultValue = defaultValue;
-            enabled = SP.getBoolean(getSPName(), defaultValue);
-        }
-
-        LogElement(String name, boolean defaultValue, boolean requiresRestart) {
-            this.name = name;
-            this.defaultValue = defaultValue;
-            this.requiresRestart = requiresRestart;
-            enabled = SP.getBoolean(getSPName(), defaultValue);
-        }
-
-        LogElement(boolean defaultValue) {
-            this.name = "NONEXISTING";
-            this.defaultValue = defaultValue;
-            enabled = defaultValue;
-        }
-
-        private String getSPName() {
-            return "log_" + name;
-        }
-
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-            SP.putBoolean(getSPName(), enabled);
-        }
-
-        void resetToDefault() {
-            setEnabled(defaultValue);
-        }
-    }
-
-    private static List<LogElement> logElements;
-
-    static {
-        initialize();
-    }
-
-    private static LogElement findByName(String name) {
-        for (LogElement element : logElements) {
-            if (element.name.equals(name))
-                return element;
-        }
-        return new LogElement(false);
-    }
-
-    public static boolean isEnabled(String name) {
-        return findByName(name).enabled;
-    }
-
-    public static List<LogElement> getLogElements() {
-        return logElements;
-    }
-
-    public static void resetToDefaults() {
-        for (LogElement element : logElements) {
-            element.resetToDefault();
-        }
-    }
-
-
-    public static final String CORE = "CORE";
-    public static final String AUTOSENS = "AUTOSENS";
-    public static final String AUTOMATION = "AUTOMATION";
-    public static final String EVENTS = "EVENTS";
-    public static final String GLUCOSE = "GLUCOSE";
-    public static final String BGSOURCE = "BGSOURCE";
-    public static final String OVERVIEW = "OVERVIEW";
-    public static final String NOTIFICATION = "NOTIFICATION";
-    public static final String DATASERVICE = "DATASERVICE";
-    public static final String DATABASE = "DATABASE";
-    public static final String DATAFOOD = "DATAFOOD";
-    public static final String DATATREATMENTS = "DATATREATMENTS";
-    public static final String NSCLIENT = "NSCLIENT";
-    public static final String TIDEPOOL = "TIDEPOOL";
-    public static final String CONSTRAINTS = "CONSTRAINTS";
-    public static final String PUMP = "PUMP";
-    public static final String PUMPQUEUE = "PUMPQUEUE";
-    public static final String PUMPCOMM = "PUMPCOMM";
-    public static final String PUMPBTCOMM = "PUMPBTCOMM";
-    public static final String APS = "APS";
-    public static final String PROFILE = "PROFILE";
-    public static final String CONFIGBUILDER = "CONFIGBUILDER";
-    public static final String UI = "UI";
-    public static final String LOCATION = "LOCATION";
-    public static final String SMS = "SMS";
-
-    private static void initialize() {
-        logElements = new ArrayList<>();
-        logElements.add(new LogElement(APS, true));
-        logElements.add(new LogElement(AUTOMATION, true));
-        logElements.add(new LogElement(AUTOSENS, false));
-        logElements.add(new LogElement(BGSOURCE, true));
-        logElements.add(new LogElement(GLUCOSE, false));
-        logElements.add(new LogElement(CONFIGBUILDER, false));
-        logElements.add(new LogElement(CONSTRAINTS, true));
-        logElements.add(new LogElement(CORE, true));
-        logElements.add(new LogElement(DATABASE, true));
-        logElements.add(new LogElement(DATAFOOD, false));
-        logElements.add(new LogElement(DATASERVICE, true));
-        logElements.add(new LogElement(DATATREATMENTS, true));
-        logElements.add(new LogElement(EVENTS, false, true));
-        logElements.add(new LogElement(LOCATION, true));
-        logElements.add(new LogElement(NOTIFICATION, true));
-        logElements.add(new LogElement(NSCLIENT, true));
-        logElements.add(new LogElement(TIDEPOOL, true));
-        logElements.add(new LogElement(OVERVIEW, true));
-        logElements.add(new LogElement(PROFILE, true));
-        logElements.add(new LogElement(PUMP, true));
-        logElements.add(new LogElement(PUMPBTCOMM, false));
-        logElements.add(new LogElement(PUMPCOMM, true));
-        logElements.add(new LogElement(PUMPQUEUE, true));
-        logElements.add(new LogElement(SMS, true));
-        logElements.add(new LogElement(UI, true));
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/L.kt b/app/src/main/java/info/nightscout/androidaps/logging/L.kt
new file mode 100644
index 0000000000..2411e76c5e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/L.kt
@@ -0,0 +1,80 @@
+package info.nightscout.androidaps.logging
+
+import androidx.preference.PreferenceManager
+import info.nightscout.androidaps.MainApp
+import java.util.*
+
+object L {
+    private var logElements: MutableList<LogElement> = ArrayList()
+
+    const val CORE = "CORE"
+    const val BGSOURCE = "BGSOURCE"
+    const val DATASERVICE = "DATASERVICE"
+    const val DATABASE = "DATABASE"
+    const val DATAFOOD = "DATAFOOD"
+    const val DATATREATMENTS = "DATATREATMENTS"
+    const val NSCLIENT = "NSCLIENT"
+    const val PUMP = "PUMP"
+    const val PUMPCOMM = "PUMPCOMM"
+    const val PUMPBTCOMM = "PUMPBTCOMM"
+
+    init {
+        LTag.values().forEach { logElements.add(LogElement(it)) }
+    }
+
+    private fun findByName(name: String): LogElement {
+        for (element in logElements) {
+            if (element.name == name) return element
+        }
+        return LogElement(false)
+    }
+
+    @JvmStatic
+    fun isEnabled(name: String): Boolean {
+        return findByName(name).enabled
+    }
+
+    fun getLogElements(): List<LogElement> {
+        return logElements
+    }
+
+    fun resetToDefaults() {
+        for (element in logElements) {
+            element.resetToDefault()
+        }
+    }
+
+    class LogElement {
+        var name: String
+        var defaultValue: Boolean
+        var enabled: Boolean
+        private var requiresRestart = false
+
+        internal constructor(tag: LTag) {
+            this.name = tag.tag
+            this.defaultValue = tag.defaultValue
+            this.requiresRestart = tag.requiresRestart
+            //TODO: remove after getting rid of old logging style "if (L.isEnabled(...))"
+            @Suppress("DEPRECATION")
+            enabled = PreferenceManager.getDefaultSharedPreferences(MainApp.instance()).getBoolean(getSPName(), defaultValue)
+        }
+
+        internal constructor(defaultValue: Boolean) {
+            name = "NONEXISTING"
+            this.defaultValue = defaultValue
+            enabled = defaultValue
+        }
+
+        private fun getSPName(): String = "log_$name"
+
+        fun enable(enabled: Boolean) {
+            this.enabled = enabled
+            @Suppress("DEPRECATION")
+            PreferenceManager.getDefaultSharedPreferences(MainApp.instance()).edit().putBoolean(getSPName(), enabled).apply()
+        }
+
+        fun resetToDefault() {
+            enable(defaultValue)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/LTag.kt b/app/src/main/java/info/nightscout/androidaps/logging/LTag.kt
new file mode 100644
index 0000000000..fc88377d6b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/LTag.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.logging
+
+enum class LTag(val tag: String, val defaultValue : Boolean = true, val requiresRestart: Boolean = false) {
+    CORE("CORE"),
+    APS("APS"),
+    AUTOSENS("AUTOSENS", defaultValue = false),
+    AUTOMATION("AUTOMATION"),
+    BGSOURCE("BGSOURCE"),
+    CONFIGBUILDER("CONFIGBUILDER"),
+    CONSTRAINTS("CONSTRAINTS"),
+    DATABASE("DATABASE"),
+    DATAFOOD("DATAFOOD", defaultValue = false),
+    DATASERVICE("DATASERVICE"),
+    DATATREATMENTS("DATATREATMENTS"),
+    EVENTS("EVENTS", defaultValue = false, requiresRestart = true),
+    GLUCOSE("GLUCOSE"),
+    LOCATION("LOCATION"),
+    NOTIFICATION("NOTIFICATION"),
+    NSCLIENT("NSCLIENT"),
+    OVERVIEW("OVERVIEW", defaultValue = false),
+    PUMP("PUMP"),
+    PUMPBTCOMM("PUMPBTCOMM", defaultValue = false),
+    PUMPCOMM("PUMPCOMM"),
+    PUMPQUEUE("PUMPQUEUE"),
+    PROFILE("PROFILE"),
+    SMS("SMS"),
+    TIDEPOOL("TIDEPOOL"),
+    UI("UI", defaultValue = false),
+    WEAR("WEAR", defaultValue = false)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt b/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt
new file mode 100644
index 0000000000..0d724a5008
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.logging
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+/**
+ * Created by adrian on 2020-01-13.
+ */
+
+class StacktraceLoggerWrapper(private val delegate: Logger) : Logger by delegate {
+
+    override fun debug(msg: String?) {
+        delegate.debug(stackLogMarker() + msg)
+    }
+
+    override fun debug(format: String?, arg: Any?) {
+        delegate.debug(stackLogMarker() + format, arg)
+    }
+
+    override fun info(msg: String?) {
+        delegate.info(stackLogMarker() + msg)
+    }
+
+    override fun error(msg: String?) {
+        delegate.error(stackLogMarker() + msg)
+    }
+
+    override fun warn(msg: String?) {
+        delegate.warn(stackLogMarker() + msg)
+    }
+
+    // all other methods will be implemented by delegate
+
+    companion object {
+        @JvmStatic
+        @Deprecated("please inject AAPSLogger")
+        fun getLogger(name: String) = StacktraceLoggerWrapper(LoggerFactory.getLogger(name))
+
+        @JvmStatic
+        @Deprecated("please inject AAPSLogger")
+        fun getLogger(clazz: Class<*>) = StacktraceLoggerWrapper(LoggerFactory.getLogger(clazz))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 7e568af2d9..5ca88bfac0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -6,33 +6,48 @@ import android.text.Spanned;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 09.06.2016.
  */
 public class APSResult {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    @Inject HasAndroidInjector injector;
+    @Inject public AAPSLogger aapsLogger;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject SP sp;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject ProfileFunction profileFunction;
+    @Inject ResourceHelper resourceHelper;
+
+    @Inject
+    public APSResult(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+    }
 
     public long date = 0;
     public String reason;
@@ -86,68 +101,65 @@ public class APSResult {
 
     @Override
     public String toString() {
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        final PumpInterface pump = activePlugin.getActivePump();
         if (isChangeRequested()) {
             String ret;
             // rate
             if (rate == 0 && duration == 0)
-                ret = MainApp.gs(R.string.canceltemp) + "\n";
+                ret = resourceHelper.gs(R.string.canceltemp) + "\n";
             else if (rate == -1)
-                ret = MainApp.gs(R.string.let_temp_basal_run) + "\n";
+                ret = resourceHelper.gs(R.string.let_temp_basal_run) + "\n";
             else if (usePercent)
-                ret = MainApp.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(percent) + "% " +
+                ret = resourceHelper.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(percent) + "% " +
                         "(" + DecimalFormatter.to2Decimal(percent * pump.getBaseBasalRate() / 100d) + " U/h)\n" +
-                        MainApp.gs(R.string.duration) + ": " + DecimalFormatter.to2Decimal(duration) + " min\n";
+                        resourceHelper.gs(R.string.duration) + ": " + DecimalFormatter.to2Decimal(duration) + " min\n";
             else
-                ret = MainApp.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(rate) + " U/h " +
+                ret = resourceHelper.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(rate) + " U/h " +
                         "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%) \n" +
-                        MainApp.gs(R.string.duration) + ": " + DecimalFormatter.to2Decimal(duration) + " min\n";
+                        resourceHelper.gs(R.string.duration) + ": " + DecimalFormatter.to2Decimal(duration) + " min\n";
 
             // smb
             if (smb != 0)
-                ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U\n");
+                ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump()) + " U\n");
 
             // reason
-            ret += MainApp.gs(R.string.reason) + ": " + reason;
+            ret += resourceHelper.gs(R.string.reason) + ": " + reason;
             return ret;
         } else
-            return MainApp.gs(R.string.nochangerequested);
+            return resourceHelper.gs(R.string.nochangerequested);
     }
 
     public Spanned toSpanned() {
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        final PumpInterface pump = activePlugin.getActivePump();
         if (isChangeRequested()) {
             String ret;
             // rate
             if (rate == 0 && duration == 0)
-                ret = MainApp.gs(R.string.canceltemp) + "<br>";
+                ret = resourceHelper.gs(R.string.canceltemp) + "<br>";
             else if (rate == -1)
-                ret = MainApp.gs(R.string.let_temp_basal_run) + "<br>";
+                ret = resourceHelper.gs(R.string.let_temp_basal_run) + "<br>";
             else if (usePercent)
-                ret = "<b>" + MainApp.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(percent) + "% " +
+                ret = "<b>" + resourceHelper.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(percent) + "% " +
                         "(" + DecimalFormatter.to2Decimal(percent * pump.getBaseBasalRate() / 100d) + " U/h)<br>" +
-                        "<b>" + MainApp.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>";
+                        "<b>" + resourceHelper.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>";
             else
-                ret = "<b>" + MainApp.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
+                ret = "<b>" + resourceHelper.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
                         "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100d) + "%) <br>" +
-                        "<b>" + MainApp.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>";
+                        "<b>" + resourceHelper.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>";
 
             // smb
             if (smb != 0)
-                ret += ("<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U<br>");
+                ret += ("<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump()) + " U<br>");
 
             // reason
-            ret += "<b>" + MainApp.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
+            ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
             return Html.fromHtml(ret);
         } else
-            return Html.fromHtml(MainApp.gs(R.string.nochangerequested));
+            return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
     }
 
-    public APSResult() {
-    }
-
-    public APSResult clone() {
-        APSResult newResult = new APSResult();
+    public APSResult newAndClone(HasAndroidInjector injector) {
+        APSResult newResult = new APSResult(injector);
         doClone(newResult);
         return newResult;
     }
@@ -163,7 +175,7 @@ public class APSResult {
         try {
             newResult.json = new JSONObject(json.toString());
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         newResult.hasPredictions = hasPredictions;
         newResult.smb = smb;
@@ -184,7 +196,7 @@ public class APSResult {
                 json.put("reason", reason);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return json;
     }
@@ -247,7 +259,7 @@ public class APSResult {
                 }
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return array;
     }
@@ -280,66 +292,60 @@ public class APSResult {
                 }
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
         return latest;
     }
 
     public boolean isChangeRequested() {
-        Constraint<Boolean> closedLoopEnabled = MainApp.getConstraintChecker().isClosedLoopAllowed();
+        Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
         // closed loop mode: handle change at driver level
         if (closedLoopEnabled.value()) {
-            if (L.isEnabled(L.APS))
-                log.debug("DEFAULT: Closed mode");
+            aapsLogger.debug(LTag.APS, "DEFAULT: Closed mode");
             return tempBasalRequested || bolusRequested;
         }
 
         // open loop mode: try to limit request
         if (!tempBasalRequested && !bolusRequested) {
-            if (L.isEnabled(L.APS))
-                log.debug("FALSE: No request");
+            aapsLogger.debug(LTag.APS, "FALSE: No request");
             return false;
         }
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(now);
+        PumpInterface pump = activePlugin.getActivePump();
+        Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
-            log.error("FALSE: No Profile");
+            aapsLogger.error("FALSE: No Profile");
             return false;
         }
 
         if (usePercent) {
             if (activeTemp == null && percent == 100) {
-                if (L.isEnabled(L.APS))
-                    log.debug("FALSE: No temp running, asking cancel temp");
+                aapsLogger.debug(LTag.APS, "FALSE: No temp running, asking cancel temp");
                 return false;
             }
             if (activeTemp != null && Math.abs(percent - activeTemp.tempBasalConvertedToPercent(now, profile)) < pump.getPumpDescription().basalStep) {
-                if (L.isEnabled(L.APS))
-                    log.debug("FALSE: Temp equal");
+                aapsLogger.debug(LTag.APS, "FALSE: Temp equal");
                 return false;
             }
             // always report zerotemp
             if (percent == 0) {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Zero temp");
+                aapsLogger.debug(LTag.APS, "TRUE: Zero temp");
                 return true;
             }
             // always report hightemp
-            if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT) {
+            if (pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT) {
                 double pumpLimit = pump.getPumpDescription().pumpType.getTbrSettings().getMaxDose();
                 if (percent == pumpLimit) {
-                    if (L.isEnabled(L.APS))
-                        log.debug("TRUE: Pump limit");
+                    aapsLogger.debug(LTag.APS, "TRUE: Pump limit");
                     return true;
                 }
             }
             // report change bigger than 30%
-            double percentMinChangeChange = SP.getDouble(R.string.key_loop_openmode_min_change, 30d);
+            double percentMinChangeChange = sp.getDouble(R.string.key_loop_openmode_min_change, 30d);
             percentMinChangeChange /= 100d;
             double lowThreshold = 1 - percentMinChangeChange;
             double highThreshold = 1 + percentMinChangeChange;
@@ -348,42 +354,36 @@ public class APSResult {
                 change = percent / (double) activeTemp.tempBasalConvertedToPercent(now, profile);
 
             if (change < lowThreshold || change > highThreshold) {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Outside allowed range " + (change * 100d) + "%");
+                aapsLogger.debug(LTag.APS, "TRUE: Outside allowed range " + (change * 100d) + "%");
                 return true;
             } else {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Inside allowed range " + (change * 100d) + "%");
+                aapsLogger.debug(LTag.APS, "TRUE: Inside allowed range " + (change * 100d) + "%");
                 return false;
             }
         } else {
             if (activeTemp == null && rate == pump.getBaseBasalRate()) {
-                if (L.isEnabled(L.APS))
-                    log.debug("FALSE: No temp running, asking cancel temp");
+                aapsLogger.debug(LTag.APS, "FALSE: No temp running, asking cancel temp");
                 return false;
             }
             if (activeTemp != null && Math.abs(rate - activeTemp.tempBasalConvertedToAbsolute(now, profile)) < pump.getPumpDescription().basalStep) {
-                if (L.isEnabled(L.APS))
-                    log.debug("FALSE: Temp equal");
+                aapsLogger.debug(LTag.APS, "FALSE: Temp equal");
                 return false;
             }
             // always report zerotemp
             if (rate == 0) {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Zero temp");
+                aapsLogger.debug(LTag.APS, "TRUE: Zero temp");
                 return true;
             }
             // always report hightemp
-            if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
+            if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
                 double pumpLimit = pump.getPumpDescription().pumpType.getTbrSettings().getMaxDose();
                 if (rate == pumpLimit) {
-                    if (L.isEnabled(L.APS))
-                        log.debug("TRUE: Pump limit");
+                    aapsLogger.debug(LTag.APS, "TRUE: Pump limit");
                     return true;
                 }
             }
             // report change bigger than 30%
-            double percentMinChangeChange = SP.getDouble(R.string.key_loop_openmode_min_change, 30d);
+            double percentMinChangeChange = sp.getDouble(R.string.key_loop_openmode_min_change, 30d);
             percentMinChangeChange /= 100d;
             double lowThreshold = 1 - percentMinChangeChange;
             double highThreshold = 1 + percentMinChangeChange;
@@ -392,12 +392,10 @@ public class APSResult {
                 change = rate / activeTemp.tempBasalConvertedToAbsolute(now, profile);
 
             if (change < lowThreshold || change > highThreshold) {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Outside allowed range " + (change * 100d) + "%");
+                aapsLogger.debug(LTag.APS, "TRUE: Outside allowed range " + (change * 100d) + "%");
                 return true;
             } else {
-                if (L.isEnabled(L.APS))
-                    log.debug("TRUE: Inside allowed range " + (change * 100d) + "%");
+                aapsLogger.debug(LTag.APS, "TRUE: Inside allowed range " + (change * 100d) + "%");
                 return false;
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
index 26d7359efe..42f25cce8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /*
 {
@@ -365,7 +366,7 @@ import info.nightscout.androidaps.logging.L;
 */
 
 public class DeviceStatus {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
 
     public String device = null;
     public JSONObject pump = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
index b7549fcfed..5abe8c354b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@@ -1,23 +1,34 @@
 package info.nightscout.androidaps.plugins.aps.loop
 
-
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.loop_fragment.*
+import javax.inject.Inject
 
-class LoopFragment : Fragment() {
+class LoopFragment : DaggerFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var loopPlugin: LoopPlugin
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -30,35 +41,31 @@ class LoopFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         loop_run.setOnClickListener {
-            loop_lastrun.text = MainApp.gs(R.string.executing)
-            Thread { LoopPlugin.getPlugin().invoke("Loop button", true) }.start()
+            loop_lastrun.text = resourceHelper.gs(R.string.executing)
+            Thread { loopPlugin.invoke("Loop button", true) }.start()
         }
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable += RxBus
-                .toObservable(EventLoopUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateGUI()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventLoopUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateGUI()
+            }, { fabricPrivacy.logException(it) })
 
-        disposable += RxBus
-                .toObservable(EventLoopSetLastRunGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    clearGUI()
-                    loop_lastrun.text = it.text
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventLoopSetLastRunGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                clearGUI()
+                loop_lastrun?.text = it.text
+            }, { fabricPrivacy.logException(it) })
 
         updateGUI()
-        SP.putBoolean(R.string.key_objectiveuseloop, true)
+        sp.putBoolean(R.string.key_objectiveuseloop, true)
     }
 
     @Synchronized
@@ -70,40 +77,45 @@ class LoopFragment : Fragment() {
     @Synchronized
     fun updateGUI() {
         if (loop_request == null) return
-        LoopPlugin.lastRun?.let {
-            loop_request.text = it.request?.toSpanned() ?: ""
-            loop_constraintsprocessed.text = it.constraintsProcessed?.toSpanned() ?: ""
-            loop_source.text = it.source ?: ""
-            loop_lastrun.text = it.lastAPSRun?.let { lastRun -> DateUtil.dateAndTimeString(lastRun.time) }
-                    ?: ""
-            loop_lastenact.text = it.lastAPSRun?.let { lastEnact -> DateUtil.dateAndTimeString(lastEnact.time) }
-                    ?: ""
-            loop_tbrsetbypump.text = it.tbrSetByPump?.let { tbrSetByPump -> HtmlHelper.fromHtml(tbrSetByPump.toHtml()) }
-                    ?: ""
-            loop_smbsetbypump.text = it.smbSetByPump?.let { smbSetByPump -> HtmlHelper.fromHtml(smbSetByPump.toHtml()) }
-                    ?: ""
+        loopPlugin.lastRun?.let {
+            loop_request?.text = it.request?.toSpanned() ?: ""
+            loop_constraintsprocessed?.text = it.constraintsProcessed?.toSpanned() ?: ""
+            loop_source?.text = it.source ?: ""
+            loop_lastrun?.text = it.lastAPSRun?.let { lastRun -> DateUtil.dateAndTimeString(lastRun.time) }
+                ?: ""
+            loop_smbrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBRequest)
+            loop_smbexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBEnact)
+            loop_tbrrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBRRequest)
+            loop_tbrexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBREnact)
+
+            loop_tbrsetbypump?.text = it.tbrSetByPump?.let { tbrSetByPump -> HtmlHelper.fromHtml(tbrSetByPump.toHtml()) }
+                ?: ""
+            loop_smbsetbypump?.text = it.smbSetByPump?.let { smbSetByPump -> HtmlHelper.fromHtml(smbSetByPump.toHtml()) }
+                ?: ""
 
             val constraints =
-                    it.constraintsProcessed?.let { constraintsProcessed ->
-                        val allConstraints = Constraint(0.0)
-                        constraintsProcessed.rateConstraint?.let { rateConstraint -> allConstraints.copyReasons(rateConstraint) }
-                        constraintsProcessed.smbConstraint?.let { smbConstraint -> allConstraints.copyReasons(smbConstraint) }
-                        allConstraints.mostLimitedReasons
-                    } ?: ""
-            loop_constraints.text = constraints
+                it.constraintsProcessed?.let { constraintsProcessed ->
+                    val allConstraints = Constraint(0.0)
+                    constraintsProcessed.rateConstraint?.let { rateConstraint -> allConstraints.copyReasons(rateConstraint) }
+                    constraintsProcessed.smbConstraint?.let { smbConstraint -> allConstraints.copyReasons(smbConstraint) }
+                    allConstraints.getMostLimitedReasons(aapsLogger)
+                } ?: ""
+            loop_constraints?.text = constraints
         }
     }
 
     @Synchronized
     private fun clearGUI() {
-        if (loop_request == null) return
-        loop_request.text = ""
-        loop_constraints.text = ""
-        loop_constraintsprocessed.text = ""
-        loop_source.text = ""
-        loop_lastrun.text = ""
-        loop_lastenact.text = ""
-        loop_tbrsetbypump.text = ""
-        loop_smbsetbypump.text = ""
+        loop_request?.text = ""
+        loop_constraints?.text = ""
+        loop_constraintsprocessed?.text = ""
+        loop_source?.text = ""
+        loop_lastrun?.text = ""
+        loop_smbrequest_time?.text = ""
+        loop_smbexecution_time?.text = ""
+        loop_tbrrequest_time?.text = ""
+        loop_tbrexecution_time?.text = ""
+        loop_tbrsetbypump?.text = ""
+        loop_smbsetbypump?.text = ""
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 7492dc64dd..79c3f5cd33 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -11,82 +11,92 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
 
-import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.Date;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.Lazy;
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 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.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAcceptOpenLoopChange;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginBase;
 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.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class LoopPlugin extends PluginBase {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private final HasAndroidInjector injector;
+    private final SP sp;
+    private final RxBusWrapper rxBus;
+    private final ConstraintChecker constraintChecker;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final Context context;
+    private final CommandQueueProvider commandQueue;
+    private final ActivePluginProvider activePlugin;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final VirtualPumpPlugin virtualPumpPlugin;
+    private final Lazy<ActionStringHandler> actionStringHandler;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private static final String CHANNEL_ID = "AndroidAPS-Openloop";
 
     private long lastBgTriggeredRun = 0;
 
-    private static LoopPlugin loopPlugin;
-
-    @NonNull
-    public static LoopPlugin getPlugin() {
-        if (loopPlugin == null) {
-            loopPlugin = new LoopPlugin();
-        }
-        return loopPlugin;
-    }
-
-    private long loopSuspendedTill = 0L; // end of manual loop suspend
-    private boolean isSuperBolus = false;
-    private boolean isDisconnected = false;
+    private long loopSuspendedTill; // end of manual loop suspend
+    private boolean isSuperBolus;
+    private boolean isDisconnected;
 
     public class LastRun {
         public APSResult request = null;
@@ -95,36 +105,68 @@ public class LoopPlugin extends PluginBase {
         public PumpEnactResult smbSetByPump = null;
         public String source = null;
         public Date lastAPSRun = null;
-        public Date lastEnact = null;
-        public Date lastOpenModeAccept;
+        public long lastTBREnact = 0;
+        public long lastSMBEnact = 0;
+        public long lastTBRRequest = 0;
+        public long lastSMBRequest = 0;
+        public long lastOpenModeAccept;
     }
 
-    static public LastRun lastRun = null;
+    public LastRun lastRun = null;
 
-    public LoopPlugin() {
+    @Inject
+    public LoopPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            SP sp,
+            ConstraintChecker constraintChecker,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            Context context,
+            CommandQueueProvider commandQueue,
+            ActivePluginProvider activePlugin,
+            TreatmentsPlugin treatmentsPlugin,
+            VirtualPumpPlugin virtualPumpPlugin,
+            Lazy<ActionStringHandler> actionStringHandler, // TODO Adrian use RxBus instead of Lazy
+            IobCobCalculatorPlugin iobCobCalculatorPlugin
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.LOOP)
-                .fragmentClass(LoopFragment.class.getName())
-                .pluginName(R.string.loop)
-                .shortName(R.string.loop_shortname)
-                .preferencesId(R.xml.pref_loop)
-                .description(R.string.description_loop)
+                        .mainType(PluginType.LOOP)
+                        .fragmentClass(LoopFragment.class.getName())
+                        .pluginName(R.string.loop)
+                        .shortName(R.string.loop_shortname)
+                        .preferencesId(R.xml.pref_loop)
+                        .description(R.string.description_loop),
+                aapsLogger, resourceHelper, injector
         );
-        loopSuspendedTill = SP.getLong("loopSuspendedTill", 0L);
-        isSuperBolus = SP.getBoolean("isSuperBolus", false);
-        isDisconnected = SP.getBoolean("isDisconnected", false);
+        this.injector = injector;
+        this.sp = sp;
+        this.rxBus = rxBus;
+        this.constraintChecker = constraintChecker;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.context = context;
+        this.activePlugin = activePlugin;
+        this.commandQueue = commandQueue;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.virtualPumpPlugin = virtualPumpPlugin;
+        this.actionStringHandler = actionStringHandler;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+
+        loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
+        isSuperBolus = sp.getBoolean("isSuperBolus", false);
+        isDisconnected = sp.getBoolean("isDisconnected", false);
     }
 
     @Override
     protected void onStart() {
         createNotificationChannel();
         super.onStart();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTempTargetChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    invoke("EventTempTargetChange", true);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> invoke("EventTempTargetChange", true), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         /**
          * This method is triggered once autosens calculation has completed, so the LoopPlugin
@@ -133,14 +175,14 @@ public class LoopPlugin extends PluginBase {
          * the event causing the calculation is not EventNewBg.
          * <p>
          */
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAutosensCalculationFinished.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     // Autosens calculation not triggered by a new BG
                     if (!(event.getCause() instanceof EventNewBG)) return;
 
-                    BgReading bgReading = DatabaseHelper.actualBg();
+                    BgReading bgReading = iobCobCalculatorPlugin.actualBg();
                     // BG outdated
                     if (bgReading == null) return;
                     // already looped with that value
@@ -148,7 +190,7 @@ public class LoopPlugin extends PluginBase {
 
                     lastBgTriggeredRun = bgReading.date;
                     invoke("AutosenseCalculation for " + bgReading, true);
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
@@ -156,7 +198,7 @@ public class LoopPlugin extends PluginBase {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 
             NotificationManager mNotificationManager =
-                    (NotificationManager) MainApp.instance().getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
+                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
             @SuppressLint("WrongConstant") NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
                     CHANNEL_ID,
                     NotificationManager.IMPORTANCE_HIGH);
@@ -172,8 +214,13 @@ public class LoopPlugin extends PluginBase {
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        try {
+            PumpInterface pump = activePlugin.getActivePump();
+            return pump.getPumpDescription().isTempBasalCapable;
+        } catch (Exception ignored) {
+            // may fail during initialization
+            return true;
+        }
     }
 
     public long suspendedTo() {
@@ -184,27 +231,27 @@ public class LoopPlugin extends PluginBase {
         loopSuspendedTill = endTime;
         isSuperBolus = false;
         isDisconnected = false;
-        SP.putLong("loopSuspendedTill", loopSuspendedTill);
-        SP.putBoolean("isSuperBolus", isSuperBolus);
-        SP.putBoolean("isDisconnected", isDisconnected);
+        sp.putLong("loopSuspendedTill", loopSuspendedTill);
+        sp.putBoolean("isSuperBolus", isSuperBolus);
+        sp.putBoolean("isDisconnected", isDisconnected);
     }
 
     public void superBolusTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = true;
         isDisconnected = false;
-        SP.putLong("loopSuspendedTill", loopSuspendedTill);
-        SP.putBoolean("isSuperBolus", isSuperBolus);
-        SP.putBoolean("isDisconnected", isDisconnected);
+        sp.putLong("loopSuspendedTill", loopSuspendedTill);
+        sp.putBoolean("isSuperBolus", isSuperBolus);
+        sp.putBoolean("isDisconnected", isDisconnected);
     }
 
-    public void disconnectTo(long endTime) {
+    private void disconnectTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = false;
         isDisconnected = true;
-        SP.putLong("loopSuspendedTill", loopSuspendedTill);
-        SP.putBoolean("isSuperBolus", isSuperBolus);
-        SP.putBoolean("isDisconnected", isDisconnected);
+        sp.putLong("loopSuspendedTill", loopSuspendedTill);
+        sp.putBoolean("isSuperBolus", isSuperBolus);
+        sp.putBoolean("isDisconnected", isDisconnected);
     }
 
     public int minutesToEndOfSuspend() {
@@ -269,44 +316,41 @@ public class LoopPlugin extends PluginBase {
 
     public synchronized void invoke(String initiator, boolean allowNotification, boolean tempBasalFallback) {
         try {
-            if (L.isEnabled(L.APS))
-                log.debug("invoke from " + initiator);
-            Constraint<Boolean> loopEnabled = MainApp.getConstraintChecker().isLoopInvokationAllowed();
+            getAapsLogger().debug(LTag.APS, "invoke from " + initiator);
+            Constraint<Boolean> loopEnabled = constraintChecker.isLoopInvocationAllowed();
 
             if (!loopEnabled.value()) {
-                String message = MainApp.gs(R.string.loopdisabled) + "\n" + loopEnabled.getReasons();
-                if (L.isEnabled(L.APS))
-                    log.debug(message);
-                RxBus.INSTANCE.send(new EventLoopSetLastRunGui(message));
+                String message = resourceHelper.gs(R.string.loopdisabled) + "\n" + loopEnabled.getReasons(getAapsLogger());
+                getAapsLogger().debug(LTag.APS, message);
+                rxBus.send(new EventLoopSetLastRunGui(message));
                 return;
             }
-            final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+            final PumpInterface pump = activePlugin.getActivePump();
             APSResult result = null;
 
             if (!isEnabled(PluginType.LOOP))
                 return;
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
+            Profile profile = profileFunction.getProfile();
 
-            if (profile == null || !ProfileFunctions.getInstance().isProfileValid("Loop")) {
-                if (L.isEnabled(L.APS))
-                    log.debug(MainApp.gs(R.string.noprofileselected));
-                RxBus.INSTANCE.send(new EventLoopSetLastRunGui(MainApp.gs(R.string.noprofileselected)));
+            if (profile == null || !profileFunction.isProfileValid("Loop")) {
+                getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected));
+                rxBus.send(new EventLoopSetLastRunGui(resourceHelper.gs(R.string.noprofileselected)));
                 return;
             }
 
             // Check if pump info is loaded
             if (pump.getBaseBasalRate() < 0.01d) return;
 
-            APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
-            if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginType.APS)) {
+            APSInterface usedAPS = activePlugin.getActiveAPS();
+            if (((PluginBase) usedAPS).isEnabled(PluginType.APS)) {
                 usedAPS.invoke(initiator, tempBasalFallback);
                 result = usedAPS.getLastAPSResult();
             }
 
             // Check if we have any result
             if (result == null) {
-                RxBus.INSTANCE.send(new EventLoopSetLastRunGui(MainApp.gs(R.string.noapsselected)));
+                rxBus.send(new EventLoopSetLastRunGui(resourceHelper.gs(R.string.noapsselected)));
                 return;
             }
 
@@ -317,21 +361,20 @@ public class LoopPlugin extends PluginBase {
             result.percent = (int) (result.rate / profile.getBasal() * 100);
 
             // check rate for constrais
-            final APSResult resultAfterConstraints = result.clone();
+            final APSResult resultAfterConstraints = result.newAndClone(injector);
             resultAfterConstraints.rateConstraint = new Constraint<>(resultAfterConstraints.rate);
-            resultAfterConstraints.rate = MainApp.getConstraintChecker().applyBasalConstraints(resultAfterConstraints.rateConstraint, profile).value();
+            resultAfterConstraints.rate = constraintChecker.applyBasalConstraints(resultAfterConstraints.rateConstraint, profile).value();
 
             resultAfterConstraints.percentConstraint = new Constraint<>(resultAfterConstraints.percent);
-            resultAfterConstraints.percent = MainApp.getConstraintChecker().applyBasalPercentConstraints(resultAfterConstraints.percentConstraint, profile).value();
+            resultAfterConstraints.percent = constraintChecker.applyBasalPercentConstraints(resultAfterConstraints.percentConstraint, profile).value();
 
             resultAfterConstraints.smbConstraint = new Constraint<>(resultAfterConstraints.smb);
-            resultAfterConstraints.smb = MainApp.getConstraintChecker().applyBolusConstraints(resultAfterConstraints.smbConstraint).value();
+            resultAfterConstraints.smb = constraintChecker.applyBolusConstraints(resultAfterConstraints.smbConstraint).value();
 
             // safety check for multiple SMBs
-            long lastBolusTime = TreatmentsPlugin.getPlugin().getLastBolusTime();
+            long lastBolusTime = treatmentsPlugin.getLastBolusTime();
             if (lastBolusTime != 0 && lastBolusTime + T.mins(3).msecs() > System.currentTimeMillis()) {
-                if (L.isEnabled(L.APS))
-                    log.debug("SMB requsted but still in 3 min interval");
+                getAapsLogger().debug(LTag.APS, "SMB requsted but still in 3 min interval");
                 resultAfterConstraints.smb = 0;
             }
 
@@ -342,61 +385,66 @@ public class LoopPlugin extends PluginBase {
             lastRun.source = ((PluginBase) usedAPS).getName();
             lastRun.tbrSetByPump = null;
             lastRun.smbSetByPump = null;
+            lastRun.lastTBREnact = 0;
+            lastRun.lastTBRRequest = 0;
+            lastRun.lastSMBEnact = 0;
+            lastRun.lastSMBRequest = 0;
 
-            NSUpload.uploadDeviceStatus();
+            NSUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump());
 
             if (isSuspended()) {
-                if (L.isEnabled(L.APS))
-                    log.debug(MainApp.gs(R.string.loopsuspended));
-                RxBus.INSTANCE.send(new EventLoopSetLastRunGui(MainApp.gs(R.string.loopsuspended)));
+                getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended));
+                rxBus.send(new EventLoopSetLastRunGui(resourceHelper.gs(R.string.loopsuspended)));
                 return;
             }
 
             if (pump.isSuspended()) {
-                if (L.isEnabled(L.APS))
-                    log.debug(MainApp.gs(R.string.pumpsuspended));
-                RxBus.INSTANCE.send(new EventLoopSetLastRunGui(MainApp.gs(R.string.pumpsuspended)));
+                getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.pumpsuspended));
+                rxBus.send(new EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpsuspended)));
                 return;
             }
 
-            Constraint<Boolean> closedLoopEnabled = MainApp.getConstraintChecker().isClosedLoopAllowed();
+            Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
 
             if (closedLoopEnabled.value()) {
                 if (resultAfterConstraints.isChangeRequested()
-                        && !ConfigBuilderPlugin.getPlugin().getCommandQueue().bolusInQueue()
-                        && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BOLUS)) {
-                    final PumpEnactResult waiting = new PumpEnactResult();
+                        && !commandQueue.bolusInQueue()
+                        && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
+                    final PumpEnactResult waiting = new PumpEnactResult(getInjector());
                     waiting.queued = true;
                     if (resultAfterConstraints.tempBasalRequested)
                         lastRun.tbrSetByPump = waiting;
                     if (resultAfterConstraints.bolusRequested)
                         lastRun.smbSetByPump = waiting;
-                    RxBus.INSTANCE.send(new EventLoopUpdateGui());
+                    rxBus.send(new EventLoopUpdateGui());
                     FabricPrivacy.getInstance().logCustom("APSRequest");
                     applyTBRRequest(resultAfterConstraints, profile, new Callback() {
                         @Override
                         public void run() {
                             if (result.enacted || result.success) {
                                 lastRun.tbrSetByPump = result;
-                                lastRun.lastEnact = lastRun.lastAPSRun;
+                                lastRun.lastTBRRequest = lastRun.lastAPSRun.getTime();
+                                lastRun.lastTBREnact = DateUtil.now();
+                                rxBus.send(new EventLoopUpdateGui());
                                 applySMBRequest(resultAfterConstraints, new Callback() {
                                     @Override
                                     public void run() {
                                         //Callback is only called if a bolus was acutally requested
                                         if (result.enacted || result.success) {
                                             lastRun.smbSetByPump = result;
-                                            lastRun.lastEnact = lastRun.lastAPSRun;
+                                            lastRun.lastSMBRequest = lastRun.lastAPSRun.getTime();
+                                            lastRun.lastSMBEnact = DateUtil.now();
                                         } else {
                                             new Thread(() -> {
                                                 SystemClock.sleep(1000);
-                                                LoopPlugin.getPlugin().invoke("tempBasalFallback", allowNotification, true);
+                                                invoke("tempBasalFallback", allowNotification, true);
                                             }).start();
                                         }
-                                        RxBus.INSTANCE.send(new EventLoopUpdateGui());
+                                        rxBus.send(new EventLoopUpdateGui());
                                     }
                                 });
                             }
-                            RxBus.INSTANCE.send(new EventLoopUpdateGui());
+                            rxBus.send(new EventLoopUpdateGui());
                         }
                     });
                 } else {
@@ -406,26 +454,26 @@ public class LoopPlugin extends PluginBase {
             } else {
                 if (resultAfterConstraints.isChangeRequested() && allowNotification) {
                     NotificationCompat.Builder builder =
-                            new NotificationCompat.Builder(MainApp.instance().getApplicationContext(), CHANNEL_ID);
+                            new NotificationCompat.Builder(context, CHANNEL_ID);
                     builder.setSmallIcon(R.drawable.notif_icon)
-                            .setContentTitle(MainApp.gs(R.string.openloop_newsuggestion))
+                            .setContentTitle(resourceHelper.gs(R.string.openloop_newsuggestion))
                             .setContentText(resultAfterConstraints.toString())
                             .setAutoCancel(true)
                             .setPriority(Notification.PRIORITY_HIGH)
                             .setCategory(Notification.CATEGORY_ALARM)
                             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
-                    if (SP.getBoolean("wearcontrol", false)) {
+                    if (sp.getBoolean("wearcontrol", false)) {
                         builder.setLocalOnly(true);
                     }
 
                     // Creates an explicit intent for an Activity in your app
-                    Intent resultIntent = new Intent(MainApp.instance().getApplicationContext(), MainActivity.class);
+                    Intent resultIntent = new Intent(context, MainActivity.class);
 
                     // The stack builder object will contain an artificial back stack for the
                     // started Activity.
                     // This ensures that navigating backward from the Activity leads out of
                     // your application to the Home screen.
-                    TaskStackBuilder stackBuilder = TaskStackBuilder.create(MainApp.instance().getApplicationContext());
+                    TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
                     stackBuilder.addParentStack(MainActivity.class);
                     // Adds the Intent that starts the Activity to the top of the stack
                     stackBuilder.addNextIntent(resultIntent);
@@ -434,43 +482,43 @@ public class LoopPlugin extends PluginBase {
                     builder.setContentIntent(resultPendingIntent);
                     builder.setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
                     NotificationManager mNotificationManager =
-                            (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
+                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
                     // mId allows you to update the notification later on.
                     mNotificationManager.notify(Constants.notificationID, builder.build());
-                    RxBus.INSTANCE.send(new EventNewOpenLoopNotification());
+                    rxBus.send(new EventNewOpenLoopNotification());
 
                     // Send to Wear
-                    ActionStringHandler.handleInitiate("changeRequest");
+                    actionStringHandler.get().handleInitiate("changeRequest");
                 } else if (allowNotification) {
                     // dismiss notifications
                     NotificationManager notificationManager =
-                            (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
+                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
                     notificationManager.cancel(Constants.notificationID);
-                    ActionStringHandler.handleInitiate("cancelChangeRequest");
+                    actionStringHandler.get().handleInitiate("cancelChangeRequest");
                 }
             }
 
-            RxBus.INSTANCE.send(new EventLoopUpdateGui());
+            rxBus.send(new EventLoopUpdateGui());
         } finally {
-            if (L.isEnabled(L.APS))
-                log.debug("invoke end");
+            getAapsLogger().debug(LTag.APS, "invoke end");
         }
     }
 
     public void acceptChangeRequest() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-
+        Profile profile = profileFunction.getProfile();
+        final LoopPlugin lp = this;
         applyTBRRequest(lastRun.constraintsProcessed, profile, new Callback() {
             @Override
             public void run() {
                 if (result.enacted) {
                     lastRun.tbrSetByPump = result;
-                    lastRun.lastEnact = new Date();
-                    lastRun.lastOpenModeAccept = new Date();
-                    NSUpload.uploadDeviceStatus();
-                    SP.incInt(R.string.key_ObjectivesmanualEnacts);
+                    lastRun.lastTBRRequest = lastRun.lastAPSRun.getTime();
+                    lastRun.lastTBREnact = DateUtil.now();
+                    lastRun.lastOpenModeAccept = DateUtil.now();
+                    NSUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump());
+                    sp.incInt(R.string.key_ObjectivesmanualEnacts);
                 }
-                RxBus.INSTANCE.send(new EventAcceptOpenLoopChange());
+                rxBus.send(new EventAcceptOpenLoopChange());
             }
         });
         FabricPrivacy.getInstance().logCustom("AcceptTemp");
@@ -481,229 +529,226 @@ public class LoopPlugin extends PluginBase {
      * TODO: update pump drivers to support APS request in %
      */
 
-    public void applyTBRRequest(APSResult request, Profile profile, Callback callback) {
-        boolean allowPercentage = VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP);
+    private void applyTBRRequest(APSResult request, Profile profile, Callback callback) {
+        boolean allowPercentage = virtualPumpPlugin.isEnabled(PluginType.PUMP);
 
         if (!request.tempBasalRequested) {
             if (callback != null) {
-                callback.result(new PumpEnactResult().enacted(false).success(true).comment(MainApp.gs(R.string.nochangerequested))).run();
+                callback.result(new PumpEnactResult(getInjector()).enacted(false).success(true).comment(resourceHelper.gs(R.string.nochangerequested))).run();
             }
             return;
         }
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
+        PumpInterface pump = activePlugin.getActivePump();
 
         if (!pump.isInitialized()) {
-            if (L.isEnabled(L.APS))
-                log.debug("applyAPSRequest: " + MainApp.gs(R.string.pumpNotInitialized));
+            getAapsLogger().debug(LTag.APS, "applyAPSRequest: " + resourceHelper.gs(R.string.pumpNotInitialized));
             if (callback != null) {
-                callback.result(new PumpEnactResult().comment(MainApp.gs(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
+                callback.result(new PumpEnactResult(getInjector()).comment(resourceHelper.gs(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
             }
             return;
         }
 
         if (pump.isSuspended()) {
-            if (L.isEnabled(L.APS))
-                log.debug("applyAPSRequest: " + MainApp.gs(R.string.pumpsuspended));
+            getAapsLogger().debug(LTag.APS, "applyAPSRequest: " + resourceHelper.gs(R.string.pumpsuspended));
             if (callback != null) {
-                callback.result(new PumpEnactResult().comment(MainApp.gs(R.string.pumpsuspended)).enacted(false).success(false)).run();
+                callback.result(new PumpEnactResult(getInjector()).comment(resourceHelper.gs(R.string.pumpsuspended)).enacted(false).success(false)).run();
             }
             return;
         }
 
-        if (L.isEnabled(L.APS))
-            log.debug("applyAPSRequest: " + request.toString());
+        getAapsLogger().debug(LTag.APS, "applyAPSRequest: " + request.toString());
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = activeTreatments.getTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(now);
         if (request.usePercent && allowPercentage) {
             if (request.percent == 100 && request.duration == 0) {
                 if (activeTemp != null) {
-                    if (L.isEnabled(L.APS))
-                        log.debug("applyAPSRequest: cancelTempBasal()");
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(false, callback);
+                    getAapsLogger().debug(LTag.APS, "applyAPSRequest: cancelTempBasal()");
+                    commandQueue.cancelTempBasal(false, callback);
                 } else {
-                    if (L.isEnabled(L.APS))
-                        log.debug("applyAPSRequest: Basal set correctly");
+                    getAapsLogger().debug(LTag.APS, "applyAPSRequest: Basal set correctly");
                     if (callback != null) {
-                        callback.result(new PumpEnactResult().percent(request.percent).duration(0)
-                                .enacted(false).success(true).comment(MainApp.gs(R.string.basal_set_correctly))).run();
+                        callback.result(new PumpEnactResult(getInjector()).percent(request.percent).duration(0)
+                                .enacted(false).success(true).comment(resourceHelper.gs(R.string.basal_set_correctly))).run();
                     }
                 }
             } else if (activeTemp != null
                     && activeTemp.getPlannedRemainingMinutes() > 5
                     && request.duration - activeTemp.getPlannedRemainingMinutes() < 30
                     && request.percent == activeTemp.percentRate) {
-                if (L.isEnabled(L.APS))
-                    log.debug("applyAPSRequest: Temp basal set correctly");
+                getAapsLogger().debug(LTag.APS, "applyAPSRequest: Temp basal set correctly");
                 if (callback != null) {
-                    callback.result(new PumpEnactResult().percent(request.percent)
+                    callback.result(new PumpEnactResult(getInjector()).percent(request.percent)
                             .enacted(false).success(true).duration(activeTemp.getPlannedRemainingMinutes())
-                            .comment(MainApp.gs(R.string.let_temp_basal_run))).run();
+                            .comment(resourceHelper.gs(R.string.let_temp_basal_run))).run();
                 }
             } else {
-                if (L.isEnabled(L.APS))
-                    log.debug("applyAPSRequest: tempBasalPercent()");
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(request.percent, request.duration, false, profile, callback);
+                getAapsLogger().debug(LTag.APS, "applyAPSRequest: tempBasalPercent()");
+                commandQueue.tempBasalPercent(request.percent, request.duration, false, profile, callback);
             }
         } else {
             if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - pump.getBaseBasalRate()) < pump.getPumpDescription().basalStep) {
                 if (activeTemp != null) {
-                    if (L.isEnabled(L.APS))
-                        log.debug("applyAPSRequest: cancelTempBasal()");
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(false, callback);
+                    getAapsLogger().debug(LTag.APS, "applyAPSRequest: cancelTempBasal()");
+                    commandQueue.cancelTempBasal(false, callback);
                 } else {
-                    if (L.isEnabled(L.APS))
-                        log.debug("applyAPSRequest: Basal set correctly");
+                    getAapsLogger().debug(LTag.APS, "applyAPSRequest: Basal set correctly");
                     if (callback != null) {
-                        callback.result(new PumpEnactResult().absolute(request.rate).duration(0)
-                                .enacted(false).success(true).comment(MainApp.gs(R.string.basal_set_correctly))).run();
+                        callback.result(new PumpEnactResult(getInjector()).absolute(request.rate).duration(0)
+                                .enacted(false).success(true).comment(resourceHelper.gs(R.string.basal_set_correctly))).run();
                     }
                 }
             } else if (activeTemp != null
                     && activeTemp.getPlannedRemainingMinutes() > 5
                     && request.duration - activeTemp.getPlannedRemainingMinutes() < 30
                     && Math.abs(request.rate - activeTemp.tempBasalConvertedToAbsolute(now, profile)) < pump.getPumpDescription().basalStep) {
-                if (L.isEnabled(L.APS))
-                    log.debug("applyAPSRequest: Temp basal set correctly");
+                getAapsLogger().debug(LTag.APS, "applyAPSRequest: Temp basal set correctly");
                 if (callback != null) {
-                    callback.result(new PumpEnactResult().absolute(activeTemp.tempBasalConvertedToAbsolute(now, profile))
+                    callback.result(new PumpEnactResult(getInjector()).absolute(activeTemp.tempBasalConvertedToAbsolute(now, profile))
                             .enacted(false).success(true).duration(activeTemp.getPlannedRemainingMinutes())
-                            .comment(MainApp.gs(R.string.let_temp_basal_run))).run();
+                            .comment(resourceHelper.gs(R.string.let_temp_basal_run))).run();
                 }
             } else {
-                if (L.isEnabled(L.APS))
-                    log.debug("applyAPSRequest: setTempBasalAbsolute()");
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, profile, callback);
+                getAapsLogger().debug(LTag.APS, "applyAPSRequest: setTempBasalAbsolute()");
+                commandQueue.tempBasalAbsolute(request.rate, request.duration, false, profile, callback);
             }
         }
     }
 
-    public void applySMBRequest(APSResult request, Callback callback) {
+    private void applySMBRequest(APSResult request, Callback callback) {
         if (!request.bolusRequested) {
             return;
         }
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
+        PumpInterface pump = activePlugin.getActivePump();
 
-        long lastBolusTime = activeTreatments.getLastBolusTime();
+        long lastBolusTime = treatmentsPlugin.getLastBolusTime();
         if (lastBolusTime != 0 && lastBolusTime + 3 * 60 * 1000 > System.currentTimeMillis()) {
-            if (L.isEnabled(L.APS))
-                log.debug("SMB requested but still in 3 min interval");
+            getAapsLogger().debug(LTag.APS, "SMB requested but still in 3 min interval");
             if (callback != null) {
-                callback.result(new PumpEnactResult()
-                        .comment(MainApp.gs(R.string.smb_frequency_exceeded))
+                callback.result(new PumpEnactResult(getInjector())
+                        .comment(resourceHelper.gs(R.string.smb_frequency_exceeded))
                         .enacted(false).success(false)).run();
             }
             return;
         }
 
         if (!pump.isInitialized()) {
-            if (L.isEnabled(L.APS))
-                log.debug("applySMBRequest: " + MainApp.gs(R.string.pumpNotInitialized));
+            getAapsLogger().debug(LTag.APS, "applySMBRequest: " + resourceHelper.gs(R.string.pumpNotInitialized));
             if (callback != null) {
-                callback.result(new PumpEnactResult().comment(MainApp.gs(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
+                callback.result(new PumpEnactResult(getInjector()).comment(resourceHelper.gs(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
             }
             return;
         }
 
         if (pump.isSuspended()) {
-            if (L.isEnabled(L.APS))
-                log.debug("applySMBRequest: " + MainApp.gs(R.string.pumpsuspended));
+            getAapsLogger().debug(LTag.APS, "applySMBRequest: " + resourceHelper.gs(R.string.pumpsuspended));
             if (callback != null) {
-                callback.result(new PumpEnactResult().comment(MainApp.gs(R.string.pumpsuspended)).enacted(false).success(false)).run();
+                callback.result(new PumpEnactResult(getInjector()).comment(resourceHelper.gs(R.string.pumpsuspended)).enacted(false).success(false)).run();
             }
             return;
         }
 
-        if (L.isEnabled(L.APS))
-            log.debug("applySMBRequest: " + request.toString());
+        getAapsLogger().debug(LTag.APS, "applySMBRequest: " + request.toString());
 
         // deliver SMB
         DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-        detailedBolusInfo.lastKnownBolusTime = activeTreatments.getLastBolusTime();
+        detailedBolusInfo.lastKnownBolusTime = treatmentsPlugin.getLastBolusTime();
         detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
         detailedBolusInfo.insulin = request.smb;
         detailedBolusInfo.isSMB = true;
         detailedBolusInfo.source = Source.USER;
         detailedBolusInfo.deliverAt = request.deliverAt;
-        if (L.isEnabled(L.APS))
-            log.debug("applyAPSRequest: bolus()");
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, callback);
+        getAapsLogger().debug(LTag.APS, "applyAPSRequest: bolus()");
+        commandQueue.bolus(detailedBolusInfo, callback);
     }
 
     public void disconnectPump(int durationInMinutes, Profile profile) {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
+        PumpInterface pump = activePlugin.getActivePump();
 
-        LoopPlugin.getPlugin().disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L);
+        disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L);
 
         if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(0, durationInMinutes, true, profile, new Callback() {
+            commandQueue.tempBasalAbsolute(0, durationInMinutes, true, profile, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
-                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.boluserror);
                         i.putExtra("status", result.comment);
-                        i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
+                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        MainApp.instance().startActivity(i);
+                        context.startActivity(i);
                     }
                 }
             });
         } else {
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, durationInMinutes, true, profile, new Callback() {
+            commandQueue.tempBasalPercent(0, durationInMinutes, true, profile, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
-                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.boluserror);
                         i.putExtra("status", result.comment);
-                        i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
+                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        MainApp.instance().startActivity(i);
+                        context.startActivity(i);
                     }
                 }
             });
         }
 
-        if (pump.getPumpDescription().isExtendedBolusCapable && activeTreatments.isInHistoryExtendedBoluslInProgress()) {
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(new Callback() {
+        if (pump.getPumpDescription().isExtendedBolusCapable && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
+            commandQueue.cancelExtended(new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
-                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.boluserror);
                         i.putExtra("status", result.comment);
-                        i.putExtra("title", MainApp.gs(R.string.extendedbolusdeliveryerror));
+                        i.putExtra("title", resourceHelper.gs(R.string.extendedbolusdeliveryerror));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        MainApp.instance().startActivity(i);
+                        context.startActivity(i);
                     }
                 }
             });
         }
-        NSUpload.uploadOpenAPSOffline(durationInMinutes);
+        createOfflineEvent(durationInMinutes);
     }
 
     public void suspendLoop(int durationInMinutes) {
-        LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000);
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+        suspendTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000);
+        commandQueue.cancelTempBasal(true, new Callback() {
             @Override
             public void run() {
                 if (!result.success) {
-                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                    Intent i = new Intent(context, ErrorHelperActivity.class);
                     i.putExtra("soundid", R.raw.boluserror);
                     i.putExtra("status", result.comment);
-                    i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror));
+                    i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror));
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    MainApp.instance().startActivity(i);
+                    context.startActivity(i);
                 }
             }
         });
-        NSUpload.uploadOpenAPSOffline(durationInMinutes);
+        createOfflineEvent(durationInMinutes);
     }
 
+    public void createOfflineEvent(int durationInMinutes) {
+        JSONObject data = new JSONObject();
+        try {
+            data.put("eventType", CareportalEvent.OPENAPSOFFLINE);
+            data.put("duration", durationInMinutes);
+        } catch (JSONException e) {
+            getAapsLogger().error("Unhandled exception", e);
+        }
+        CareportalEvent event = new CareportalEvent();
+        event.date = DateUtil.now();
+        event.source = Source.USER;
+        event.eventType = CareportalEvent.OPENAPSOFFLINE;
+        event.json = data.toString();
+        MainApp.getDbHelper().createOrUpdate(event);
+        NSUpload.uploadOpenAPSOffline(event);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
index 9ea2d39567..5606014c0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -11,37 +11,42 @@ import org.mozilla.javascript.RhinoException;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.Undefined;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.LoggerCallback;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class DetermineBasalAdapterAMAJS {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject SP sp;
+    @Inject ProfileFunction profileFunction;
+    @Inject TreatmentsPlugin treatmentsPlugin;
 
-
-    private ScriptReader mScriptReader = null;
+    private ScriptReader mScriptReader;
 
     private JSONObject mProfile;
     private JSONObject mGlucoseStatus;
@@ -59,25 +64,26 @@ public class DetermineBasalAdapterAMAJS {
 
     private String scriptDebug = "";
 
-    public DetermineBasalAdapterAMAJS(ScriptReader scriptReader) {
+    DetermineBasalAdapterAMAJS(ScriptReader scriptReader, HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
         mScriptReader = scriptReader;
+        this.injector = injector;
     }
 
     @Nullable
     public DetermineBasalResultAMA invoke() {
 
-        if (L.isEnabled(L.APS)) {
-            log.debug(">>> Invoking detemine_basal <<<");
-            log.debug("Glucose status: " + (storedGlucoseStatus = mGlucoseStatus.toString()));
-            log.debug("IOB data:       " + (storedIobData = mIobData.toString()));
-            log.debug("Current temp:   " + (storedCurrentTemp = mCurrentTemp.toString()));
-            log.debug("Profile:        " + (storedProfile = mProfile.toString()));
-            log.debug("Meal data:      " + (storedMeal_data = mMealData.toString()));
-            if (mAutosensData != null)
-                log.debug("Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
-            else
-                log.debug("Autosens data:  " + (storedAutosens_data = "undefined"));
-        }
+        aapsLogger.debug(LTag.APS, ">>> Invoking detemine_basal <<<");
+        aapsLogger.debug(LTag.APS, "Glucose status: " + (storedGlucoseStatus = mGlucoseStatus.toString()));
+        aapsLogger.debug(LTag.APS, "IOB data:       " + (storedIobData = mIobData.toString()));
+        aapsLogger.debug(LTag.APS, "Current temp:   " + (storedCurrentTemp = mCurrentTemp.toString()));
+        aapsLogger.debug(LTag.APS, "Profile:        " + (storedProfile = mProfile.toString()));
+        aapsLogger.debug(LTag.APS, "Meal data:      " + (storedMeal_data = mMealData.toString()));
+        if (mAutosensData != null)
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
+        else
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = "undefined"));
+
 
         DetermineBasalResultAMA determineBasalResultAMA = null;
 
@@ -124,22 +130,21 @@ public class DetermineBasalAdapterAMAJS {
 
                 // Parse the jsResult object to a JSON-String
                 String result = NativeJSON.stringify(rhino, scope, jsResult, null, null).toString();
-                if (L.isEnabled(L.APS))
-                    log.debug("Result: " + result);
+                aapsLogger.debug(LTag.APS, "Result: " + result);
                 try {
-                    determineBasalResultAMA = new DetermineBasalResultAMA(jsResult, new JSONObject(result));
+                    determineBasalResultAMA = new DetermineBasalResultAMA(injector, jsResult, new JSONObject(result));
                 } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error(LTag.APS, "Unhandled exception", e);
                 }
             } else {
-                log.error("Problem loading JS Functions");
+                aapsLogger.error(LTag.APS, "Problem loading JS Functions");
             }
         } catch (IOException e) {
-            log.error("IOException");
+            aapsLogger.error(LTag.APS, "IOException");
         } catch (RhinoException e) {
-            log.error("RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
+            aapsLogger.error(LTag.APS, "RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
         } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
-            log.error(e.toString());
+            aapsLogger.error(LTag.APS, e.toString());
         } finally {
             Context.exit();
         }
@@ -206,25 +211,25 @@ public class DetermineBasalAdapterAMAJS {
         mProfile.put("target_bg", targetBg);
         mProfile.put("carb_ratio", profile.getIc());
         mProfile.put("sens", profile.getIsfMgdl());
-        mProfile.put("max_daily_safety_multiplier", SP.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
-        mProfile.put("current_basal_safety_multiplier", SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));
+        mProfile.put("max_daily_safety_multiplier", sp.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
+        mProfile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));
         mProfile.put("skip_neutral_temps", true);
         mProfile.put("current_basal", basalrate);
         mProfile.put("temptargetSet", tempTargetSet);
-        mProfile.put("autosens_adjust_targets", SP.getBoolean(R.string.key_openapsama_autosens_adjusttargets, true));
+        mProfile.put("autosens_adjust_targets", sp.getBoolean(R.string.key_openapsama_autosens_adjusttargets, true));
         //align with max-absorption model in AMA sensitivity
         if (mealData.usedMinCarbsImpact > 0) {
             mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
         } else {
-            mProfile.put("min_5m_carbimpact", SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact));
+            mProfile.put("min_5m_carbimpact", sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact));
         }
 
-        if (ProfileFunctions.getSystemUnits().equals(Constants.MMOL)) {
+        if (profileFunction.getUnits().equals(Constants.MMOL)) {
             mProfile.put("out_units", "mmol/L");
         }
 
         long now = System.currentTimeMillis();
-        TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+        TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
 
         mCurrentTemp = new JSONObject();
         mCurrentTemp.put("temp", "absolute");
@@ -232,7 +237,7 @@ public class DetermineBasalAdapterAMAJS {
         mCurrentTemp.put("rate", tb != null ? tb.tempBasalConvertedToAbsolute(now, profile) : 0d);
 
         // as we have non default temps longer than 30 mintues
-        TemporaryBasal tempBasal = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal tempBasal = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (tempBasal != null) {
             mCurrentTemp.put("minutesrunning", tempBasal.getRealDuration());
         }
@@ -242,7 +247,7 @@ public class DetermineBasalAdapterAMAJS {
         mGlucoseStatus = new JSONObject();
         mGlucoseStatus.put("glucose", glucoseStatus.glucose);
 
-        if (SP.getBoolean(R.string.key_always_use_shortavg, false)) {
+        if (sp.getBoolean(R.string.key_always_use_shortavg, false)) {
             mGlucoseStatus.put("delta", glucoseStatus.short_avgdelta);
         } else {
             mGlucoseStatus.put("delta", glucoseStatus.delta);
@@ -255,7 +260,7 @@ public class DetermineBasalAdapterAMAJS {
         mMealData.put("boluses", mealData.boluses);
         mMealData.put("mealCOB", mealData.mealCOB);
 
-        if (MainApp.getConstraintChecker().isAutosensModeEnabled().value()) {
+        if (constraintChecker.isAutosensModeEnabled().value()) {
             mAutosensData = new JSONObject();
             mAutosensData.put("ratio", autosensDataRatio);
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalResultAMA.java
index 46f1057e27..0bf4839f84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalResultAMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalResultAMA.java
@@ -3,21 +3,21 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.javascript.NativeObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.logging.L;
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
 
 public class DetermineBasalResultAMA extends APSResult {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private AAPSLogger aapsLogger;
 
     private double eventualBG;
     private double snoozeBG;
 
-    DetermineBasalResultAMA(NativeObject result, JSONObject j) {
-        this();
+    DetermineBasalResultAMA(HasAndroidInjector injector, NativeObject result, JSONObject j) {
+        this(injector);
         date = DateUtil.now();
         json = j;
         if (result.containsKey("error")) {
@@ -48,13 +48,14 @@ public class DetermineBasalResultAMA extends APSResult {
         bolusRequested = false;
     }
 
-    private DetermineBasalResultAMA() {
+    private DetermineBasalResultAMA(HasAndroidInjector injector) {
+        super(injector);
         hasPredictions = true;
     }
 
     @Override
-    public DetermineBasalResultAMA clone() {
-        DetermineBasalResultAMA newResult = new DetermineBasalResultAMA();
+    public DetermineBasalResultAMA newAndClone(HasAndroidInjector injector) {
+        DetermineBasalResultAMA newResult = new DetermineBasalResultAMA(injector);
         doClone(newResult);
 
         newResult.eventualBG = eventualBG;
@@ -68,7 +69,7 @@ public class DetermineBasalResultAMA extends APSResult {
             JSONObject ret = new JSONObject(this.json.toString());
             return ret;
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error(LTag.APS, "Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
index 94747a4597..6bf087417b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@@ -5,28 +5,34 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.openapsama_fragment.*
 import org.json.JSONArray
 import org.json.JSONException
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
-class OpenAPSAMAFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.APS)
+class OpenAPSAMAFragment : DaggerFragment() {
     private var disposable: CompositeDisposable = CompositeDisposable()
 
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.openapsama_fragment, container, false)
@@ -36,7 +42,7 @@ class OpenAPSAMAFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         openapsma_run.setOnClickListener {
-            OpenAPSAMAPlugin.getPlugin().invoke("OpenAPSAMA button", false)
+            openAPSAMAPlugin.invoke("OpenAPSAMA button", false)
         }
     }
 
@@ -44,22 +50,18 @@ class OpenAPSAMAFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateGUI()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateResultGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateResultGUI(it.text)
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateGUI()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateResultGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateResultGUI(it.text)
+            }, { fabricPrivacy.logException(it) })
 
         updateGUI()
     }
@@ -73,18 +75,19 @@ class OpenAPSAMAFragment : Fragment() {
     @Synchronized
     private fun updateGUI() {
         if (openapsma_result == null) return
-        OpenAPSAMAPlugin.getPlugin().lastAPSResult?.let { lastAPSResult ->
+        openAPSAMAPlugin.lastAPSResult?.let { lastAPSResult ->
             openapsma_result.text = JSONFormatter.format(lastAPSResult.json)
             openapsma_request.text = lastAPSResult.toSpanned()
         }
-        OpenAPSAMAPlugin.getPlugin().lastDetermineBasalAdapterAMAJS?.let { determineBasalAdapterAMAJS ->
+        openAPSAMAPlugin.lastDetermineBasalAdapterAMAJS?.let { determineBasalAdapterAMAJS ->
             openapsma_glucosestatus.text = JSONFormatter.format(determineBasalAdapterAMAJS.glucoseStatusParam)
             openapsma_currenttemp.text = JSONFormatter.format(determineBasalAdapterAMAJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterAMAJS.iobDataParam)
-                openapsma_iobdata.text = TextUtils.concat(String.format(MainApp.gs(R.string.array_of_elements), iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
+                openapsma_iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
-                log.error("Unhandled exception", e)
+                aapsLogger.error(LTag.APS, "Unhandled exception", e)
+                @Suppress("SetTextI18n")
                 openapsma_iobdata.text = "JSONException see log for details"
             }
 
@@ -92,10 +95,10 @@ class OpenAPSAMAFragment : Fragment() {
             openapsma_mealdata.text = JSONFormatter.format(determineBasalAdapterAMAJS.mealDataParam)
             openapsma_scriptdebugdata.text = determineBasalAdapterAMAJS.scriptDebug
         }
-        if (OpenAPSAMAPlugin.getPlugin().lastAPSRun != 0L) {
-            openapsma_lastrun.text = DateUtil.dateAndTimeFullString(OpenAPSAMAPlugin.getPlugin().lastAPSRun)
+        if (openAPSAMAPlugin.lastAPSRun != 0L) {
+            openapsma_lastrun.text = DateUtil.dateAndTimeString(openAPSAMAPlugin.lastAPSRun)
         }
-        OpenAPSAMAPlugin.getPlugin().lastAutosensResult?.let {
+        openAPSAMAPlugin.lastAutosensResult?.let {
             openapsma_autosensdata.text = JSONFormatter.format(it.json())
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
index 49881c5158..bc80b755fa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
@@ -1,28 +1,33 @@
 package info.nightscout.androidaps.plugins.aps.openAPSAMA;
 
-import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import android.content.Context;
 
-import info.nightscout.androidaps.MainApp;
+import org.json.JSONException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
@@ -33,21 +38,20 @@ import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.Profiler;
 import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
-
-    private static OpenAPSAMAPlugin openAPSAMAPlugin;
-
-    public static OpenAPSAMAPlugin getPlugin() {
-        if (openAPSAMAPlugin == null) {
-            openAPSAMAPlugin = new OpenAPSAMAPlugin();
-        }
-        return openAPSAMAPlugin;
-    }
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ConstraintChecker constraintChecker;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final Context context;
+    private final ActivePluginProvider activePlugin;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    private final HardLimits hardLimits;
 
     // last values
     DetermineBasalAdapterAMAJS lastDetermineBasalAdapterAMAJS = null;
@@ -55,27 +59,56 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
     DetermineBasalResultAMA lastAPSResult = null;
     AutosensResult lastAutosensResult = null;
 
-    private OpenAPSAMAPlugin() {
+    @Inject
+    public OpenAPSAMAPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ConstraintChecker constraintChecker,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            Context context,
+            ActivePluginProvider activePlugin,
+            TreatmentsPlugin treatmentsPlugin,
+            IobCobCalculatorPlugin iobCobCalculatorPlugin,
+            HardLimits hardLimits
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.APS)
-                .fragmentClass(OpenAPSAMAFragment.class.getName())
-                .pluginName(R.string.openapsama)
-                .shortName(R.string.oaps_shortname)
-                .preferencesId(R.xml.pref_openapsama)
-                .description(R.string.description_ama)
+                        .mainType(PluginType.APS)
+                        .fragmentClass(OpenAPSAMAFragment.class.getName())
+                        .pluginName(R.string.openapsama)
+                        .shortName(R.string.oaps_shortname)
+                        .preferencesId(R.xml.pref_openapsama)
+                        .description(R.string.description_ama),
+                aapsLogger, resourceHelper, injector
         );
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.constraintChecker = constraintChecker;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.context = context;
+        this.activePlugin = activePlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+        this.hardLimits = hardLimits;
     }
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        try {
+            PumpInterface pump = activePlugin.getActivePump();
+            return pump.getPumpDescription().isTempBasalCapable;
+        } catch (Exception ignored) {
+            // may fail during initialization
+            return true;
+        }
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        PumpInterface pump = activePlugin.getActivePump();
+        return pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
@@ -90,45 +123,34 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
 
     @Override
     public void invoke(String initiator, boolean tempBasalFallback) {
-        if (L.isEnabled(L.APS))
-            log.debug("invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
+        aapsLogger.debug(LTag.APS, "invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
         lastAPSResult = null;
         DetermineBasalAdapterAMAJS determineBasalAdapterAMAJS;
-        determineBasalAdapterAMAJS = new DetermineBasalAdapterAMAJS(new ScriptReader(MainApp.instance().getBaseContext()));
+        determineBasalAdapterAMAJS = new DetermineBasalAdapterAMAJS(new ScriptReader(context), getInjector());
 
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        GlucoseStatus glucoseStatus = new GlucoseStatus(getInjector()).getGlucoseStatusData();
+        Profile profile = profileFunction.getProfile();
+        PumpInterface pump = activePlugin.getActivePump();
 
         if (profile == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.noprofileselected));
-            return;
-        }
-
-        if (pump == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.nopumpselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.nopumpselected));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.noprofileselected)));
+            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected));
             return;
         }
 
         if (!isEnabled(PluginType.APS)) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_disabled)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_disabled));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_disabled)));
+            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_disabled));
             return;
         }
 
         if (glucoseStatus == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_noglucosedata)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_noglucosedata));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_noglucosedata)));
+            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_noglucosedata));
             return;
         }
 
-        double maxBasal = MainApp.getConstraintChecker().getMaxBasalAllowed(profile).value();
+        double maxBasal = constraintChecker.getMaxBasalAllowed(profile).value();
         double minBg = profile.getTargetLowMgdl();
         double maxBg = profile.getTargetHighMgdl();
         double targetBg = profile.getTargetMgdl();
@@ -138,47 +160,45 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
 
         long start = System.currentTimeMillis();
         long startPart = System.currentTimeMillis();
-        IobTotal[] iobArray = IobCobCalculatorPlugin.getPlugin().calculateIobArrayInDia(profile);
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "calculateIobArrayInDia()", startPart);
+        IobTotal[] iobArray = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
+        Profiler.log(aapsLogger, LTag.APS, "calculateIobArrayInDia()", startPart);
 
         startPart = System.currentTimeMillis();
-        MealData mealData = TreatmentsPlugin.getPlugin().getMealData();
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "getMealData()", startPart);
+        MealData mealData = iobCobCalculatorPlugin.getMealData();
+        Profiler.log(aapsLogger, LTag.APS, "getMealData()", startPart);
 
-        double maxIob = MainApp.getConstraintChecker().getMaxIOBAllowed().value();
+        double maxIob = constraintChecker.getMaxIOBAllowed().value();
 
-        minBg = HardLimits.verifyHardLimits(minBg, "minBg", HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]);
-        maxBg = HardLimits.verifyHardLimits(maxBg, "maxBg", HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]);
-        targetBg = HardLimits.verifyHardLimits(targetBg, "targetBg", HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]);
+        minBg = hardLimits.verifyHardLimits(minBg, "minBg", hardLimits.getVERY_HARD_LIMIT_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_MIN_BG()[1]);
+        maxBg = hardLimits.verifyHardLimits(maxBg, "maxBg", hardLimits.getVERY_HARD_LIMIT_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_MAX_BG()[1]);
+        targetBg = hardLimits.verifyHardLimits(targetBg, "targetBg", hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[1]);
 
         boolean isTempTarget = false;
-        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(System.currentTimeMillis());
+        TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory(System.currentTimeMillis());
         if (tempTarget != null) {
             isTempTarget = true;
-            minBg = HardLimits.verifyHardLimits(tempTarget.low, "minBg", HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1]);
-            maxBg = HardLimits.verifyHardLimits(tempTarget.high, "maxBg", HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1]);
-            targetBg = HardLimits.verifyHardLimits(tempTarget.target(), "targetBg", HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1]);
+            minBg = hardLimits.verifyHardLimits(tempTarget.low, "minBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[1]);
+            maxBg = hardLimits.verifyHardLimits(tempTarget.high, "maxBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[1]);
+            targetBg = hardLimits.verifyHardLimits(tempTarget.target(), "targetBg", hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[1]);
         }
 
 
-        if (!HardLimits.checkOnlyHardLimits(profile.getDia(), "dia", HardLimits.MINDIA, HardLimits.MAXDIA))
+        if (!hardLimits.checkOnlyHardLimits(profile.getDia(), "dia", hardLimits.getMINDIA(), hardLimits.getMAXDIA()))
             return;
-        if (!HardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", HardLimits.MINIC, HardLimits.MAXIC))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", hardLimits.getMINIC(), hardLimits.getMAXIC()))
             return;
-        if (!HardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), "sens", HardLimits.MINISF, HardLimits.MAXISF))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), "sens", hardLimits.getMINISF(), hardLimits.getMAXISF()))
             return;
-        if (!HardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, hardLimits.maxBasal()))
             return;
-        if (!HardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, hardLimits.maxBasal()))
             return;
 
         startPart = System.currentTimeMillis();
-        if (MainApp.getConstraintChecker().isAutosensModeEnabled().value()) {
-            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("OpenAPSPlugin");
+        if (constraintChecker.isAutosensModeEnabled().value()) {
+            AutosensData autosensData = iobCobCalculatorPlugin.getLastAutosensDataSynchronized("OpenAPSPlugin");
             if (autosensData == null) {
-                RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openaps_noasdata)));
+                rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)));
                 return;
             }
             lastAutosensResult = autosensData.autosensResult;
@@ -186,36 +206,32 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
             lastAutosensResult = new AutosensResult();
             lastAutosensResult.sensResult = "autosens disabled";
         }
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "detectSensitivityandCarbAbsorption()", startPart);
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "AMA data gathering", start);
+        Profiler.log(aapsLogger, LTag.APS, "detectSensitivityandCarbAbsorption()", startPart);
+        Profiler.log(aapsLogger, LTag.APS, "AMA data gathering", start);
 
         start = System.currentTimeMillis();
 
         try {
-            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
+            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, activePlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
                     isTempTarget
             );
         } catch (JSONException e) {
-            FabricPrivacy.logException(e);
+            FabricPrivacy.getInstance().logException(e);
             return;
         }
 
 
         DetermineBasalResultAMA determineBasalResultAMA = determineBasalAdapterAMAJS.invoke();
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "AMA calculation", start);
+        Profiler.log(aapsLogger, LTag.APS, "AMA calculation", start);
         // Fix bug determine basal
         if (determineBasalResultAMA == null) {
-            if (L.isEnabled(L.APS))
-                log.error("SMB calculation returned null");
+            aapsLogger.error(LTag.APS, "SMB calculation returned null");
             lastDetermineBasalAdapterAMAJS = null;
             lastAPSResult = null;
             lastAPSRun = 0;
         } else {
-            if (determineBasalResultAMA.rate == 0d && determineBasalResultAMA.duration == 0 && !TreatmentsPlugin.getPlugin().isTempBasalInProgress())
+            if (determineBasalResultAMA.rate == 0d && determineBasalResultAMA.duration == 0 && !treatmentsPlugin.isTempBasalInProgress())
                 determineBasalResultAMA.tempBasalRequested = false;
 
             determineBasalResultAMA.iob = iobArray[0];
@@ -225,14 +241,14 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
             try {
                 determineBasalResultAMA.json.put("timestamp", DateUtil.toISOString(now));
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error(LTag.APS, "Unhandled exception", e);
             }
 
             lastDetermineBasalAdapterAMAJS = determineBasalAdapterAMAJS;
             lastAPSResult = determineBasalResultAMA;
             lastAPSRun = now;
         }
-        RxBus.INSTANCE.send(new EventOpenAPSUpdateGui());
+        rxBus.send(new EventOpenAPSUpdateGui());
 
         //deviceStatus.suggested = determineBasalResultAMA.json;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalAdapterMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalAdapterMAJS.java
index dbc7782ab3..c7733d4eb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalAdapterMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalAdapterMAJS.java
@@ -9,30 +9,36 @@ import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.RhinoException;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.SP;
 
 public class DetermineBasalAdapterMAJS {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+
+    private HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject ProfileFunction profileFunction;
+    @Inject TreatmentsPlugin treatmentsPlugin;
 
     private ScriptReader mScriptReader;
     private JSONObject mProfile;
@@ -47,8 +53,10 @@ public class DetermineBasalAdapterMAJS {
     private String storedProfile = null;
     private String storedMeal_data = null;
 
-    DetermineBasalAdapterMAJS(ScriptReader scriptReader) {
+    DetermineBasalAdapterMAJS(ScriptReader scriptReader, HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
         mScriptReader = scriptReader;
+        this.injector = injector;
     }
 
     @Nullable
@@ -101,22 +109,21 @@ public class DetermineBasalAdapterMAJS {
 
                 // Parse the jsResult object to a JSON-String
                 String result = NativeJSON.stringify(rhino, scope, jsResult, null, null).toString();
-                if (L.isEnabled(L.APS))
-                    log.debug("Result: " + result);
+                aapsLogger.debug(LTag.APS, "Result: " + result);
                 try {
-                    determineBasalResultMA = new DetermineBasalResultMA(jsResult, new JSONObject(result));
+                    determineBasalResultMA = new DetermineBasalResultMA(injector, jsResult, new JSONObject(result));
                 } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error(LTag.APS, "Unhandled exception", e);
                 }
             } else {
-                log.debug("Problem loading JS Functions");
+                aapsLogger.debug(LTag.APS, "Problem loading JS Functions");
             }
         } catch (IOException e) {
-            log.error("IOException");
+            aapsLogger.error(LTag.APS, "IOException");
         } catch (RhinoException e) {
-            log.error("RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
+            aapsLogger.error(LTag.APS, "RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
         } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
-            log.error(e.toString());
+            aapsLogger.error(LTag.APS, e.toString());
         } finally {
             Context.exit();
         }
@@ -175,12 +182,12 @@ public class DetermineBasalAdapterMAJS {
 
         mProfile.put("current_basal", basalRate);
 
-        if (ProfileFunctions.getSystemUnits().equals(Constants.MMOL)) {
+        if (profileFunction.getUnits().equals(Constants.MMOL)) {
             mProfile.put("out_units", "mmol/L");
         }
 
         long now = System.currentTimeMillis();
-        TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+        TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
 
         mCurrentTemp = new JSONObject();
         mCurrentTemp.put("duration", tb != null ? tb.getPlannedRemainingMinutes() : 0);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalResultMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalResultMA.java
index bbbcf7f893..298b313540 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalResultMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/DetermineBasalResultMA.java
@@ -3,20 +3,21 @@ package info.nightscout.androidaps.plugins.aps.openAPSMA;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.javascript.NativeObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.logging.L;
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 
 public class DetermineBasalResultMA extends APSResult {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private AAPSLogger aapsLogger;
 
     private double eventualBG;
     private double snoozeBG;
     private String mealAssist;
 
-    DetermineBasalResultMA(NativeObject result, JSONObject j) {
+    DetermineBasalResultMA(HasAndroidInjector injector, NativeObject result, JSONObject j) {
+        this(injector);
         json = j;
         if (result.containsKey("error")) {
             reason = (String) result.get("error");
@@ -49,12 +50,13 @@ public class DetermineBasalResultMA extends APSResult {
         }
     }
 
-    private DetermineBasalResultMA() {
+    private DetermineBasalResultMA(HasAndroidInjector injector) {
+        super(injector);
     }
 
     @Override
-    public DetermineBasalResultMA clone() {
-        DetermineBasalResultMA newResult = new DetermineBasalResultMA();
+    public DetermineBasalResultMA newAndClone(HasAndroidInjector injector) {
+        DetermineBasalResultMA newResult = new DetermineBasalResultMA(injector);
         doClone(newResult);
 
         newResult.eventualBG = eventualBG;
@@ -69,7 +71,7 @@ public class DetermineBasalResultMA extends APSResult {
             JSONObject ret = new JSONObject(this.json.toString());
             return ret;
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error(LTag.APS, "Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/LoggerCallback.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/LoggerCallback.java
index a2596d9174..d7e0c44d42 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/LoggerCallback.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/LoggerCallback.java
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.aps.openAPSMA;
 
 import org.mozilla.javascript.ScriptableObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.logging.L;
+import javax.inject.Inject;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 
 /**
  * Created by adrian on 15/10/17.
@@ -13,7 +15,8 @@ import info.nightscout.androidaps.logging.L;
 
 public class LoggerCallback extends ScriptableObject {
 
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    @Inject
+    AAPSLogger aapsLogger;
 
     private static StringBuffer errorBuffer = new StringBuffer();
     private static StringBuffer logBuffer = new StringBuffer();
@@ -23,6 +26,7 @@ public class LoggerCallback extends ScriptableObject {
         //empty constructor needed for Rhino
         errorBuffer = new StringBuffer();
         logBuffer = new StringBuffer();
+        MainApp.instance().androidInjector().inject(this);
     }
 
     @Override
@@ -35,14 +39,12 @@ public class LoggerCallback extends ScriptableObject {
     }
 
     public void jsFunction_log(Object obj1) {
-        if (L.isEnabled(L.APS))
-            log.debug(obj1.toString().trim());
+        aapsLogger.debug(LTag.APS, obj1.toString().trim());
         logBuffer.append(obj1.toString());
     }
 
     public void jsFunction_error(Object obj1) {
-        if (L.isEnabled(L.APS))
-            log.error(obj1.toString().trim());
+        aapsLogger.error(LTag.APS, obj1.toString().trim());
         errorBuffer.append(obj1.toString());
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAFragment.kt
index 1b72f57365..5a92764b46 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAFragment.kt
@@ -4,25 +4,27 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.openapsama_fragment.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
-class OpenAPSMAFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.APS)
+class OpenAPSMAFragment : DaggerFragment() {
     private var disposable: CompositeDisposable = CompositeDisposable()
 
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var openAPSMAPlugin: OpenAPSMAPlugin
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.openapsma_fragment, container, false)
@@ -32,7 +34,7 @@ class OpenAPSMAFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         openapsma_run.setOnClickListener {
-            OpenAPSMAPlugin.getPlugin().invoke("OpenAPSMA button", false)
+            openAPSMAPlugin.invoke("OpenAPSMA button", false)
         }
 
     }
@@ -41,22 +43,18 @@ class OpenAPSMAFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateGUI()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateResultGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateResultGUI(it.text)
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateGUI()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateResultGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateResultGUI(it.text)
+            }, { fabricPrivacy.logException(it) })
         updateGUI()
     }
 
@@ -69,19 +67,19 @@ class OpenAPSMAFragment : Fragment() {
     @Synchronized
     private fun updateGUI() {
         if (openapsma_result == null) return
-        OpenAPSMAPlugin.getPlugin().lastAPSResult?.let { lastAPSResult ->
+        openAPSMAPlugin.lastAPSResult?.let { lastAPSResult ->
             openapsma_result.text = JSONFormatter.format(lastAPSResult.json)
             openapsma_request.text = lastAPSResult.toSpanned()
         }
-        OpenAPSMAPlugin.getPlugin().lastDetermineBasalAdapterMAJS?.let { determineBasalAdapterMAJS ->
+        openAPSMAPlugin.lastDetermineBasalAdapterMAJS?.let { determineBasalAdapterMAJS ->
             openapsma_glucosestatus.text = JSONFormatter.format(determineBasalAdapterMAJS.glucoseStatusParam)
             openapsma_currenttemp.text = JSONFormatter.format(determineBasalAdapterMAJS.currentTempParam)
             openapsma_iobdata.text = JSONFormatter.format(determineBasalAdapterMAJS.iobDataParam)
             openapsma_profile.text = JSONFormatter.format(determineBasalAdapterMAJS.profileParam)
             openapsma_mealdata.text = JSONFormatter.format(determineBasalAdapterMAJS.mealDataParam)
         }
-        if (OpenAPSMAPlugin.getPlugin().lastAPSRun != 0L) {
-            openapsma_lastrun.text = DateUtil.dateAndTimeString(OpenAPSMAPlugin.getPlugin().lastAPSRun)
+        if (openAPSMAPlugin.lastAPSRun != 0L) {
+            openapsma_lastrun.text = DateUtil.dateAndTimeString(openAPSMAPlugin.lastAPSRun)
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
index 0380156c74..a1b8c24d02 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
@@ -1,80 +1,110 @@
 package info.nightscout.androidaps.plugins.aps.openAPSMA;
 
-import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import android.content.Context;
 
-import info.nightscout.androidaps.MainApp;
+import org.json.JSONException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.Profiler;
 import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-import static info.nightscout.androidaps.utils.HardLimits.checkOnlyHardLimits;
-import static info.nightscout.androidaps.utils.HardLimits.verifyHardLimits;
-
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
-
-    private static OpenAPSMAPlugin openAPSMAPlugin;
-
-    public static OpenAPSMAPlugin getPlugin() {
-        if (openAPSMAPlugin == null) {
-            openAPSMAPlugin = new OpenAPSMAPlugin();
-        }
-        return openAPSMAPlugin;
-    }
+    private final RxBusWrapper rxBus;
+    private final ConstraintChecker constraintChecker;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final Context context;
+    private final ActivePluginProvider activePlugin;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    private final HardLimits hardLimits;
 
     // last values
     DetermineBasalAdapterMAJS lastDetermineBasalAdapterMAJS = null;
     long lastAPSRun = 0;
     DetermineBasalResultMA lastAPSResult = null;
 
-    private OpenAPSMAPlugin() {
+    @Inject
+    public OpenAPSMAPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ConstraintChecker constraintChecker,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            Context context,
+            ActivePluginProvider activePlugin,
+            TreatmentsPlugin treatmentsPlugin,
+            IobCobCalculatorPlugin iobCobCalculatorPlugin,
+            HardLimits hardLimits
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.APS)
-                .fragmentClass(OpenAPSMAFragment.class.getName())
-                .pluginName(R.string.openapsma)
-                .shortName(R.string.oaps_shortname)
-                .preferencesId(R.xml.pref_openapsma)
-                .description(R.string.description_ma)
+                        .mainType(PluginType.APS)
+                        .fragmentClass(OpenAPSMAFragment.class.getName())
+                        .pluginName(R.string.openapsma)
+                        .shortName(R.string.oaps_shortname)
+                        .preferencesId(R.xml.pref_openapsma)
+                        .description(R.string.description_ma),
+                aapsLogger, resourceHelper, injector
         );
+
+        this.constraintChecker = constraintChecker;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.context = context;
+        this.rxBus = rxBus;
+        this.activePlugin = activePlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+        this.hardLimits = hardLimits;
     }
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        try {
+            PumpInterface pump = activePlugin.getActivePump();
+            return pump.getPumpDescription().isTempBasalCapable;
+        } catch (Exception ignored) {
+            // may fail during initialization
+            return true;
+        }
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        PumpInterface pump = activePlugin.getActivePump();
+        return pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
@@ -89,45 +119,34 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
 
     @Override
     public void invoke(String initiator, boolean tempBasalFallback) {
-        if (L.isEnabled(L.APS))
-            log.debug("invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
+        getAapsLogger().debug(LTag.APS, "invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
         lastAPSResult = null;
         DetermineBasalAdapterMAJS determineBasalAdapterMAJS;
-        determineBasalAdapterMAJS = new DetermineBasalAdapterMAJS(new ScriptReader(MainApp.instance().getBaseContext()));
+        determineBasalAdapterMAJS = new DetermineBasalAdapterMAJS(new ScriptReader(context), getInjector());
 
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        GlucoseStatus glucoseStatus = new GlucoseStatus(getInjector()).getGlucoseStatusData();
+        Profile profile = profileFunction.getProfile();
+        PumpInterface pump = activePlugin.getActivePump();
 
         if (profile == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.noprofileselected));
-            return;
-        }
-
-        if (pump == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.nopumpselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.nopumpselected));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.noprofileselected)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected));
             return;
         }
 
         if (!isEnabled(PluginType.APS)) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_disabled)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_disabled));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_disabled)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.openapsma_disabled));
             return;
         }
 
         if (glucoseStatus == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_noglucosedata)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_noglucosedata));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_noglucosedata)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.openapsma_noglucosedata));
             return;
         }
 
-        double maxBasal = MainApp.getConstraintChecker().getMaxBasalAllowed(profile).value();
+        double maxBasal = constraintChecker.getMaxBasalAllowed(profile).value();
 
         double minBg = profile.getTargetLowMgdl();
         double maxBg = profile.getTargetHighMgdl();
@@ -137,64 +156,61 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
         maxBg = Round.roundTo(maxBg, 0.1d);
 
         long start = System.currentTimeMillis();
-        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
-        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
-        IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments();
-        IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals();
+        treatmentsPlugin.updateTotalIOBTreatments();
+        treatmentsPlugin.updateTotalIOBTempBasals();
+        IobTotal bolusIob = treatmentsPlugin.getLastCalculationTreatments();
+        IobTotal basalIob = treatmentsPlugin.getLastCalculationTempBasals();
 
         IobTotal iobTotal = IobTotal.combine(bolusIob, basalIob).round();
 
-        MealData mealData = TreatmentsPlugin.getPlugin().getMealData();
+        MealData mealData = iobCobCalculatorPlugin.getMealData();
 
-        double maxIob = MainApp.getConstraintChecker().getMaxIOBAllowed().value();
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "MA data gathering", start);
+        double maxIob = constraintChecker.getMaxIOBAllowed().value();
+        Profiler.log(getAapsLogger(), LTag.APS, "MA data gathering", start);
 
-        minBg = verifyHardLimits(minBg, "minBg", HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]);
-        maxBg = verifyHardLimits(maxBg, "maxBg", HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]);
-        targetBg = verifyHardLimits(targetBg, "targetBg", HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]);
+        minBg = hardLimits.verifyHardLimits(minBg, "minBg", hardLimits.getVERY_HARD_LIMIT_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_MIN_BG()[1]);
+        maxBg = hardLimits.verifyHardLimits(maxBg, "maxBg", hardLimits.getVERY_HARD_LIMIT_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_MAX_BG()[1]);
+        targetBg = hardLimits.verifyHardLimits(targetBg, "targetBg", hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[1]);
 
-        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(System.currentTimeMillis());
+        TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory(System.currentTimeMillis());
         if (tempTarget != null) {
-            minBg = verifyHardLimits(tempTarget.low, "minBg", HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1]);
-            maxBg = verifyHardLimits(tempTarget.high, "maxBg", HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1]);
-            targetBg = verifyHardLimits(tempTarget.target(), "targetBg", HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1]);
+            minBg = hardLimits.verifyHardLimits(tempTarget.low, "minBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[1]);
+            maxBg = hardLimits.verifyHardLimits(tempTarget.high, "maxBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[1]);
+            targetBg = hardLimits.verifyHardLimits(tempTarget.target(), "targetBg", hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[1]);
         }
 
-        if (!checkOnlyHardLimits(profile.getDia(), "dia", HardLimits.MINDIA, HardLimits.MAXDIA))
+        if (!hardLimits.checkOnlyHardLimits(profile.getDia(), "dia", hardLimits.getMINDIA(), hardLimits.getMAXDIA()))
             return;
-        if (!checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", HardLimits.MINIC, HardLimits.MAXIC))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", hardLimits.getMINIC(), hardLimits.getMAXIC()))
             return;
-        if (!checkOnlyHardLimits(profile.getIsfMgdl(), "sens", HardLimits.MINISF, HardLimits.MAXISF))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), "sens", hardLimits.getMINISF(), hardLimits.getMAXISF()))
             return;
-        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, hardLimits.maxBasal()))
             return;
-        if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, hardLimits.maxBasal()))
             return;
 
         start = System.currentTimeMillis();
         try {
-            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobTotal, glucoseStatus, mealData);
+            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, activePlugin.getActivePump().getBaseBasalRate(), iobTotal, glucoseStatus, mealData);
         } catch (JSONException e) {
-            FabricPrivacy.logException(e);
+            FabricPrivacy.getInstance().logException(e);
             return;
         }
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "MA calculation", start);
+        Profiler.log(getAapsLogger(), LTag.APS, "MA calculation", start);
 
 
         long now = System.currentTimeMillis();
 
         DetermineBasalResultMA determineBasalResultMA = determineBasalAdapterMAJS.invoke();
         if (determineBasalResultMA == null) {
-            if (L.isEnabled(L.APS))
-                log.error("MA calculation returned null");
+            getAapsLogger().error(LTag.APS, "MA calculation returned null");
             lastDetermineBasalAdapterMAJS = null;
             lastAPSResult = null;
             lastAPSRun = 0;
         } else {
-            // Fix bug determinef basal
-            if (determineBasalResultMA.rate == 0d && determineBasalResultMA.duration == 0 && !TreatmentsPlugin.getPlugin().isTempBasalInProgress())
+            // Fix bug determine basal
+            if (determineBasalResultMA.rate == 0d && determineBasalResultMA.duration == 0 && !treatmentsPlugin.isTempBasalInProgress())
                 determineBasalResultMA.tempBasalRequested = false;
 
             determineBasalResultMA.iob = iobTotal;
@@ -202,14 +218,14 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
             try {
                 determineBasalResultMA.json.put("timestamp", DateUtil.toISOString(now));
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                getAapsLogger().error(LTag.APS, "Unhandled exception", e);
             }
 
             lastDetermineBasalAdapterMAJS = determineBasalAdapterMAJS;
             lastAPSResult = determineBasalResultMA;
             lastAPSRun = now;
         }
-        RxBus.INSTANCE.send(new EventOpenAPSUpdateGui());
+        rxBus.send(new EventOpenAPSUpdateGui());
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 76571176d3..af56162640 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -11,34 +11,46 @@ import org.mozilla.javascript.RhinoException;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.Undefined;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.LoggerCallback;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+
 
 public class DetermineBasalAdapterSMBJS {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
+    private final HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject SP sp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject ActivePluginProvider activePluginProvider;
 
 
     private ScriptReader mScriptReader;
@@ -50,6 +62,7 @@ public class DetermineBasalAdapterSMBJS {
     private JSONObject mAutosensData = null;
     private boolean mMicrobolusAllowed;
     private boolean mSMBAlwaysAllowed;
+    private long mCurrentTime;
 
     private String storedCurrentTemp = null;
     private String storedIobData = null;
@@ -60,6 +73,7 @@ public class DetermineBasalAdapterSMBJS {
     private String storedAutosens_data = null;
     private String storedMicroBolusAllowed = null;
     private String storedSMBAlwaysAllowed = null;
+    private String storedCurrentTime = null;
 
     private String scriptDebug = "";
 
@@ -67,8 +81,10 @@ public class DetermineBasalAdapterSMBJS {
      * Main code
      */
 
-    DetermineBasalAdapterSMBJS(ScriptReader scriptReader) {
+    DetermineBasalAdapterSMBJS(ScriptReader scriptReader, HasAndroidInjector injector) {
         mScriptReader = scriptReader;
+        this.injector = injector;
+        injector.androidInjector().inject(this);
     }
 
 
@@ -76,21 +92,21 @@ public class DetermineBasalAdapterSMBJS {
     public DetermineBasalResultSMB invoke() {
 
 
-        if (L.isEnabled(L.APS)) {
-            log.debug(">>> Invoking detemine_basal <<<");
-            log.debug("Glucose status: " + (storedGlucoseStatus = mGlucoseStatus.toString()));
-            log.debug("IOB data:       " + (storedIobData = mIobData.toString()));
-            log.debug("Current temp:   " + (storedCurrentTemp = mCurrentTemp.toString()));
-            log.debug("Profile:        " + (storedProfile = mProfile.toString()));
-            log.debug("Meal data:      " + (storedMeal_data = mMealData.toString()));
-            if (mAutosensData != null)
-                log.debug("Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
-            else
-                log.debug("Autosens data:  " + (storedAutosens_data = "undefined"));
-            log.debug("Reservoir data: " + "undefined");
-            log.debug("MicroBolusAllowed:  " + (storedMicroBolusAllowed = "" + mMicrobolusAllowed));
-            log.debug("SMBAlwaysAllowed:  " + (storedSMBAlwaysAllowed = "" + mSMBAlwaysAllowed));
-        }
+        aapsLogger.debug(LTag.APS, ">>> Invoking detemine_basal <<<");
+        aapsLogger.debug(LTag.APS, "Glucose status: " + (storedGlucoseStatus = mGlucoseStatus.toString()));
+        aapsLogger.debug(LTag.APS, "IOB data:       " + (storedIobData = mIobData.toString()));
+        aapsLogger.debug(LTag.APS, "Current temp:   " + (storedCurrentTemp = mCurrentTemp.toString()));
+        aapsLogger.debug(LTag.APS, "Profile:        " + (storedProfile = mProfile.toString()));
+        aapsLogger.debug(LTag.APS, "Meal data:      " + (storedMeal_data = mMealData.toString()));
+        if (mAutosensData != null)
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
+        else
+            aapsLogger.debug(LTag.APS, "Autosens data:  " + (storedAutosens_data = "undefined"));
+        aapsLogger.debug(LTag.APS, "Reservoir data: " + "undefined");
+        aapsLogger.debug(LTag.APS, "MicroBolusAllowed:  " + (storedMicroBolusAllowed = "" + mMicrobolusAllowed));
+        aapsLogger.debug(LTag.APS, "SMBAlwaysAllowed:  " + (storedSMBAlwaysAllowed = "" + mSMBAlwaysAllowed));
+        aapsLogger.debug(LTag.APS, "CurrentTime: " + (storedCurrentTime = "" + mCurrentTime));
+
 
         DetermineBasalResultSMB determineBasalResultSMB = null;
 
@@ -132,7 +148,8 @@ public class DetermineBasalAdapterSMBJS {
                         makeParam(mMealData, rhino, scope),
                         setTempBasalFunctionsObj,
                         new Boolean(mMicrobolusAllowed),
-                        makeParam(null, rhino, scope) // reservoir data as undefined
+                        makeParam(null, rhino, scope), // reservoir data as undefined
+                        new Long(mCurrentTime)
                 };
 
 
@@ -141,22 +158,21 @@ public class DetermineBasalAdapterSMBJS {
 
                 // Parse the jsResult object to a JSON-String
                 String result = NativeJSON.stringify(rhino, scope, jsResult, null, null).toString();
-                if (L.isEnabled(L.APS))
-                    log.debug("Result: " + result);
+                aapsLogger.debug(LTag.APS, "Result: " + result);
                 try {
-                    determineBasalResultSMB = new DetermineBasalResultSMB(new JSONObject(result));
+                    determineBasalResultSMB = new DetermineBasalResultSMB(injector, new JSONObject(result));
                 } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error(LTag.APS, "Unhandled exception", e);
                 }
             } else {
-                log.error("Problem loading JS Functions");
+                aapsLogger.error(LTag.APS, "Problem loading JS Functions");
             }
         } catch (IOException e) {
-            log.error("IOException");
+            aapsLogger.error(LTag.APS, "IOException");
         } catch (RhinoException e) {
-            log.error("RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
+            aapsLogger.error(LTag.APS, "RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
         } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
-            log.error(e.toString());
+            aapsLogger.error(LTag.APS, e.toString());
         } finally {
             Context.exit();
         }
@@ -220,6 +236,8 @@ public class DetermineBasalAdapterSMBJS {
                         boolean advancedFiltering
     ) throws JSONException {
 
+        String units = profile.getUnits();
+        Double pumpbolusstep = activePluginProvider.getActivePump().getPumpDescription().bolusStep;
         mProfile = new JSONObject();
 
         mProfile.put("max_iob", maxIob);
@@ -232,11 +250,10 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("target_bg", targetBg);
         mProfile.put("carb_ratio", profile.getIc());
         mProfile.put("sens", profile.getIsfMgdl());
-        mProfile.put("max_daily_safety_multiplier", SP.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
-        mProfile.put("current_basal_safety_multiplier", SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));
+        mProfile.put("max_daily_safety_multiplier", sp.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
+        mProfile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));
 
-        // TODO AS-FIX
-        // mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
+        //mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
         mProfile.put("high_temptarget_raises_sensitivity", false);
         //mProfile.put("low_temptarget_lowers_sensitivity", SP.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
         mProfile.put("low_temptarget_lowers_sensitivity", false);
@@ -259,26 +276,30 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("enableUAM", uamAllowed);
         mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
 
-        boolean smbEnabled = SP.getBoolean(MainApp.gs(R.string.key_use_smb), false);
-        mProfile.put("enableSMB_with_COB", smbEnabled && SP.getBoolean(R.string.key_enableSMB_with_COB, false));
-        mProfile.put("enableSMB_with_temptarget", smbEnabled && SP.getBoolean(R.string.key_enableSMB_with_temptarget, false));
-        mProfile.put("allowSMB_with_high_temptarget", smbEnabled && SP.getBoolean(R.string.key_allowSMB_with_high_temptarget, false));
-        mProfile.put("enableSMB_always", smbEnabled && SP.getBoolean(R.string.key_enableSMB_always, false) && advancedFiltering);
-        mProfile.put("enableSMB_after_carbs", smbEnabled && SP.getBoolean(R.string.key_enableSMB_after_carbs, false) && advancedFiltering);
-        mProfile.put("maxSMBBasalMinutes", SP.getInt(R.string.key_smbmaxminutes, SMBDefaults.maxSMBBasalMinutes));
-        mProfile.put("carbsReqThreshold", SMBDefaults.carbsReqThreshold);
+        boolean smbEnabled = sp.getBoolean(resourceHelper.gs(R.string.key_use_smb), false);
+        mProfile.put("SMBInterval", sp.getInt("key_smbinterval", SMBDefaults.SMBInterval));
+        mProfile.put("enableSMB_with_COB", smbEnabled && sp.getBoolean(R.string.key_enableSMB_with_COB, false));
+        mProfile.put("enableSMB_with_temptarget", smbEnabled && sp.getBoolean(R.string.key_enableSMB_with_temptarget, false));
+        mProfile.put("allowSMB_with_high_temptarget", smbEnabled && sp.getBoolean(R.string.key_allowSMB_with_high_temptarget, false));
+        mProfile.put("enableSMB_always", smbEnabled && sp.getBoolean(R.string.key_enableSMB_always, false) && advancedFiltering);
+        mProfile.put("enableSMB_after_carbs", smbEnabled && sp.getBoolean(R.string.key_enableSMB_after_carbs, false) && advancedFiltering);
+        mProfile.put("maxSMBBasalMinutes", sp.getInt(R.string.key_smbmaxminutes, SMBDefaults.maxSMBBasalMinutes));
+        mProfile.put("maxUAMSMBBasalMinutes", sp.getInt(R.string.key_uamsmbmaxminutes, SMBDefaults.maxUAMSMBBasalMinutes));
+        //set the min SMB amount to be the amount set by the pump.
+        mProfile.put("bolus_increment", pumpbolusstep);
+        mProfile.put("carbsReqThreshold", sp.getInt(R.string.key_carbsReqThreshold, SMBDefaults.carbsReqThreshold));
 
         mProfile.put("current_basal", basalrate);
         mProfile.put("temptargetSet", tempTargetSet);
-        mProfile.put("autosens_max", SafeParse.stringToDouble(SP.getString(R.string.key_openapsama_autosens_max, "1.2")));
+        mProfile.put("autosens_max", SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_max, "1.2")));
 
-        if (ProfileFunctions.getSystemUnits().equals(Constants.MMOL)) {
+        if (profileFunction.getUnits().equals(Constants.MMOL)) {
             mProfile.put("out_units", "mmol/L");
         }
 
 
         long now = System.currentTimeMillis();
-        TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+        TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
 
         mCurrentTemp = new JSONObject();
         mCurrentTemp.put("temp", "absolute");
@@ -286,7 +307,7 @@ public class DetermineBasalAdapterSMBJS {
         mCurrentTemp.put("rate", tb != null ? tb.tempBasalConvertedToAbsolute(now, profile) : 0d);
 
         // as we have non default temps longer than 30 mintues
-        TemporaryBasal tempBasal = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal tempBasal = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (tempBasal != null) {
             mCurrentTemp.put("minutesrunning", tempBasal.getRealDuration());
         }
@@ -295,8 +316,9 @@ public class DetermineBasalAdapterSMBJS {
 
         mGlucoseStatus = new JSONObject();
         mGlucoseStatus.put("glucose", glucoseStatus.glucose);
+        mGlucoseStatus.put("noise", glucoseStatus.noise);
 
-        if (SP.getBoolean(R.string.key_always_use_shortavg, false)) {
+        if (sp.getBoolean(R.string.key_always_use_shortavg, false)) {
             mGlucoseStatus.put("delta", glucoseStatus.short_avgdelta);
         } else {
             mGlucoseStatus.put("delta", glucoseStatus.delta);
@@ -315,7 +337,7 @@ public class DetermineBasalAdapterSMBJS {
         mMealData.put("lastCarbTime", mealData.lastCarbTime);
 
 
-        if (MainApp.getConstraintChecker().isAutosensModeEnabled().value()) {
+        if (constraintChecker.isAutosensModeEnabled().value()) {
             mAutosensData = new JSONObject();
             mAutosensData.put("ratio", autosensDataRatio);
         } else {
@@ -325,6 +347,8 @@ public class DetermineBasalAdapterSMBJS {
         mMicrobolusAllowed = microBolusAllowed;
         mSMBAlwaysAllowed = advancedFiltering;
 
+        mCurrentTime = now;
+
     }
 
     private Object makeParam(JSONObject jsonObject, Context rhino, Scriptable scope) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index 9d0bd22557..dae170d5d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -2,21 +2,25 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.logging.L;
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
 
 public class DetermineBasalResultSMB extends APSResult {
-    private static final Logger log = LoggerFactory.getLogger(L.APS);
 
     private double eventualBG;
     private double snoozeBG;
 
-    DetermineBasalResultSMB(JSONObject result) {
-        this();
+    private DetermineBasalResultSMB(HasAndroidInjector injector) {
+        super(injector);
+        hasPredictions = true;
+    }
+
+    DetermineBasalResultSMB(HasAndroidInjector injector, JSONObject result) {
+        this(injector);
         date = DateUtil.now();
         json = result;
         try {
@@ -53,21 +57,17 @@ public class DetermineBasalResultSMB extends APSResult {
                 try {
                     deliverAt = DateUtil.fromISODateString(date).getTime();
                 } catch (Exception e) {
-                    log.warn("Error parsing 'deliverAt' date: " + date, e);
+                    aapsLogger.error(LTag.APS, "Error parsing 'deliverAt' date: " + date, e);
                 }
             }
         } catch (JSONException e) {
-            log.error("Error parsing determine-basal result JSON", e);
+            aapsLogger.error(LTag.APS, "Error parsing determine-basal result JSON", e);
         }
     }
 
-    private DetermineBasalResultSMB() {
-        hasPredictions = true;
-    }
-
     @Override
-    public DetermineBasalResultSMB clone() {
-        DetermineBasalResultSMB newResult = new DetermineBasalResultSMB();
+    public DetermineBasalResultSMB newAndClone(HasAndroidInjector injector) {
+        DetermineBasalResultSMB newResult = new DetermineBasalResultSMB(injector);
         doClone(newResult);
 
         newResult.eventualBG = eventualBG;
@@ -80,7 +80,7 @@ public class DetermineBasalResultSMB extends APSResult {
         try {
             return new JSONObject(this.json.toString());
         } catch (JSONException e) {
-            log.error("Error converting determine-basal result to JSON", e);
+            aapsLogger.error(LTag.APS, "Error converting determine-basal result to JSON", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
index 06ad0d01fd..ec60365f2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@@ -6,28 +6,34 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.openapsama_fragment.*
 import org.json.JSONArray
 import org.json.JSONException
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
-class OpenAPSSMBFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.APS)
+class OpenAPSSMBFragment : DaggerFragment() {
     private var disposable: CompositeDisposable = CompositeDisposable()
 
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.openapsama_fragment, container, false)
@@ -37,29 +43,25 @@ class OpenAPSSMBFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         openapsma_run.setOnClickListener {
-            OpenAPSSMBPlugin.getPlugin().invoke("OpenAPSSMB button", false)
+            openAPSSMBPlugin.invoke("OpenAPSSMB button", false)
         }
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateGUI()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventOpenAPSUpdateResultGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateResultGUI(it.text)
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateGUI()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventOpenAPSUpdateResultGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateResultGUI(it.text)
+            }, { fabricPrivacy.logException(it) })
 
         updateGUI()
     }
@@ -73,34 +75,33 @@ class OpenAPSSMBFragment : Fragment() {
     @Synchronized
     fun updateGUI() {
         if (openapsma_result == null) return
-        val plugin = OpenAPSSMBPlugin.getPlugin()
-        plugin.lastAPSResult?.let { lastAPSResult ->
+        openAPSSMBPlugin.lastAPSResult?.let { lastAPSResult ->
             openapsma_result.text = JSONFormatter.format(lastAPSResult.json)
             openapsma_request.text = lastAPSResult.toSpanned()
         }
-        plugin.lastDetermineBasalAdapterSMBJS?.let { determineBasalAdapterSMBJS ->
+        openAPSSMBPlugin.lastDetermineBasalAdapterSMBJS?.let { determineBasalAdapterSMBJS ->
             openapsma_glucosestatus.text = JSONFormatter.format(determineBasalAdapterSMBJS.glucoseStatusParam)
             openapsma_currenttemp.text = JSONFormatter.format(determineBasalAdapterSMBJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterSMBJS.iobDataParam)
-                openapsma_iobdata.text = TextUtils.concat(String.format(MainApp.gs(R.string.array_of_elements), iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
+                openapsma_iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", JSONFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
-                log.error("Unhandled exception", e)
-                @SuppressLint("SetTextl18n")
+                aapsLogger.error(LTag.APS, "Unhandled exception", e)
+                @SuppressLint("SetTextI18n")
                 openapsma_iobdata.text = "JSONException see log for details"
             }
 
             openapsma_profile.text = JSONFormatter.format(determineBasalAdapterSMBJS.profileParam)
             openapsma_mealdata.text = JSONFormatter.format(determineBasalAdapterSMBJS.mealDataParam)
             openapsma_scriptdebugdata.text = determineBasalAdapterSMBJS.scriptDebug
-            plugin.lastAPSResult?.inputConstraints?.let {
-                openapsma_constraints.text = it.reasons
+            openAPSSMBPlugin.lastAPSResult?.inputConstraints?.let {
+                openapsma_constraints.text = it.getReasons(aapsLogger)
             }
         }
-        if (plugin.lastAPSRun != 0L) {
-            openapsma_lastrun.text = DateUtil.dateAndTimeFullString(plugin.lastAPSRun)
+        if (openAPSSMBPlugin.lastAPSRun != 0L) {
+            openapsma_lastrun.text = DateUtil.dateAndTimeString(openAPSSMBPlugin.lastAPSRun)
         }
-        plugin.lastAutosensResult?.let {
+        openAPSSMBPlugin.lastAutosensResult?.let {
             openapsma_autosensdata.text = JSONFormatter.format(it.json())
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index 426c04090b..6081849d59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -1,31 +1,36 @@
 package info.nightscout.androidaps.plugins.aps.openAPSSMB;
 
-import org.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import android.content.Context;
 
-import info.nightscout.androidaps.MainApp;
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
@@ -36,22 +41,19 @@ import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.Profiler;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, ConstraintsInterface {
-    private static Logger log = LoggerFactory.getLogger(L.APS);
-
-    private static OpenAPSSMBPlugin openAPSSMBPlugin;
-
-    public static OpenAPSSMBPlugin getPlugin() {
-        if (openAPSSMBPlugin == null) {
-            openAPSSMBPlugin = new OpenAPSSMBPlugin();
-        }
-        return openAPSSMBPlugin;
-    }
+    private final ConstraintChecker constraintChecker;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final Context context;
+    private final RxBusWrapper rxBus;
+    private final ActivePluginProvider activePlugin;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    private final HardLimits hardLimits;
 
     // last values
     DetermineBasalAdapterSMBJS lastDetermineBasalAdapterSMBJS = null;
@@ -59,27 +61,56 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
     DetermineBasalResultSMB lastAPSResult = null;
     AutosensResult lastAutosensResult = null;
 
-    private OpenAPSSMBPlugin() {
+    @Inject
+    public OpenAPSSMBPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ConstraintChecker constraintChecker,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            Context context,
+            ActivePluginProvider activePlugin,
+            TreatmentsPlugin treatmentsPlugin,
+            IobCobCalculatorPlugin iobCobCalculatorPlugin,
+            HardLimits hardLimits
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.APS)
-                .fragmentClass(OpenAPSSMBFragment.class.getName())
-                .pluginName(R.string.openapssmb)
-                .shortName(R.string.smb_shortname)
-                .preferencesId(R.xml.pref_openapssmb)
-                .description(R.string.description_smb)
+                        .mainType(PluginType.APS)
+                        .fragmentClass(OpenAPSSMBFragment.class.getName())
+                        .pluginName(R.string.openapssmb)
+                        .shortName(R.string.smb_shortname)
+                        .preferencesId(R.xml.pref_openapssmb)
+                        .description(R.string.description_smb)
+                        .setDefault(),
+                aapsLogger, resourceHelper, injector
         );
+        this.constraintChecker = constraintChecker;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.rxBus = rxBus;
+        this.context = context;
+        this.activePlugin = activePlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+        this.hardLimits = hardLimits;
     }
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        try {
+            PumpInterface pump = activePlugin.getActivePump();
+            return pump.getPumpDescription().isTempBasalCapable;
+        } catch (Exception ignored) {
+            // may fail during initialization
+            return true;
+        }
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        return pump == null || pump.getPumpDescription().isTempBasalCapable;
+        PumpInterface pump = activePlugin.getActivePump();
+        return pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
@@ -94,47 +125,36 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
 
     @Override
     public void invoke(String initiator, boolean tempBasalFallback) {
-        if (L.isEnabled(L.APS))
-            log.debug("invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
+        getAapsLogger().debug(LTag.APS, "invoke from " + initiator + " tempBasalFallback: " + tempBasalFallback);
         lastAPSResult = null;
         DetermineBasalAdapterSMBJS determineBasalAdapterSMBJS;
-        determineBasalAdapterSMBJS = new DetermineBasalAdapterSMBJS(new ScriptReader(MainApp.instance().getBaseContext()));
+        determineBasalAdapterSMBJS = new DetermineBasalAdapterSMBJS(new ScriptReader(context), getInjector());
 
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        GlucoseStatus glucoseStatus = new GlucoseStatus(getInjector()).getGlucoseStatusData();
+        Profile profile = profileFunction.getProfile();
+        PumpInterface pump = activePlugin.getActivePump();
 
         if (profile == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.noprofileselected));
-            return;
-        }
-
-        if (pump == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.nopumpselected)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.nopumpselected));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.noprofileselected)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected));
             return;
         }
 
         if (!isEnabled(PluginType.APS)) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_disabled)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_disabled));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_disabled)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.openapsma_disabled));
             return;
         }
 
         if (glucoseStatus == null) {
-            RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openapsma_noglucosedata)));
-            if (L.isEnabled(L.APS))
-                log.debug(MainApp.gs(R.string.openapsma_noglucosedata));
+            rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_noglucosedata)));
+            getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.openapsma_noglucosedata));
             return;
         }
 
         Constraint<Double> inputConstraints = new Constraint<>(0d); // fake. only for collecting all results
 
-        Constraint<Double> maxBasalConstraint = MainApp.getConstraintChecker().getMaxBasalAllowed(profile);
+        Constraint<Double> maxBasalConstraint = constraintChecker.getMaxBasalAllowed(profile);
         inputConstraints.copyReasons(maxBasalConstraint);
         double maxBasal = maxBasalConstraint.value();
         double minBg = profile.getTargetLowMgdl();
@@ -147,44 +167,43 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         long start = System.currentTimeMillis();
         long startPart = System.currentTimeMillis();
 
-        MealData mealData = TreatmentsPlugin.getPlugin().getMealData();
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "getMealData()", startPart);
+        MealData mealData = iobCobCalculatorPlugin.getMealData();
+        Profiler.log(getAapsLogger(), LTag.APS, "getMealData()", startPart);
 
-        Constraint<Double> maxIOBAllowedConstraint = MainApp.getConstraintChecker().getMaxIOBAllowed();
+        Constraint<Double> maxIOBAllowedConstraint = constraintChecker.getMaxIOBAllowed();
         inputConstraints.copyReasons(maxIOBAllowedConstraint);
         double maxIob = maxIOBAllowedConstraint.value();
 
-        minBg = verifyHardLimits(minBg, "minBg", HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]);
-        maxBg = verifyHardLimits(maxBg, "maxBg", HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]);
-        targetBg = verifyHardLimits(targetBg, "targetBg", HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]);
+        minBg = hardLimits.verifyHardLimits(minBg, "minBg", hardLimits.getVERY_HARD_LIMIT_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_MIN_BG()[1]);
+        maxBg = hardLimits.verifyHardLimits(maxBg, "maxBg", hardLimits.getVERY_HARD_LIMIT_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_MAX_BG()[1]);
+        targetBg = hardLimits.verifyHardLimits(targetBg, "targetBg", hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TARGET_BG()[1]);
 
         boolean isTempTarget = false;
-        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(System.currentTimeMillis());
+        TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory(System.currentTimeMillis());
         if (tempTarget != null) {
             isTempTarget = true;
-            minBg = verifyHardLimits(tempTarget.low, "minBg", HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1]);
-            maxBg = verifyHardLimits(tempTarget.high, "maxBg", HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1]);
-            targetBg = verifyHardLimits(tempTarget.target(), "targetBg", HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1]);
+            minBg = hardLimits.verifyHardLimits(tempTarget.low, "minBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MIN_BG()[1]);
+            maxBg = hardLimits.verifyHardLimits(tempTarget.high, "maxBg", hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_MAX_BG()[1]);
+            targetBg = hardLimits.verifyHardLimits(tempTarget.target(), "targetBg", hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[0], hardLimits.getVERY_HARD_LIMIT_TEMP_TARGET_BG()[1]);
         }
 
 
-        if (!checkOnlyHardLimits(profile.getDia(), "dia", HardLimits.MINDIA, HardLimits.MAXDIA))
+        if (!hardLimits.checkOnlyHardLimits(profile.getDia(), "dia", hardLimits.getMINDIA(), hardLimits.getMAXDIA()))
             return;
-        if (!checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", HardLimits.MINIC, HardLimits.MAXIC))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), "carbratio", hardLimits.getMINIC(), hardLimits.getMAXIC()))
             return;
-        if (!checkOnlyHardLimits(profile.getIsfMgdl(), "sens", HardLimits.MINISF, HardLimits.MAXISF))
+        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), "sens", hardLimits.getMINISF(), hardLimits.getMAXISF()))
             return;
-        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, hardLimits.maxBasal()))
             return;
-        if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
+        if (!hardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, hardLimits.maxBasal()))
             return;
 
         startPart = System.currentTimeMillis();
-        if (MainApp.getConstraintChecker().isAutosensModeEnabled().value()) {
-            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("OpenAPSPlugin");
+        if (constraintChecker.isAutosensModeEnabled().value()) {
+            AutosensData autosensData = iobCobCalculatorPlugin.getLastAutosensDataSynchronized("OpenAPSPlugin");
             if (autosensData == null) {
-                RxBus.INSTANCE.send(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.openaps_noasdata)));
+                rxBus.send(new EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)));
                 return;
             }
             lastAutosensResult = autosensData.autosensResult;
@@ -193,31 +212,28 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
             lastAutosensResult.sensResult = "autosens disabled";
         }
 
-        IobTotal[] iobArray = IobCobCalculatorPlugin.getPlugin().calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget);
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "calculateIobArrayInDia()", startPart);
+        IobTotal[] iobArray = iobCobCalculatorPlugin.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget);
+        Profiler.log(getAapsLogger(), LTag.APS, "calculateIobArrayInDia()", startPart);
 
         startPart = System.currentTimeMillis();
         Constraint<Boolean> smbAllowed = new Constraint<>(!tempBasalFallback);
-        MainApp.getConstraintChecker().isSMBModeEnabled(smbAllowed);
+        constraintChecker.isSMBModeEnabled(smbAllowed);
         inputConstraints.copyReasons(smbAllowed);
 
         Constraint<Boolean> advancedFiltering = new Constraint<>(!tempBasalFallback);
-        MainApp.getConstraintChecker().isAdvancedFilteringEnabled(advancedFiltering);
+        constraintChecker.isAdvancedFilteringEnabled(advancedFiltering);
         inputConstraints.copyReasons(advancedFiltering);
 
         Constraint<Boolean> uam = new Constraint<>(true);
-        MainApp.getConstraintChecker().isUAMEnabled(uam);
+        constraintChecker.isUAMEnabled(uam);
         inputConstraints.copyReasons(uam);
 
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "detectSensitivityandCarbAbsorption()", startPart);
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "SMB data gathering", start);
+        Profiler.log(getAapsLogger(), LTag.APS, "detectSensitivityandCarbAbsorption()", startPart);
+        Profiler.log(getAapsLogger(), LTag.APS, "SMB data gathering", start);
 
         start = System.currentTimeMillis();
         try {
-            determineBasalAdapterSMBJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
+            determineBasalAdapterSMBJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, activePlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
                     isTempTarget,
                     smbAllowed.value(),
@@ -225,25 +241,23 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
                     advancedFiltering.value()
             );
         } catch (JSONException e) {
-            FabricPrivacy.logException(e);
+            FabricPrivacy.getInstance().logException(e);
             return;
         }
 
         long now = System.currentTimeMillis();
 
         DetermineBasalResultSMB determineBasalResultSMB = determineBasalAdapterSMBJS.invoke();
-        if (L.isEnabled(L.APS))
-            Profiler.log(log, "SMB calculation", start);
+        Profiler.log(getAapsLogger(), LTag.APS, "SMB calculation", start);
         if (determineBasalResultSMB == null) {
-            if (L.isEnabled(L.APS))
-                log.error("SMB calculation returned null");
+            getAapsLogger().error(LTag.APS, "SMB calculation returned null");
             lastDetermineBasalAdapterSMBJS = null;
             lastAPSResult = null;
             lastAPSRun = 0;
         } else {
             // TODO still needed with oref1?
             // Fix bug determine basal
-            if (determineBasalResultSMB.rate == 0d && determineBasalResultSMB.duration == 0 && !TreatmentsPlugin.getPlugin().isTempBasalInProgress())
+            if (determineBasalResultSMB.rate == 0d && determineBasalResultSMB.duration == 0 && !treatmentsPlugin.isTempBasalInProgress())
                 determineBasalResultSMB.tempBasalRequested = false;
 
             determineBasalResultSMB.iob = iobArray[0];
@@ -251,7 +265,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
             try {
                 determineBasalResultSMB.json.put("timestamp", DateUtil.toISOString(now));
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                getAapsLogger().error(LTag.APS, "Unhandled exception", e);
             }
 
             determineBasalResultSMB.inputConstraints = inputConstraints;
@@ -260,33 +274,15 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
             lastAPSResult = determineBasalResultSMB;
             lastAPSRun = now;
         }
-        RxBus.INSTANCE.send(new EventOpenAPSUpdateGui());
+        rxBus.send(new EventOpenAPSUpdateGui());
 
         //deviceStatus.suggested = determineBasalResultAMA.json;
     }
 
-    // safety checks
-    private static boolean checkOnlyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
-        return value.equals(verifyHardLimits(value, valueName, lowLimit, highLimit));
-    }
-
-    private static Double verifyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
-        Double newvalue = value;
-        if (newvalue < lowLimit || newvalue > highLimit) {
-            newvalue = Math.max(newvalue, lowLimit);
-            newvalue = Math.min(newvalue, highLimit);
-            String msg = String.format(MainApp.gs(R.string.valueoutofrange), valueName);
-            msg += ".\n";
-            msg += String.format(MainApp.gs(R.string.valuelimitedto), value, newvalue);
-            log.error(msg);
-            NSUpload.uploadError(msg);
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), msg, R.raw.error);
-        }
-        return newvalue;
-    }
-
+    @NotNull
+    @Override
     public Constraint<Boolean> isSuperBolusEnabled(Constraint<Boolean> value) {
-        value.set(false);
+        value.set(getAapsLogger(), false);
         return value;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
index f6b8f20233..5f2216b5ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
@@ -55,10 +55,13 @@ public class SMBDefaults {
     // *** WARNING *** DO NOT USE enableSMB_always or enableSMB_after_carbs with xDrip+, Libre, or similar
     //public final static boolean enableSMB_after_carbs = false; // enable supermicrobolus for 6h after carbs, even with 0 COB
     //public final static boolean allowSMB_with_high_temptarget = false; // allow supermicrobolus (if otherwise enabled) even with high temp targets
+    public final static int SMBInterval = 3; // minimum interval between SMBs, in minutes. (limited between 1 and 10 min)
     public final static int maxSMBBasalMinutes = 30; // maximum minutes of basal that can be delivered as a single SMB with uncovered COB
+    public final static int maxUAMSMBBasalMinutes = 30; // maximum minutes of basal that can be delivered as a single SMB when IOB exceeds COB
     // curve:"rapid-acting" // Supported curves: "bilinear", "rapid-acting" (Novolog, Novorapid, Humalog, Apidra) and "ultra-rapid" (Fiasp)
     // useCustomPeakTime:false // allows changing insulinPeakTime
     // insulinPeakTime:75 // number of minutes after a bolus activity peaks.  defaults to 55m for Fiasp if useCustomPeakTime: false
     public final static int carbsReqThreshold = 1; // grams of carbsReq to trigger a pushover
     // offline_hotspot:false // enabled an offline-only local wifi hotspot if no Internet available
+    public final static double bolus_increment = 0.1; // minimum bolus that can be delivered as an SMB
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
index 1774df1471..0b2960c7d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
@@ -5,8 +5,13 @@ import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
 
-// Use object so we have a singleton instance
-object RxBus {
+class RxBus {
+
+    companion object {
+        @JvmStatic
+        @Deprecated("Get via Dagger. Will be removed once fully transitioned to Dagger")
+        var INSTANCE: RxBus = RxBus()//TODO: remove as soon as Dagger is fully set up
+    }
 
     private val publisher = PublishSubject.create<Event>()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt b/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
new file mode 100644
index 0000000000..66e5324113
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.bus
+
+import info.nightscout.androidaps.events.Event
+import io.reactivex.Observable
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+open class RxBusWrapper @Inject constructor() {
+
+    private val bus: RxBus = RxBus.INSTANCE
+
+    fun send(event: Event) {
+        bus.send(event)
+    }
+
+    // Listen should return an Observable and not the publisher
+    // Using ofType we filter only events that match that class type
+    fun <T> toObservable(eventType: Class<T>): Observable<T> =
+        bus.toObservable(eventType)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
index 059bec1444..c864313b27 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@@ -1,26 +1,41 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
-
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.ImageButton
 import android.widget.LinearLayout
+import android.widget.RadioButton
 import android.widget.TextView
 import androidx.annotation.StringRes
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.PreferencesActivity
+import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.*
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.PasswordProtection
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.toVisibility
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.configbuilder_fragment.*
 import java.util.*
+import javax.inject.Inject
 
-class ConfigBuilderFragment : Fragment() {
+class ConfigBuilderFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var protectionCheck: ProtectionCheck
 
     private var disposable: CompositeDisposable = CompositeDisposable()
     private val pluginViewHolders = ArrayList<PluginViewHolder>()
@@ -33,30 +48,32 @@ class ConfigBuilderFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if (PasswordProtection.isLocked("settings_password"))
+        if (protectionCheck.isLocked(ProtectionCheck.Protection.PREFERENCES))
             configbuilder_main_layout.visibility = View.GONE
         else
             unlock.visibility = View.GONE
 
         unlock.setOnClickListener {
-            PasswordProtection.QueryPassword(context, R.string.settings_password, "settings_password", {
-                configbuilder_main_layout.visibility = View.VISIBLE
-                unlock.visibility = View.GONE
-            }, null)
+            activity?.let { activity ->
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    activity.runOnUiThread {
+                        configbuilder_main_layout.visibility = View.VISIBLE
+                        unlock.visibility = View.GONE
+                    }
+                })
+            }
         }
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
-                .toObservable(EventConfigBuilderUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    for (pluginViewHolder in pluginViewHolders) pluginViewHolder.update()
-                }, {
-                    FabricPrivacy.logException(it)
-                }))
+        disposable += rxBus
+            .toObservable(EventConfigBuilderUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                for (pluginViewHolder in pluginViewHolders) pluginViewHolder.update()
+            }, { fabricPrivacy.logException(it) })
         updateGUI()
     }
 
@@ -69,23 +86,24 @@ class ConfigBuilderFragment : Fragment() {
     @Synchronized
     private fun updateGUI() {
         configbuilder_categories.removeAllViews()
-        createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, MainApp.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
-        createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, MainApp.getSpecificPluginsVisibleInListByInterface(InsulinInterface::class.java, PluginType.INSULIN))
-        createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, MainApp.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
-        createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, MainApp.getSpecificPluginsVisibleInList(PluginType.PUMP))
-        createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, MainApp.getSpecificPluginsVisibleInListByInterface(SensitivityInterface::class.java, PluginType.SENSITIVITY))
-        createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, MainApp.getSpecificPluginsVisibleInList(PluginType.APS))
-        createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, MainApp.getSpecificPluginsVisibleInList(PluginType.LOOP))
-        createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, MainApp.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface::class.java, PluginType.CONSTRAINTS))
-        createViewsForPlugins(R.string.configbuilder_treatments, R.string.configbuilder_treatments_description, PluginType.TREATMENT, MainApp.getSpecificPluginsVisibleInList(PluginType.TREATMENT))
-        createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, MainApp.getSpecificPluginsVisibleInList(PluginType.GENERAL))
+        createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
+        createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInListByInterface(InsulinInterface::class.java, PluginType.INSULIN))
+        createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
+        createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, activePlugin.getSpecificPluginsVisibleInList(PluginType.PUMP))
+        createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInListByInterface(SensitivityInterface::class.java, PluginType.SENSITIVITY))
+        createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, activePlugin.getSpecificPluginsVisibleInList(PluginType.APS))
+        createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
+        createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface::class.java, PluginType.CONSTRAINTS))
+        createViewsForPlugins(R.string.configbuilder_treatments, R.string.configbuilder_treatments_description, PluginType.TREATMENT, activePlugin.getSpecificPluginsVisibleInList(PluginType.TREATMENT))
+        createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, activePlugin.getSpecificPluginsVisibleInList(PluginType.GENERAL))
     }
 
     private fun createViewsForPlugins(@StringRes title: Int, @StringRes description: Int, pluginType: PluginType, plugins: List<PluginBase>) {
-        if (plugins.size == 0) return
+        if (plugins.isEmpty()) return
+        @Suppress("InflateParams")
         val parent = layoutInflater.inflate(R.layout.configbuilder_single_category, null) as LinearLayout
-        (parent.findViewById<View>(R.id.category_title) as TextView).text = MainApp.gs(title)
-        (parent.findViewById<View>(R.id.category_description) as TextView).text = MainApp.gs(description)
+        (parent.findViewById<View>(R.id.category_title) as TextView).text = resourceHelper.gs(title)
+        (parent.findViewById<View>(R.id.category_description) as TextView).text = resourceHelper.gs(description)
         val pluginContainer = parent.findViewById<LinearLayout>(R.id.category_plugins)
         for (plugin in plugins) {
             val pluginViewHolder = PluginViewHolder(this, pluginType, plugin)
@@ -95,4 +113,77 @@ class ConfigBuilderFragment : Fragment() {
         configbuilder_categories.addView(parent)
     }
 
+    inner class PluginViewHolder internal constructor(private val fragment: ConfigBuilderFragment,
+                                                      private val pluginType: PluginType,
+                                                      private val plugin: PluginBase) {
+
+        @Suppress("InflateParams")
+        val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout
+        private val enabledExclusive: RadioButton
+        private val enabledInclusive: CheckBox
+        private val pluginName: TextView
+        private val pluginDescription: TextView
+        private val pluginPreferences: ImageButton
+        private val pluginVisibility: CheckBox
+
+        init {
+            enabledExclusive = baseView.findViewById(R.id.plugin_enabled_exclusive)
+            enabledInclusive = baseView.findViewById(R.id.plugin_enabled_inclusive)
+            pluginName = baseView.findViewById(R.id.plugin_name)
+            pluginDescription = baseView.findViewById(R.id.plugin_description)
+            pluginPreferences = baseView.findViewById(R.id.plugin_preferences)
+            pluginVisibility = baseView.findViewById(R.id.plugin_visibility)
+
+            pluginVisibility.setOnClickListener {
+                plugin.setFragmentVisible(pluginType, pluginVisibility.isChecked)
+                configBuilderPlugin.storeSettings("CheckedCheckboxVisible")
+                rxBus.send(EventRebuildTabs())
+                configBuilderPlugin.logPluginStatus()
+            }
+
+            enabledExclusive.setOnClickListener {
+                configBuilderPlugin.switchAllowed(plugin, if (enabledExclusive.visibility == View.VISIBLE) enabledExclusive.isChecked else enabledInclusive.isChecked, fragment.activity, pluginType)
+            }
+            enabledInclusive.setOnClickListener {
+                configBuilderPlugin.switchAllowed(plugin, if (enabledExclusive.visibility == View.VISIBLE) enabledExclusive.isChecked else enabledInclusive.isChecked, fragment.activity, pluginType)
+            }
+
+            pluginPreferences.setOnClickListener {
+                fragment.activity?.let { activity ->
+                    protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                        val i = Intent(fragment.context, PreferencesActivity::class.java)
+                        i.putExtra("id", plugin.preferencesId)
+                        fragment.startActivity(i)
+                    }, null)
+                }
+            }
+            update()
+        }
+
+        fun update() {
+            enabledExclusive.visibility = areMultipleSelectionsAllowed(pluginType).not().toVisibility()
+            enabledInclusive.visibility = areMultipleSelectionsAllowed(pluginType).toVisibility()
+            enabledExclusive.isChecked = plugin.isEnabled(pluginType)
+            enabledInclusive.isChecked = plugin.isEnabled(pluginType)
+            enabledInclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
+            enabledExclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
+            pluginName.text = plugin.name
+            if (plugin.description == null)
+                pluginDescription.visibility = View.GONE
+            else {
+                pluginDescription.visibility = View.VISIBLE
+                pluginDescription.text = plugin.description
+            }
+            pluginPreferences.visibility = if (plugin.preferencesId == -1 || !plugin.isEnabled(pluginType)) View.INVISIBLE else View.VISIBLE
+            pluginVisibility.visibility = plugin.hasFragment().toVisibility()
+            pluginVisibility.isEnabled = !(plugin.pluginDescription.neverVisible || plugin.pluginDescription.alwaysVisible) && plugin.isEnabled(pluginType)
+            pluginVisibility.isChecked = plugin.isFragmentVisible()
+        }
+
+        private fun areMultipleSelectionsAllowed(type: PluginType): Boolean {
+            return type == PluginType.GENERAL || type == PluginType.CONSTRAINTS || type == PluginType.LOOP
+        }
+
+    }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.java
index f43513fbf5..a6608b07c0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.java
@@ -1,16 +1,21 @@
 package info.nightscout.androidaps.plugins.configBuilder;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import androidx.fragment.app.FragmentActivity;
 
 import java.util.ArrayList;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventAppInitialized;
+import info.nightscout.androidaps.events.EventConfigBuilderChange;
+import info.nightscout.androidaps.events.EventRebuildTabs;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
@@ -19,98 +24,116 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.SensitivityInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref0Plugin;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
+@Singleton
 public class ConfigBuilderPlugin extends PluginBase {
-    private Logger log = LoggerFactory.getLogger(L.CONFIGBUILDER);
-
     private static ConfigBuilderPlugin configBuilderPlugin;
 
+    private final ActivePluginProvider activePlugin;
+    private final SP sp;
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+
+    /**
+     * @deprecated Use dagger to get an instance
+     */
+
+    @Deprecated
+    public ProfileFunction getProfileFunction() {
+        if (profileFunction == null)
+            throw new IllegalStateException("Accessing profileFunction before first instantiation");
+        return profileFunction;
+    }
+
+    @Deprecated
     static public ConfigBuilderPlugin getPlugin() {
         if (configBuilderPlugin == null)
-            configBuilderPlugin = new ConfigBuilderPlugin();
+            throw new IllegalStateException("Accessing ConfigBuilder before first instantiation");
         return configBuilderPlugin;
     }
 
-    private BgSourceInterface activeBgSource;
-    private PumpInterface activePump;
-    private ProfileInterface activeProfile;
-    private APSInterface activeAPS;
-    private InsulinInterface activeInsulin;
-    private SensitivityInterface activeSensitivity;
-
-    private ArrayList<PluginBase> pluginList;
-
-    private CommandQueue commandQueue = new CommandQueue();
-
-    public ConfigBuilderPlugin() {
+    /*
+     * Written by Adrian:
+     * The ConfigBuilderPlugin.getPlugin() method is used at 333 places throughout the app.
+     * In order to make the transition to DI, while legacy code is still calling `getPlugin()`,
+     * I'd instantiate this plugin very very early on (first injected dependency in MainApp) and use
+     * Lazy dependencies in this constructor.
+     * */
+    @Inject
+    public ConfigBuilderPlugin(
+            ActivePluginProvider activePlugin,
+            HasAndroidInjector injector,
+            SP sp,
+            RxBusWrapper rxBus,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(ConfigBuilderFragment.class.getName())
-                .showInList(true)
-                .alwaysEnabled(true)
-                .alwaysVisible(false)
-                .pluginName(R.string.configbuilder)
-                .shortName(R.string.configbuilder_shortname)
-                .description(R.string.description_config_builder)
+                        .mainType(PluginType.GENERAL)
+                        .fragmentClass(ConfigBuilderFragment.class.getName())
+                        .showInList(true)
+                        .alwaysEnabled(true)
+                        .alwaysVisible(false)
+                        .pluginName(R.string.configbuilder)
+                        .shortName(R.string.configbuilder_shortname)
+                        .description(R.string.description_config_builder),
+                aapsLogger, resourceHelper, injector
         );
+        this.activePlugin = activePlugin;
+        this.sp = sp;
+        this.rxBus = rxBus;
+        this.aapsLogger = aapsLogger;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        configBuilderPlugin = this;  // TODO: only while transitioning to Dagger
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-
     public void initialize() {
-        pluginList = MainApp.getPluginsList();
         upgradeSettings();
+        ((PluginStore) activePlugin).loadDefaults();
         loadSettings();
         setAlwaysEnabledPluginsEnabled();
-        RxBus.INSTANCE.send(new EventAppInitialized());
+        rxBus.send(new EventAppInitialized());
     }
 
     private void setAlwaysEnabledPluginsEnabled() {
-        for (PluginBase plugin : pluginList) {
-            if (plugin.pluginDescription.alwaysEnabled)
+        for (PluginBase plugin : activePlugin.getPluginsList()) {
+            if (plugin.getPluginDescription().alwaysEnabled)
                 plugin.setPluginEnabled(plugin.getType(), true);
         }
         storeSettings("setAlwaysEnabledPluginsEnabled");
     }
 
     public void storeSettings(String from) {
-        if (pluginList != null) {
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Storing settings from: " + from);
+        activePlugin.getPluginsList();
+        getAapsLogger().debug(LTag.CONFIGBUILDER, "Storing settings from: " + from);
 
-            verifySelectionInCategories();
+        activePlugin.verifySelectionInCategories();
 
-            for (PluginBase p : pluginList) {
-                PluginType type = p.getType();
-                if (p.pluginDescription.alwaysEnabled && p.pluginDescription.alwaysVisible)
-                    continue;
-                if (p.pluginDescription.alwaysEnabled && p.pluginDescription.neverVisible)
-                    continue;
-                savePref(p, type, true);
-                if (type == PluginType.PUMP) {
-                    if (p instanceof ProfileInterface) { // Store state of optional Profile interface
-                        savePref(p, PluginType.PROFILE, false);
-                    }
+        for (PluginBase p : activePlugin.getPluginsList()) {
+            PluginType type = p.getType();
+            if (p.getPluginDescription().alwaysEnabled && p.getPluginDescription().alwaysVisible)
+                continue;
+            if (p.getPluginDescription().alwaysEnabled && p.getPluginDescription().neverVisible)
+                continue;
+            savePref(p, type, true);
+            if (type == PluginType.PUMP) {
+                if (p instanceof ProfileInterface) { // Store state of optional Profile interface
+                    savePref(p, PluginType.PROFILE, false);
                 }
             }
         }
@@ -118,21 +141,18 @@ public class ConfigBuilderPlugin extends PluginBase {
 
     private void savePref(PluginBase p, PluginType type, boolean storeVisible) {
         String settingEnabled = "ConfigBuilder_" + type.name() + "_" + p.getClass().getSimpleName() + "_Enabled";
-        SP.putBoolean(settingEnabled, p.isEnabled(type));
-        if (L.isEnabled(L.CONFIGBUILDER))
-            log.debug("Storing: " + settingEnabled + ":" + p.isEnabled(type));
+        sp.putBoolean(settingEnabled, p.isEnabled(type));
+        getAapsLogger().debug(LTag.CONFIGBUILDER, "Storing: " + settingEnabled + ":" + p.isEnabled(type));
         if (storeVisible) {
             String settingVisible = "ConfigBuilder_" + type.name() + "_" + p.getClass().getSimpleName() + "_Visible";
-            SP.putBoolean(settingVisible, p.isFragmentVisible());
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Storing: " + settingVisible + ":" + p.isFragmentVisible());
+            sp.putBoolean(settingVisible, p.isFragmentVisible());
+            getAapsLogger().debug(LTag.CONFIGBUILDER, "Storing: " + settingVisible + ":" + p.isFragmentVisible());
         }
     }
 
     private void loadSettings() {
-        if (L.isEnabled(L.CONFIGBUILDER))
-            log.debug("Loading stored settings");
-        for (PluginBase p : pluginList) {
+        getAapsLogger().debug(LTag.CONFIGBUILDER, "Loading stored settings");
+        for (PluginBase p : activePlugin.getPluginsList()) {
             PluginType type = p.getType();
             loadPref(p, type, true);
             if (p.getType() == PluginType.PUMP) {
@@ -141,39 +161,35 @@ public class ConfigBuilderPlugin extends PluginBase {
                 }
             }
         }
-        verifySelectionInCategories();
+        activePlugin.verifySelectionInCategories();
     }
 
     private void loadPref(PluginBase p, PluginType type, boolean loadVisible) {
         String settingEnabled = "ConfigBuilder_" + type.name() + "_" + p.getClass().getSimpleName() + "_Enabled";
-        if (SP.contains(settingEnabled))
-            p.setPluginEnabled(type, SP.getBoolean(settingEnabled, false));
-        else if (p.getType() == type && (p.pluginDescription.enableByDefault || p.pluginDescription.alwaysEnabled)) {
+        if (sp.contains(settingEnabled))
+            p.setPluginEnabled(type, sp.getBoolean(settingEnabled, false));
+        else if (p.getType() == type && (p.getPluginDescription().enableByDefault || p.getPluginDescription().alwaysEnabled)) {
             p.setPluginEnabled(type, true);
         }
-        if (L.isEnabled(L.CONFIGBUILDER))
-            log.debug("Loaded: " + settingEnabled + ":" + p.isEnabled(type));
+        getAapsLogger().debug(LTag.CONFIGBUILDER, "Loaded: " + settingEnabled + ":" + p.isEnabled(type));
         if (loadVisible) {
             String settingVisible = "ConfigBuilder_" + type.name() + "_" + p.getClass().getSimpleName() + "_Visible";
-            if (SP.contains(settingVisible))
-                p.setFragmentVisible(type, SP.getBoolean(settingVisible, false) && SP.getBoolean(settingEnabled, false));
-            else if (p.getType() == type && p.pluginDescription.visibleByDefault) {
+            if (sp.contains(settingVisible))
+                p.setFragmentVisible(type, sp.getBoolean(settingVisible, false) && sp.getBoolean(settingEnabled, false));
+            else if (p.getType() == type && p.getPluginDescription().visibleByDefault) {
                 p.setFragmentVisible(type, true);
             }
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Loaded: " + settingVisible + ":" + p.isFragmentVisible());
+            getAapsLogger().debug(LTag.CONFIGBUILDER, "Loaded: " + settingVisible + ":" + p.isFragmentVisible());
         }
     }
 
     // Detect settings prior 1.60
     private void upgradeSettings() {
-        if (!SP.contains("ConfigBuilder_1_NSProfilePlugin_Enabled"))
+        if (!sp.contains("ConfigBuilder_1_NSProfilePlugin_Enabled"))
             return;
-        if (L.isEnabled(L.CONFIGBUILDER))
-            log.debug("Upgrading stored settings");
-        for (PluginBase p : pluginList) {
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Processing " + p.getName());
+        getAapsLogger().debug(LTag.CONFIGBUILDER, "Upgrading stored settings");
+        for (PluginBase p : activePlugin.getPluginsList()) {
+            getAapsLogger().debug(LTag.CONFIGBUILDER, "Processing " + p.getName());
             for (int type = 1; type < 11; type++) {
                 PluginType newType;
                 switch (type) {
@@ -213,196 +229,69 @@ public class ConfigBuilderPlugin extends PluginBase {
                 }
                 String settingEnabled = "ConfigBuilder_" + type + "_" + p.getClass().getSimpleName() + "_Enabled";
                 String settingVisible = "ConfigBuilder_" + type + "_" + p.getClass().getSimpleName() + "_Visible";
-                if (SP.contains(settingEnabled))
-                    p.setPluginEnabled(newType, SP.getBoolean(settingEnabled, false));
-                if (SP.contains(settingVisible))
-                    p.setFragmentVisible(newType, SP.getBoolean(settingVisible, false) && SP.getBoolean(settingEnabled, false));
-                SP.remove(settingEnabled);
-                SP.remove(settingVisible);
+                if (sp.contains(settingEnabled))
+                    p.setPluginEnabled(newType, sp.getBoolean(settingEnabled, false));
+                if (sp.contains(settingVisible))
+                    p.setFragmentVisible(newType, sp.getBoolean(settingVisible, false) && sp.getBoolean(settingEnabled, false));
+                sp.remove(settingEnabled);
+                sp.remove(settingVisible);
                 if (newType == p.getType()) {
                     savePref(p, newType, true);
-                } else if (p.getType() == PluginType.PUMP && p instanceof ProfileInterface) {
-                    savePref(p, PluginType.PROFILE, false);
                 }
             }
         }
     }
 
-    public CommandQueue getCommandQueue() {
-        return commandQueue;
-    }
-
-    @Nullable
-    public BgSourceInterface getActiveBgSource() {
-        return activeBgSource;
-    }
-
-    @Nullable
-    public ProfileInterface getActiveProfileInterface() {
-        return activeProfile;
-    }
-
-    @Nullable
-    public InsulinInterface getActiveInsulin() {
-        return activeInsulin;
-    }
-
-    @Nullable
-    public APSInterface getActiveAPS() {
-        return activeAPS;
-    }
-
-    @Nullable
-    public PumpInterface getActivePump() {
-        return activePump;
-    }
-
-    @Nullable
-    public SensitivityInterface getActiveSensitivity() {
-        return activeSensitivity;
-    }
-
     public void logPluginStatus() {
-        if (L.isEnabled(L.CONFIGBUILDER))
-            for (PluginBase p : pluginList) {
-                log.debug(p.getName() + ":" +
-                        (p.isEnabled(PluginType.GENERAL) ? " GENERAL" : "") +
-                        (p.isEnabled(PluginType.TREATMENT) ? " TREATMENT" : "") +
-                        (p.isEnabled(PluginType.SENSITIVITY) ? " SENSITIVITY" : "") +
-                        (p.isEnabled(PluginType.PROFILE) ? " PROFILE" : "") +
-                        (p.isEnabled(PluginType.APS) ? " APS" : "") +
-                        (p.isEnabled(PluginType.PUMP) ? " PUMP" : "") +
-                        (p.isEnabled(PluginType.CONSTRAINTS) ? " CONSTRAINTS" : "") +
-                        (p.isEnabled(PluginType.LOOP) ? " LOOP" : "") +
-                        (p.isEnabled(PluginType.BGSOURCE) ? " BGSOURCE" : "") +
-                        (p.isEnabled(PluginType.INSULIN) ? " INSULIN" : "")
-                );
-            }
-    }
-
-    private void verifySelectionInCategories() {
-        ArrayList<PluginBase> pluginsInCategory;
-
-        // PluginType.APS
-        activeAPS = this.determineActivePlugin(APSInterface.class, PluginType.APS);
-
-        // PluginType.INSULIN
-        pluginsInCategory = MainApp.getSpecificPluginsList(PluginType.INSULIN);
-        activeInsulin = (InsulinInterface) getTheOneEnabledInArray(pluginsInCategory, PluginType.INSULIN);
-        if (activeInsulin == null) {
-            activeInsulin = InsulinOrefRapidActingPlugin.getPlugin();
-            InsulinOrefRapidActingPlugin.getPlugin().setPluginEnabled(PluginType.INSULIN, true);
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Defaulting InsulinOrefRapidActingPlugin");
-        }
-        this.setFragmentVisiblities(((PluginBase) activeInsulin).getName(), pluginsInCategory, PluginType.INSULIN);
-
-        // PluginType.SENSITIVITY
-        pluginsInCategory = MainApp.getSpecificPluginsList(PluginType.SENSITIVITY);
-        activeSensitivity = (SensitivityInterface) getTheOneEnabledInArray(pluginsInCategory, PluginType.SENSITIVITY);
-        if (activeSensitivity == null) {
-            activeSensitivity = SensitivityOref0Plugin.getPlugin();
-            SensitivityOref0Plugin.getPlugin().setPluginEnabled(PluginType.SENSITIVITY, true);
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Defaulting SensitivityOref0Plugin");
-        }
-        this.setFragmentVisiblities(((PluginBase) activeSensitivity).getName(), pluginsInCategory, PluginType.SENSITIVITY);
-
-        // PluginType.PROFILE
-        activeProfile = this.determineActivePlugin(ProfileInterface.class, PluginType.PROFILE);
-
-        // PluginType.BGSOURCE
-        activeBgSource = this.determineActivePlugin(BgSourceInterface.class, PluginType.BGSOURCE);
-
-        // PluginType.PUMP
-        pluginsInCategory = MainApp.getSpecificPluginsList(PluginType.PUMP);
-        activePump = (PumpInterface) getTheOneEnabledInArray(pluginsInCategory, PluginType.PUMP);
-        if (activePump == null) {
-            activePump = VirtualPumpPlugin.getPlugin();
-            VirtualPumpPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, true);
-            if (L.isEnabled(L.CONFIGBUILDER))
-                log.debug("Defaulting VirtualPumpPlugin");
-        }
-        this.setFragmentVisiblities(((PluginBase) activePump).getName(), pluginsInCategory, PluginType.PUMP);
-
-        // PluginType.TREATMENT
-    }
-
-    /**
-     * disables the visibility for all fragments of Plugins with the given PluginType
-     * which are not equally named to the Plugin implementing the given Plugin Interface.
-     *
-     * @param pluginInterface
-     * @param pluginType
-     * @param <T>
-     * @return
-     */
-    private <T> T determineActivePlugin(Class<T> pluginInterface, PluginType pluginType) {
-        ArrayList<PluginBase> pluginsInCategory;
-        pluginsInCategory = MainApp.getSpecificPluginsListByInterface(pluginInterface);
-
-        return this.determineActivePlugin(pluginsInCategory, pluginType);
-    }
-
-    private <T> T determineActivePlugin(PluginType pluginType) {
-        ArrayList<PluginBase> pluginsInCategory;
-        pluginsInCategory = MainApp.getSpecificPluginsList(pluginType);
-
-        return this.determineActivePlugin(pluginsInCategory, pluginType);
-    }
-
-    /**
-     * disables the visibility for all fragments of Plugins in the given pluginsInCategory
-     * with the given PluginType which are not equally named to the Plugin implementing the
-     * given Plugin Interface.
-     * <p>
-     * TODO we are casting an interface to PluginBase, which seems to be rather odd, since
-     * TODO the interface is not implementing PluginBase (this is just avoiding errors through
-     * TODO conventions.
-     *
-     * @param pluginsInCategory
-     * @param pluginType
-     * @param <T>
-     * @return
-     */
-    private <T> T determineActivePlugin(ArrayList<PluginBase> pluginsInCategory,
-                                        PluginType pluginType) {
-        T activePlugin = (T) getTheOneEnabledInArray(pluginsInCategory, pluginType);
-
-        if (activePlugin != null) {
-            this.setFragmentVisiblities(((PluginBase) activePlugin).getName(),
-                    pluginsInCategory, pluginType);
-        }
-
-        return activePlugin;
-    }
-
-    private void setFragmentVisiblities(String activePluginName, ArrayList<PluginBase> pluginsInCategory,
-                                        PluginType pluginType) {
-        if (L.isEnabled(L.CONFIGBUILDER))
-            log.debug("Selected interface: " + activePluginName);
-        for (PluginBase p : pluginsInCategory) {
-            if (!p.getName().equals(activePluginName)) {
-                p.setFragmentVisible(pluginType, false);
-            }
+        for (PluginBase p : activePlugin.getPluginsList()) {
+            getAapsLogger().debug(LTag.CONFIGBUILDER, p.getName() + ":" +
+                    (p.isEnabled(PluginType.GENERAL) ? " GENERAL" : "") +
+                    (p.isEnabled(PluginType.TREATMENT) ? " TREATMENT" : "") +
+                    (p.isEnabled(PluginType.SENSITIVITY) ? " SENSITIVITY" : "") +
+                    (p.isEnabled(PluginType.PROFILE) ? " PROFILE" : "") +
+                    (p.isEnabled(PluginType.APS) ? " APS" : "") +
+                    (p.isEnabled(PluginType.PUMP) ? " PUMP" : "") +
+                    (p.isEnabled(PluginType.CONSTRAINTS) ? " CONSTRAINTS" : "") +
+                    (p.isEnabled(PluginType.LOOP) ? " LOOP" : "") +
+                    (p.isEnabled(PluginType.BGSOURCE) ? " BGSOURCE" : "") +
+                    (p.isEnabled(PluginType.INSULIN) ? " INSULIN" : "")
+            );
         }
     }
 
-    @Nullable
-    private PluginBase getTheOneEnabledInArray(ArrayList<PluginBase> pluginsInCategory, PluginType type) {
-        PluginBase found = null;
-        for (PluginBase p : pluginsInCategory) {
-            if (p.isEnabled(type) && found == null) {
-                found = p;
-            } else if (p.isEnabled(type)) {
-                // set others disabled
-                p.setPluginEnabled(type, false);
-            }
+    // Ask when switching to physical pump plugin
+    public void switchAllowed(@NonNull PluginBase changedPlugin, boolean newState, @Nullable FragmentActivity activity, @NonNull PluginType type) {
+        if (changedPlugin.getType() == PluginType.PUMP && !changedPlugin.getName().equals(resourceHelper.gs(R.string.virtualpump)))
+            confirmPumpPluginActivation(changedPlugin, newState, activity, type);
+        else
+            performPluginSwitch(changedPlugin, newState, type);
+    }
+
+    private void confirmPumpPluginActivation(@NonNull PluginBase changedPlugin, boolean newState, @Nullable FragmentActivity activity, @NonNull PluginType type) {
+        boolean allowHardwarePump = sp.getBoolean("allow_hardware_pump", false);
+        if (allowHardwarePump || activity == null) {
+            performPluginSwitch(changedPlugin, newState, type);
+        } else {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.allow_hardware_pump_text), () -> {
+                performPluginSwitch(changedPlugin, newState, type);
+                sp.putBoolean("allow_hardware_pump", true);
+                aapsLogger.debug(LTag.PUMP, "First time HW pump allowed!");
+            }, () -> {
+                rxBus.send(new EventConfigBuilderUpdateGui());
+                aapsLogger.debug(LTag.PUMP, "User does not allow switching to HW pump!");
+            });
         }
-        // If none enabled, enable first one
-        //if (found == null && pluginsInCategory.size() > 0)
-        //    found = pluginsInCategory.get(0);
-        return found;
+    }
+
+    public void performPluginSwitch(PluginBase changedPlugin, boolean enabled, @NonNull PluginType type) {
+        changedPlugin.setPluginEnabled(type, enabled);
+        changedPlugin.setFragmentVisible(type, enabled);
+        processOnEnabledCategoryChanged(changedPlugin, type);
+        storeSettings("CheckedCheckboxEnabled");
+        rxBus.send(new EventRebuildTabs());
+        rxBus.send(new EventConfigBuilderChange());
+        rxBus.send(new EventConfigBuilderUpdateGui());
+        logPluginStatus();
     }
 
     public void processOnEnabledCategoryChanged(PluginBase changedPlugin, PluginType type) {
@@ -415,23 +304,25 @@ public class ConfigBuilderPlugin extends PluginBase {
                 break;
             // Single selection allowed
             case INSULIN:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(InsulinInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(InsulinInterface.class);
                 break;
             case SENSITIVITY:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(SensitivityInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(SensitivityInterface.class);
                 break;
             case APS:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(APSInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(APSInterface.class);
                 break;
             case PROFILE:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(ProfileInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(ProfileInterface.class);
                 break;
             case BGSOURCE:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(BgSourceInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(BgSourceInterface.class);
                 break;
             case TREATMENT:
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(TreatmentsInterface.class);
+                break;
             case PUMP:
-                pluginsInCategory = MainApp.getSpecificPluginsListByInterface(PumpInterface.class);
+                pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(PumpInterface.class);
                 break;
         }
         if (pluginsInCategory != null) {
@@ -446,16 +337,7 @@ public class ConfigBuilderPlugin extends PluginBase {
                     }
                 }
             } else { // enable first plugin in list
-                if (type == PluginType.PUMP)
-                    VirtualPumpPlugin.getPlugin().setPluginEnabled(type, true);
-                else if (type == PluginType.INSULIN)
-                    InsulinOrefRapidActingPlugin.getPlugin().setPluginEnabled(type, true);
-                else if (type == PluginType.SENSITIVITY)
-                    SensitivityOref0Plugin.getPlugin().setPluginEnabled(type, true);
-                else if (type == PluginType.PROFILE)
-                    NSProfilePlugin.getPlugin().setPluginEnabled(type, true);
-                else
-                    pluginsInCategory.get(0).setPluginEnabled(type, true);
+                pluginsInCategory.get(0).setPluginEnabled(type, true);
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
new file mode 100644
index 0000000000..78a30a9720
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
@@ -0,0 +1,196 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.PluginType
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ConstraintChecker @Inject constructor(private val activePlugin: ActivePluginProvider) : ConstraintsInterface {
+
+    fun isLoopInvocationAllowed(): Constraint<Boolean> =
+        isLoopInvocationAllowed(Constraint(true))
+
+    fun isClosedLoopAllowed(): Constraint<Boolean> =
+        isClosedLoopAllowed(Constraint(true))
+
+    fun isAutosensModeEnabled(): Constraint<Boolean> =
+        isAutosensModeEnabled(Constraint(true))
+
+    fun isAMAModeEnabled(): Constraint<Boolean> =
+        isAMAModeEnabled(Constraint(true))
+
+    fun isSMBModeEnabled(): Constraint<Boolean> =
+        isSMBModeEnabled(Constraint(true))
+
+    fun isUAMEnabled(): Constraint<Boolean> =
+        isUAMEnabled(Constraint(true))
+
+    fun isAdvancedFilteringEnabled(): Constraint<Boolean> =
+        isAdvancedFilteringEnabled(Constraint(true))
+
+    fun isSuperBolusEnabled(): Constraint<Boolean> =
+        isSuperBolusEnabled(Constraint(true))
+
+    fun getMaxBasalAllowed(profile: Profile): Constraint<Double> =
+        applyBasalConstraints(Constraint(Constants.REALLYHIGHBASALRATE), profile)
+
+    fun getMaxBasalPercentAllowed(profile: Profile): Constraint<Int> =
+        applyBasalPercentConstraints(Constraint(Constants.REALLYHIGHPERCENTBASALRATE), profile)
+
+    fun getMaxBolusAllowed(): Constraint<Double> =
+        applyBolusConstraints(Constraint(Constants.REALLYHIGHBOLUS))
+
+    fun getMaxExtendedBolusAllowed(): Constraint<Double> =
+        applyExtendedBolusConstraints(Constraint(Constants.REALLYHIGHBOLUS))
+
+    fun getMaxCarbsAllowed(): Constraint<Int> =
+        applyCarbsConstraints(Constraint(Constants.REALLYHIGHCARBS))
+
+    fun getMaxIOBAllowed(): Constraint<Double> =
+        applyMaxIOBConstraints(Constraint(Constants.REALLYHIGHIOB))
+
+    override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isLoopInvocationAllowed(value)
+        }
+        return value
+    }
+
+    override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isClosedLoopAllowed(value)
+        }
+        return value
+    }
+
+    override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isAutosensModeEnabled(value)
+        }
+        return value
+    }
+
+    override fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.isAMAModeEnabled(value)
+        }
+        return value
+    }
+
+    override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isSMBModeEnabled(value)
+        }
+        return value
+    }
+
+    override fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isUAMEnabled(value)
+        }
+        return value
+    }
+
+    override fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isAdvancedFilteringEnabled(value)
+        }
+        return value
+    }
+
+    override fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.isSuperBolusEnabled(value)
+        }
+        return value
+    }
+
+    override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constraint = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constraint.applyBasalConstraints(absoluteRate, profile)
+        }
+        return absoluteRate
+    }
+
+    override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.applyBasalPercentConstraints(percentRate, profile)
+        }
+        return percentRate
+    }
+
+    override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.applyBolusConstraints(insulin)
+        }
+        return insulin
+    }
+
+    override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.applyExtendedBolusConstraints(insulin)
+        }
+        return insulin
+    }
+
+    override fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.applyCarbsConstraints(carbs)
+        }
+        return carbs
+    }
+
+    override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)
+        for (p in constraintsPlugins) {
+            val constrain = p as ConstraintsInterface
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            constrain.applyMaxIOBConstraints(maxIob)
+        }
+        return maxIob
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
new file mode 100644
index 0000000000..558e23df2b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
@@ -0,0 +1,245 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PluginStore @Inject constructor(
+    val aapsLogger: AAPSLogger
+) : ActivePluginProvider {
+
+    // TODO remove
+    init {
+        pluginStore = this
+    }
+
+    companion object {
+        var pluginStore: PluginStore? = null
+
+        @Deprecated("Use dagger instead")
+        fun getInstance(): PluginStore {
+            checkNotNull(pluginStore) { "Accessing PluginStore before first instantiation" }
+            return pluginStore!!
+        }
+    }
+
+    lateinit var plugins: List<@JvmSuppressWildcards PluginBase>
+
+    private var activeBgSource: BgSourceInterface? = null
+    private var activePump: PumpInterface? = null
+    private var activeProfile: ProfileInterface? = null
+    private var activeAPS: APSInterface? = null
+    private var activeInsulin: InsulinInterface? = null
+    private var activeSensitivity: SensitivityInterface? = null
+    private var activeTreatments: TreatmentsInterface? = null
+
+    fun loadDefaults() {
+        verifySelectionInCategories()
+    }
+
+    fun getDefaultPlugin(type: PluginType): PluginBase {
+        for (p in plugins)
+            if (p.getType() == type && p.isDefault()) return p
+        throw IllegalStateException("Default plugin not found")
+    }
+
+    fun getSpecificPluginsList(type: PluginType): ArrayList<PluginBase> {
+        val newList = ArrayList<PluginBase>()
+        for (p in plugins) {
+            if (p.getType() == type) newList.add(p)
+        }
+        return newList
+    }
+
+    override fun getSpecificPluginsVisibleInList(type: PluginType): ArrayList<PluginBase> {
+        val newList = ArrayList<PluginBase>()
+        for (p in plugins) {
+            if (p.getType() == type) if (p.showInList(type)) newList.add(p)
+        }
+        return newList
+    }
+
+    override fun getSpecificPluginsListByInterface(interfaceClass: Class<*>): ArrayList<PluginBase> {
+        val newList = ArrayList<PluginBase>()
+        for (p in plugins) {
+            if (p.javaClass != ConfigBuilderPlugin::class.java && interfaceClass.isAssignableFrom(p.javaClass)) newList.add(p)
+        }
+        return newList
+    }
+
+    override fun getSpecificPluginsVisibleInListByInterface(interfaceClass: Class<*>, type: PluginType): ArrayList<PluginBase> {
+        val newList = ArrayList<PluginBase>()
+        for (p in plugins) {
+            if (p.javaClass != ConfigBuilderPlugin::class.java && interfaceClass.isAssignableFrom(p.javaClass)) if (p.showInList(type)) newList.add(p)
+        }
+        return newList
+    }
+
+    override fun verifySelectionInCategories() {
+        var pluginsInCategory: ArrayList<PluginBase>?
+
+        // PluginType.APS
+        if (!Config.NSCLIENT && !Config.PUMPCONTROL) {
+            pluginsInCategory = getSpecificPluginsList(PluginType.APS)
+            activeAPS = getTheOneEnabledInArray(pluginsInCategory, PluginType.APS) as APSInterface?
+            if (activeAPS == null) {
+                activeAPS = getDefaultPlugin(PluginType.APS) as APSInterface
+                (activeAPS as PluginBase).setPluginEnabled(PluginType.APS, true)
+                aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting APSInterface")
+            }
+            setFragmentVisiblities((activeAPS as PluginBase).name, pluginsInCategory, PluginType.APS)
+        }
+
+        // PluginType.INSULIN
+        pluginsInCategory = getSpecificPluginsList(PluginType.INSULIN)
+        activeInsulin = getTheOneEnabledInArray(pluginsInCategory, PluginType.INSULIN) as InsulinInterface?
+        if (activeInsulin == null) {
+            activeInsulin = getDefaultPlugin(PluginType.INSULIN) as InsulinInterface
+            (activeInsulin as PluginBase).setPluginEnabled(PluginType.INSULIN, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting InsulinInterface")
+        }
+        setFragmentVisiblities((activeInsulin as PluginBase).name, pluginsInCategory, PluginType.INSULIN)
+
+        // PluginType.SENSITIVITY
+        pluginsInCategory = getSpecificPluginsList(PluginType.SENSITIVITY)
+        activeSensitivity = getTheOneEnabledInArray(pluginsInCategory, PluginType.SENSITIVITY) as SensitivityInterface?
+        if (activeSensitivity == null) {
+            activeSensitivity = getDefaultPlugin(PluginType.SENSITIVITY) as SensitivityInterface
+            (activeSensitivity as PluginBase).setPluginEnabled(PluginType.SENSITIVITY, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting SensitivityInterface")
+        }
+        setFragmentVisiblities((activeSensitivity as PluginBase).name, pluginsInCategory, PluginType.SENSITIVITY)
+
+        // PluginType.PROFILE
+        pluginsInCategory = getSpecificPluginsList(PluginType.PROFILE)
+        activeProfile = getTheOneEnabledInArray(pluginsInCategory, PluginType.PROFILE) as ProfileInterface?
+        if (activeProfile == null) {
+            activeProfile = getDefaultPlugin(PluginType.PROFILE) as ProfileInterface
+            (activeProfile as PluginBase).setPluginEnabled(PluginType.PROFILE, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting ProfileInterface")
+        }
+        setFragmentVisiblities((activeSensitivity as PluginBase).name, pluginsInCategory, PluginType.PROFILE)
+
+        // PluginType.BGSOURCE
+        pluginsInCategory = getSpecificPluginsList(PluginType.BGSOURCE)
+        activeBgSource = getTheOneEnabledInArray(pluginsInCategory, PluginType.BGSOURCE) as BgSourceInterface?
+        if (activeBgSource == null) {
+            activeBgSource = getDefaultPlugin(PluginType.BGSOURCE) as BgSourceInterface
+            (activeBgSource as PluginBase).setPluginEnabled(PluginType.BGSOURCE, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting BgInterface")
+        }
+        setFragmentVisiblities((activeBgSource as PluginBase).name, pluginsInCategory, PluginType.PUMP)
+
+        // PluginType.PUMP
+        pluginsInCategory = getSpecificPluginsList(PluginType.PUMP)
+        activePump = getTheOneEnabledInArray(pluginsInCategory, PluginType.PUMP) as PumpInterface?
+        if (activePump == null) {
+            activePump = getDefaultPlugin(PluginType.PUMP) as PumpInterface
+            (activePump as PluginBase).setPluginEnabled(PluginType.PUMP, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
+        }
+        setFragmentVisiblities((activePump as PluginBase).name, pluginsInCategory, PluginType.PUMP)
+
+        // PluginType.TREATMENT
+        pluginsInCategory = getSpecificPluginsList(PluginType.TREATMENT)
+        activeTreatments = getTheOneEnabledInArray(pluginsInCategory, PluginType.TREATMENT) as TreatmentsInterface?
+        if (activeTreatments == null) {
+            activeTreatments = getDefaultPlugin(PluginType.TREATMENT) as TreatmentsInterface
+            (activeTreatments as PluginBase).setPluginEnabled(PluginType.TREATMENT, true)
+            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
+        }
+        setFragmentVisiblities((activeTreatments as PluginBase).name, pluginsInCategory, PluginType.TREATMENT)
+    }
+
+    /**
+     * disables the visibility for all fragments of Plugins with the given PluginType
+     * which are not equally named to the Plugin implementing the given Plugin Interface.
+     *
+     * @param pluginInterface
+     * @param pluginType
+     * @param <T>
+     * @return
+    </T> */
+    private fun <T> determineActivePlugin(pluginInterface: Class<T>, pluginType: PluginType): T? {
+        val pluginsInCategory: ArrayList<PluginBase>
+        pluginsInCategory = pluginStore!!.getSpecificPluginsListByInterface(pluginInterface)
+        return determineActivePlugin(pluginsInCategory, pluginType)
+    }
+
+    /**
+     * disables the visibility for all fragments of Plugins in the given pluginsInCategory
+     * with the given PluginType which are not equally named to the Plugin implementing the
+     * given Plugin Interface.
+     *
+     *
+     * TODO we are casting an interface to PluginBase, which seems to be rather odd, since
+     * TODO the interface is not implementing PluginBase (this is just avoiding errors through
+     * TODO conventions.
+     *
+     * @param pluginsInCategory
+     * @param pluginType
+     * @param <T>
+     * @return
+    </T> */
+    private fun <T> determineActivePlugin(pluginsInCategory: ArrayList<PluginBase>,
+                                          pluginType: PluginType): T? {
+        @Suppress("UNCHECKED_CAST")
+        val activePlugin = getTheOneEnabledInArray(pluginsInCategory, pluginType) as T?
+        if (activePlugin != null) {
+            setFragmentVisiblities((activePlugin as PluginBase).name, pluginsInCategory, pluginType)
+        }
+        return activePlugin
+    }
+
+    private fun setFragmentVisiblities(activePluginName: String, pluginsInCategory: ArrayList<PluginBase>,
+                                       pluginType: PluginType) {
+        aapsLogger.debug(LTag.CONFIGBUILDER, "Selected interface: $activePluginName")
+        for (p in pluginsInCategory)
+            if (p.name != activePluginName)
+                p.setFragmentVisible(pluginType, false)
+    }
+
+    private fun getTheOneEnabledInArray(pluginsInCategory: ArrayList<PluginBase>, type: PluginType): PluginBase? {
+        var found: PluginBase? = null
+        for (p in pluginsInCategory) {
+            if (p.isEnabled(type) && found == null) {
+                found = p
+            } else if (p.isEnabled(type)) {
+                // set others disabled
+                p.setPluginEnabled(type, false)
+            }
+        }
+        return found
+    }
+
+    // ***** Interface *****
+
+    override fun getActiveBgSource(): BgSourceInterface {
+        return activeBgSource ?: checkNotNull(activeBgSource) { "No bg source selected" }
+    }
+
+    override fun getActiveProfileInterface(): ProfileInterface =
+        activeProfile ?: checkNotNull(activeProfile) { "No profile selected" }
+
+    override fun getActiveInsulin(): InsulinInterface =
+        activeInsulin ?: checkNotNull(activeInsulin) { "No insulin selected" }
+
+    override fun getActiveAPS(): APSInterface =
+        activeAPS ?: checkNotNull(activeAPS) { "No APS selected" }
+
+    override fun getActivePump(): PumpInterface =
+        activePump ?: checkNotNull(activePump) { "No pump selected" }
+
+    override fun getActiveSensitivity(): SensitivityInterface =
+        activeSensitivity ?: checkNotNull(activeSensitivity) { "No sensitivity selected" }
+
+    override fun getActiveTreatments(): TreatmentsInterface =
+        activeTreatments ?: checkNotNull(activeTreatments) { "No treatments selected" }
+
+    override fun getPluginsList(): ArrayList<PluginBase> = ArrayList(plugins)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginViewHolder.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginViewHolder.kt
deleted file mode 100644
index 2670e78633..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginViewHolder.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package info.nightscout.androidaps.plugins.configBuilder
-
-import android.content.Intent
-import android.view.View
-import android.widget.CheckBox
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import android.widget.RadioButton
-import android.widget.TextView
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.PreferencesActivity
-import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.utils.PasswordProtection
-import info.nightscout.androidaps.utils.toVisibility
-
-class PluginViewHolder internal constructor(private val fragment: ConfigBuilderFragment,
-                                            private val pluginType: PluginType,
-                                            private val plugin: PluginBase) {
-
-    val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout
-    private val enabledExclusive: RadioButton
-    private val enabledInclusive: CheckBox
-    private val pluginName: TextView
-    private val pluginDescription: TextView
-    private val pluginPreferences: ImageButton
-    private val pluginVisibility: CheckBox
-
-    init {
-        enabledExclusive = baseView.findViewById(R.id.plugin_enabled_exclusive)
-        enabledInclusive = baseView.findViewById(R.id.plugin_enabled_inclusive)
-        pluginName = baseView.findViewById(R.id.plugin_name)
-        pluginDescription = baseView.findViewById(R.id.plugin_description)
-        pluginPreferences = baseView.findViewById(R.id.plugin_preferences)
-        pluginVisibility = baseView.findViewById(R.id.plugin_visibility)
-
-        pluginVisibility.setOnClickListener {
-            plugin.setFragmentVisible(pluginType, pluginVisibility.isChecked)
-            ConfigBuilderPlugin.getPlugin().storeSettings("CheckedCheckboxVisible")
-            RxBus.send(EventRebuildTabs())
-            ConfigBuilderPlugin.getPlugin().logPluginStatus()
-        }
-
-        enabledExclusive.setOnClickListener {
-            plugin.switchAllowed(if (enabledExclusive.visibility == View.VISIBLE) enabledExclusive.isChecked else enabledInclusive.isChecked, fragment.activity, pluginType)
-        }
-        enabledInclusive.setOnClickListener {
-            plugin.switchAllowed(if (enabledExclusive.visibility == View.VISIBLE) enabledExclusive.isChecked else enabledInclusive.isChecked, fragment.activity, pluginType)
-        }
-
-        pluginPreferences.setOnClickListener {
-            PasswordProtection.QueryPassword(fragment.context, R.string.settings_password, "settings_password", {
-                val i = Intent(fragment.context, PreferencesActivity::class.java)
-                i.putExtra("id", plugin.preferencesId)
-                fragment.startActivity(i)
-            }, null)
-        }
-        update()
-    }
-
-    fun update() {
-        enabledExclusive.visibility = areMultipleSelectionsAllowed(pluginType).not().toVisibility()
-        enabledInclusive.visibility = areMultipleSelectionsAllowed(pluginType).toVisibility()
-        enabledExclusive.isChecked = plugin.isEnabled(pluginType)
-        enabledInclusive.isChecked = plugin.isEnabled(pluginType)
-        enabledInclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
-        enabledExclusive.isEnabled = !plugin.pluginDescription.alwaysEnabled
-        pluginName.text = plugin.name
-        if (plugin.description == null)
-            pluginDescription.visibility = View.GONE
-        else {
-            pluginDescription.visibility = View.VISIBLE
-            pluginDescription.text = plugin.description
-        }
-        pluginPreferences.visibility = if (plugin.preferencesId == -1 || !plugin.isEnabled(pluginType)) View.INVISIBLE else View.VISIBLE
-        pluginVisibility.visibility = plugin.hasFragment().toVisibility()
-        pluginVisibility.isEnabled = !(plugin.pluginDescription.neverVisible || plugin.pluginDescription.alwaysVisible) && plugin.isEnabled(pluginType)
-        pluginVisibility.isChecked = plugin.isFragmentVisible
-    }
-
-    private fun areMultipleSelectionsAllowed(type: PluginType): Boolean {
-        return type == PluginType.GENERAL || type == PluginType.CONSTRAINTS || type == PluginType.LOOP
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt
new file mode 100644
index 0000000000..e6adc728f5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.db.ProfileSwitch
+
+interface ProfileFunction {
+    fun getProfileName(): String
+    fun getProfileName(customized: Boolean): String
+    fun getProfileNameWithDuration(): String
+    fun getProfileName(time: Long, customized: Boolean, showRemainingTime: Boolean): String
+    fun isProfileValid(from: String): Boolean
+    fun getProfile(): Profile?
+    fun getUnits(): String
+    fun getProfile(time: Long): Profile?
+    fun prepareProfileSwitch(profileStore: ProfileStore, profileName: String, duration: Int, percentage: Int, timeShift: Int, date: Long): ProfileSwitch
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
new file mode 100644
index 0000000000..80947013d5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -0,0 +1,116 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import android.os.Bundle
+import com.google.firebase.analytics.FirebaseAnalytics
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.security.spec.InvalidParameterSpecException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProfileFunctionImplementation @Inject constructor(
+    private val injector: HasAndroidInjector,
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePluginProvider,
+    private val fabricPrivacy: FabricPrivacy
+) : ProfileFunction {
+
+    override fun getProfileName(): String =
+        getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = false)
+
+    override fun getProfileName(customized: Boolean): String =
+        getProfileName(System.currentTimeMillis(), customized, showRemainingTime = false)
+
+    override fun getProfileName(time: Long, customized: Boolean, showRemainingTime: Boolean): String {
+        var profileName = resourceHelper.gs(R.string.noprofileselected)
+
+        val activeTreatments = activePlugin.activeTreatments
+        val activeProfile = activePlugin.activeProfileInterface
+
+        val profileSwitch = activeTreatments.getProfileSwitchFromHistory(time)
+        if (profileSwitch != null) {
+            if (profileSwitch.profileJson != null) {
+                profileName = if (customized) profileSwitch.customizedName else profileSwitch.profileName
+            } else {
+                activeProfile.profile?.let { profileStore ->
+                    val profile = profileStore.getSpecificProfile(profileSwitch.profileName)
+                    if (profile != null)
+                        profileName = profileSwitch.profileName
+                }
+            }
+
+            if (showRemainingTime && profileSwitch.durationInMinutes != 0) {
+                profileName += DateUtil.untilString(profileSwitch.originalEnd(), resourceHelper)
+            }
+        }
+        return profileName
+    }
+
+    override fun getProfileNameWithDuration(): String =
+        getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = true)
+
+    override fun isProfileValid(from: String): Boolean =
+        getProfile()?.isValid(from) ?: false
+
+    override fun getProfile(): Profile? =
+        getProfile(System.currentTimeMillis())
+
+    override fun getProfile(time: Long): Profile? {
+        val activeTreatments = activePlugin.activeTreatments
+        val activeProfile = activePlugin.activeProfileInterface
+
+        //log.debug("Profile for: " + new Date(time).toLocaleString() + " : " + getProfileName(time));
+        val profileSwitch = activeTreatments.getProfileSwitchFromHistory(time)
+        if (profileSwitch != null) {
+            if (profileSwitch.profileJson != null) {
+                return profileSwitch.profileObject
+            } else if (activeProfile.profile != null) {
+                val profile = activeProfile.profile!!.getSpecificProfile(profileSwitch.profileName)
+                if (profile != null) return profile
+            }
+        }
+        if (activeTreatments.profileSwitchesFromHistory.size() > 0) {
+            val bundle = Bundle()
+            bundle.putString(FirebaseAnalytics.Param.ITEM_ID, "CatchedError")
+            bundle.putString(FirebaseAnalytics.Param.ITEM_CATEGORY, BuildConfig.BUILDVERSION)
+            bundle.putString(FirebaseAnalytics.Param.START_DATE, time.toString())
+            bundle.putString(FirebaseAnalytics.Param.VALUE, activeTreatments.profileSwitchesFromHistory.toString())
+            fabricPrivacy.logCustom(bundle)
+        }
+        aapsLogger.error("getProfile at the end: returning null")
+        return null
+    }
+
+    override fun getUnits(): String =
+        sp.getString(R.string.key_units, Constants.MGDL)
+
+    override fun prepareProfileSwitch(profileStore: ProfileStore, profileName: String, duration: Int, percentage: Int, timeShift: Int, date: Long): ProfileSwitch {
+        val profile = profileStore.getSpecificProfile(profileName)
+            ?: throw InvalidParameterSpecException(profileName)
+        val profileSwitch = ProfileSwitch(injector)
+        profileSwitch.date = date
+        profileSwitch.source = Source.USER
+        profileSwitch.profileName = profileName
+        profileSwitch.profileJson = profile.data.toString()
+        profileSwitch.durationInMinutes = duration
+        profileSwitch.isCPP = percentage != 100 || timeShift != 0
+        profileSwitch.timeshift = timeShift
+        profileSwitch.percentage = percentage
+        return profileSwitch
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
deleted file mode 100644
index bdde6606bb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package info.nightscout.androidaps.plugins.configBuilder;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import com.google.firebase.analytics.FirebaseAnalytics;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.events.EventNewBasalProfile;
-import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-public class ProfileFunctions {
-    private static Logger log = LoggerFactory.getLogger(L.PROFILE);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private static ProfileFunctions profileFunctions = null;
-
-    public static ProfileFunctions getInstance() {
-        if (profileFunctions == null)
-            profileFunctions = new ProfileFunctions();
-        return profileFunctions;
-    }
-
-    static {
-        ProfileFunctions.getInstance(); // register to bus at start
-    }
-
-    private ProfileFunctions() {
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventProfileNeedsUpdate.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.PROFILE))
-                        log.debug("onProfileSwitch");
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().setProfile(getProfile(), 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.failedupdatebasalprofile));
-                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                MainApp.instance().startActivity(i);
-                            }
-                            if (result.enacted)
-                                RxBus.INSTANCE.send(new EventNewBasalProfile());
-                        }
-                    });
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    public String getProfileName() {
-        return getProfileName(System.currentTimeMillis(), true, false);
-    }
-
-    public String getProfileName(boolean customized) {
-        return getProfileName(System.currentTimeMillis(), customized, false);
-    }
-
-    public String getProfileNameWithDuration() {
-        return getProfileName(System.currentTimeMillis(), true, true);
-    }
-
-    public String getProfileName(long time, boolean customized, boolean showRemainingTime) {
-        String profileName = MainApp.gs(R.string.noprofileselected);
-
-        TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
-        ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-
-        ProfileSwitch profileSwitch = activeTreatments.getProfileSwitchFromHistory(time);
-        if (profileSwitch != null) {
-            if (profileSwitch.profileJson != null) {
-                profileName = customized ? profileSwitch.getCustomizedName() : profileSwitch.profileName;
-            } else {
-                ProfileStore profileStore = activeProfile.getProfile();
-                if (profileStore != null) {
-                    Profile profile = profileStore.getSpecificProfile(profileSwitch.profileName);
-                    if (profile != null)
-                        profileName = profileSwitch.profileName;
-                }
-            }
-
-            if (showRemainingTime && profileSwitch.durationInMinutes != 0) {
-                profileName += DateUtil.untilString(profileSwitch.originalEnd());
-            }
-            return profileName;
-        }
-        return profileName;
-    }
-
-    public boolean isProfileValid(String from) {
-        Profile profile = getProfile();
-        return profile != null && profile.isValid(from);
-    }
-
-    @Nullable
-    public Profile getProfile() {
-        return getProfile(System.currentTimeMillis());
-    }
-
-    public static String getSystemUnits() {
-        return SP.getString(R.string.key_units, Constants.MGDL);
-    }
-
-    @Nullable
-    public Profile getProfile(long time) {
-        TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
-        ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-
-        //log.debug("Profile for: " + new Date(time).toLocaleString() + " : " + getProfileName(time));
-        ProfileSwitch profileSwitch = activeTreatments.getProfileSwitchFromHistory(time);
-        if (profileSwitch != null) {
-            if (profileSwitch.profileJson != null) {
-                return profileSwitch.getProfileObject();
-            } else if (activeProfile.getProfile() != null) {
-                Profile profile = activeProfile.getProfile().getSpecificProfile(profileSwitch.profileName);
-                if (profile != null)
-                    return profile;
-            }
-        }
-        if (activeTreatments.getProfileSwitchesFromHistory().size() > 0) {
-            Bundle bundle = new Bundle();
-            bundle.putString(FirebaseAnalytics.Param.ITEM_ID, "CatchedError");
-            bundle.putString(FirebaseAnalytics.Param.ITEM_CATEGORY, BuildConfig.BUILDVERSION);
-            bundle.putString(FirebaseAnalytics.Param.START_DATE, String.valueOf(time));
-            bundle.putString(FirebaseAnalytics.Param.VALUE, activeTreatments.getProfileSwitchesFromHistory().toString());
-            FabricPrivacy.getInstance().logCustom(bundle);
-        }
-        log.error("getProfile at the end: returning null");
-        return null;
-    }
-
-    public static ProfileSwitch prepareProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift, long date) {
-        ProfileSwitch profileSwitch = new ProfileSwitch();
-        profileSwitch.date = date;
-        profileSwitch.source = Source.USER;
-        profileSwitch.profileName = profileName;
-        profileSwitch.profileJson = profileStore.getSpecificProfile(profileName).getData().toString();
-        profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
-        profileSwitch.durationInMinutes = duration;
-        profileSwitch.isCPP = percentage != 100 || timeshift != 0;
-        profileSwitch.timeshift = timeshift;
-        profileSwitch.percentage = percentage;
-        return profileSwitch;
-    }
-
-    public static void doProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift, final long date) {
-        ProfileSwitch profileSwitch = prepareProfileSwitch(profileStore, profileName, duration, percentage, timeshift, date);
-        TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
-        if (percentage == 90 && duration == 10)
-            SP.putBoolean(R.string.key_objectiveuseprofileswitch, true);
-    }
-
-    public static void doProfileSwitch(final int duration, final int percentage, final int timeshift) {
-        ProfileSwitch profileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
-        if (profileSwitch != null) {
-            profileSwitch = new ProfileSwitch();
-            profileSwitch.date = System.currentTimeMillis();
-            profileSwitch.source = Source.USER;
-            profileSwitch.profileName = getInstance().getProfileName(System.currentTimeMillis(), false, false);
-            profileSwitch.profileJson = getInstance().getProfile().getData().toString();
-            profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
-            profileSwitch.durationInMinutes = duration;
-            profileSwitch.isCPP = percentage != 100 || timeshift != 0;
-            profileSwitch.timeshift = timeshift;
-            profileSwitch.percentage = percentage;
-            TreatmentsPlugin.getPlugin().addToHistoryProfileSwitch(profileSwitch);
-        } else {
-            log.error("No profile switch existing");
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/EventConfigBuilderUpdateGui.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/events/EventConfigBuilderUpdateGui.kt
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/EventConfigBuilderUpdateGui.kt
rename to app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/events/EventConfigBuilderUpdateGui.kt
index e57fd79983..26904127dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/EventConfigBuilderUpdateGui.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/events/EventConfigBuilderUpdateGui.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.configBuilder
+package info.nightscout.androidaps.plugins.configBuilder.events
 
 import info.nightscout.androidaps.events.EventUpdateGui
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
deleted file mode 100644
index 828fa1b86f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.dstHelper;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-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;
-
-public class DstHelperPlugin extends PluginBase implements ConstraintsInterface {
-    public static final int DISABLE_TIMEFRAME_HOURS = -3;
-    public static final int WARN_PRIOR_TIMEFRAME_HOURS = 12;
-    private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
-
-    static DstHelperPlugin plugin = null;
-
-    public static DstHelperPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new DstHelperPlugin();
-        return plugin;
-    }
-
-    public DstHelperPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.CONSTRAINTS)
-                .neverVisible(true)
-                .alwaysEnabled(true)
-                .showInList(false)
-                .pluginName(R.string.dst_plugin_name)
-        );
-    }
-
-    public static boolean wasDST(Calendar now) {
-        Calendar ago = (Calendar) now.clone();
-        ago.add(Calendar.HOUR, DISABLE_TIMEFRAME_HOURS);
-        return now.get(Calendar.DST_OFFSET) != ago.get(Calendar.DST_OFFSET);
-    }
-
-    public static boolean willBeDST(Calendar now) {
-        Calendar ago = (Calendar) now.clone();
-        ago.add(Calendar.HOUR, WARN_PRIOR_TIMEFRAME_HOURS);
-        return now.get(Calendar.DST_OFFSET) != ago.get(Calendar.DST_OFFSET);
-    }
-
-    //Return false if time to DST change happened in the last 3 hours.
-    @Override
-    public Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
-
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump == null || pump.canHandleDST()) {
-            log.debug("Pump can handle DST");
-            return value;
-        }
-
-        Calendar cal = Calendar.getInstance();
-
-        if (willBeDST(cal)) {
-            warnUser(Notification.DST_IN_24H, MainApp.gs(R.string.dst_in_24h_warning));
-        }
-
-        if (!value.value()) {
-            log.debug("Already not allowed - don't check further");
-            return value;
-        }
-
-        if (wasDST(cal)) {
-            LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-            if (!loopPlugin.isSuspended()) {
-                warnUser(Notification.DST_LOOP_DISABLED, MainApp.gs(R.string.dst_loop_disabled_warning));
-            } else {
-                log.debug("Loop already suspended");
-            }
-            value.set(false, "DST in last 3 hours.", this);
-        }
-        return value;
-    }
-
-    private void warnUser(int id, String warningText) {
-        Notification notification = new Notification(id, warningText, Notification.LOW);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
new file mode 100644
index 0000000000..8292346a11
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.constraints.dstHelper
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DstHelperPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private var rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    private var sp: SP,
+    private var activePlugin: ActivePluginProvider,
+    private var loopPlugin: LoopPlugin
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.CONSTRAINTS)
+    .neverVisible(true)
+    .alwaysEnabled(true)
+    .showInList(false)
+    .pluginName(R.string.dst_plugin_name),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
+
+    companion object {
+        private const val DISABLE_TIME_FRAME_HOURS = -3
+        private const val WARN_PRIOR_TIME_FRAME_HOURS = 12
+    }
+
+    //Return false if time to DST change happened in the last 3 hours.
+    override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        val pump = activePlugin.activePump
+        if (pump.canHandleDST()) {
+            aapsLogger.debug(LTag.CONSTRAINTS, "Pump can handle DST")
+            return value
+        }
+        val cal = Calendar.getInstance()
+        if (willBeDST(cal)) {
+            val snoozedTo: Long = sp.getLong(R.string.key_snooze_dst_in24h, 0L)
+            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                val notification = NotificationWithAction(injector, Notification.DST_IN_24H, resourceHelper.gs(R.string.dst_in_24h_warning), Notification.LOW)
+                notification.action(R.string.snooze, Runnable {
+                    sp.putLong(R.string.key_snooze_dst_in24h, System.currentTimeMillis() + T.hours(24).msecs())
+                })
+                rxBus.send(EventNewNotification(notification))
+            }
+        }
+        if (!value.value()) {
+            aapsLogger.debug(LTag.CONSTRAINTS, "Already not allowed - don't check further")
+            return value
+        }
+        if (wasDST(cal)) {
+            if (!loopPlugin.isSuspended) {
+                val snoozedTo: Long = sp.getLong(R.string.key_snooze_loopdisabled, 0L)
+                if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                    val notification = NotificationWithAction(injector, Notification.DST_LOOP_DISABLED, resourceHelper.gs(R.string.dst_loop_disabled_warning), Notification.LOW)
+                    notification.action(R.string.snooze, Runnable {
+                        sp.putLong(R.string.key_snooze_loopdisabled, System.currentTimeMillis() + T.hours(24).msecs())
+                    })
+                    rxBus.send(EventNewNotification(notification))
+                }
+            } else {
+                aapsLogger.debug(LTag.CONSTRAINTS, "Loop already suspended")
+            }
+            value.set(aapsLogger, false, "DST in last 3 hours.", this)
+        }
+        return value
+    }
+
+    fun wasDST(now: Calendar): Boolean {
+        val ago = now.clone() as Calendar
+        ago.add(Calendar.HOUR, DISABLE_TIME_FRAME_HOURS)
+        return now[Calendar.DST_OFFSET] != ago[Calendar.DST_OFFSET]
+    }
+
+    fun willBeDST(now: Calendar): Boolean {
+        val ago = now.clone() as Calendar
+        ago.add(Calendar.HOUR, WARN_PRIOR_TIME_FRAME_HOURS)
+        return now[Calendar.DST_OFFSET] != ago[Calendar.DST_OFFSET]
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index 7f004b7f02..44f82fb97e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -14,29 +14,42 @@ import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.androidaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventNtpStatus
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.SntpClient
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.objectives_fragment.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+class ObjectivesFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var objectivesPlugin: ObjectivesPlugin
+    @Inject lateinit var receiverStatusStore: ReceiverStatusStore
 
-class ObjectivesFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.CONSTRAINTS)
     private val objectivesAdapter = ObjectivesAdapter()
     private val handler = Handler(Looper.getMainLooper())
 
@@ -60,7 +73,7 @@ class ObjectivesFragment : Fragment() {
         objectives_recyclerview.adapter = objectivesAdapter
         objectives_fake.setOnClickListener { updateGUI() }
         objectives_reset.setOnClickListener {
-            ObjectivesPlugin.reset()
+            objectivesPlugin.reset()
             objectives_recyclerview.adapter?.notifyDataSetChanged()
             scrollToCurrentObjective()
         }
@@ -71,15 +84,13 @@ class ObjectivesFragment : Fragment() {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
+        disposable += rxBus
             .toObservable(EventObjectivesUpdateGui::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 objectives_recyclerview.adapter?.notifyDataSetChanged()
-            }, {
-                FabricPrivacy.logException(it)
-            })
-        )
+            }, { fabricPrivacy.logException(it) }
+            )
     }
 
     @Synchronized
@@ -96,7 +107,7 @@ class ObjectivesFragment : Fragment() {
 
     private fun startUpdateTimer() {
         handler.removeCallbacks(objectiveUpdater)
-        for (objective in ObjectivesPlugin.objectives) {
+        for (objective in objectivesPlugin.objectives) {
             if (objective.isStarted && !objective.isAccomplished) {
                 val timeTillNextMinute = (System.currentTimeMillis() - objective.startedOn) % (60 * 1000)
                 handler.postDelayed(objectiveUpdater, timeTillNextMinute)
@@ -107,8 +118,8 @@ class ObjectivesFragment : Fragment() {
 
     private fun scrollToCurrentObjective() {
         activity?.runOnUiThread {
-            for (i in 0 until ObjectivesPlugin.objectives.size) {
-                val objective = ObjectivesPlugin.objectives[i]
+            for (i in 0 until objectivesPlugin.objectives.size) {
+                val objective = objectivesPlugin.objectives[i]
                 if (!objective.isStarted || !objective.isAccomplished) {
                     context?.let {
                         val smoothScroller = object : LinearSmoothScroller(it) {
@@ -131,16 +142,16 @@ class ObjectivesFragment : Fragment() {
         }
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val objective = ObjectivesPlugin.objectives[position]
-            holder.title.text = MainApp.gs(R.string.nth_objective, position + 1)
+            val objective = objectivesPlugin.objectives[position]
+            holder.title.text = resourceHelper.gs(R.string.nth_objective, position + 1)
             if (objective.objective != 0) {
                 holder.objective.visibility = View.VISIBLE
-                holder.objective.text = MainApp.gs(objective.objective)
+                holder.objective.text = resourceHelper.gs(objective.objective)
             } else
                 holder.objective.visibility = View.GONE
             if (objective.gate != 0) {
                 holder.gate.visibility = View.VISIBLE
-                holder.gate.text = MainApp.gs(objective.gate)
+                holder.gate.text = resourceHelper.gs(objective.gate)
             } else
                 holder.gate.visibility = View.GONE
             if (!objective.isStarted) {
@@ -150,7 +161,7 @@ class ObjectivesFragment : Fragment() {
                 holder.accomplished.visibility = View.GONE
                 holder.unFinish.visibility = View.GONE
                 holder.unStart.visibility = View.GONE
-                if (position == 0 || ObjectivesPlugin.objectives[position - 1].isAccomplished)
+                if (position == 0 || objectivesPlugin.objectives[position - 1].isAccomplished)
                     holder.start.visibility = View.VISIBLE
                 else
                     holder.start.visibility = View.GONE
@@ -176,7 +187,8 @@ class ObjectivesFragment : Fragment() {
                     if (task.shouldBeIgnored()) continue
                     // name
                     val name = TextView(holder.progress.context)
-                    name.text = MainApp.gs(task.task) + ":"
+                    @Suppress("SetTextlI8n")
+                    name.text = resourceHelper.gs(task.task) + ":"
                     name.setTextColor(-0x1)
                     holder.progress.addView(name, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
                     // hint
@@ -209,102 +221,102 @@ class ObjectivesFragment : Fragment() {
                     holder.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2)
                 }
             }
-            holder.accomplished.text = MainApp.gs(R.string.accomplished, DateUtil.dateAndTimeString(objective.accomplishedOn))
+            holder.accomplished.text = resourceHelper.gs(R.string.accomplished, DateUtil.dateAndTimeString(objective.accomplishedOn))
             holder.accomplished.setTextColor(-0x3e3e3f)
             holder.verify.setOnClickListener {
-                NetworkChangeReceiver.grabNetworkStatus(context)
+                receiverStatusStore.updateNetworkStatus()
                 if (objectives_fake.isChecked) {
                     objective.accomplishedOn = DateUtil.now()
                     scrollToCurrentObjective()
                     startUpdateTimer()
-                    RxBus.send(EventObjectivesUpdateGui())
-                    RxBus.send(EventSWUpdate(false))
+                    rxBus.send(EventObjectivesUpdateGui())
+                    rxBus.send(EventSWUpdate(false))
                 } else {
                     // move out of UI thread
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
-                        RxBus.send(EventNtpStatus(MainApp.gs(R.string.timedetection), 0))
+                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
                         SntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
-                                log.debug("NTP time: $time System time: ${DateUtil.now()}")
+                                aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
-                                    RxBus.send(EventNtpStatus(MainApp.gs(R.string.notconnected), 99))
+                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
                                 } else if (success) {
                                     if (objective.isCompleted(time)) {
                                         objective.accomplishedOn = time
-                                        RxBus.send(EventNtpStatus(MainApp.gs(R.string.success), 100))
+                                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.success), 100))
                                         SystemClock.sleep(1000)
-                                        RxBus.send(EventObjectivesUpdateGui())
-                                        RxBus.send(EventSWUpdate(false))
+                                        rxBus.send(EventObjectivesUpdateGui())
+                                        rxBus.send(EventSWUpdate(false))
                                         SystemClock.sleep(100)
                                         scrollToCurrentObjective()
                                     } else {
-                                        RxBus.send(EventNtpStatus(MainApp.gs(R.string.requirementnotmet), 99))
+                                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.requirementnotmet), 99))
                                     }
                                 } else {
-                                    RxBus.send(EventNtpStatus(MainApp.gs(R.string.failedretrievetime), 99))
+                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.failedretrievetime), 99))
                                 }
                             }
-                        }, NetworkChangeReceiver.isConnected())
+                        }, receiverStatusStore.isConnected)
                     }.start()
                 }
             }
             holder.start.setOnClickListener {
-                NetworkChangeReceiver.grabNetworkStatus(context)
+                receiverStatusStore.updateNetworkStatus()
                 if (objectives_fake.isChecked) {
                     objective.startedOn = DateUtil.now()
                     scrollToCurrentObjective()
                     startUpdateTimer()
-                    RxBus.send(EventObjectivesUpdateGui())
-                    RxBus.send(EventSWUpdate(false))
+                    rxBus.send(EventObjectivesUpdateGui())
+                    rxBus.send(EventSWUpdate(false))
                 } else
                 // move out of UI thread
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
-                        RxBus.send(EventNtpStatus(MainApp.gs(R.string.timedetection), 0))
+                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
                         SntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
-                                log.debug("NTP time: $time System time: ${DateUtil.now()}")
+                                aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
-                                    RxBus.send(EventNtpStatus(MainApp.gs(R.string.notconnected), 99))
+                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
                                 } else if (success) {
                                     objective.startedOn = time
-                                    RxBus.send(EventNtpStatus(MainApp.gs(R.string.success), 100))
+                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.success), 100))
                                     SystemClock.sleep(1000)
-                                    RxBus.send(EventObjectivesUpdateGui())
-                                    RxBus.send(EventSWUpdate(false))
+                                    rxBus.send(EventObjectivesUpdateGui())
+                                    rxBus.send(EventSWUpdate(false))
                                     SystemClock.sleep(100)
                                     scrollToCurrentObjective()
                                 } else {
-                                    RxBus.send(EventNtpStatus(MainApp.gs(R.string.failedretrievetime), 99))
+                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.failedretrievetime), 99))
                                 }
                             }
-                        }, NetworkChangeReceiver.isConnected())
+                        }, receiverStatusStore.isConnected)
                     }.start()
             }
             holder.unStart.setOnClickListener {
                 activity?.let { activity ->
-                    OKDialog.showConfirmation(activity, MainApp.gs(R.string.objectives), MainApp.gs(R.string.doyouwantresetstart), Runnable {
+                    OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.doyouwantresetstart), Runnable {
                         objective.startedOn = 0
                         scrollToCurrentObjective()
-                        RxBus.send(EventObjectivesUpdateGui())
-                        RxBus.send(EventSWUpdate(false))
+                        rxBus.send(EventObjectivesUpdateGui())
+                        rxBus.send(EventSWUpdate(false))
                     })
                 }
             }
             holder.unFinish.setOnClickListener {
                 objective.accomplishedOn = 0
                 scrollToCurrentObjective()
-                RxBus.send(EventObjectivesUpdateGui())
-                RxBus.send(EventSWUpdate(false))
+                rxBus.send(EventObjectivesUpdateGui())
+                rxBus.send(EventSWUpdate(false))
             }
             if (objective.hasSpecialInput && !objective.isAccomplished && objective.isStarted && objective.specialActionEnabled()) {
                 // generate random request code if none exists
-                val request = SP.getString(R.string.key_objectives_request_code, String.format("%1$05d", (Math.random() * 99999).toInt()))
-                SP.putString(R.string.key_objectives_request_code, request)
-                holder.requestCode.text = MainApp.gs(R.string.requestcode, request)
+                val request = sp.getString(R.string.key_objectives_request_code, String.format("%1$05d", (Math.random() * 99999).toInt()))
+                sp.putString(R.string.key_objectives_request_code, request)
+                holder.requestCode.text = resourceHelper.gs(R.string.requestcode, request)
                 holder.requestCode.visibility = View.VISIBLE
                 holder.enterButton.visibility = View.VISIBLE
                 holder.input.visibility = View.VISIBLE
@@ -312,7 +324,7 @@ class ObjectivesFragment : Fragment() {
                 holder.enterButton.setOnClickListener {
                     val input = holder.input.text.toString()
                     objective.specialAction(activity, input)
-                    RxBus.send(EventObjectivesUpdateGui())
+                    rxBus.send(EventObjectivesUpdateGui())
                 }
             } else {
                 holder.enterButton.visibility = View.GONE
@@ -323,7 +335,7 @@ class ObjectivesFragment : Fragment() {
         }
 
         override fun getItemCount(): Int {
-            return ObjectivesPlugin.objectives.size
+            return objectivesPlugin.objectives.size
         }
 
         inner class ViewHolder internal constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index ebae80150c..e357a1b57d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -3,51 +3,64 @@ package info.nightscout.androidaps.plugins.constraints.objectives
 import android.app.Activity
 import com.google.common.base.Charsets
 import com.google.common.hash.Hashing
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.Config
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
-/**
- * Created by mike on 05.08.2016.
- */
-object ObjectivesPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.CONSTRAINTS)
-        .fragmentClass(ObjectivesFragment::class.qualifiedName)
-        .alwaysEnabled(Config.APS)
-        .showInList(Config.APS)
-        .pluginName(R.string.objectives)
-        .shortName(R.string.objectives_shortname)
-        .description(R.string.description_objectives)), ConstraintsInterface {
+@Singleton
+class ObjectivesPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePluginProvider,
+    private val sp: SP
+
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.CONSTRAINTS)
+    .fragmentClass(ObjectivesFragment::class.qualifiedName)
+    .alwaysEnabled(Config.APS)
+    .showInList(Config.APS)
+    .pluginName(R.string.objectives)
+    .shortName(R.string.objectives_shortname)
+    .description(R.string.description_objectives),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
 
     var objectives: MutableList<Objective> = ArrayList()
 
-    val FIRST_OBJECTIVE = 0
-    val USAGE_OBJECTIVE = 1
-    val EXAM_OBJECTIVE = 2
-    val OPENLOOP_OBJECTIVE = 3
-    val MAXBASAL_OBJECTIVE = 4
-    val MAXIOB_ZERO_CL_OBJECTIVE = 5
-    val MAXIOB_OBJECTIVE = 6
-    val AUTOSENS_OBJECTIVE = 7
-    val AMA_OBJECTIVE = 8
-    val SMB_OBJECTIVE = 9
+    companion object {
+        const val FIRST_OBJECTIVE = 0
+        @Suppress("unused") const val USAGE_OBJECTIVE = 1
+        @Suppress("unused") const val EXAM_OBJECTIVE = 2
+        @Suppress("unused") const val OPENLOOP_OBJECTIVE = 3
+        @Suppress("unused") const val MAXBASAL_OBJECTIVE = 4
+        const val MAXIOB_ZERO_CL_OBJECTIVE = 5
+        @Suppress("unused") const val MAXIOB_OBJECTIVE = 6
+        const val AUTOSENS_OBJECTIVE = 7
+        const val AMA_OBJECTIVE = 8
+        const val SMB_OBJECTIVE = 9
+    }
 
-    init {
+    public override fun onStart() {
+        super.onStart()
         convertSP()
         setupObjectives()
     }
 
     override fun specialEnableCondition(): Boolean {
-        val pump = ConfigBuilderPlugin.getPlugin().activePump
-        return pump == null || pump.pumpDescription.isTempBasalCapable
+        return activePlugin.activePump.pumpDescription.isTempBasalCapable
     }
 
     // convert 2.3 SP version
@@ -63,25 +76,25 @@ object ObjectivesPlugin : PluginBase(PluginDescription()
     }
 
     private fun doConvertSP(number: Int, name: String) {
-        if (!SP.contains("Objectives_" + name + "_started")) {
-            SP.putLong("Objectives_" + name + "_started", SP.getLong("Objectives" + number + "started", 0L))
-            SP.putLong("Objectives_" + name + "_accomplished", SP.getLong("Objectives" + number + "accomplished", 0L))
+        if (!sp.contains("Objectives_" + name + "_started")) {
+            sp.putLong("Objectives_" + name + "_started", sp.getLong("Objectives" + number + "started", 0L))
+            sp.putLong("Objectives_" + name + "_accomplished", sp.getLong("Objectives" + number + "accomplished", 0L))
         }
         // TODO: we can remove Objectives1accomplished sometimes later
     }
 
     private fun setupObjectives() {
         objectives.clear()
-        objectives.add(Objective0())
-        objectives.add(Objective1())
-        objectives.add(Objective2())
-        objectives.add(Objective3())
-        objectives.add(Objective4())
-        objectives.add(Objective5())
-        objectives.add(Objective6())
-        objectives.add(Objective7())
-        objectives.add(Objective8())
-        objectives.add(Objective9())
+        objectives.add(Objective0(injector))
+        objectives.add(Objective1(injector))
+        objectives.add(Objective2(injector))
+        objectives.add(Objective3(injector))
+        objectives.add(Objective4(injector))
+        objectives.add(Objective5(injector))
+        objectives.add(Objective6(injector))
+        objectives.add(Objective7(injector))
+        objectives.add(Objective8(injector))
+        objectives.add(Objective9(injector))
     }
 
     fun reset() {
@@ -89,42 +102,42 @@ object ObjectivesPlugin : PluginBase(PluginDescription()
             objective.startedOn = 0
             objective.accomplishedOn = 0
         }
-        SP.putBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false)
-        SP.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false)
-        SP.putInt(R.string.key_ObjectivesmanualEnacts, 0)
-        SP.putBoolean(R.string.key_objectiveuseprofileswitch, false)
-        SP.putBoolean(R.string.key_objectiveusedisconnect, false)
-        SP.putBoolean(R.string.key_objectiveusereconnect, false)
-        SP.putBoolean(R.string.key_objectiveusetemptarget, false)
-        SP.putBoolean(R.string.key_objectiveuseactions, false)
-        SP.putBoolean(R.string.key_objectiveuseloop, false)
-        SP.putBoolean(R.string.key_objectiveusescale, false)
+        sp.putBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false)
+        sp.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false)
+        sp.putInt(R.string.key_ObjectivesmanualEnacts, 0)
+        sp.putBoolean(R.string.key_objectiveuseprofileswitch, false)
+        sp.putBoolean(R.string.key_objectiveusedisconnect, false)
+        sp.putBoolean(R.string.key_objectiveusereconnect, false)
+        sp.putBoolean(R.string.key_objectiveusetemptarget, false)
+        sp.putBoolean(R.string.key_objectiveuseactions, false)
+        sp.putBoolean(R.string.key_objectiveuseloop, false)
+        sp.putBoolean(R.string.key_objectiveusescale, false)
     }
 
     fun completeObjectives(activity: Activity, request: String) {
-        val requestCode = SP.getString(R.string.key_objectives_request_code, "")
-        var url = SP.getString(R.string.key_nsclientinternal_url, "").toLowerCase()
+        val requestCode = sp.getString(R.string.key_objectives_request_code, "")
+        var url = sp.getString(R.string.key_nsclientinternal_url, "").toLowerCase(Locale.getDefault())
         if (!url.endsWith("/")) url = "$url/"
         @Suppress("DEPRECATION") val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
         if (request.equals(hashNS.substring(0, 10), ignoreCase = true)) {
-            SP.putLong("Objectives_" + "openloop" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "openloop" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "maxbasal" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "maxbasal" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "maxiobzero" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "maxiobzero" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "maxiob" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "maxiob" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "autosens" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "autosens" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "ama" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "ama" + "_accomplished", DateUtil.now())
-            SP.putLong("Objectives_" + "smb" + "_started", DateUtil.now())
-            SP.putLong("Objectives_" + "smb" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "openloop" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "openloop" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "maxbasal" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "maxbasal" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "maxiobzero" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "maxiobzero" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "maxiob" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "maxiob" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "autosens" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "autosens" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "ama" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "ama" + "_accomplished", DateUtil.now())
+            sp.putLong("Objectives_" + "smb" + "_started", DateUtil.now())
+            sp.putLong("Objectives_" + "smb" + "_accomplished", DateUtil.now())
             setupObjectives()
-            OKDialog.show(activity, MainApp.gs(R.string.objectives), MainApp.gs(R.string.codeaccepted))
+            OKDialog.show(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeaccepted))
         } else {
-            OKDialog.show(activity, MainApp.gs(R.string.objectives), MainApp.gs(R.string.codeinvalid))
+            OKDialog.show(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeinvalid))
         }
     }
 
@@ -133,38 +146,37 @@ object ObjectivesPlugin : PluginBase(PluginDescription()
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[FIRST_OBJECTIVE].isStarted)
-            value.set(false, String.format(MainApp.gs(R.string.objectivenotstarted), FIRST_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), FIRST_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted)
-            value.set(false, String.format(MainApp.gs(R.string.objectivenotstarted), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTOSENS_OBJECTIVE].isStarted)
-            value.set(false, String.format(MainApp.gs(R.string.objectivenotstarted), AUTOSENS_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), AUTOSENS_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AMA_OBJECTIVE].isStarted)
-            value.set(false, String.format(MainApp.gs(R.string.objectivenotstarted), AMA_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), AMA_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[SMB_OBJECTIVE].isStarted)
-            value.set(false, String.format(MainApp.gs(R.string.objectivenotstarted), SMB_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), SMB_OBJECTIVE + 1), this)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted && !objectives[MAXIOB_ZERO_CL_OBJECTIVE].isAccomplished)
-            maxIob.set(0.0, String.format(MainApp.gs(R.string.objectivenotfinished), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            maxIob.set(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.objectivenotfinished), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return maxIob
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
index 1428652be5..2ea9743cee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
@@ -4,25 +4,29 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
-import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.*
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.Option
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.objectives_exam_fragment.*
+import javax.inject.Inject
+
+class ObjectivesExamDialog : DaggerDialogFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
 
-class ObjectivesExamDialog : DialogFragment() {
     companion object {
         var objective: Objective? = null
     }
 
-    var currentTask = 0
+    private var currentTask = 0
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -37,7 +41,7 @@ class ObjectivesExamDialog : DialogFragment() {
     override fun onStart() {
         super.onStart()
         dialog?.setCanceledOnTouchOutside(false)
-        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
     }
 
     override fun onResume() {
@@ -72,30 +76,30 @@ class ObjectivesExamDialog : DialogFragment() {
                 objectives_exam_hints.addView(h.generate(context))
             }
             // Disabled to
-            objectives_exam_disabledto.text = MainApp.gs(R.string.answerdisabledto, DateUtil.timeString(task.disabledTo))
+            objectives_exam_disabledto.text = resourceHelper.gs(R.string.answerdisabledto, DateUtil.timeString(task.disabledTo))
             objectives_exam_disabledto.visibility = if (task.isEnabledAnswer) View.GONE else View.VISIBLE
             // Buttons
             objectives_exam_verify.isEnabled = !task.answered && task.isEnabledAnswer
             objectives_exam_verify.setOnClickListener {
                 var result = true
                 for (o in task.options) {
-                    val option: Option = o as Option;
+                    val option: Option = o as Option
                     result = result && option.evaluate()
                 }
-                task.setAnswered(result);
+                task.answered = result
                 if (!result) {
                     task.disabledTo = DateUtil.now() + T.hours(1).msecs()
                     ToastUtils.showToastInUiThread(context, R.string.wronganswer)
                 } else task.disabledTo = 0
                 updateGui()
-                RxBus.send(EventObjectivesUpdateGui())
+                rxBus.send(EventObjectivesUpdateGui())
             }
             close.setOnClickListener { dismiss() }
             objectives_exam_reset.setOnClickListener {
                 task.answered = false
                 //task.disabledTo = 0
                 updateGui()
-                RxBus.send(EventObjectivesUpdateGui())
+                rxBus.send(EventObjectivesUpdateGui())
             }
             objectives_back_button.isEnabled = currentTask != 0
             objectives_back_button.setOnClickListener {
@@ -110,7 +114,7 @@ class ObjectivesExamDialog : DialogFragment() {
 
             objectives_next_unanswered_button.isEnabled = !objective.isCompleted
             objectives_next_unanswered_button.setOnClickListener {
-                for (i in (currentTask + 1)..(objective.tasks.size - 1)) {
+                for (i in (currentTask + 1) until objective.tasks.size) {
                     if (!objective.tasks[i].isCompleted) {
                         currentTask = i
                         updateGui()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
index 77e6f22b43..2e5ec7d9e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
@@ -5,32 +5,36 @@ import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventNtpStatus
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.dialog_bolusprogress.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+class NtpProgressDialog : DaggerDialogFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
 
-class NtpProgressDialog : DialogFragment() {
-    private val log = LoggerFactory.getLogger(L.UI)
     private val disposable = CompositeDisposable()
 
-    private val DEFAULT_STATE = MainApp.gs(R.string.timedetection)
-    private var state: String = DEFAULT_STATE
+    private var state: String? = null
     private var percent = 0
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        dialog?.setTitle(String.format(MainApp.gs(R.string.objectives)))
         isCancelable = false
 
-        state = savedInstanceState?.getString("state", DEFAULT_STATE) ?: DEFAULT_STATE
+        state = savedInstanceState?.getString("state", null)
         percent = savedInstanceState?.getInt("percent", 0) ?: 0
 
         return inflater.inflate(R.layout.dialog_bolusprogress, container, false)
@@ -38,41 +42,43 @@ class NtpProgressDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val defaultMessage = resourceHelper.gs(R.string.timedetection)
+        dialog?.setTitle(resourceHelper.gs(R.string.objectives))
         overview_bolusprogress_stop.setOnClickListener { dismiss() }
-        overview_bolusprogress_status.text = state
+        overview_bolusprogress_status.text = state ?: defaultMessage
         overview_bolusprogress_progressbar.max = 100
         overview_bolusprogress_progressbar.progress = percent
-        overview_bolusprogress_stop.text = MainApp.gs(R.string.close)
-        overview_bolusprogress_title.text = MainApp.gs(R.string.please_wait)
+        overview_bolusprogress_stop.text = resourceHelper.gs(R.string.close)
+        overview_bolusprogress_title.text = resourceHelper.gs(R.string.please_wait)
     }
 
     override fun onResume() {
         super.onResume()
-        if (L.isEnabled(L.UI)) log.debug("onResume")
+        aapsLogger.debug(LTag.UI, "onResume")
         if (percent == 100) {
             dismiss()
             return
         } else
             dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
 
-        disposable.add(toObservable(EventNtpStatus::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ event: EventNtpStatus ->
-                    if (L.isEnabled(L.UI)) log.debug("Status: " + event.status + " Percent: " + event.percent)
-                    overview_bolusprogress_status?.text = event.status
-                    overview_bolusprogress_progressbar?.progress = event.percent
-                    if (event.percent == 100) {
-                        SystemClock.sleep(100)
-                        dismiss()
-                    }
-                    state = event.status
-                    percent = event.percent
-                }) { FabricPrivacy.logException(it) }
-        )
+        disposable += rxBus
+            .toObservable(EventNtpStatus::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ event: EventNtpStatus ->
+                aapsLogger.debug(LTag.UI, "Status: " + event.status + " Percent: " + event.percent)
+                overview_bolusprogress_status?.text = event.status
+                overview_bolusprogress_progressbar?.progress = event.percent
+                if (event.percent == 100) {
+                    SystemClock.sleep(100)
+                    dismiss()
+                }
+                state = event.status
+                percent = event.percent
+            }) { fabricPrivacy.logException(it) }
     }
 
     override fun onPause() {
-        if (L.isEnabled(L.UI)) log.debug("onPause")
+        aapsLogger.debug(LTag.UI, "onPause")
         super.onPause()
         disposable.clear()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
index 7082c7e7bc..c15e1f8599 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.util.Linkify;
-import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
@@ -13,30 +12,34 @@ import androidx.annotation.StringRes;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public abstract class Objective {
+    @Inject public SP sp;
+    @Inject public ResourceHelper resourceHelper;
 
     private String spName;
-    @StringRes
-    private int objective;
-    @StringRes
-    private int gate;
+    @StringRes private int objective;
+    @StringRes private int gate;
     private long startedOn;
     private long accomplishedOn;
     List<Task> tasks = new ArrayList<>();
     public boolean hasSpecialInput = false;
 
-    public Objective(String spName, @StringRes int objective, @StringRes int gate) {
+    public Objective(HasAndroidInjector injector, String spName, @StringRes int objective, @StringRes int gate) {
+        injector.androidInjector().inject(this);
         this.spName = spName;
         this.objective = objective;
         this.gate = gate;
-        startedOn = SP.getLong("Objectives_" + spName + "_started", 0L);
-        accomplishedOn = SP.getLong("Objectives_" + spName + "_accomplished", 0L);
+        startedOn = sp.getLong("Objectives_" + spName + "_started", 0L);
+        accomplishedOn = sp.getLong("Objectives_" + spName + "_accomplished", 0L);
         if ((accomplishedOn - DateUtil.now()) > T.hours(3).msecs() || (startedOn - DateUtil.now()) > T.hours(3).msecs()) { // more than 3 hours in the future
             startedOn = 0;
             accomplishedOn = 0;
@@ -83,12 +86,12 @@ public abstract class Objective {
 
     public void setStartedOn(long startedOn) {
         this.startedOn = startedOn;
-        SP.putLong("Objectives_" + spName + "_started", startedOn);
+        sp.putLong("Objectives_" + spName + "_started", startedOn);
     }
 
     public void setAccomplishedOn(long accomplishedOn) {
         this.accomplishedOn = accomplishedOn;
-        SP.putLong("Objectives_" + spName + "_accomplished", accomplishedOn);
+        sp.putLong("Objectives_" + spName + "_accomplished", accomplishedOn);
     }
 
     public long getAccomplishedOn() {
@@ -103,9 +106,12 @@ public abstract class Objective {
         return tasks;
     }
 
-    public boolean specialActionEnabled() { return true; }
+    public boolean specialActionEnabled() {
+        return true;
+    }
 
-    public void specialAction(Activity activity, String input) {}
+    public void specialAction(Activity activity, String input) {
+    }
 
     public abstract class Task {
         @StringRes
@@ -126,10 +132,15 @@ public abstract class Objective {
         }
 
         public abstract boolean isCompleted();
-        public boolean isCompleted(long trueTime) { return isCompleted(); };
+
+        public boolean isCompleted(long trueTime) {
+            return isCompleted();
+        }
+
+        ;
 
         public String getProgress() {
-            return MainApp.gs(isCompleted() ? R.string.completed_well_done : R.string.not_completed_yet);
+            return resourceHelper.gs(isCompleted() ? R.string.completed_well_done : R.string.not_completed_yet);
         }
 
         Task hint(Hint hint) {
@@ -175,9 +186,9 @@ public abstract class Objective {
             int days = (int) Math.floor((double) duration / T.days(1).msecs());
             int hours = (int) Math.floor((double) duration / T.hours(1).msecs());
             int minutes = (int) Math.floor((double) duration / T.mins(1).msecs());
-            if (days > 0) return MainApp.gq(R.plurals.objective_days, days, days);
-            else if (hours > 0) return MainApp.gq(R.plurals.objective_hours, hours, hours);
-            else return MainApp.gq(R.plurals.objective_minutes, minutes, minutes);
+            if (days > 0) return resourceHelper.gq(R.plurals.objective_days, days, days);
+            else if (hours > 0) return resourceHelper.gq(R.plurals.objective_hours, hours, hours);
+            else return resourceHelper.gq(R.plurals.objective_minutes, minutes, minutes);
         }
     }
 
@@ -193,13 +204,13 @@ public abstract class Objective {
             super(task);
             this.question = question;
             this.spIdentifier = spIdentifier;
-            answered = SP.getBoolean("ExamTask_" + spIdentifier, false);
-            disabledTo = SP.getLong("DisabledTo_" + spIdentifier, 0L);
+            answered = sp.getBoolean("ExamTask_" + spIdentifier, false);
+            disabledTo = sp.getLong("DisabledTo_" + spIdentifier, 0L);
         }
 
         public void setDisabledTo(long newState) {
             disabledTo = newState;
-            SP.putLong("DisabledTo_" + spIdentifier, disabledTo);
+            sp.putLong("DisabledTo_" + spIdentifier, disabledTo);
         }
 
         public long getDisabledTo() {
@@ -212,7 +223,7 @@ public abstract class Objective {
 
         public void setAnswered(boolean newState) {
             answered = newState;
-            SP.putBoolean("ExamTask_" + spIdentifier, answered);
+            sp.putBoolean("ExamTask_" + spIdentifier, answered);
         }
 
         public boolean getAnswered() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.java
index f6f0267a23..d673e2b7f4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.java
@@ -2,24 +2,33 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class Objective0 extends Objective {
+    @Inject SP sp;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject VirtualPumpPlugin virtualPumpPlugin;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject LoopPlugin loopPlugin;
+    @Inject NSClientPlugin nsClientPlugin;
+    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
 
-    public Objective0() {
-        super("config", R.string.objectives_0_objective, R.string.objectives_0_gate);
+    public Objective0(HasAndroidInjector injector) {
+        super(injector, "config", R.string.objectives_0_objective, R.string.objectives_0_gate);
     }
 
     @Override
@@ -27,49 +36,49 @@ public class Objective0 extends Objective {
         tasks.add(new Task(R.string.objectives_bgavailableinns) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false);
+                return sp.getBoolean(R.string.key_ObjectivesbgIsAvailableInNS, false);
             }
         });
         tasks.add(new Task(R.string.nsclienthaswritepermission) {
             @Override
             public boolean isCompleted() {
-                return NSClientPlugin.getPlugin().hasWritePermission();
+                return nsClientPlugin.hasWritePermission();
             }
         });
         tasks.add(new Task(R.string.virtualpump_uploadstatus_title) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean("virtualpump_uploadstatus", false);
+                return sp.getBoolean("virtualpump_uploadstatus", false);
             }
 
             @Override
             public boolean shouldBeIgnored() {
-                return !VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP);
+                return !virtualPumpPlugin.isEnabled(PluginType.PUMP);
             }
         });
         tasks.add(new Task(R.string.objectives_pumpstatusavailableinns) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false);
+                return sp.getBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, false);
             }
         });
         tasks.add(new Task(R.string.hasbgdata) {
             @Override
             public boolean isCompleted() {
-                return DatabaseHelper.lastBg() != null;
+                return iobCobCalculatorPlugin.lastBg() != null;
             }
         });
         tasks.add(new Task(R.string.loopenabled) {
             @Override
             public boolean isCompleted() {
-                return LoopPlugin.getPlugin().isEnabled(PluginType.LOOP);
+                return loopPlugin.isEnabled(PluginType.LOOP);
             }
         });
         tasks.add(new Task(R.string.apsselected) {
             @Override
             public boolean isCompleted() {
-                APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
-                if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginType.APS))
+                APSInterface usedAPS = activePlugin.getActiveAPS();
+                if (((PluginBase) usedAPS).isEnabled(PluginType.APS))
                     return true;
                 return false;
             }
@@ -77,7 +86,7 @@ public class Objective0 extends Objective {
         tasks.add(new Task(R.string.activate_profile) {
             @Override
             public boolean isCompleted() {
-                return TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(DateUtil.now()) != null;
+                return treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now()) != null;
             }
         });
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
index 1687b56987..057a5ef556 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
@@ -2,16 +2,21 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class Objective1 extends Objective {
+    @Inject SP sp;
+    @Inject ActionsPlugin actionsPlugin;
 
-
-    public Objective1() {
-        super("usage", R.string.objectives_usage_objective, R.string.objectives_usage_gate);
+    @Inject
+    public Objective1(HasAndroidInjector injector) {
+        super(injector, "usage", R.string.objectives_usage_objective, R.string.objectives_usage_gate);
     }
 
     @Override
@@ -19,43 +24,43 @@ public class Objective1 extends Objective {
         tasks.add(new Task(R.string.objectives_useprofileswitch) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveuseprofileswitch, false);
+                return sp.getBoolean(R.string.key_objectiveuseprofileswitch, false);
             }
         });
         tasks.add(new Task(R.string.objectives_usedisconnectpump) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveusedisconnect, false);
+                return sp.getBoolean(R.string.key_objectiveusedisconnect, false);
             }
         }.hint(new Hint(R.string.disconnectpump_hint)));
         tasks.add(new Task(R.string.objectives_usereconnectpump) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveusereconnect, false);
+                return sp.getBoolean(R.string.key_objectiveusereconnect, false);
             }
         }.hint(new Hint(R.string.disconnectpump_hint)));
         tasks.add(new Task(R.string.objectives_usetemptarget) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveusetemptarget, false);
+                return sp.getBoolean(R.string.key_objectiveusetemptarget, false);
             }
         }.hint(new Hint(R.string.usetemptarget_hint)));
         tasks.add(new Task(R.string.objectives_useactions) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveuseactions, false) && ActionsPlugin.INSTANCE.isEnabled(PluginType.GENERAL) && ActionsPlugin.INSTANCE.isFragmentVisible();
+                return sp.getBoolean(R.string.key_objectiveuseactions, false) && actionsPlugin.isEnabled(PluginType.GENERAL) && actionsPlugin.isFragmentVisible();
             }
         }.hint(new Hint(R.string.useaction_hint)));
         tasks.add(new Task(R.string.objectives_useloop) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveuseloop, false);
+                return sp.getBoolean(R.string.key_objectiveuseloop, false);
             }
         }.hint(new Hint(R.string.useaction_hint)));
         tasks.add(new Task(R.string.objectives_usescale) {
             @Override
             public boolean isCompleted() {
-                return SP.getBoolean(R.string.key_objectiveusescale, false);
+                return sp.getBoolean(R.string.key_objectiveusescale, false);
             }
         }.hint(new Hint(R.string.usescale_hint)));
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
index 017ad33a8c..78c79d691f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
@@ -3,13 +3,15 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 import java.util.Collections;
 import java.util.List;
 
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 
 public class Objective2 extends Objective {
 
 
-    public Objective2() {
-        super("exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate);
+    public Objective2(HasAndroidInjector injector) {
+        super(injector, "exam", R.string.objectives_exam_objective, R.string.objectives_exam_gate);
         for (Task task : tasks) {
             if (!task.isCompleted()) setAccomplishedOn(0);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.java
index f8eb45bb2a..b088a7862b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.java
@@ -4,19 +4,27 @@ import android.app.Activity;
 
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class Objective3 extends Objective {
+    @Inject SP sp;
+    @Inject ObjectivesPlugin objectivesPlugin;
+    @Inject ResourceHelper resourceHelper;
+    @Inject NSClientPlugin nsClientPlugin;
 
-    public final int MANUAL_ENACTS_NEEDED = 20;
+    private final int MANUAL_ENACTS_NEEDED = 20;
 
-    public Objective3() {
-        super("openloop", R.string.objectives_openloop_objective, R.string.objectives_openloop_gate);
+    @Inject
+    public Objective3(HasAndroidInjector injector) {
+        super(injector, "openloop", R.string.objectives_openloop_objective, R.string.objectives_openloop_gate);
         hasSpecialInput = true;
     }
 
@@ -26,26 +34,26 @@ public class Objective3 extends Objective {
         tasks.add(new Task(R.string.objectives_manualenacts) {
             @Override
             public boolean isCompleted() {
-                return SP.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED;
+                return sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED;
             }
 
             @Override
             public String getProgress() {
-                if (SP.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED)
-                    return MainApp.gs(R.string.completed_well_done);
+                if (sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED)
+                    return resourceHelper.gs(R.string.completed_well_done);
                 else
-                    return SP.getInt(R.string.key_ObjectivesmanualEnacts, 0) + " / " + MANUAL_ENACTS_NEEDED;
+                    return sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) + " / " + MANUAL_ENACTS_NEEDED;
             }
         });
     }
 
     @Override
     public boolean specialActionEnabled() {
-        return NSClientPlugin.getPlugin().nsClientService.isConnected && NSClientPlugin.getPlugin().nsClientService.hasWriteAuth;
+        return nsClientPlugin.nsClientService.isConnected && nsClientPlugin.nsClientService.hasWriteAuth;
     }
 
     @Override
     public void specialAction(Activity activity, String input) {
-        ObjectivesPlugin.INSTANCE.completeObjectives(activity, input);
+        objectivesPlugin.completeObjectives(activity, input);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
index bb46d3c338..4ae475d099 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective4.java
@@ -1,10 +1,11 @@
 package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 
 public class Objective4 extends Objective {
 
-    public Objective4() {
-        super("maxbasal", R.string.objectives_maxbasal_objective, R.string.objectives_maxbasal_gate);
+    public Objective4(HasAndroidInjector injector) {
+        super(injector, "maxbasal", R.string.objectives_maxbasal_objective, R.string.objectives_maxbasal_gate);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.java
index bd3e69c751..2410b3ae4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.java
@@ -2,15 +2,19 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
 import info.nightscout.androidaps.utils.T;
 
 public class Objective5 extends Objective {
+    @Inject SafetyPlugin safetyPlugin;
 
-    public Objective5() {
-        super("maxiobzero", R.string.objectives_maxiobzero_objective, R.string.objectives_maxiobzero_gate);
+    public Objective5(HasAndroidInjector injector) {
+        super(injector, "maxiobzero", R.string.objectives_maxiobzero_objective, R.string.objectives_maxiobzero_gate);
     }
 
     @Override
@@ -20,7 +24,7 @@ public class Objective5 extends Objective {
             @Override
             public boolean isCompleted() {
                 Constraint<Boolean> closedLoopEnabled = new Constraint<>(true);
-                SafetyPlugin.getPlugin().isClosedLoopAllowed(closedLoopEnabled);
+                safetyPlugin.isClosedLoopAllowed(closedLoopEnabled);
                 return closedLoopEnabled.value();
             }
         });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective6.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective6.java
index 1b224bd40c..e05cb272d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective6.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective6.java
@@ -2,14 +2,18 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.utils.T;
 
 public class Objective6 extends Objective {
+    @Inject ConstraintChecker constraintChecker;
 
-    public Objective6() {
-        super("maxiob", R.string.objectives_maxiob_objective, R.string.objectives_maxiob_gate);
+    public Objective6(HasAndroidInjector injector) {
+        super(injector, "maxiob", R.string.objectives_maxiob_objective, R.string.objectives_maxiob_gate);
     }
 
     @Override
@@ -18,7 +22,7 @@ public class Objective6 extends Objective {
         tasks.add(new Task(R.string.maxiobset) {
             @Override
             public boolean isCompleted() {
-                double maxIOB = MainApp.getConstraintChecker().getMaxIOBAllowed().value();
+                double maxIOB = constraintChecker.getMaxIOBAllowed().value();
                 return maxIOB > 0;
             }
         });
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective7.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective7.java
index 497eb0a180..3a1a2d05f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective7.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective7.java
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.utils.T;
 
 public class Objective7 extends Objective {
 
-    public Objective7() {
-        super("autosens", R.string.objectives_autosens_objective, R.string.objectives_autosens_gate);
+    public Objective7(HasAndroidInjector injector) {
+        super(injector, "autosens", R.string.objectives_autosens_objective, R.string.objectives_autosens_gate);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.java
index 3f943041b6..01e89fb415 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.java
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.utils.T;
 
 public class Objective8 extends Objective {
 
-    public Objective8() {
-        super("ama", R.string.objectives_ama_objective, 0);
+    public Objective8(HasAndroidInjector injector) {
+        super(injector, "ama", R.string.objectives_ama_objective, 0);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective9.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective9.java
index 106c25cb79..9db81bacdb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective9.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective9.java
@@ -2,13 +2,14 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
 import java.util.List;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.utils.T;
 
 public class Objective9 extends Objective {
 
-    public Objective9() {
-        super("smb", R.string.objectives_smb_objective, R.string.objectives_smb_gate);
+    public Objective9(HasAndroidInjector injector) {
+        super(injector, "smb", R.string.objectives_smb_objective, R.string.objectives_smb_gate);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
new file mode 100644
index 0000000000..749f7f795c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.constraints.phoneChecker
+
+import android.content.Context
+import android.os.Build
+import com.scottyab.rootbeer.RootBeer
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PhoneCheckerPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val context: Context
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.CONSTRAINTS)
+    .neverVisible(true)
+    .alwaysEnabled(true)
+    .showInList(false)
+    .pluginName(R.string.phonechecker),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
+
+    var phoneRooted: Boolean = false
+    var devMode: Boolean = false
+    val phoneModel: String = Build.MODEL
+    val manufacturer: String = Build.MANUFACTURER
+
+    private fun isDevModeEnabled(): Boolean {
+        return android.provider.Settings.Secure.getInt(context.contentResolver,
+            android.provider.Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+    }
+
+    override fun onStart() {
+        super.onStart()
+        phoneRooted = RootBeer(context).isRootedWithoutBusyBoxCheck()
+        devMode = isDevModeEnabled()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
index 4d66f36194..a344d8b56a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
@@ -1,10 +1,15 @@
 package info.nightscout.androidaps.plugins.constraints.safety;
 
+import androidx.annotation.NonNull;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ConstraintChecker;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
@@ -13,156 +18,190 @@ 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.logging.AAPSLogger;
 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.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 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;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
-    static SafetyPlugin plugin = null;
+    private SP sp;
+    private RxBusWrapper rxBus;
+    private ConstraintChecker constraintChecker;
+    private OpenAPSAMAPlugin openAPSAMAPlugin;
+    private OpenAPSMAPlugin openAPSMAPlugin;
+    private OpenAPSSMBPlugin openAPSSMBPlugin;
+    private SensitivityOref1Plugin sensitivityOref1Plugin;
+    private ActivePluginProvider activePlugin;
+    private HardLimits hardLimits;
+    private BuildHelper buildHelper;
+    private TreatmentsPlugin treatmentsPlugin;
 
-    public static SafetyPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SafetyPlugin();
-        return plugin;
-    }
-
-    public SafetyPlugin() {
+    @Inject
+    public SafetyPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            RxBusWrapper rxBus,
+            ConstraintChecker constraintChecker,
+            OpenAPSAMAPlugin openAPSAMAPlugin,
+            OpenAPSMAPlugin openAPSMAPlugin,
+            OpenAPSSMBPlugin openAPSSMBPlugin,
+            SensitivityOref1Plugin sensitivityOref1Plugin,
+            ActivePluginProvider activePlugin,
+            HardLimits hardLimits,
+            BuildHelper buildHelper,
+            TreatmentsPlugin treatmentsPlugin
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.CONSTRAINTS)
-                .neverVisible(true)
-                .alwaysEnabled(true)
-                .showInList(false)
-                .pluginName(R.string.safety)
-                .preferencesId(R.xml.pref_safety)
+                        .mainType(PluginType.CONSTRAINTS)
+                        .neverVisible(true)
+                        .alwaysEnabled(true)
+                        .showInList(false)
+                        .pluginName(R.string.safety)
+                        .preferencesId(R.xml.pref_safety),
+                aapsLogger, resourceHelper, injector
         );
+        this.sp = sp;
+        this.rxBus = rxBus;
+        this.constraintChecker = constraintChecker;
+        this.openAPSAMAPlugin = openAPSAMAPlugin;
+        this.openAPSMAPlugin = openAPSMAPlugin;
+        this.openAPSSMBPlugin = openAPSSMBPlugin;
+        this.sensitivityOref1Plugin = sensitivityOref1Plugin;
+        this.activePlugin = activePlugin;
+        this.hardLimits = hardLimits;
+        this.buildHelper = buildHelper;
+        this.treatmentsPlugin = treatmentsPlugin;
     }
 
     /**
      * Constraints interface
      **/
-    @Override
-    public Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
-        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isTempBasalCapable)
-            value.set(false, MainApp.gs(R.string.pumpisnottempbasalcapable), this);
+    @NonNull @Override
+    public Constraint<Boolean> isLoopInvocationAllowed(@NonNull Constraint<Boolean> value) {
+        if (!activePlugin.getActivePump().getPumpDescription().isTempBasalCapable)
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.pumpisnottempbasalcapable), this);
         return value;
     }
 
-    @Override
-    public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
-        String mode = SP.getString(R.string.key_aps_mode, "open");
+    @NonNull @Override
+    public Constraint<Boolean> isClosedLoopAllowed(@NonNull Constraint<Boolean> value) {
+        String mode = sp.getString(R.string.key_aps_mode, "open");
         if (!mode.equals("closed"))
-            value.set(false, MainApp.gs(R.string.closedmodedisabledinpreferences), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.closedmodedisabledinpreferences), this);
 
-        if (!MainApp.isEngineeringModeOrRelease()) {
+        if (!buildHelper.isEngineeringModeOrRelease()) {
             if (value.value()) {
-                Notification n = new Notification(Notification.TOAST_ALARM, MainApp.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL);
-                RxBus.INSTANCE.send(new EventNewNotification(n));
+                Notification n = new Notification(Notification.TOAST_ALARM, getResourceHelper().gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL);
+                rxBus.send(new EventNewNotification(n));
             }
-            value.set(false, MainApp.gs(R.string.closed_loop_disabled_on_dev_branch), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.closed_loop_disabled_on_dev_branch), this);
+        }
+        PumpInterface pump = activePlugin.getActivePump();
+        if (!pump.isFakingTempsByExtendedBoluses() && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.closed_loop_disabled_with_eb), this);
         }
-
         return value;
     }
 
-    @Override
-    public Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
-        boolean enabled = SP.getBoolean(R.string.key_openapsama_useautosens, false);
+    @NonNull @Override
+    public Constraint<Boolean> isAutosensModeEnabled(@NonNull Constraint<Boolean> value) {
+        boolean enabled = sp.getBoolean(R.string.key_openapsama_useautosens, false);
         if (!enabled)
-            value.set(false, MainApp.gs(R.string.autosensdisabledinpreferences), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.autosensdisabledinpreferences), this);
         return value;
     }
 
-    @Override
-    public Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
-        boolean enabled = SP.getBoolean(R.string.key_use_smb, false);
+    @NonNull @Override
+    public Constraint<Boolean> isSMBModeEnabled(@NonNull Constraint<Boolean> value) {
+        boolean enabled = sp.getBoolean(R.string.key_use_smb, false);
         if (!enabled)
-            value.set(false, MainApp.gs(R.string.smbdisabledinpreferences), this);
-        ConstraintChecker constraintChecker = MainApp.getConstraintChecker();
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.smbdisabledinpreferences), this);
         Constraint<Boolean> closedLoop = constraintChecker.isClosedLoopAllowed();
         if (!closedLoop.value())
-            value.set(false, MainApp.gs(R.string.smbnotallowedinopenloopmode), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.smbnotallowedinopenloopmode), this);
         return value;
     }
 
-    @Override
-    public Constraint<Boolean> isUAMEnabled(Constraint<Boolean> value) {
-        boolean enabled = SP.getBoolean(R.string.key_use_uam, false);
+    @NonNull @Override
+    public Constraint<Boolean> isUAMEnabled(@NonNull Constraint<Boolean> value) {
+        boolean enabled = sp.getBoolean(R.string.key_use_uam, false);
         if (!enabled)
-            value.set(false, MainApp.gs(R.string.uamdisabledinpreferences), this);
-        boolean oref1Enabled = SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.uamdisabledinpreferences), this);
+        boolean oref1Enabled = sensitivityOref1Plugin.isEnabled(PluginType.SENSITIVITY);
         if (!oref1Enabled)
-            value.set(false, MainApp.gs(R.string.uamdisabledoref1notselected), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.uamdisabledoref1notselected), this);
         return value;
     }
 
-    @Override
-    public Constraint<Boolean> isAdvancedFilteringEnabled(Constraint<Boolean> value) {
-        BgSourceInterface bgSource = ConfigBuilderPlugin.getPlugin().getActiveBgSource();
+    @NonNull @Override
+    public Constraint<Boolean> isAdvancedFilteringEnabled(@NonNull Constraint<Boolean> value) {
+        BgSourceInterface bgSource = activePlugin.getActiveBgSource();
 
-        if (bgSource != null) {
-            if (!bgSource.advancedFilteringSupported())
-                value.set(false, MainApp.gs(R.string.smbalwaysdisabled), this);
-        }
+        if (!bgSource.advancedFilteringSupported())
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.smbalwaysdisabled), this);
         return value;
     }
 
-    @Override
-    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
+    @NonNull @Override
+    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
 
-        absoluteRate.setIfGreater(0d, String.format(MainApp.gs(R.string.limitingbasalratio), 0d, MainApp.gs(R.string.itmustbepositivevalue)), this);
+        absoluteRate.setIfGreater(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingbasalratio), 0d, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
 
         if (Config.APS) {
-            double maxBasal = SP.getDouble(R.string.key_openapsma_max_basal, 1d);
+            double maxBasal = sp.getDouble(R.string.key_openapsma_max_basal, 1d);
             if (maxBasal < profile.getMaxDailyBasal()) {
                 maxBasal = profile.getMaxDailyBasal();
-                absoluteRate.addReason(MainApp.gs(R.string.increasingmaxbasal), this);
+                absoluteRate.addReason(getResourceHelper().gs(R.string.increasingmaxbasal), this);
             }
-            absoluteRate.setIfSmaller(maxBasal, String.format(MainApp.gs(R.string.limitingbasalratio), maxBasal, MainApp.gs(R.string.maxvalueinpreferences)), this);
+            absoluteRate.setIfSmaller(getAapsLogger(), maxBasal, String.format(getResourceHelper().gs(R.string.limitingbasalratio), maxBasal, getResourceHelper().gs(R.string.maxvalueinpreferences)), this);
 
             // Check percentRate but absolute rate too, because we know real current basal in pump
-            Double maxBasalMult = SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d);
+            double maxBasalMult = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d);
             double maxFromBasalMult = Math.floor(maxBasalMult * profile.getBasal() * 100) / 100;
-            absoluteRate.setIfSmaller(maxFromBasalMult, String.format(MainApp.gs(R.string.limitingbasalratio), maxFromBasalMult, MainApp.gs(R.string.maxbasalmultiplier)), this);
+            absoluteRate.setIfSmaller(getAapsLogger(), maxFromBasalMult, String.format(getResourceHelper().gs(R.string.limitingbasalratio), maxFromBasalMult, getResourceHelper().gs(R.string.maxbasalmultiplier)), this);
 
-            Double maxBasalFromDaily = SP.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d);
+            double maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d);
             double maxFromDaily = Math.floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100;
-            absoluteRate.setIfSmaller(maxFromDaily, String.format(MainApp.gs(R.string.limitingbasalratio), maxFromDaily, MainApp.gs(R.string.maxdailybasalmultiplier)), this);
+            absoluteRate.setIfSmaller(getAapsLogger(), maxFromDaily, String.format(getResourceHelper().gs(R.string.limitingbasalratio), maxFromDaily, getResourceHelper().gs(R.string.maxdailybasalmultiplier)), this);
         }
 
-        absoluteRate.setIfSmaller(HardLimits.maxBasal(), String.format(MainApp.gs(R.string.limitingbasalratio), HardLimits.maxBasal(), MainApp.gs(R.string.hardlimit)), this);
+        absoluteRate.setIfSmaller(getAapsLogger(), hardLimits.maxBasal(), String.format(getResourceHelper().gs(R.string.limitingbasalratio), hardLimits.maxBasal(), getResourceHelper().gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        PumpInterface pump = activePlugin.getActivePump();
         // check for pump max
-        if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
+        if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
             double pumpLimit = pump.getPumpDescription().pumpType.getTbrSettings().getMaxDose();
-            absoluteRate.setIfSmaller(pumpLimit, String.format(MainApp.gs(R.string.limitingbasalratio), pumpLimit, MainApp.gs(R.string.pumplimit)), this);
+            absoluteRate.setIfSmaller(getAapsLogger(), pumpLimit, String.format(getResourceHelper().gs(R.string.limitingbasalratio), pumpLimit, getResourceHelper().gs(R.string.pumplimit)), this);
         }
 
         // do rounding
-        if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
-            absoluteRate.set(Round.roundTo(absoluteRate.value(), pump.getPumpDescription().tempAbsoluteStep));
+        if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
+            absoluteRate.set(getAapsLogger(), Round.roundTo(absoluteRate.value(), pump.getPumpDescription().tempAbsoluteStep));
         }
         return absoluteRate;
     }
 
-    @Override
+    @NonNull @Override
     public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
 
         Double currentBasal = profile.getBasal();
-        Double absoluteRate = currentBasal * ((double) percentRate.originalValue() / 100);
+        double absoluteRate = currentBasal * ((double) percentRate.originalValue() / 100);
 
         percentRate.addReason("Percent rate " + percentRate.originalValue() + "% recalculated to " + DecimalFormatter.to2Decimal(absoluteRate) + " U/h with current basal " + DecimalFormatter.to2Decimal(currentBasal) + " U/h", this);
 
@@ -170,85 +209,79 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
         applyBasalConstraints(absoluteConstraint, profile);
         percentRate.copyReasons(absoluteConstraint);
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        PumpInterface pump = activePlugin.getActivePump();
 
-        Integer percentRateAfterConst = Double.valueOf(absoluteConstraint.value() / currentBasal * 100).intValue();
-        if (pump != null) {
-            if (percentRateAfterConst < 100)
-                percentRateAfterConst = Round.ceilTo((double) percentRateAfterConst, (double) pump.getPumpDescription().tempPercentStep).intValue();
-            else
-                percentRateAfterConst = Round.floorTo((double) percentRateAfterConst, (double) pump.getPumpDescription().tempPercentStep).intValue();
-        }
+        int percentRateAfterConst = Double.valueOf(absoluteConstraint.value() / currentBasal * 100).intValue();
+        if (percentRateAfterConst < 100)
+            percentRateAfterConst = Round.ceilTo((double) percentRateAfterConst, (double) pump.getPumpDescription().tempPercentStep).intValue();
+        else
+            percentRateAfterConst = Round.floorTo((double) percentRateAfterConst, (double) pump.getPumpDescription().tempPercentStep).intValue();
 
-        percentRate.set(percentRateAfterConst, String.format(MainApp.gs(R.string.limitingpercentrate), percentRateAfterConst, MainApp.gs(R.string.pumplimit)), this);
+        percentRate.set(getAapsLogger(), percentRateAfterConst, String.format(getResourceHelper().gs(R.string.limitingpercentrate), percentRateAfterConst, getResourceHelper().gs(R.string.pumplimit)), this);
 
-        if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT) {
+        if (pump.getPumpDescription().tempBasalStyle == PumpDescription.PERCENT) {
             double pumpLimit = pump.getPumpDescription().pumpType.getTbrSettings().getMaxDose();
-            percentRate.setIfSmaller((int) pumpLimit, String.format(MainApp.gs(R.string.limitingbasalratio), pumpLimit, MainApp.gs(R.string.pumplimit)), this);
+            percentRate.setIfSmaller(getAapsLogger(), (int) pumpLimit, String.format(getResourceHelper().gs(R.string.limitingbasalratio), pumpLimit, getResourceHelper().gs(R.string.pumplimit)), this);
         }
 
         return percentRate;
     }
 
-    @Override
+    @NonNull @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfGreater(0d, String.format(MainApp.gs(R.string.limitingbolus), 0d, MainApp.gs(R.string.itmustbepositivevalue)), this);
+        insulin.setIfGreater(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingbolus), 0d, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
 
-        Double maxBolus = SP.getDouble(R.string.key_treatmentssafety_maxbolus, 3d);
-        insulin.setIfSmaller(maxBolus, String.format(MainApp.gs(R.string.limitingbolus), maxBolus, MainApp.gs(R.string.maxvalueinpreferences)), this);
+        Double maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3d);
+        insulin.setIfSmaller(getAapsLogger(), maxBolus, String.format(getResourceHelper().gs(R.string.limitingbolus), maxBolus, getResourceHelper().gs(R.string.maxvalueinpreferences)), this);
 
-        insulin.setIfSmaller(HardLimits.maxBolus(), String.format(MainApp.gs(R.string.limitingbolus), HardLimits.maxBolus(), MainApp.gs(R.string.hardlimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), hardLimits.maxBolus(), String.format(getResourceHelper().gs(R.string.limitingbolus), hardLimits.maxBolus(), getResourceHelper().gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump != null) {
-            double rounded = pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulin.value());
-            insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);
-        }
+        PumpInterface pump = activePlugin.getActivePump();
+        double rounded = pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulin.value());
+        insulin.setIfDifferent(getAapsLogger(), rounded, getResourceHelper().gs(R.string.pumplimit), this);
         return insulin;
     }
 
-    @Override
+    @NonNull @Override
     public Constraint<Double> applyExtendedBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfGreater(0d, String.format(MainApp.gs(R.string.limitingextendedbolus), 0d, MainApp.gs(R.string.itmustbepositivevalue)), this);
+        insulin.setIfGreater(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingextendedbolus), 0d, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
 
-        Double maxBolus = SP.getDouble(R.string.key_treatmentssafety_maxbolus, 3d);
-        insulin.setIfSmaller(maxBolus, String.format(MainApp.gs(R.string.limitingextendedbolus), maxBolus, MainApp.gs(R.string.maxvalueinpreferences)), this);
+        Double maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3d);
+        insulin.setIfSmaller(getAapsLogger(), maxBolus, String.format(getResourceHelper().gs(R.string.limitingextendedbolus), maxBolus, getResourceHelper().gs(R.string.maxvalueinpreferences)), this);
 
-        insulin.setIfSmaller(HardLimits.maxBolus(), String.format(MainApp.gs(R.string.limitingextendedbolus), HardLimits.maxBolus(), MainApp.gs(R.string.hardlimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), hardLimits.maxBolus(), String.format(getResourceHelper().gs(R.string.limitingextendedbolus), hardLimits.maxBolus(), getResourceHelper().gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump != null) {
-            double rounded = pump.getPumpDescription().pumpType.determineCorrectExtendedBolusSize(insulin.value());
-            insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);
-        }
+        PumpInterface pump = activePlugin.getActivePump();
+        double rounded = pump.getPumpDescription().pumpType.determineCorrectExtendedBolusSize(insulin.value());
+        insulin.setIfDifferent(getAapsLogger(), rounded, getResourceHelper().gs(R.string.pumplimit), this);
         return insulin;
     }
 
-    @Override
+    @NonNull @Override
     public Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
-        carbs.setIfGreater(0, String.format(MainApp.gs(R.string.limitingcarbs), 0, MainApp.gs(R.string.itmustbepositivevalue)), this);
+        carbs.setIfGreater(getAapsLogger(), 0, String.format(getResourceHelper().gs(R.string.limitingcarbs), 0, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
 
-        Integer maxCarbs = SP.getInt(R.string.key_treatmentssafety_maxcarbs, 48);
-        carbs.setIfSmaller(maxCarbs, String.format(MainApp.gs(R.string.limitingcarbs), maxCarbs, MainApp.gs(R.string.maxvalueinpreferences)), this);
+        Integer maxCarbs = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48);
+        carbs.setIfSmaller(getAapsLogger(), maxCarbs, String.format(getResourceHelper().gs(R.string.limitingcarbs), maxCarbs, getResourceHelper().gs(R.string.maxvalueinpreferences)), this);
 
         return carbs;
     }
 
-    @Override
-    public Constraint<Double> applyMaxIOBConstraints(Constraint<Double> maxIob) {
+    @NonNull @Override
+    public Constraint<Double> applyMaxIOBConstraints(@NonNull Constraint<Double> maxIob) {
         double maxIobPref;
-        if (OpenAPSSMBPlugin.getPlugin().isEnabled(PluginType.APS))
-            maxIobPref = SP.getDouble(R.string.key_openapssmb_max_iob, 3d);
+        if (openAPSSMBPlugin.isEnabled(PluginType.APS))
+            maxIobPref = sp.getDouble(R.string.key_openapssmb_max_iob, 3d);
         else
-            maxIobPref = SP.getDouble(R.string.key_openapsma_max_iob, 1.5d);
-        maxIob.setIfSmaller(maxIobPref, String.format(MainApp.gs(R.string.limitingiob), maxIobPref, MainApp.gs(R.string.maxvalueinpreferences)), this);
+            maxIobPref = sp.getDouble(R.string.key_openapsma_max_iob, 1.5d);
+        maxIob.setIfSmaller(getAapsLogger(), maxIobPref, String.format(getResourceHelper().gs(R.string.limitingiob), maxIobPref, getResourceHelper().gs(R.string.maxvalueinpreferences)), this);
 
-        if (OpenAPSMAPlugin.getPlugin().isEnabled(PluginType.APS))
-            maxIob.setIfSmaller(HardLimits.maxIobAMA(), String.format(MainApp.gs(R.string.limitingiob), HardLimits.maxIobAMA(), MainApp.gs(R.string.hardlimit)), this);
-        if (OpenAPSAMAPlugin.getPlugin().isEnabled(PluginType.APS))
-            maxIob.setIfSmaller(HardLimits.maxIobAMA(), String.format(MainApp.gs(R.string.limitingiob), HardLimits.maxIobAMA(), MainApp.gs(R.string.hardlimit)), this);
-        if (OpenAPSSMBPlugin.getPlugin().isEnabled(PluginType.APS))
-            maxIob.setIfSmaller(HardLimits.maxIobSMB(), String.format(MainApp.gs(R.string.limitingiob), HardLimits.maxIobSMB(), MainApp.gs(R.string.hardlimit)), this);
+        if (openAPSMAPlugin.isEnabled(PluginType.APS))
+            maxIob.setIfSmaller(getAapsLogger(), hardLimits.maxIobAMA(), String.format(getResourceHelper().gs(R.string.limitingiob), hardLimits.maxIobAMA(), getResourceHelper().gs(R.string.hardlimit)), this);
+        if (openAPSAMAPlugin.isEnabled(PluginType.APS))
+            maxIob.setIfSmaller(getAapsLogger(), hardLimits.maxIobAMA(), String.format(getResourceHelper().gs(R.string.limitingiob), hardLimits.maxIobAMA(), getResourceHelper().gs(R.string.hardlimit)), this);
+        if (openAPSSMBPlugin.isEnabled(PluginType.APS))
+            maxIob.setIfSmaller(getAapsLogger(), hardLimits.maxIobSMB(), String.format(getResourceHelper().gs(R.string.limitingiob), hardLimits.maxIobSMB(), getResourceHelper().gs(R.string.hardlimit)), this);
         return maxIob;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.java
deleted file mode 100644
index 9c9e38bb46..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.signatureVerifier;
-
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.spongycastle.util.encoders.Hex;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * AndroidAPS is meant to be build by the user.
- * In case someone decides to leak a ready-to-use APK nonetheless, we can still disable it.
- * Self-compiled APKs with privately held certificates cannot and will not be disabled.
- */
-public class SignatureVerifierPlugin extends PluginBase implements ConstraintsInterface {
-
-    private static final String REVOKED_CERTS_URL = "https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/src/main/assets/revoked_certs.txt";
-    private static final long UPDATE_INTERVAL = TimeUnit.DAYS.toMillis(1);
-
-    private static SignatureVerifierPlugin plugin = new SignatureVerifierPlugin();
-
-    private Logger log = LoggerFactory.getLogger(L.CORE);
-    private final Object $lock = new Object[0];
-    private File revokedCertsFile;
-    private List<byte[]> revokedCerts;
-
-    public static SignatureVerifierPlugin getPlugin() {
-        return plugin;
-    }
-
-    private SignatureVerifierPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.CONSTRAINTS)
-                .neverVisible(true)
-                .alwaysEnabled(true)
-                .showInList(false)
-                .pluginName(R.string.signature_verifier));
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        revokedCertsFile = new File(MainApp.instance().getFilesDir(), "revoked_certs.txt");
-        new Thread(() -> {
-            loadLocalRevokedCerts();
-            if (shouldDownloadCerts()) {
-                try {
-                    downloadAndSaveRevokedCerts();
-                } catch (IOException e) {
-                    log.error("Could not download revoked certs", e);
-                }
-            }
-            if (hasIllegalSignature()) showNotification();
-        }).start();
-    }
-
-    @Override
-    public Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
-        if (hasIllegalSignature()) {
-            showNotification();
-            value.set(false);
-        }
-        if (shouldDownloadCerts()) {
-            new Thread(() -> {
-                try {
-                    downloadAndSaveRevokedCerts();
-                } catch (IOException e) {
-                    log.error("Could not download revoked certs", e);
-                }
-            }).start();
-        }
-        return value;
-    }
-
-    private void showNotification() {
-        Notification notification = new Notification(Notification.INVALID_VERSION, MainApp.gs(R.string.running_invalid_version), Notification.URGENT);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
-    }
-
-    private boolean hasIllegalSignature() {
-        try {
-            synchronized ($lock) {
-                if (revokedCerts == null) return false;
-                Signature[] signatures = MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), PackageManager.GET_SIGNATURES).signatures;
-                if (signatures != null) {
-                    for (Signature signature : signatures) {
-                        MessageDigest digest = MessageDigest.getInstance("SHA256");
-                        byte[] fingerprint = digest.digest(signature.toByteArray());
-                        for (byte[] cert : revokedCerts) {
-                            if (Arrays.equals(cert, fingerprint)) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) {
-            log.error("Error in SignatureVerifierPlugin", e);
-        }
-        return false;
-    }
-
-    public List<String> shortHashes() {
-        List<String> hashes = new ArrayList<>();
-        try {
-            Signature[] signatures = MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), PackageManager.GET_SIGNATURES).signatures;
-            if (signatures != null) {
-                for (Signature signature : signatures) {
-                    MessageDigest digest = MessageDigest.getInstance("SHA256");
-                    byte[] fingerprint = digest.digest(signature.toByteArray());
-                    String hash = Hex.toHexString(fingerprint);
-                    log.debug("Found signature: " + hash);
-                    log.debug("Found signature (short): " + singleCharMap(fingerprint));
-                    hashes.add(singleCharMap(fingerprint));
-                }
-            }
-        } catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) {
-            log.error("Error in SignatureVerifierPlugin", e);
-        }
-        return hashes;
-    }
-
-    String map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?,.-;:_<>|°^`´\\@€*'#+~{}[]¿¡áéíóúàèìòùöäü`ÁÉÍÓÚÀÈÌÒÙÖÄÜßÆÇÊËÎÏԌ۟æçêëîïôœûÿĆČĐŠŽćđšžñΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ\u03A2ΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϨϩϪϫϬϭϮϯϰϱϲϳϴϵ϶ϷϸϹϺϻϼϽϾϿЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗ";
-
-    private String singleCharMap(byte[] array) {
-        StringBuilder sb = new StringBuilder();
-        for (byte b : array) {
-            sb.append(map.charAt(b & 0xFF));
-        }
-        return sb.toString();
-    }
-
-    public String singleCharUnMap(String shortHash) {
-        byte[] array = new byte[shortHash.length()];
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < array.length; i++) {
-            if (i != 0) sb.append(":");
-            sb.append(String.format("%02X", 0xFF & map.charAt(map.indexOf(shortHash.charAt(i)))));
-        }
-        return sb.toString();
-    }
-
-    private boolean shouldDownloadCerts() {
-        return System.currentTimeMillis() - SP.getLong(R.string.key_last_revoked_certs_check, 0L) >= UPDATE_INTERVAL;
-    }
-
-    private void downloadAndSaveRevokedCerts() throws IOException {
-        String download = downloadRevokedCerts();
-        saveRevokedCerts(download);
-        SP.putLong(R.string.key_last_revoked_certs_check, System.currentTimeMillis());
-        synchronized ($lock) {
-            revokedCerts = parseRevokedCertsFile(download);
-        }
-    }
-
-    private void loadLocalRevokedCerts() {
-        try {
-            String revokedCerts = readCachedDownloadedRevokedCerts();
-            if (revokedCerts == null) revokedCerts = readRevokedCertsInAssets();
-            synchronized ($lock) {
-                this.revokedCerts = parseRevokedCertsFile(revokedCerts);
-            }
-        } catch (IOException e) {
-            log.error("Error in SignatureVerifierPlugin", e);
-        }
-    }
-
-    private void saveRevokedCerts(String revokedCerts) throws IOException {
-        OutputStream outputStream = new FileOutputStream(revokedCertsFile);
-        outputStream.write(revokedCerts.getBytes(StandardCharsets.UTF_8));
-        outputStream.close();
-    }
-
-    private String downloadRevokedCerts() throws IOException {
-        URLConnection connection = new URL(REVOKED_CERTS_URL).openConnection();
-        return readInputStream(connection.getInputStream());
-    }
-
-    private String readInputStream(InputStream inputStream) throws IOException {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int read;
-            while ((read = inputStream.read(buffer)) != -1) {
-                baos.write(buffer, 0, read);
-            }
-            baos.flush();
-            return new String(baos.toByteArray(), StandardCharsets.UTF_8);
-        } finally {
-            inputStream.close();
-        }
-    }
-
-    private String readRevokedCertsInAssets() throws IOException {
-        InputStream inputStream = MainApp.instance().getAssets().open("revoked_certs.txt");
-        return readInputStream(inputStream);
-    }
-
-    private String readCachedDownloadedRevokedCerts() throws IOException {
-        if (!revokedCertsFile.exists()) return null;
-        return readInputStream(new FileInputStream(revokedCertsFile));
-    }
-
-    private List<byte[]> parseRevokedCertsFile(String file) {
-        List<byte[]> revokedCerts = new ArrayList<>();
-        for (String line : file.split("\n")) {
-            if (line.startsWith("#")) continue;
-            revokedCerts.add(Hex.decode(line.replace(" ", "").replace(":", "")));
-        }
-        return revokedCerts;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
new file mode 100644
index 0000000000..0faa87decf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
@@ -0,0 +1,232 @@
+package info.nightscout.androidaps.plugins.constraints.signatureVerifier
+
+import android.content.Context
+import android.content.pm.PackageManager
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.spongycastle.util.encoders.Hex
+import java.io.*
+import java.net.URL
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * AndroidAPS is meant to be build by the user.
+ * In case someone decides to leak a ready-to-use APK nonetheless, we can still disable it.
+ * Self-compiled APKs with privately held certificates cannot and will not be disabled.
+ */
+@Singleton
+class SignatureVerifierPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val rxBus: RxBusWrapper,
+    private val context: Context
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.CONSTRAINTS)
+    .neverVisible(true)
+    .alwaysEnabled(true)
+    .showInList(false)
+    .pluginName(R.string.signature_verifier),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
+
+    private val REVOKED_CERTS_URL = "https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/src/main/assets/revoked_certs.txt"
+    private val UPDATE_INTERVAL = TimeUnit.DAYS.toMillis(1)
+
+    private val lock: Any = arrayOfNulls<Any>(0)
+    private var revokedCertsFile: File? = null
+    private var revokedCerts: List<ByteArray>? = null
+    override fun onStart() {
+        super.onStart()
+        revokedCertsFile = File(context.filesDir, "revoked_certs.txt")
+        Thread(Runnable {
+            loadLocalRevokedCerts()
+            if (shouldDownloadCerts()) {
+                try {
+                    downloadAndSaveRevokedCerts()
+                } catch (e: IOException) {
+                    aapsLogger.error("Could not download revoked certs", e)
+                }
+            }
+            if (hasIllegalSignature()) showNotification()
+        }).start()
+    }
+
+    override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        if (hasIllegalSignature()) {
+            showNotification()
+            value.set(aapsLogger, false)
+        }
+        if (shouldDownloadCerts()) {
+            Thread(Runnable {
+                try {
+                    downloadAndSaveRevokedCerts()
+                } catch (e: IOException) {
+                    aapsLogger.error("Could not download revoked certs", e)
+                }
+            }).start()
+        }
+        return value
+    }
+
+    private fun showNotification() {
+        val notification = Notification(Notification.INVALID_VERSION, resourceHelper.gs(R.string.running_invalid_version), Notification.URGENT)
+        rxBus.send(EventNewNotification(notification))
+    }
+
+    private fun hasIllegalSignature(): Boolean {
+        try {
+            synchronized(lock) {
+                if (revokedCerts == null) return false
+                // TODO Change after raising min API to 28
+                @Suppress("DEPRECATION", "PackageManagerGetSignatures")
+                val signatures = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES).signatures
+                if (signatures != null) {
+                    for (signature in signatures) {
+                        val digest = MessageDigest.getInstance("SHA256")
+                        val fingerprint = digest.digest(signature.toByteArray())
+                        for (cert in revokedCerts!!) {
+                            if (Arrays.equals(cert, fingerprint)) {
+                                return true
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+            aapsLogger.error("Error in SignatureVerifierPlugin", e)
+        } catch (e: NoSuchAlgorithmException) {
+            aapsLogger.error("Error in SignatureVerifierPlugin", e)
+        }
+        return false
+    }
+
+    fun shortHashes(): List<String> {
+        val hashes: MutableList<String> = ArrayList()
+        try {
+            // TODO Change after raising min API to 28
+            @Suppress("DEPRECATION", "PackageManagerGetSignatures")
+            val signatures = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES).signatures
+            if (signatures != null) {
+                for (signature in signatures) {
+                    val digest = MessageDigest.getInstance("SHA256")
+                    val fingerprint = digest.digest(signature.toByteArray())
+                    val hash = Hex.toHexString(fingerprint)
+                    aapsLogger.debug("Found signature: $hash")
+                    aapsLogger.debug("Found signature (short): " + singleCharMap(fingerprint))
+                    hashes.add(singleCharMap(fingerprint))
+                }
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+            aapsLogger.error("Error in SignatureVerifierPlugin", e)
+        } catch (e: NoSuchAlgorithmException) {
+            aapsLogger.error("Error in SignatureVerifierPlugin", e)
+        }
+        return hashes
+    }
+
+    var map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?,.-;:_<>|°^`´\\@€*'#+~{}[]¿¡áéíóúàèìòùöäü`ÁÉÍÓÚÀÈÌÒÙÖÄÜßÆÇÊËÎÏԌ۟æçêëîïôœûÿĆČĐŠŽćđšžñΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ\u03A2ΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϨϩϪϫϬϭϮϯϰϱϲϳϴϵ϶ϷϸϹϺϻϼϽϾϿЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗ"
+    private fun singleCharMap(array: ByteArray): String {
+        val sb = StringBuilder()
+        for (b in array) {
+            sb.append(map[b.toInt() and 0xFF])
+        }
+        return sb.toString()
+    }
+
+    fun singleCharUnMap(shortHash: String): String {
+        val array = ByteArray(shortHash.length)
+        val sb = StringBuilder()
+        for (i in array.indices) {
+            if (i != 0) sb.append(":")
+            sb.append(String.format("%02X", 0xFF and map[map.indexOf(shortHash[i])].toInt()))
+        }
+        return sb.toString()
+    }
+
+    private fun shouldDownloadCerts(): Boolean {
+        return System.currentTimeMillis() - sp.getLong(R.string.key_last_revoked_certs_check, 0L) >= UPDATE_INTERVAL
+    }
+
+    @Throws(IOException::class) private fun downloadAndSaveRevokedCerts() {
+        val download = downloadRevokedCerts()
+        saveRevokedCerts(download)
+        sp.putLong(R.string.key_last_revoked_certs_check, System.currentTimeMillis())
+        synchronized(lock) { revokedCerts = parseRevokedCertsFile(download) }
+    }
+
+    private fun loadLocalRevokedCerts() {
+        try {
+            var revokedCerts = readCachedDownloadedRevokedCerts()
+            if (revokedCerts == null) revokedCerts = readRevokedCertsInAssets()
+            synchronized(lock) { this.revokedCerts = parseRevokedCertsFile(revokedCerts) }
+        } catch (e: IOException) {
+            aapsLogger.error("Error in SignatureVerifierPlugin", e)
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun saveRevokedCerts(revokedCerts: String) {
+        val outputStream: OutputStream = FileOutputStream(revokedCertsFile)
+        outputStream.write(revokedCerts.toByteArray(StandardCharsets.UTF_8))
+        outputStream.close()
+    }
+
+    @Throws(IOException::class) private fun downloadRevokedCerts(): String {
+        val connection = URL(REVOKED_CERTS_URL).openConnection()
+        return readInputStream(connection.getInputStream())
+    }
+
+    @Throws(IOException::class)
+    private fun readInputStream(inputStream: InputStream): String {
+        return try {
+            val baos = ByteArrayOutputStream()
+            val buffer = ByteArray(1024)
+            var read: Int
+            while (inputStream.read(buffer).also { read = it } != -1) {
+                baos.write(buffer, 0, read)
+            }
+            baos.flush()
+            String(baos.toByteArray(), StandardCharsets.UTF_8)
+        } finally {
+            inputStream.close()
+        }
+    }
+
+    @Throws(IOException::class) private fun readRevokedCertsInAssets(): String {
+        val inputStream = context.assets.open("revoked_certs.txt")
+        return readInputStream(inputStream)
+    }
+
+    @Throws(IOException::class)
+    private fun readCachedDownloadedRevokedCerts(): String? {
+        return if (!revokedCertsFile!!.exists()) null else readInputStream(FileInputStream(revokedCertsFile))
+    }
+
+    private fun parseRevokedCertsFile(file: String?): List<ByteArray> {
+        val revokedCerts: MutableList<ByteArray> = ArrayList()
+        for (line in file!!.split("\n").toTypedArray()) {
+            if (line.startsWith("#")) continue
+            revokedCerts.add(Hex.decode(line.replace(" ", "").replace(":", "")))
+        }
+        return revokedCerts
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java
deleted file mode 100644
index f40b7728e5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.storage;
-
-import android.os.Environment;
-import android.os.StatFs;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-
-/**
- * Created by Rumen on 06.03.2019.
- */
-public class StorageConstraintPlugin extends PluginBase implements ConstraintsInterface {
-    private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
-    static StorageConstraintPlugin plugin = null;
-
-    public static StorageConstraintPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new StorageConstraintPlugin();
-        return plugin;
-    }
-
-    public StorageConstraintPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.CONSTRAINTS)
-                .neverVisible(true)
-                .alwaysEnabled(true)
-                .showInList(false)
-                .pluginName(R.string.storage)
-        );
-    }
-
-    /**
-     * Constraints interface
-     **/
-
-    @Override
-    public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
-        long diskfree = getAvailableInternalMemorySize();
-        if (L.isEnabled(L.CONSTRAINTS))
-            log.debug("Internal storage free (Mb):" + diskfree);
-        if (diskfree < Constants.MINIMUM_FREE_SPACE) {
-            value.set(false, MainApp.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), this);
-            Notification notification = new Notification(Notification.DISKFULL, MainApp.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.DISKFULL));
-        }
-
-        return value;
-    }
-
-    public static long getAvailableInternalMemorySize() {
-        File path = Environment.getDataDirectory();
-        StatFs stat = new StatFs(path.getPath());
-        long blockSize = stat.getBlockSizeLong();
-        long blocksAvailable = stat.getAvailableBlocksLong();
-        int size = 1048576; // blocksize of 1 Mb
-        return ((blocksAvailable * blockSize) / size);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
new file mode 100644
index 0000000000..7dc264c0a4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.constraints.storage
+
+import android.os.Environment
+import android.os.StatFs
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.ConstraintsInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+open class StorageConstraintPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val rxBus: RxBusWrapper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.CONSTRAINTS)
+    .neverVisible(true)
+    .alwaysEnabled(true)
+    .showInList(false)
+    .pluginName(R.string.storage),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
+
+    override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        val diskFree = availableInternalMemorySize()
+        aapsLogger.debug(LTag.CONSTRAINTS, "Internal storage free (Mb):$diskFree")
+        if (diskFree < Constants.MINIMUM_FREE_SPACE) {
+            value[aapsLogger, false, resourceHelper.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE)] = this
+            val notification = Notification(Notification.DISKFULL, resourceHelper.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.DISKFULL))
+        }
+        return value
+    }
+
+    open fun availableInternalMemorySize(): Long {
+        val path = Environment.getDataDirectory()
+        val stat = StatFs(path.path)
+        val blockSize = stat.blockSizeLong
+        val blocksAvailable = stat.availableBlocksLong
+        val size = 1048576 // block size of 1 Mb
+        return blocksAvailable * blockSize / size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
index 9d88740d4b..ca5902395a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
@@ -1,32 +1,46 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.ConstraintsInterface
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 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 info.nightscout.androidaps.utils.extensions.daysToMillis
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.math.roundToInt
 
-/**
- * Usually we would have a class here.
- * Instead of having a class we can use an object directly inherited from PluginBase.
- * This is a lazy loading singleton only loaded when actually used.
- * */
-
-object VersionCheckerPlugin : PluginBase(PluginDescription()
+@Singleton
+class VersionCheckerPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val sp: SP,
+    resourceHelper: ResourceHelper,
+    private val versionCheckerUtils: VersionCheckerUtils,
+    val rxBus: RxBusWrapper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
     .neverVisible(true)
     .alwaysEnabled(true)
     .showInList(false)
-    .pluginName(R.string.versionChecker)), ConstraintsInterface {
+    .pluginName(R.string.versionChecker),
+    aapsLogger, resourceHelper, injector
+), ConstraintsInterface {
+
+    enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) {
+        RELEASE(30, 60, 90),
+        RC(1, 7, 14)
+    }
 
     private val gracePeriod: GracePeriod
         get() = if ((BuildConfig.VERSION_NAME.contains("RC", ignoreCase = true))) {
@@ -35,11 +49,16 @@ object VersionCheckerPlugin : PluginBase(PluginDescription()
             GracePeriod.RELEASE
         }
 
+    companion object {
+        private val WARN_EVERY: Long
+            get() = TimeUnit.DAYS.toMillis(1)
+    }
+
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         checkWarning()
-        triggerCheckVersion()
+        versionCheckerUtils.triggerCheckVersion()
         return if (isOldVersion(gracePeriod.veryOld.daysToMillis()))
-            value.set(false, MainApp.gs(R.string.very_old_version), this)
+            value.set(aapsLogger,false, resourceHelper.gs(R.string.very_old_version), this)
         else
             value
     }
@@ -47,48 +66,38 @@ object VersionCheckerPlugin : PluginBase(PluginDescription()
     private fun checkWarning() {
         val now = System.currentTimeMillis()
 
-        if (!SP.contains(R.string.key_last_versionchecker_plugin_warning)) {
-            SP.putLong(R.string.key_last_versionchecker_plugin_warning, now)
+        if (!sp.contains(R.string.key_last_versionchecker_plugin_warning)) {
+            sp.putLong(R.string.key_last_versionchecker_plugin_warning, now)
             return
         }
 
 
         if (isOldVersion(gracePeriod.warning.daysToMillis()) && shouldWarnAgain(now)) {
             // store last notification time
-            SP.putLong(R.string.key_last_versionchecker_plugin_warning, now)
+            sp.putLong(R.string.key_last_versionchecker_plugin_warning, now)
 
             //notify
-            val message = MainApp.gs(R.string.new_version_warning,
-                ((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / 1L.daysToMillis().toDouble()).roundToInt(),
+            val message = resourceHelper.gs(R.string.new_version_warning,
+                ((now - sp.getLong(R.string.key_last_time_this_version_detected, now)) / 1L.daysToMillis().toDouble()).roundToInt(),
                 gracePeriod.old,
                 gracePeriod.veryOld
             )
             val notification = Notification(Notification.OLDVERSION, message, Notification.NORMAL)
-            RxBus.send(EventNewNotification(notification))
+            rxBus.send(EventNewNotification(notification))
         }
     }
 
     private fun shouldWarnAgain(now: Long) =
-        now > SP.getLong(R.string.key_last_versionchecker_plugin_warning, 0) + WARN_EVERY
+        now > sp.getLong(R.string.key_last_versionchecker_plugin_warning, 0) + WARN_EVERY
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> =
         if (isOldVersion(gracePeriod.old.daysToMillis()))
-            maxIob.set(0.toDouble(), MainApp.gs(R.string.old_version), this)
+            maxIob.set(aapsLogger, 0.0, resourceHelper.gs(R.string.old_version), this)
         else
             maxIob
 
     private fun isOldVersion(gracePeriod: Long): Boolean {
         val now = System.currentTimeMillis()
-        return now > SP.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod
+        return now > sp.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod
     }
-
-    private val WARN_EVERY = TimeUnit.DAYS.toMillis(1)
-
 }
-
-enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) {
-    RELEASE(30, 60, 90),
-    RC(1, 7, 14)
-}
-
-private fun Long.daysToMillis() = TimeUnit.DAYS.toMillis(this)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
index ac9724608f..3e822177eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
@@ -5,101 +5,135 @@ import android.net.ConnectivityManager
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 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.slf4j.LoggerFactory
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.io.IOException
 import java.net.URL
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
 
-// check network connection
-fun isConnected(): Boolean {
-    val connMgr = MainApp.instance().applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    return connMgr.activeNetworkInfo?.isConnected ?: false
-}
+@Singleton
+class VersionCheckerUtils @Inject constructor(
+    val aapsLogger: AAPSLogger,
+    val sp: SP,
+    val resourceHelper: ResourceHelper,
+    val rxBus: RxBusWrapper,
+    val context: Context
+) {
 
-private val log = LoggerFactory.getLogger(L.CORE)
-
-fun triggerCheckVersion() {
-
-    if (!SP.contains(R.string.key_last_time_this_version_detected)) {
-        // On a new installation, set it as 30 days old in order to warn that there is a new version.
-        SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
+    // check network connection
+    fun isConnected(): Boolean {
+        val connMgr = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        return connMgr.activeNetworkInfo?.isConnected ?: false
     }
 
-    // If we are good, only check once every day.
-    if (System.currentTimeMillis() > SP.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY) {
-        checkVersion()
-    }
-}
+    fun triggerCheckVersion() {
 
-private fun checkVersion() = if (isConnected()) {
-    Thread {
-        try {
-            val version: String? = findVersion(URL("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle").readText())
-            compareWithCurrentVersion(version, BuildConfig.VERSION_NAME)
-        } catch (e: IOException) {
-            log.debug("Github master version check error: $e")
+        if (!sp.contains(R.string.key_last_time_this_version_detected)) {
+            // On a new installation, set it as 30 days old in order to warn that there is a new version.
+            sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
         }
-    }.start()
-} else
-    log.debug("Github master version no checked. No connectivity")
 
-fun compareWithCurrentVersion(newVersion: String?, currentVersion: String) {
-
-    val newVersionElements = newVersion.toNumberList()
-    val currentVersionElements = currentVersion.toNumberList()
-
-    if (newVersionElements == null || newVersionElements.isEmpty()) {
-        onVersionNotDetectable()
-        return
+        // If we are good, only check once every day.
+        if (System.currentTimeMillis() > sp.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY) {
+            checkVersion()
+        }
     }
 
-    if (currentVersionElements == null || currentVersionElements.isEmpty()) {
-        // current version scrambled?!
-        onNewVersionDetected(currentVersion, newVersion)
-        return
-    }
+    private fun checkVersion() = if (isConnected()) {
+        Thread {
+            try {
+                val version: String? = findVersion(URL("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle").readText())
+                compareWithCurrentVersion(version, BuildConfig.VERSION_NAME)
+            } catch (e: IOException) {
+                aapsLogger.error(LTag.CORE, "Github master version check error: $e")
+            }
+        }.start()
+    } else
+        aapsLogger.debug(LTag.CORE, "Github master version no checked. No connectivity")
 
-    newVersionElements.take(3).forEachIndexed { i, newElem ->
-        val currElem: Int = currentVersionElements.getOrNull(i)
-            ?: return onNewVersionDetected(currentVersion, newVersion)
+    @Suppress("SameParameterValue")
+    fun compareWithCurrentVersion(newVersion: String?, currentVersion: String) {
 
-        (newElem - currElem).let {
-            when {
-                it > 0  -> return onNewVersionDetected(currentVersion, newVersion)
-                it < 0  -> return onOlderVersionDetected()
-                it == 0 -> Unit
+        val newVersionElements = newVersion.toNumberList()
+        val currentVersionElements = currentVersion.toNumberList()
+
+        if (newVersionElements == null || newVersionElements.isEmpty()) {
+            onVersionNotDetectable()
+            return
+        }
+
+        if (currentVersionElements == null || currentVersionElements.isEmpty()) {
+            // current version scrambled?!
+            onNewVersionDetected(currentVersion, newVersion)
+            return
+        }
+
+        newVersionElements.take(3).forEachIndexed { i, newElem ->
+            val currElem: Int = currentVersionElements.getOrNull(i)
+                ?: return onNewVersionDetected(currentVersion, newVersion)
+
+            (newElem - currElem).let {
+                when {
+                    it > 0  -> return onNewVersionDetected(currentVersion, newVersion)
+                    it < 0  -> return onOlderVersionDetected()
+                    it == 0 -> Unit
+                }
             }
         }
+        onSameVersionDetected()
     }
-    onSameVersionDetected()
-}
 
-private fun onOlderVersionDetected() {
-    log.debug("Version newer than master. Are you developer?")
-    SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
-}
-
-fun onSameVersionDetected() {
-    SP.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
-}
-
-fun onVersionNotDetectable() {
-    log.debug("fetch failed")
-}
-
-fun onNewVersionDetected(currentVersion: String, newVersion: String?) {
-    val now = System.currentTimeMillis()
-    if (now > SP.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
-        log.debug("Version ${currentVersion} outdated. Found $newVersion")
-        val notification = Notification(Notification.NEWVERSIONDETECTED, String.format(MainApp.gs(R.string.versionavailable), newVersion.toString()), Notification.LOW)
-        RxBus.send(EventNewNotification(notification))
-        SP.putLong(R.string.key_last_versionchecker_warning, now)
+    private fun onOlderVersionDetected() {
+        aapsLogger.debug(LTag.CORE, "Version newer than master. Are you developer?")
+        sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
     }
+
+    private fun onSameVersionDetected() {
+        sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
+    }
+
+    private fun onVersionNotDetectable() {
+        aapsLogger.debug(LTag.CORE, "fetch failed")
+    }
+
+    private fun onNewVersionDetected(currentVersion: String, newVersion: String?) {
+        val now = System.currentTimeMillis()
+        if (now > sp.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
+            aapsLogger.debug(LTag.CORE, "Version $currentVersion outdated. Found $newVersion")
+            val notification = Notification(Notification.NEWVERSIONDETECTED, resourceHelper.gs(R.string.versionavailable, newVersion.toString()), Notification.LOW)
+            rxBus.send(EventNewNotification(notification))
+            sp.putLong(R.string.key_last_versionchecker_warning, now)
+        }
+    }
+
+    private fun String?.toNumberList() =
+        this?.numericVersionPart().takeIf { !it.isNullOrBlank() }?.split(".")?.map { it.toInt() }
+
+    fun findVersion(file: String?): String? {
+        val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
+        return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
+    }
+
+    companion object {
+        private val CHECK_EVERY = TimeUnit.DAYS.toMillis(1)
+        private val WARN_EVERY = TimeUnit.DAYS.toMillis(1)
+    }
+}
+
+fun String.numericVersionPart(): String =
+    "(((\\d+)\\.)+(\\d+))(\\D(.*))?".toRegex().matchEntire(this)?.groupValues?.getOrNull(1)
+        ?: ""
+
+fun findVersion(file: String?): String? {
+    val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
+    return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
 }
 
 @Deprecated(replaceWith = ReplaceWith("numericVersionPart()"), message = "Will not work if RCs have another index number in it.")
@@ -109,18 +143,4 @@ fun String.versionStrip() = this.mapNotNull {
         '.'         -> it
         else        -> null
     }
-}.joinToString(separator = "")
-
-fun String.numericVersionPart(): String =
-    "(((\\d+)\\.)+(\\d+))(\\D(.*))?".toRegex().matchEntire(this)?.groupValues?.getOrNull(1) ?: ""
-
-fun String?.toNumberList() =
-    this?.numericVersionPart().takeIf { !it.isNullOrBlank() }?.split(".")?.map { it.toInt() }
-
-fun findVersion(file: String?): String? {
-    val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
-    return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
-}
-
-val CHECK_EVERY = TimeUnit.DAYS.toMillis(1)
-val WARN_EVERY = TimeUnit.DAYS.toMillis(1)
+}.joinToString(separator = "")
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 5143cdebc5..3080c27b7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.general.actions
 
-
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,39 +7,52 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.HistoryBrowseActivity
-import info.nightscout.androidaps.activities.TDDStatsActivity
-import info.nightscout.androidaps.events.*
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
-import info.nightscout.androidaps.dialogs.CareDialog
-import info.nightscout.androidaps.dialogs.ExtendedBolusDialog
-import info.nightscout.androidaps.dialogs.FillDialog
-import info.nightscout.androidaps.dialogs.TempBasalDialog
-import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
 import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
-import info.nightscout.androidaps.dialogs.TempTargetDialog
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.activities.TDDStatsActivity
+import info.nightscout.androidaps.dialogs.*
+import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
+import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.SingleClickButton
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.toVisibility
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.actions_fragment.*
 import kotlinx.android.synthetic.main.careportal_stats_fragment.*
 import java.util.*
+import javax.inject.Inject
 
-class ActionsFragment : Fragment() {
+class ActionsFragment : DaggerFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var statusLightHandler: StatusLightHandler
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var buildHelper: BuildHelper
+    @Inject lateinit var protectionCheck: ProtectionCheck
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -62,19 +74,27 @@ class ActionsFragment : Fragment() {
             fragmentManager?.let { TempTargetDialog().show(it, "Actions") }
         }
         actions_extendedbolus.setOnClickListener {
-            fragmentManager?.let { ExtendedBolusDialog().show(it, "Actions") }
+            activity?.let { activity ->
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, Runnable {
+                    OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), resourceHelper.gs(R.string.ebstopsloop),
+                        Runnable {
+                            fragmentManager?.let { ExtendedBolusDialog().show(it, "Actions") }
+                        }, null)
+                })
+            }
         }
         actions_extendedbolus_cancel.setOnClickListener {
-            if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress) {
-                ConfigBuilderPlugin.getPlugin().commandQueue.cancelExtended(object : Callback() {
+            if (activePlugin.activeTreatments.isInHistoryExtendedBoluslInProgress) {
+                aapsLogger.debug("USER ENTRY: CANCEL EXTENDED BOLUS")
+                commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
-                            i.putExtra("title", MainApp.gs(R.string.extendedbolusdeliveryerror))
+                            i.putExtra("title", resourceHelper.gs(R.string.extendedbolusdeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            MainApp.instance().startActivity(i)
+                            mainApp.startActivity(i)
                         }
                     }
                 })
@@ -84,22 +104,27 @@ class ActionsFragment : Fragment() {
             fragmentManager?.let { TempBasalDialog().show(it, "Actions") }
         }
         actions_canceltempbasal.setOnClickListener {
-            if (TreatmentsPlugin.getPlugin().isTempBasalInProgress) {
-                ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+            if (activePlugin.activeTreatments.isTempBasalInProgress) {
+                aapsLogger.debug("USER ENTRY: CANCEL TEMP BASAL")
+                commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                            val i = Intent(mainApp, ErrorHelperActivity::class.java)
                             i.putExtra("soundid", R.raw.boluserror)
                             i.putExtra("status", result.comment)
-                            i.putExtra("title", MainApp.gs(R.string.tempbasaldeliveryerror))
+                            i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
                             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            MainApp.instance().startActivity(i)
+                            mainApp.startActivity(i)
                         }
                     }
                 })
             }
         }
-        actions_fill.setOnClickListener { fragmentManager?.let { FillDialog().show(it, "FillDialog") } }
+        actions_fill.setOnClickListener {
+            activity?.let { activity ->
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, Runnable { fragmentManager?.let { FillDialog().show(it, "FillDialog") } })
+            }
+        }
         actions_historybrowser.setOnClickListener { startActivity(Intent(context, HistoryBrowseActivity::class.java)) }
         actions_tddstats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
         actions_bgcheck.setOnClickListener {
@@ -111,37 +136,43 @@ class ActionsFragment : Fragment() {
         actions_pumpbatterychange.setOnClickListener {
             fragmentManager?.let { CareDialog().setOptions(CareDialog.EventType.BATTERY_CHANGE, R.string.careportal_pumpbatterychange).show(it, "Actions") }
         }
+        actions_note.setOnClickListener {
+            fragmentManager?.let { CareDialog().setOptions(CareDialog.EventType.NOTE, R.string.careportal_note).show(it, "Actions") }
+        }
+        actions_exercise.setOnClickListener {
+            fragmentManager?.let { CareDialog().setOptions(CareDialog.EventType.EXERCISE, R.string.careportal_exercise).show(it, "Actions") }
+        }
 
-        SP.putBoolean(R.string.key_objectiveuseactions, true)
+        sp.putBoolean(R.string.key_objectiveuseactions, true)
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable += RxBus
-                .toObservable(EventInitializationChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventRefreshOverview::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventExtendedBolusChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventTempBasalChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventCustomActionsChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventCareportalEventChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventInitializationChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventRefreshOverview::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventCustomActionsChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventCareportalEventChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
         updateGui()
     }
 
@@ -154,33 +185,35 @@ class ActionsFragment : Fragment() {
     @Synchronized
     fun updateGui() {
         actions_profileswitch?.visibility =
-                if (ConfigBuilderPlugin.getPlugin().activeProfileInterface?.profile != null) View.VISIBLE
-                else View.GONE
+            if (activePlugin.activeProfileInterface.profile != null) View.VISIBLE
+            else View.GONE
 
-        if (ProfileFunctions.getInstance().profile == null) {
-            actions_temptarget?.visibility = View.GONE
-            actions_extendedbolus?.visibility = View.GONE
-            actions_extendedbolus_cancel?.visibility = View.GONE
-            actions_settempbasal?.visibility = View.GONE
-            actions_canceltempbasal?.visibility = View.GONE
-            actions_fill?.visibility = View.GONE
-            return
-        }
+        val profile = profileFunction.getProfile()
+        val pump = activePlugin.activePump
 
-        val pump = ConfigBuilderPlugin.getPlugin().activePump ?: return
-        val basalProfileEnabled = MainApp.isEngineeringModeOrRelease() && pump.pumpDescription.isSetBasalProfileCapable
+        actions_temptarget?.visibility = (profile != null).toVisibility()
+        actions_canceltempbasal.visibility = (profile == null).toVisibility()
+        actions_settempbasal.visibility = (profile == null).toVisibility()
+        actions_fill.visibility = (profile == null).toVisibility()
+        actions_extendedbolus.visibility = (profile == null).toVisibility()
+        actions_extendedbolus_cancel.visibility = (profile == null).toVisibility()
+        actions_historybrowser.visibility = (profile == null).toVisibility()
+        actions_tddstats.visibility = (profile == null).toVisibility()
+
+        val basalProfileEnabled = buildHelper.isEngineeringModeOrRelease() && pump.pumpDescription.isSetBasalProfileCapable
 
         actions_profileswitch?.visibility = if (!basalProfileEnabled || !pump.isInitialized || pump.isSuspended) View.GONE else View.VISIBLE
 
-        if (!pump.pumpDescription.isExtendedBolusCapable || !pump.isInitialized || pump.isSuspended || pump.isFakingTempsByExtendedBoluses || Config.APS) {
+        if (!pump.pumpDescription.isExtendedBolusCapable || !pump.isInitialized || pump.isSuspended || pump.isFakingTempsByExtendedBoluses) {
             actions_extendedbolus?.visibility = View.GONE
             actions_extendedbolus_cancel?.visibility = View.GONE
         } else {
-            val activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis())
+            val activeExtendedBolus = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
             if (activeExtendedBolus != null) {
                 actions_extendedbolus?.visibility = View.GONE
                 actions_extendedbolus_cancel?.visibility = View.VISIBLE
-                actions_extendedbolus_cancel?.text = MainApp.gs(R.string.cancel) + " " + activeExtendedBolus.toString()
+                @Suppress("SetTextI18n")
+                actions_extendedbolus_cancel?.text = resourceHelper.gs(R.string.cancel) + " " + activeExtendedBolus.toStringMedium()
             } else {
                 actions_extendedbolus?.visibility = View.VISIBLE
                 actions_extendedbolus_cancel?.visibility = View.GONE
@@ -191,11 +224,12 @@ class ActionsFragment : Fragment() {
             actions_settempbasal?.visibility = View.GONE
             actions_canceltempbasal?.visibility = View.GONE
         } else {
-            val activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis())
+            val activeTemp = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
             if (activeTemp != null) {
                 actions_settempbasal?.visibility = View.GONE
                 actions_canceltempbasal?.visibility = View.VISIBLE
-                actions_canceltempbasal?.text = MainApp.gs(R.string.cancel) + " " + activeTemp.toStringShort()
+                @Suppress("SetTextI18n")
+                actions_canceltempbasal?.text = resourceHelper.gs(R.string.cancel) + " " + activeTemp.toStringShort()
             } else {
                 actions_settempbasal?.visibility = View.VISIBLE
                 actions_canceltempbasal?.visibility = View.GONE
@@ -203,19 +237,17 @@ class ActionsFragment : Fragment() {
         }
 
         actions_fill?.visibility =
-                if (!pump.pumpDescription.isRefillingCapable || !pump.isInitialized || pump.isSuspended) View.GONE
-                else View.VISIBLE
+            if (!pump.pumpDescription.isRefillingCapable || !pump.isInitialized || pump.isSuspended) View.GONE
+            else View.VISIBLE
 
         actions_temptarget?.visibility = Config.APS.toVisibility()
         actions_tddstats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
-        activity?.let { activity ->
-            CareportalFragment.updateAge(activity, careportal_sensorage, careportal_insulinage, careportal_canulaage, careportal_pbage)
-        }
+        statusLightHandler.updateAge(careportal_sensorage, careportal_insulinage, careportal_canulaage, careportal_pbage)
         checkPumpCustomActions()
     }
 
     private fun checkPumpCustomActions() {
-        val activePump = ConfigBuilderPlugin.getPlugin().activePump ?: return
+        val activePump = activePlugin.activePump
         val customActions = activePump.customActions ?: return
         removePumpCustomActions()
 
@@ -223,24 +255,25 @@ class ActionsFragment : Fragment() {
             if (!customAction.isEnabled) continue
 
             val btn = SingleClickButton(context, null, android.R.attr.buttonStyle)
-            btn.text = MainApp.gs(customAction.name)
+            btn.text = resourceHelper.gs(customAction.name)
 
             val layoutParams = LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0.5f)
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0.5f)
             layoutParams.setMargins(20, 8, 20, 8) // 10,3,10,3
 
             btn.layoutParams = layoutParams
             btn.setOnClickListener { v ->
                 val b = v as SingleClickButton
-                val action = this.pumpCustomActions[b.text.toString()]
-                ConfigBuilderPlugin.getPlugin().activePump!!.executeCustomAction(action!!.customActionType)
+                this.pumpCustomActions[b.text.toString()]?.let {
+                    activePlugin.activePump.executeCustomAction(it.customActionType)
+                }
             }
             val top = activity?.let { ContextCompat.getDrawable(it, customAction.iconResourceId) }
             btn.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null)
 
             action_buttons_layout?.addView(btn)
 
-            this.pumpCustomActions[MainApp.gs(customAction.name)] = customAction
+            this.pumpCustomActions[resourceHelper.gs(customAction.name)] = customAction
             this.pumpCustomButtons.add(btn)
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
index e534fefa26..91125a9e1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
@@ -1,16 +1,28 @@
 package info.nightscout.androidaps.plugins.general.actions
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object ActionsPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .fragmentClass(ActionsFragment::class.qualifiedName)
-        .enableByDefault(Config.APS || Config.PUMPCONTROL)
-        .visibleByDefault(Config.APS || Config.PUMPCONTROL)
-        .pluginName(R.string.actions)
-        .shortName(R.string.actions_shortname)
-        .description(R.string.description_actions))
+@Singleton
+class ActionsPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(ActionsFragment::class.qualifiedName)
+    .enableByDefault(Config.APS || Config.PUMPCONTROL)
+    .visibleByDefault(Config.APS || Config.PUMPCONTROL)
+    .pluginName(R.string.actions)
+    .shortName(R.string.actions_shortname)
+    .description(R.string.description_actions),
+    aapsLogger, resourceHelper, injector
+)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java
deleted file mode 100644
index 4f7bb62c74..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.general.automation.actions.Action;
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AutomationEvent {
-    private static final Logger log = LoggerFactory.getLogger(AutomationEvent.class);
-
-    private Trigger trigger = new TriggerConnector();
-    private List<Action> actions = new ArrayList<>();
-    private String title;
-    private boolean enabled = true;
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setTrigger(Trigger trigger) {
-        this.trigger = trigger;
-    }
-
-    public Trigger getTrigger() {
-        return trigger;
-    }
-
-    public List<Action> getActions() {
-        return actions;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean newState) {
-        enabled = newState;
-    }
-
-    public TriggerConnector getPreconditions() {
-        TriggerConnector trigger = new TriggerConnector(TriggerConnector.Type.AND);
-        for (Action action : actions) {
-            if (action.precondition != null)
-                trigger.add(action.precondition);
-        }
-        return trigger;
-    }
-
-    public void addAction(Action action) {
-        actions.add(action);
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            // title
-            o.put("title", title);
-            o.put("enabled", enabled);
-            // trigger
-            o.put("trigger", trigger.toJSON());
-            // actions
-            JSONArray array = new JSONArray();
-            for (Action a : actions) {
-                array.put(a.toJSON());
-            }
-            o.put("actions", array);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    public AutomationEvent fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            title = d.optString("title", "");
-            enabled = d.optBoolean("enabled", true);
-            trigger = Trigger.instantiate(d.getString("trigger"));
-            JSONArray array = d.getJSONArray("actions");
-            actions.clear();
-            for (int i = 0; i < array.length(); i++) {
-                actions.add(Action.instantiate(new JSONObject(array.getString(i))));
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
new file mode 100644
index 0000000000..d0106e7646
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugins.general.automation
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.automation.actions.Action
+import info.nightscout.androidaps.plugins.general.automation.actions.ActionDummy
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+
+class AutomationEvent(private val injector: HasAndroidInjector) {
+    @Inject lateinit var aapsLogger: AAPSLogger
+
+    var trigger: Trigger = TriggerConnector(injector)
+    val actions: MutableList<Action> = ArrayList()
+    var title: String? = null
+    var isEnabled = true
+    var lastRun: Long = 0
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    fun getPreconditions(): TriggerConnector {
+        val trigger = TriggerConnector(injector, TriggerConnector.Type.AND)
+        for (action in actions) {
+            action.precondition?.let { trigger.list.add(it) }
+        }
+        return trigger
+    }
+
+    fun addAction(action: Action) = actions.add(action)
+
+    fun toJSON(): String {
+        val array = JSONArray()
+        for (a in actions) array.put(a.toJSON())
+        return JSONObject()
+            .put("title", title)
+            .put("enabled", isEnabled)
+            .put("trigger", trigger.toJSON())
+            .put("actions", array)
+            .toString()
+    }
+
+    fun fromJSON(data: String?): AutomationEvent {
+        val d = JSONObject(data)
+        title = d.optString("title", "")
+        isEnabled = d.optBoolean("enabled", true)
+        trigger = TriggerDummy(injector).instantiate(JSONObject(d.getString("trigger")))
+            ?: TriggerConnector(injector)
+        val array = d.getJSONArray("actions")
+        actions.clear()
+        for (i in 0 until array.length()) {
+            ActionDummy(injector).instantiate(JSONObject(array.getString(i)))?.let {
+                actions.add(it)
+            }
+        }
+        return this
+    }
+
+    fun shouldRun(): Boolean {
+        return lastRun <= DateUtil.now() - T.mins(5).msecs()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
index 1db87f6472..5c9092c9e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
@@ -1,32 +1,55 @@
 package info.nightscout.androidaps.plugins.general.automation
 
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Color
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.annotation.DrawableRes
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
+import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperAdapter
+import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperViewHolder
 import info.nightscout.androidaps.plugins.general.automation.dragHelpers.OnStartDragListener
 import info.nightscout.androidaps.plugins.general.automation.dragHelpers.SimpleItemTouchHelperCallback
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationDataChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.automation_fragment.*
+import java.util.*
+import javax.inject.Inject
 
-class AutomationFragment : Fragment(), OnStartDragListener {
+class AutomationFragment : DaggerFragment(), OnStartDragListener {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var mainApp : MainApp
 
     private var disposable: CompositeDisposable = CompositeDisposable()
-    private var eventListAdapter: EventListAdapter? = null
+    private lateinit var eventListAdapter: EventListAdapter
 
     private var itemTouchHelper: ItemTouchHelper? = null
 
@@ -37,22 +60,22 @@ class AutomationFragment : Fragment(), OnStartDragListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        eventListAdapter = EventListAdapter(AutomationPlugin.automationEvents, fragmentManager, activity, this)
+        eventListAdapter = EventListAdapter()
         automation_eventListView.layoutManager = LinearLayoutManager(context)
         automation_eventListView.adapter = eventListAdapter
 
-        automation_logView.setMovementMethod(ScrollingMovementMethod())
+        automation_logView.movementMethod = ScrollingMovementMethod()
 
         automation_fabAddEvent.setOnClickListener {
             val dialog = EditEventDialog()
             val args = Bundle()
-            args.putString("event", AutomationEvent().toJSON())
+            args.putString("event", AutomationEvent(mainApp).toJSON())
             args.putInt("position", -1) // New event
             dialog.arguments = args
             fragmentManager?.let { dialog.show(it, "EditEventDialog") }
         }
 
-        val callback: ItemTouchHelper.Callback = SimpleItemTouchHelperCallback(eventListAdapter!!)
+        val callback: ItemTouchHelper.Callback = SimpleItemTouchHelperCallback(eventListAdapter)
         itemTouchHelper = ItemTouchHelper(callback)
         itemTouchHelper?.attachToRecyclerView(automation_eventListView)
 
@@ -61,22 +84,18 @@ class AutomationFragment : Fragment(), OnStartDragListener {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable += RxBus
-                .toObservable(EventAutomationUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    updateGui()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventAutomationDataChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    eventListAdapter?.notifyDataSetChanged()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventAutomationUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                updateGui()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventAutomationDataChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                eventListAdapter.notifyDataSetChanged()
+            }, { fabricPrivacy.logException(it) })
         updateGui()
     }
 
@@ -88,15 +107,124 @@ class AutomationFragment : Fragment(), OnStartDragListener {
 
     @Synchronized
     private fun updateGui() {
-        eventListAdapter?.notifyDataSetChanged()
+        eventListAdapter.notifyDataSetChanged()
         val sb = StringBuilder()
-        for (l in AutomationPlugin.executionLog.reversed())
+        for (l in automationPlugin.executionLog.reversed())
             sb.append(l).append("<br>")
         automation_logView?.text = HtmlHelper.fromHtml(sb.toString())
     }
 
     override fun onStartDrag(viewHolder: RecyclerView.ViewHolder) {
-        itemTouchHelper?.startDrag(viewHolder);
+        itemTouchHelper?.startDrag(viewHolder)
     }
 
+    fun fillIconSet(connector: TriggerConnector, set: HashSet<Int>) {
+        for (t in connector.list) {
+            if (t is TriggerConnector) {
+                fillIconSet(t, set)
+            } else {
+                val icon = t.icon()
+                if (icon.isPresent) {
+                    set.add(icon.get()!!)
+                }
+            }
+        }
+    }
+
+    inner class EventListAdapter : RecyclerView.Adapter<EventListAdapter.ViewHolder>(), ItemTouchHelperAdapter {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val v = LayoutInflater.from(parent.context).inflate(R.layout.automation_event_item, parent, false)
+            return ViewHolder(v, parent.context)
+        }
+
+        private fun addImage(@DrawableRes res: Int, context: Context, layout: LinearLayout) {
+            val iv = ImageView(context)
+            iv.setImageResource(res)
+            iv.layoutParams = LinearLayout.LayoutParams(resourceHelper.dpToPx(24), resourceHelper.dpToPx(24))
+            layout.addView(iv)
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val event = automationPlugin.automationEvents[position]
+            holder.eventTitle.text = event.title
+            holder.enabled.isChecked = event.isEnabled
+            holder.iconLayout.removeAllViews()
+            // trigger icons
+            val triggerIcons = HashSet<Int>()
+            fillIconSet(event.trigger as TriggerConnector, triggerIcons)
+            for (res in triggerIcons) {
+                addImage(res, holder.context, holder.iconLayout)
+            }
+            // arrow icon
+            val iv = ImageView(holder.context)
+            iv.setImageResource(R.drawable.ic_arrow_forward_white_24dp)
+            iv.layoutParams = LinearLayout.LayoutParams(resourceHelper.dpToPx(24), resourceHelper.dpToPx(24))
+            iv.setPadding(resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4), 0)
+            holder.iconLayout.addView(iv)
+            // action icons
+            val actionIcons = HashSet<Int>()
+            for (action in event.actions) {
+                actionIcons.add(action.icon())
+            }
+            for (res in actionIcons) {
+                addImage(res, holder.context, holder.iconLayout)
+            }
+            // enabled event
+            holder.enabled.setOnClickListener {
+                event.isEnabled = holder.enabled.isChecked
+                rxBus.send(EventAutomationDataChanged())
+            }
+            // edit event
+            holder.rootLayout.setOnClickListener {
+                val dialog = EditEventDialog()
+                val args = Bundle()
+                args.putString("event", event.toJSON())
+                args.putInt("position", position)
+                dialog.arguments = args
+                fragmentManager?.let { dialog.show(it, "EditEventDialog") }
+            }
+            // Start a drag whenever the handle view it touched
+            holder.iconSort.setOnTouchListener { v: View, motionEvent: MotionEvent ->
+                if (motionEvent.action == MotionEvent.ACTION_DOWN) {
+                    this@AutomationFragment.onStartDrag(holder)
+                    return@setOnTouchListener true
+                }
+                v.onTouchEvent(motionEvent)
+            }
+        }
+
+        override fun getItemCount(): Int = automationPlugin.automationEvents.size
+
+        override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
+            Collections.swap(automationPlugin.automationEvents, fromPosition, toPosition)
+            notifyItemMoved(fromPosition, toPosition)
+            rxBus.send(EventAutomationDataChanged())
+            return true
+        }
+
+        override fun onItemDismiss(position: Int) {
+            activity?.let { activity ->
+                showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.automationEvents[position].title,
+                    Runnable {
+                        automationPlugin.automationEvents.removeAt(position)
+                        notifyItemRemoved(position)
+                        rxBus.send(EventAutomationDataChanged())
+                        rxBus.send(EventAutomationUpdateGui())
+                    }, Runnable { rxBus.send(EventAutomationUpdateGui()) })
+            }
+        }
+
+        inner class ViewHolder(view: View, val context: Context) : RecyclerView.ViewHolder(view), ItemTouchHelperViewHolder {
+            val rootLayout: RelativeLayout = view.findViewById(R.id.rootLayout)
+            val iconLayout: LinearLayout = view.findViewById(R.id.iconLayout)
+            val eventTitle: TextView = view.findViewById(R.id.viewEventTitle)
+            val iconSort: ImageView = view.findViewById(R.id.iconSort)
+            val enabled: CheckBox = view.findViewById(R.id.automation_enabled)
+
+            override fun onItemSelected() = itemView.setBackgroundColor(Color.LTGRAY)
+
+            override fun onItemClear() = itemView.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
+        }
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index 0d220c2dd4..6e1aad8871 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.general.automation
 
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Handler
-import info.nightscout.androidaps.MainApp
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventBTChange
 import info.nightscout.androidaps.events.EventChargingState
 import info.nightscout.androidaps.events.EventLocationChange
 import info.nightscout.androidaps.events.EventNetworkChange
@@ -12,9 +14,10 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.actions.*
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationDataChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
@@ -22,30 +25,49 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.*
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.services.LocationService
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.collections.ArrayList
 
-object AutomationPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .fragmentClass(AutomationFragment::class.qualifiedName)
-        .pluginName(R.string.automation)
-        .shortName(R.string.automation_short)
-        .preferencesId(R.xml.pref_automation)
-        .description(R.string.automation_description)) {
+@Singleton
+class AutomationPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val sp: SP,
+    private val fabricPrivacy: FabricPrivacy,
+    private val loopPlugin: LoopPlugin,
+    private val rxBus: RxBusWrapper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(AutomationFragment::class.qualifiedName)
+    .pluginName(R.string.automation)
+    .shortName(R.string.automation_short)
+    .preferencesId(R.xml.pref_automation)
+    .description(R.string.automation_description),
+    aapsLogger, resourceHelper, injector
+) {
 
-    private val log = LoggerFactory.getLogger(L.AUTOMATION)
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    private const val key_AUTOMATION_EVENTS = "AUTOMATION_EVENTS"
+    private val keyAutomationEvents = "AUTOMATION_EVENTS"
 
     val automationEvents = ArrayList<AutomationEvent>()
     var executionLog: MutableList<String> = ArrayList()
+    var btConnects : MutableList<EventBTChange> = ArrayList()
 
     private val loopHandler = Handler()
     private lateinit var refreshLoop: Runnable
@@ -58,7 +80,6 @@ object AutomationPlugin : PluginBase(PluginDescription()
     }
 
     override fun onStart() {
-        val context = MainApp.instance().applicationContext
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
             context.startForegroundService(Intent(context, LocationService::class.java))
         else
@@ -68,61 +89,56 @@ object AutomationPlugin : PluginBase(PluginDescription()
         loadFromSP()
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
 
-        disposable += RxBus
-                .toObservable(EventPreferenceChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ e ->
-                    if (e.isChanged(R.string.key_location)) {
-                        context.stopService(Intent(context, LocationService::class.java))
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                            context.startForegroundService(Intent(context, LocationService::class.java))
-                        else
-                            context.startService(Intent(context, LocationService::class.java))
-                    }
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventAutomationDataChanged::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ storeToSP() }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventLocationChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ e ->
-                    e?.let {
-                        log.debug("Grabbed location: $it.location.latitude $it.location.longitude Provider: $it.location.provider")
-                        processActions()
-                    }
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventChargingState::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ processActions() }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventNetworkChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ processActions() }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventAutosensCalculationFinished::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ processActions() }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ e ->
+                if (e.isChanged(resourceHelper, R.string.key_location)) {
+                    context.stopService(Intent(context, LocationService::class.java))
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                        context.startForegroundService(Intent(context, LocationService::class.java))
+                    else
+                        context.startService(Intent(context, LocationService::class.java))
+                }
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventAutomationDataChanged::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ storeToSP() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventLocationChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ e ->
+                e?.let {
+                    aapsLogger.debug(LTag.AUTOMATION, "Grabbed location: $it.location.latitude $it.location.longitude Provider: $it.location.provider")
+                    processActions()
+                }
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventChargingState::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ processActions() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventNetworkChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ processActions() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ processActions() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventBTChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                aapsLogger.debug(LTag.AUTOMATION, "Grabbed new BT event: $it")
+                btConnects.add(it)
+                processActions()
+            }, { fabricPrivacy.logException(it) })
     }
 
     override fun onStop() {
         disposable.clear()
         loopHandler.removeCallbacks(refreshLoop)
-        val context = MainApp.instance().applicationContext
         context.stopService(Intent(context, LocationService::class.java))
         super.onStop()
     }
@@ -137,18 +153,18 @@ object AutomationPlugin : PluginBase(PluginDescription()
             e.printStackTrace()
         }
 
-        SP.putString(key_AUTOMATION_EVENTS, array.toString())
+        sp.putString(keyAutomationEvents, array.toString())
     }
 
     private fun loadFromSP() {
         automationEvents.clear()
-        val data = SP.getString(key_AUTOMATION_EVENTS, "")
+        val data = sp.getString(keyAutomationEvents, "")
         if (data != "") {
             try {
                 val array = JSONArray(data)
                 for (i in 0 until array.length()) {
                     val o = array.getJSONObject(i)
-                    val event = AutomationEvent().fromJSON(o.toString())
+                    val event = AutomationEvent(injector).fromJSON(o.toString())
                     automationEvents.add(event)
                 }
             } catch (e: JSONException) {
@@ -161,16 +177,14 @@ object AutomationPlugin : PluginBase(PluginDescription()
     private fun processActions() {
         if (!isEnabled(PluginType.GENERAL))
             return
-        if (LoopPlugin.getPlugin().isSuspended || !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Loop deactivated")
+        if (loopPlugin.isSuspended || !loopPlugin.isEnabled(PluginType.LOOP)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated")
             return
         }
 
-        if (L.isEnabled(L.AUTOMATION))
-            log.debug("processActions")
+        aapsLogger.debug(LTag.AUTOMATION, "processActions")
         for (event in automationEvents) {
-            if (event.isEnabled && event.trigger.shouldRun() && event.preconditions.shouldRun()) {
+            if (event.isEnabled && event.shouldRun() && event.trigger.shouldRun() && event.getPreconditions().shouldRun()) {
                 val actions = event.actions
                 for (action in actions) {
                     action.doAction(object : Callback() {
@@ -186,50 +200,56 @@ object AutomationPlugin : PluginBase(PluginDescription()
                             sb.append(": ")
                             sb.append(result.comment)
                             executionLog.add(sb.toString())
-                            if (L.isEnabled(L.AUTOMATION))
-                                log.debug("Executed: $sb")
-                            RxBus.send(EventAutomationUpdateGui())
+                            aapsLogger.debug(LTag.AUTOMATION, "Executed: $sb")
+                            rxBus.send(EventAutomationUpdateGui())
                         }
                     })
                 }
-                event.trigger.executed(DateUtil.now())
+                event.lastRun = DateUtil.now()
             }
         }
+        // we cannot detect connected BT devices
+        // so let's collect all connection/disconnections between 2 runs of processActions()
+        // TriggerBTDevice can pick up and process these events
+        // after processing clear events to prevent repeated actions
+        btConnects.clear()
+
         storeToSP() // save last run time
     }
 
     fun getActionDummyObjects(): List<Action> {
         return listOf(
-                //ActionLoopDisable(),
-                //ActionLoopEnable(),
-                //ActionLoopResume(),
-                //ActionLoopSuspend(),
-                ActionStartTempTarget(),
-                ActionStopTempTarget(),
-                ActionNotification(),
-                ActionProfileSwitchPercent(),
-                ActionProfileSwitch(),
-                ActionSendSMS()
+            //ActionLoopDisable(injector),
+            //ActionLoopEnable(injector),
+            //ActionLoopResume(injector),
+            //ActionLoopSuspend(injector),
+            ActionStartTempTarget(injector),
+            ActionStopTempTarget(injector),
+            ActionNotification(injector),
+            ActionProfileSwitchPercent(injector),
+            ActionProfileSwitch(injector),
+            ActionSendSMS(injector)
         )
     }
 
     fun getTriggerDummyObjects(): List<Trigger> {
         return listOf(
-                TriggerTime(),
-                TriggerRecurringTime(),
-                TriggerTimeRange(),
-                TriggerBg(),
-                TriggerDelta(),
-                TriggerIob(),
-                TriggerCOB(),
-                TriggerProfilePercent(),
-                TriggerTempTarget(),
-                TriggerWifiSsid(),
-                TriggerLocation(),
-                TriggerAutosensValue(),
-                TriggerBolusAgo(),
-                TriggerPumpLastConnection()
+            TriggerConnector(injector),
+            TriggerTime(injector),
+            TriggerRecurringTime(injector),
+            TriggerTimeRange(injector),
+            TriggerBg(injector),
+            TriggerDelta(injector),
+            TriggerIob(injector),
+            TriggerCOB(injector),
+            TriggerProfilePercent(injector),
+            TriggerTempTarget(injector),
+            TriggerWifiSsid(injector),
+            TriggerLocation(injector),
+            TriggerAutosensValue(injector),
+            TriggerBolusAgo(injector),
+            TriggerPumpLastConnection(injector),
+            TriggerBTDevice(injector)
         )
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/EventListAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/EventListAdapter.java
deleted file mode 100644
index 87c78d02eb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/EventListAdapter.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.automation.actions.Action;
-import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog;
-import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperAdapter;
-import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperViewHolder;
-import info.nightscout.androidaps.plugins.general.automation.dragHelpers.OnStartDragListener;
-import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationDataChanged;
-import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
-import info.nightscout.androidaps.utils.OKDialog;
-
-class EventListAdapter extends RecyclerView.Adapter<EventListAdapter.ViewHolder> implements ItemTouchHelperAdapter {
-    private final List<AutomationEvent> eventList;
-    private final FragmentManager fragmentManager;
-    private final Activity activity;
-
-    private final OnStartDragListener mDragStartListener;
-
-    EventListAdapter(List<AutomationEvent> events, FragmentManager fragmentManager, Activity activity, OnStartDragListener dragStartListener) {
-        this.eventList = events;
-        this.fragmentManager = fragmentManager;
-        this.activity = activity;
-        mDragStartListener = dragStartListener;
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.automation_event_item, parent, false);
-        return new ViewHolder(v, parent.getContext());
-    }
-
-    private void addImage(@DrawableRes int res, Context context, LinearLayout layout) {
-        ImageView iv = new ImageView(context);
-        iv.setImageResource(res);
-        iv.setLayoutParams(new LinearLayout.LayoutParams(MainApp.dpToPx(24), MainApp.dpToPx(24)));
-        layout.addView(iv);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        final AutomationEvent event = eventList.get(position);
-        holder.eventTitle.setText(event.getTitle());
-        holder.enabled.setChecked(event.isEnabled());
-        holder.iconLayout.removeAllViews();
-
-        // trigger icons
-        HashSet<Integer> triggerIcons = new HashSet<>();
-        TriggerConnector.fillIconSet((TriggerConnector) event.getTrigger(), triggerIcons);
-        for (int res : triggerIcons) {
-            addImage(res, holder.context, holder.iconLayout);
-        }
-
-        // arrow icon
-        ImageView iv = new ImageView(holder.context);
-        iv.setImageResource(R.drawable.ic_arrow_forward_white_24dp);
-        iv.setLayoutParams(new LinearLayout.LayoutParams(MainApp.dpToPx(24), MainApp.dpToPx(24)));
-        iv.setPadding(MainApp.dpToPx(4), 0, MainApp.dpToPx(4), 0);
-        holder.iconLayout.addView(iv);
-
-        // action icons
-        HashSet<Integer> actionIcons = new HashSet<>();
-        for (Action action : event.getActions()) {
-            if (action.icon().isPresent())
-                actionIcons.add(action.icon().get());
-        }
-        for (int res : actionIcons) {
-            addImage(res, holder.context, holder.iconLayout);
-        }
-
-        // enabled event
-        holder.enabled.setOnClickListener(v -> {
-            event.setEnabled((holder.enabled.isChecked()));
-            RxBus.INSTANCE.send(new EventAutomationDataChanged());
-        });
-
-        // edit event
-        holder.rootLayout.setOnClickListener(v ->
-
-        {
-            //EditEventDialog dialog = EditEventDialog.Companion.newInstance(event, false);
-            EditEventDialog dialog = new EditEventDialog();
-            Bundle args = new Bundle();
-            args.putString("event", event.toJSON());
-            args.putInt("position", position);
-            dialog.setArguments(args);
-            if (fragmentManager != null)
-                dialog.show(fragmentManager, "EditEventDialog");
-        });
-
-        // Start a drag whenever the handle view it touched
-        holder.iconSort.setOnTouchListener((v, motionEvent) ->
-
-        {
-            if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-                mDragStartListener.onStartDrag(holder);
-                return true;
-            }
-            return v.onTouchEvent(motionEvent);
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return eventList.size();
-    }
-
-    @Override
-    public boolean onItemMove(int fromPosition, int toPosition) {
-        Collections.swap(eventList, fromPosition, toPosition);
-        notifyItemMoved(fromPosition, toPosition);
-        RxBus.INSTANCE.send(new EventAutomationDataChanged());
-        return true;
-    }
-
-    @Override
-    public void onItemDismiss(int position) {
-        OKDialog.showConfirmation(activity, MainApp.gs(R.string.removerecord) + " " + eventList.get(position).getTitle(),
-                () -> {
-                    eventList.remove(position);
-                    notifyItemRemoved(position);
-                    RxBus.INSTANCE.send(new EventAutomationDataChanged());
-                    RxBus.INSTANCE.send(new EventAutomationUpdateGui());
-                }, () -> {
-                    RxBus.INSTANCE.send(new EventAutomationUpdateGui());
-                });
-    }
-
-    static class ViewHolder extends RecyclerView.ViewHolder implements ItemTouchHelperViewHolder {
-        final RelativeLayout rootLayout;
-        final LinearLayout iconLayout;
-        final TextView eventTitle;
-        final Context context;
-        final ImageView iconSort;
-        final CheckBox enabled;
-
-        ViewHolder(View view, Context context) {
-            super(view);
-            this.context = context;
-            eventTitle = view.findViewById(R.id.viewEventTitle);
-            rootLayout = view.findViewById(R.id.rootLayout);
-            iconLayout = view.findViewById(R.id.iconLayout);
-            iconSort = view.findViewById(R.id.iconSort);
-            enabled = view.findViewById(R.id.automation_enabled);
-        }
-
-        @Override
-        public void onItemSelected() {
-            itemView.setBackgroundColor(Color.LTGRAY);
-        }
-
-        @Override
-        public void onItemClear() {
-            itemView.setBackgroundColor(MainApp.gc(R.color.ribbonDefault));
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java
deleted file mode 100644
index ee4564fd6f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import javax.annotation.Nullable;
-
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
-import info.nightscout.androidaps.queue.Callback;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/*
-    Action ideas:
-
-    * cancel temp target
-    * change preference setting
-    * enable/disable plugin
-    * create notification
-    * create ugly alarm
-    * create profile switch
-    * set/cancel tbr
-    * set/cancel extended bolus
-    * run bolus wizard
-
-    Trigger ideas:
-
-    * location (close to)
-    * connected to specific wifi
-    * internet available/not available
-    * nsclient connected/disconnected
-    * iob
-    * cob
-    * autosens value
-    * delta, short delta, long delta
-    * last bolus ago
-    * is tbr running
-    * bolus wizard result
-    * loop is enabled, disabled, suspended, running
-
-*/
-
-
-public abstract class Action {
-    private static final Logger log = LoggerFactory.getLogger(Action.class);
-
-    public Trigger precondition = null;
-
-    public abstract int friendlyName();
-
-    public abstract String shortDescription();
-
-    public abstract void doAction(Callback callback);
-
-    public void generateDialog(LinearLayout root) {
-    }
-
-    public boolean hasDialog() {
-        return false;
-    }
-
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", this.getClass().getName());
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    public abstract Optional<Integer> icon();
-
-    public Action fromJSON(String data) {
-        return this;
-    }
-
-    @Nullable
-    public static Action instantiate(JSONObject object) {
-        try {
-            String type = object.getString("type");
-            JSONObject data = object.optJSONObject("data");
-            Class clazz = Class.forName(type);
-            return ((Action) clazz.newInstance()).fromJSON(data != null ? data.toString() : "");
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    public void apply(Action a) {
-        try {
-            JSONObject object = new JSONObject(a.toJSON());
-            String type = object.getString("type");
-            JSONObject data = object.getJSONObject("data");
-            if (type.equals(getClass().getName())) {
-                fromJSON(data.toString());
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
new file mode 100644
index 0000000000..98c8d27c60
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.queue.Callback
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import kotlin.reflect.full.primaryConstructor
+
+abstract class Action(val injector: HasAndroidInjector) {
+    @Inject lateinit var aapsLogger: AAPSLogger
+
+    var precondition: Trigger? = null
+
+    abstract fun friendlyName(): Int
+    abstract fun shortDescription(): String
+    abstract fun doAction(callback: Callback)
+    @DrawableRes abstract fun icon(): Int
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    open fun generateDialog(root: LinearLayout) {}
+
+    open fun hasDialog(): Boolean = false
+
+    open fun toJSON(): String =
+        JSONObject().put("type", this.javaClass.name).toString()
+
+    open fun fromJSON(data: String): Action = this
+
+    fun apply(a: Action) {
+        val obj = JSONObject(a.toJSON())
+        val type = obj.getString("type")
+        val data = obj.getJSONObject("data")
+        if (type == javaClass.name) fromJSON(data.toString())
+    }
+
+    fun instantiate(obj: JSONObject): Action? {
+        try {
+            val type = obj.getString("type")
+            val data = obj.optJSONObject("data")
+            val clazz = Class.forName(type).kotlin
+            return (clazz.primaryConstructor?.call(injector) as Action).fromJSON(data?.toString()
+                ?: "")
+            //return (clazz.newInstance() as Action).fromJSON(data?.toString() ?: "")
+        } catch (e: ClassNotFoundException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: InstantiationException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: IllegalAccessException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionDummy.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionDummy.kt
new file mode 100644
index 0000000000..c7d1fec9b1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionDummy.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.queue.Callback
+
+// Used for instantiation of other actions only
+class ActionDummy(injector: HasAndroidInjector) : Action(injector) {
+
+    override fun friendlyName(): Int {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun shortDescription(): String {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun doAction(callback: Callback) {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun icon(): Int {
+        throw NotImplementedError("An operation is not implemented")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.java
deleted file mode 100644
index cf8326a0f2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-public class ActionLoopDisable extends Action {
-    @Override
-    public int friendlyName() {
-        return R.string.disableloop;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.disableloop);
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        if (LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) {
-            LoopPlugin.getPlugin().setPluginEnabled(PluginType.LOOP, false);
-            ConfigBuilderPlugin.getPlugin().storeSettings("ActionLoopDisable");
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
-                @Override
-                public void run() {
-                    RxBus.INSTANCE.send(new EventRefreshOverview("ActionLoopDisable"));
-                    if (callback != null)
-                        callback.result(result).run();
-                }
-            });
-        } else {
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.alreadydisabled)).run();
-        }
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_stop_24dp);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
new file mode 100644
index 0000000000..bc6f7a6fb8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    override fun friendlyName(): Int = R.string.disableloop
+    override fun shortDescription(): String = resourceHelper.gs(R.string.disableloop)
+    @DrawableRes override fun icon(): Int = R.drawable.ic_stop_24dp
+
+    override fun doAction(callback: Callback) {
+        if (loopPlugin.isEnabled(PluginType.LOOP)) {
+            loopPlugin.setPluginEnabled(PluginType.LOOP, false)
+            configBuilderPlugin.storeSettings("ActionLoopDisable")
+            commandQueue.cancelTempBasal(true, object : Callback() {
+                override fun run() {
+                    rxBus.send(EventRefreshOverview("ActionLoopDisable"))
+                    callback.result(result).run()
+                }
+            })
+        } else {
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadydisabled)).run()
+        }
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.java
deleted file mode 100644
index f33bec8e3f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-public class ActionLoopEnable extends Action {
-    @Override
-    public int friendlyName() {
-        return R.string.enableloop;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.enableloop);
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        if (!LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) {
-            LoopPlugin.getPlugin().setPluginEnabled(PluginType.LOOP, true);
-            ConfigBuilderPlugin.getPlugin().storeSettings("ActionLoopEnable");
-            RxBus.INSTANCE.send(new EventRefreshOverview("ActionLoopEnable"));
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-        } else {
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.alreadyenabled)).run();
-        }
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_play_circle_outline_24dp);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
new file mode 100644
index 0000000000..4b94520523
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    override fun friendlyName(): Int = R.string.enableloop
+    override fun shortDescription(): String = resourceHelper.gs(R.string.enableloop)
+    @DrawableRes override fun icon(): Int = R.drawable.ic_play_circle_outline_24dp
+
+    override fun doAction(callback: Callback) {
+        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
+            loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+            configBuilderPlugin.storeSettings("ActionLoopEnable")
+            rxBus.send(EventRefreshOverview("ActionLoopEnable"))
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+        } else {
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadyenabled))?.run()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java
deleted file mode 100644
index 38e5dee33a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.queue.Callback;
-
-public class ActionLoopResume extends Action {
-    @Override
-    public int friendlyName() {
-        return R.string.resumeloop;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.resumeloop);
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        if (LoopPlugin.getPlugin().isSuspended()) {
-            LoopPlugin.getPlugin().suspendTo(0);
-            ConfigBuilderPlugin.getPlugin().storeSettings("ActionLoopResume");
-            NSUpload.uploadOpenAPSOffline(0);
-            RxBus.INSTANCE.send(new EventRefreshOverview("ActionLoopResume"));
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-        } else {
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.notsuspended)).run();
-        }
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_replay_24dp);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
new file mode 100644
index 0000000000..4e155bcdcc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    override fun friendlyName(): Int = R.string.resumeloop
+    override fun shortDescription(): String = resourceHelper.gs(R.string.resumeloop)
+    @DrawableRes override fun icon(): Int = R.drawable.ic_replay_24dp
+
+    override fun doAction(callback: Callback) {
+        if (loopPlugin.isSuspended) {
+            loopPlugin.suspendTo(0)
+            configBuilderPlugin.storeSettings("ActionLoopResume")
+            loopPlugin.createOfflineEvent(0)
+            rxBus.send(EventRefreshOverview("ActionLoopResume"))
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+        } else {
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.notsuspended))?.run()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java
deleted file mode 100644
index 39adbcac27..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.JsonHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ActionLoopSuspend extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionLoopSuspend.class);
-
-    public InputDuration minutes = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
-
-    @Override
-    public int friendlyName() {
-        return R.string.suspendloop;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.suspendloopforXmin, minutes.getMinutes());
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        if (!LoopPlugin.getPlugin().isSuspended()) {
-            LoopPlugin.getPlugin().suspendLoop(minutes.getMinutes());
-            RxBus.INSTANCE.send(new EventRefreshOverview("ActionLoopSuspend"));
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-        } else {
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.alreadysuspended)).run();
-        }
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_pause_circle_outline_24dp);
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        JSONObject data = new JSONObject();
-        try {
-            data.put("minutes", minutes.getMinutes());
-            o.put("type", this.getClass().getName());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject o = new JSONObject(data);
-            minutes.setMinutes(JsonHelper.safeGetInt(o, "minutes"));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.careportal_newnstreatment_duration_min_label), "", minutes))
-                .build(root);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
new file mode 100644
index 0000000000..0bdb33c935
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    var minutes = InputDuration(injector, 0, InputDuration.TimeUnit.MINUTES)
+
+    override fun friendlyName(): Int = R.string.suspendloop
+    override fun shortDescription(): String = resourceHelper.gs(R.string.suspendloopforXmin, minutes.getMinutes())
+    @DrawableRes override fun icon(): Int = R.drawable.ic_pause_circle_outline_24dp
+
+    override fun doAction(callback: Callback) {
+        if (!loopPlugin.isSuspended) {
+            loopPlugin.suspendLoop(minutes.getMinutes())
+            rxBus.send(EventRefreshOverview("ActionLoopSuspend"))
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+        } else {
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadysuspended))?.run()
+        }
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject().put("minutes", minutes.getMinutes())
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        minutes.setMinutes(JsonHelper.safeGetInt(o, "minutes"))
+        return this
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.careportal_newnstreatment_duration_min_label), "", minutes))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java
deleted file mode 100644
index 7bd501b460..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.JsonHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ActionNotification extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionNotification.class);
-
-    public InputString text = new InputString();
-
-    @Override
-    public int friendlyName() {
-        return R.string.notification;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.notification_message, text.getValue());
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        Notification notification = new Notification(Notification.USERMESSAGE, text.getValue(), Notification.URGENT);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
-        NSUpload.uploadError(text.getValue());
-        RxBus.INSTANCE.send(new EventRefreshOverview("ActionNotification"));
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_notifications);
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        JSONObject data = new JSONObject();
-        try {
-            data.put("text", text.getValue());
-            o.put("type", this.getClass().getName());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject o = new JSONObject(data);
-            text.setValue(JsonHelper.safeGetString(o, "text"));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.message_short), "", text))
-                .build(root);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
new file mode 100644
index 0000000000..76152b8861
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationUserMessage
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    var text = InputString(injector)
+
+    override fun friendlyName(): Int = R.string.notification
+    override fun shortDescription(): String = resourceHelper.gs(R.string.notification_message, text.value)
+    @DrawableRes override fun icon(): Int = R.drawable.ic_notifications
+
+    override fun doAction(callback: Callback) {
+        val notification = NotificationUserMessage(text.value)
+        rxBus.send(EventNewNotification(notification))
+        NSUpload.uploadError(text.value)
+        rxBus.send(EventRefreshOverview("ActionNotification"))
+        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject().put("text", text.value)
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        text.value = JsonHelper.safeGetString(o, "text", "")
+        return this
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.message_short), "", text))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java
deleted file mode 100644
index 63c923fdcf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputProfileName;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-
-public class ActionProfileSwitch extends Action {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    InputProfileName inputProfileName;
-    String profileName = "";
-
-    public ActionProfileSwitch() {
-        // Prevent action if active profile is already active
-        // but we don't have a trigger IS_NOT_EQUAL
-        // so check is in the doRun()
-        ProfileInterface profileInterface =  ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-        if (profileInterface != null) {
-            ProfileStore profileStore = profileInterface.getProfile();
-            if (profileStore != null) {
-                String name = profileStore.getDefaultProfileName();
-                if (name != null) {
-                    profileName = name;
-                }
-            }
-        }
-        inputProfileName = new InputProfileName(profileName);
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.profilename;
-    }
-
-    @Override
-    public String shortDescription() {
-        String returned = MainApp.gs(R.string.changengetoprofilename, inputProfileName.getValue());
-        return returned;
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-
-        String activeProfileName = ProfileFunctions.getInstance().getProfileName();
-        //Check for uninitialized profileName
-        if ( profileName.equals("")){
-            log.error("Selected profile not initialized");
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(false).comment(R.string.error_field_must_not_be_empty)).run();
-            return;
-        }
-        if ( ProfileFunctions.getInstance().getProfile() == null){
-            log.error("ProfileFunctions not initialized");
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(false).comment(R.string.noprofile)).run();
-            return;
-        }
-        if (profileName.equals(activeProfileName)) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Profile is already switched");
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).comment(R.string.alreadyset)).run();
-            return;
-        }
-        ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-        if (activeProfile == null) {
-            log.error("ProfileInterface not initialized");
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(false).comment(R.string.noprofile)).run();
-            return;
-        }
-        ProfileStore profileStore = activeProfile.getProfile();
-        if (profileStore == null) return;
-        if(profileStore.getSpecificProfile(profileName) == null) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.error("Selected profile does not exist! - "+ profileName);
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(false).comment(R.string.notexists)).run();
-            return;
-        }
-
-        ProfileFunctions.doProfileSwitch(profileStore, profileName, 0, 100, 0, DateUtil.now());
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.profilename), "", inputProfileName))
-                .build(root);
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", ActionProfileSwitch.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("profileToSwitchTo", inputProfileName.getValue());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-
-        try {
-            JSONObject d = new JSONObject(data);
-            profileName = JsonHelper.safeGetString(d, "profileToSwitchTo");
-            inputProfileName.setValue(profileName);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_actions_profileswitch);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
new file mode 100644
index 0000000000..3e6406fac0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.automation.elements.InputProfileName
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    var inputProfileName: InputProfileName = InputProfileName(injector, "")
+
+    override fun friendlyName(): Int = R.string.profilename
+    override fun shortDescription(): String = resourceHelper.gs(R.string.changengetoprofilename, inputProfileName.value)
+    @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch
+
+    override fun doAction(callback: Callback) {
+        val activeProfileName = profileFunction.getProfileName()
+        //Check for uninitialized profileName
+        if (inputProfileName.value == "") {
+            aapsLogger.error(LTag.AUTOMATION, "Selected profile not initialized")
+            callback.result(PumpEnactResult(injector).success(false).comment(R.string.error_field_must_not_be_empty))?.run()
+            return
+        }
+        if (profileFunction.getProfile() == null) {
+            aapsLogger.error(LTag.AUTOMATION, "ProfileFunctions not initialized")
+            callback.result(PumpEnactResult(injector).success(false).comment(R.string.noprofile))?.run()
+            return
+        }
+        if (inputProfileName.value == activeProfileName) {
+            aapsLogger.debug(LTag.AUTOMATION, "Profile is already switched")
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadyset))?.run()
+            return
+        }
+        val profileStore = activePlugin.activeProfileInterface.profile ?: return
+        if (profileStore.getSpecificProfile(inputProfileName.value) == null) {
+            aapsLogger.error(LTag.AUTOMATION, "Selected profile does not exist! - ${inputProfileName.value}")
+            callback.result(PumpEnactResult(injector).success(false).comment(R.string.notexists))?.run()
+            return
+        }
+        activePlugin.activeTreatments.doProfileSwitch(profileStore, inputProfileName.value, 0, 100, 0, DateUtil.now())
+        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+    }
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.profilename), "", inputProfileName))
+            .build(root)
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun toJSON(): String {
+        val data = JSONObject().put("profileToSwitchTo", inputProfileName.value)
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        inputProfileName.value = JsonHelper.safeGetString(o, "profileToSwitchTo", "")
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java
deleted file mode 100644
index 23b54640a5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.JsonHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ActionProfileSwitchPercent extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionProfileSwitchPercent.class);
-
-    InputPercent pct = new InputPercent();
-    InputDuration duration = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
-
-    public ActionProfileSwitchPercent() {
-        precondition = new TriggerProfilePercent().comparator(Comparator.Compare.IS_EQUAL).setValue(100);
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.profilepercentage;
-    }
-
-    @Override
-    public String shortDescription() {
-        if (duration.getMinutes() == 0)
-            return MainApp.gs(R.string.startprofileforever, (int) pct.getValue());
-        else
-            return MainApp.gs(R.string.startprofile, (int) pct.getValue(), duration.getMinutes());
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        ProfileFunctions.doProfileSwitch((int) duration.getValue(), (int) pct.getValue(), 0);
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.percent_u), "", pct))
-                .add(new LabelWithElement(MainApp.gs(R.string.careportal_newnstreatment_duration_min_label), "", duration))
-                .build(root);
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", ActionProfileSwitchPercent.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("percentage", pct.getValue());
-            data.put("durationInMinutes", duration.getMinutes());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            pct.setValue(JsonHelper.safeGetInt(d, "percentage"));
-            duration.setMinutes(JsonHelper.safeGetInt(d, "durationInMinutes"));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_actions_profileswitch);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
new file mode 100644
index 0000000000..f45e8d19e9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
@@ -0,0 +1,69 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    var pct = InputPercent(injector)
+    var duration = InputDuration(injector, 0, InputDuration.TimeUnit.MINUTES)
+
+    override fun friendlyName(): Int = R.string.profilepercentage
+    override fun shortDescription(): String =
+        if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt())
+        else resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value)
+
+    @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch
+
+    init {
+        precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL)
+    }
+
+    override fun doAction(callback: Callback) {
+        activePlugin.activeTreatments.doProfileSwitch(duration.value, pct.value.toInt(), 0)
+        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+    }
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.percent_u), "", pct))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.careportal_newnstreatment_duration_min_label), "", duration))
+            .build(root)
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("percentage", pct.value)
+            .put("durationInMinutes", duration.value)
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        pct.value = JsonHelper.safeGetDouble(o, "percentage")
+        duration.value = JsonHelper.safeGetInt(o, "durationInMinutes")
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java
deleted file mode 100644
index fa9140e5f9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.JsonHelper;
-
-public class ActionSendSMS extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionSendSMS.class);
-
-    public InputString text = new InputString();
-
-    @Override
-    public int friendlyName() {
-        return R.string.sendsmsactiondescription;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.sendsmsactionlabel, text.getValue());
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        boolean result = SmsCommunicatorPlugin.INSTANCE.sendNotificationToAllNumbers(text.getValue());
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(result).comment(result ? R.string.ok : R.string.danar_error)).run();
-
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_notifications);
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        JSONObject data = new JSONObject();
-        try {
-            data.put("text", text.getValue());
-            o.put("type", this.getClass().getName());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject o = new JSONObject(data);
-            text.setValue(JsonHelper.safeGetString(o, "text"));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.sendsmsactiontext), "", text))
-                .build(root);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
new file mode 100644
index 0000000000..5db3c14add
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+
+    var text = InputString(injector)
+
+    override fun friendlyName(): Int = R.string.sendsmsactiondescription
+    override fun shortDescription(): String = resourceHelper.gs(R.string.sendsmsactionlabel, text.value)
+    override fun icon(): Int = R.drawable.ic_notifications
+
+    override fun doAction(callback: Callback) {
+        val result = smsCommunicatorPlugin.sendNotificationToAllNumbers(text.value)
+        callback.result(PumpEnactResult(injector).success(result).comment(if (result) R.string.ok else R.string.danar_error))?.run()
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject().put("text", text.value)
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        text.value = JsonHelper.safeGetString(o, "text", "")
+        return this
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.sendsmsactiontext), "", text))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java
deleted file mode 100644
index 1d7ab8db48..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.widget.LinearLayout;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTempTarget;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ActionStartTempTarget extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionStartTempTarget.class);
-
-    String reason = "";
-    InputTempTarget value = new InputTempTarget();
-    InputDuration duration = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
-    private TempTarget tempTarget;
-
-    public ActionStartTempTarget() {
-        precondition = new TriggerTempTarget().comparator(ComparatorExists.Compare.NOT_EXISTS);
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.starttemptarget;
-    }
-
-    @Override
-    public String shortDescription() {
-        tempTarget = new TempTarget()
-                .date(DateUtil.now())
-                .duration(duration.getMinutes())
-                .reason(reason)
-                .source(Source.USER)
-                .low(Profile.toMgdl(value.getValue(), value.getUnits()))
-                .high(Profile.toMgdl(value.getValue(), value.getUnits()));
-        return MainApp.gs(R.string.starttemptarget) + ": " + (tempTarget == null ? "null" : tempTarget.friendlyDescription(value.getUnits()));
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        tempTarget = new TempTarget()
-                .date(DateUtil.now())
-                .duration(duration.getMinutes())
-                .reason(reason)
-                .source(Source.USER)
-                .low(Profile.toMgdl(value.getValue(), value.getUnits()))
-                .high(Profile.toMgdl(value.getValue(), value.getUnits()));
-        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root) {
-        int unitResId = value.getUnits().equals(Constants.MGDL) ? R.string.mgdl : R.string.mmol;
-
-        new LayoutBuilder()
-                .add(new LabelWithElement(MainApp.gs(R.string.careportal_temporarytarget) + "\n[" + MainApp.gs(unitResId) + "]", "", value))
-                .add(new LabelWithElement(MainApp.gs(R.string.careportal_newnstreatment_duration_min_label), "", duration))
-                .build(root);
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return true;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", ActionStartTempTarget.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("reason", reason);
-            data.put("value", value.getValue());
-            data.put("units", value.getUnits());
-            data.put("durationInMinutes", duration.getMinutes());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            reason = JsonHelper.safeGetString(d, "reason");
-            value.setUnits(JsonHelper.safeGetString(d, "units"));
-            value.setValue(JsonHelper.safeGetDouble(d, "value"));
-            duration.setMinutes(JsonHelper.safeGetInt(d, "durationInMinutes"));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_cp_cgm_target);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
new file mode 100644
index 0000000000..d7f1b6a4e2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
@@ -0,0 +1,86 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTempTarget
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    var value = InputTempTarget(injector)
+    var duration = InputDuration(injector, 0, InputDuration.TimeUnit.MINUTES)
+
+    init {
+        precondition = TriggerTempTarget(injector, ComparatorExists.Compare.NOT_EXISTS)
+    }
+
+    override fun friendlyName(): Int = R.string.starttemptarget
+    override fun shortDescription(): String = resourceHelper.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units)
+    @DrawableRes override fun icon(): Int = R.drawable.icon_cp_cgm_target
+
+    override fun doAction(callback: Callback) {
+        activePlugin.activeTreatments.addToHistoryTempTarget(tt())
+        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+    }
+
+    override fun generateDialog(root: LinearLayout) {
+        val unitResId = if (value.units == Constants.MGDL) R.string.mgdl else R.string.mmol
+        LayoutBuilder()
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.careportal_temporarytarget) + "\n[" + resourceHelper.gs(unitResId) + "]", "", value))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.careportal_newnstreatment_duration_min_label), "", duration))
+            .build(root)
+    }
+
+    override fun hasDialog(): Boolean {
+        return true
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("value", value.value)
+            .put("units", value.units)
+            .put("durationInMinutes", duration.getMinutes())
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        value.units = JsonHelper.safeGetString(o, "units", Constants.MGDL)
+        value.value = safeGetDouble(o, "value")
+        duration.setMinutes(JsonHelper.safeGetInt(o, "durationInMinutes"))
+        return this
+    }
+
+    fun tt(): TempTarget =
+        TempTarget()
+            .date(DateUtil.now())
+            .duration(duration.getMinutes())
+            .reason("Automation")
+            .source(Source.USER)
+            .low(Profile.toMgdl(value.value, value.units))
+            .high(Profile.toMgdl(value.value, value.units))
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java
deleted file mode 100644
index abf354bc9c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ActionStopTempTarget extends Action {
-    private static final Logger log = LoggerFactory.getLogger(ActionStopTempTarget.class);
-
-    String reason = "";
-    private TempTarget tempTarget;
-
-    public ActionStopTempTarget() {
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.stoptemptarget;
-    }
-
-    @Override
-    public String shortDescription() {
-        return MainApp.gs(R.string.stoptemptarget);
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-        tempTarget = new TempTarget().date(DateUtil.now()).duration(0).reason(reason).source(Source.USER).low(0).high(0);
-        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-        if (callback != null)
-            callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
-    }
-
-    @Override
-    public boolean hasDialog() {
-        return false;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", ActionStopTempTarget.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("reason", reason);
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    public Action fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            reason = JsonHelper.safeGetString(d, "reason");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_stop_24dp);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
new file mode 100644
index 0000000000..f7e86f6d73
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun friendlyName(): Int = R.string.stoptemptarget
+    override fun shortDescription(): String = resourceHelper.gs(R.string.stoptemptarget)
+    override fun icon(): Int = R.drawable.ic_stop_24dp
+
+    override fun doAction(callback: Callback) {
+        val tempTarget = TempTarget()
+            .date(DateUtil.now())
+            .duration(0)
+            .reason("Automation")
+            .source(Source.USER)
+            .low(0.0).high(0.0)
+        activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
+        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ActionListAdapter.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ActionListAdapter.kt
deleted file mode 100644
index d3a8eb20c0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ActionListAdapter.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.dialogs
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.fragment.app.FragmentManager
-import androidx.recyclerview.widget.RecyclerView
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.general.automation.actions.Action
-import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
-
-class ActionListAdapter(private val fragmentManager: FragmentManager, private val actionList: MutableList<Action>) : RecyclerView.Adapter<ActionListAdapter.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(parent.context).inflate(R.layout.automation_action_item, parent, false)
-        return ViewHolder(v)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val action = actionList[position]
-        holder.bind(action, fragmentManager, this, position, actionList)
-    }
-
-    override fun getItemCount(): Int {
-        return actionList.size
-    }
-
-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-
-        fun bind(action: Action, fragmentManager: FragmentManager, recyclerView: RecyclerView.Adapter<ViewHolder>, position: Int, actionList: MutableList<Action>) {
-            view.findViewById<LinearLayout>(R.id.automation_layoutText).setOnClickListener {
-                if (action.hasDialog()) {
-                    val args = Bundle()
-                    args.putInt("actionPosition", position)
-                    args.putString("action", action.toJSON())
-                    val dialog = EditActionDialog()
-                    dialog.arguments = args
-                    dialog.show(fragmentManager, "EditActionDialog")
-                }
-            }
-            view.findViewById<ImageView>(R.id.automation_iconTrash).setOnClickListener {
-                actionList.remove(action)
-                recyclerView.notifyDataSetChanged()
-                RxBus.send(EventAutomationUpdateGui())
-            }
-            if (action.icon().isPresent) view.findViewById<ImageView>(R.id.automation_action_image).setImageResource(action.icon().get())
-            view.findViewById<TextView>(R.id.automation_viewActionTitle).text = action.shortDescription()
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
index c6097a1e88..183537a53b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
@@ -5,16 +5,22 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationAddAction
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
 import kotlinx.android.synthetic.main.automation_dialog_choose_action.*
+import javax.inject.Inject
+import kotlin.reflect.full.primaryConstructor
 
 class ChooseActionDialog : DialogFragmentWithDate() {
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var mainApp : MainApp
 
     private var checkedIndex = -1
 
@@ -32,10 +38,10 @@ class ChooseActionDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        for (a in AutomationPlugin.getActionDummyObjects()) {
+        for (a in automationPlugin.getActionDummyObjects()) {
             val radioButton = RadioButton(context)
             radioButton.setText(a.friendlyName())
-            radioButton.tag = a.javaClass
+            radioButton.tag = a.javaClass.name
             automation_radioGroup.addView(radioButton)
         }
 
@@ -45,8 +51,8 @@ class ChooseActionDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         instantiateAction()?.let {
-            RxBus.send(EventAutomationAddAction(it))
-            RxBus.send(EventAutomationUpdateGui())
+            rxBus.send(EventAutomationAddAction(it))
+            rxBus.send(EventAutomationUpdateGui())
         }
         return true
     }
@@ -58,15 +64,16 @@ class ChooseActionDialog : DialogFragmentWithDate() {
 
     private fun instantiateAction(): Action? {
         return getActionClass()?.let {
-            it.newInstance() as Action
+            val clazz = Class.forName(it).kotlin
+            clazz.primaryConstructor?.call(mainApp) as Action
         }
     }
 
-    private fun getActionClass(): Class<*>? {
+    private fun getActionClass(): String? {
         val radioButtonID = automation_radioGroup.checkedRadioButtonId
         val radioButton = automation_radioGroup.findViewById<RadioButton>(radioButtonID)
         return radioButton?.let {
-            it.tag as Class<*>
+            it.tag as String
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
index eef3a7057e..8721273afa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
@@ -5,13 +5,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import kotlinx.android.synthetic.main.automation_dialog_choose_trigger.*
+import javax.inject.Inject
+import kotlin.reflect.full.primaryConstructor
 
 class ChooseTriggerDialog : DialogFragmentWithDate() {
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var mainApp : MainApp
 
     private var checkedIndex = -1
     private var clickListener: OnClickListener? = null
@@ -34,10 +39,10 @@ class ChooseTriggerDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        for (t in AutomationPlugin.getTriggerDummyObjects()) {
+        for (t in automationPlugin.getTriggerDummyObjects()) {
             val radioButton = RadioButton(context)
             radioButton.setText(t.friendlyName())
-            radioButton.tag = t.javaClass
+            radioButton.tag = t.javaClass.name
             automation_chooseTriggerRadioGroup.addView(radioButton)
         }
 
@@ -63,15 +68,16 @@ class ChooseTriggerDialog : DialogFragmentWithDate() {
 
     private fun instantiateTrigger(): Trigger? {
         return getTriggerClass()?.let {
-            it.newInstance() as Trigger
+            val clazz = Class.forName(it).kotlin
+            clazz.primaryConstructor?.call(mainApp) as Trigger
         }
     }
 
-    private fun getTriggerClass(): Class<*>? {
+    private fun getTriggerClass(): String? {
         val radioButtonID = automation_chooseTriggerRadioGroup.checkedRadioButtonId
         val radioButton = automation_chooseTriggerRadioGroup.findViewById<RadioButton>(radioButtonID)
         return radioButton?.let {
-            it.tag as Class<*>
+            it.tag as String
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
index e738b7f94c..37c7a0ad34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
@@ -4,15 +4,21 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
+import info.nightscout.androidaps.plugins.general.automation.actions.ActionDummy
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateAction
 import kotlinx.android.synthetic.main.automation_dialog_action.*
 import org.json.JSONObject
+import javax.inject.Inject
 
 class EditActionDialog : DialogFragmentWithDate() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var mainApp: MainApp
+
     private var action: Action? = null
     private var actionPosition: Int = -1
 
@@ -21,7 +27,7 @@ class EditActionDialog : DialogFragmentWithDate() {
         // load data from bundle
         (savedInstanceState ?: arguments)?.let { bundle ->
             actionPosition = bundle.getInt("actionPosition", -1)
-            bundle.getString("action")?.let { action = Action.instantiate(JSONObject(it)) }
+            bundle.getString("action")?.let { action = ActionDummy(mainApp).instantiate(JSONObject(it)) }
         }
         onCreateViewGeneral()
         return inflater.inflate(R.layout.automation_dialog_action, container, false)
@@ -39,16 +45,16 @@ class EditActionDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         action?.let {
-            RxBus.send(EventAutomationUpdateAction(it, actionPosition))
+            rxBus.send(EventAutomationUpdateAction(it, actionPosition))
         }
         return true
     }
 
-    override fun onSaveInstanceState(bundle: Bundle) {
-        super.onSaveInstanceState(bundle)
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
         action?.let {
-            bundle.putInt("actionPosition", actionPosition)
-            bundle.putString("action", it.toJSON())
+            savedInstanceState.putInt("actionPosition", actionPosition)
+            savedInstanceState.putString("action", it.toJSON())
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
index 0bcb183e11..21a62bc0a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
@@ -4,34 +4,51 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
-import info.nightscout.androidaps.plugins.general.automation.events.*
+import info.nightscout.androidaps.plugins.general.automation.actions.Action
+import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationAddAction
+import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationDataChanged
+import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateAction
+import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
+import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateTrigger
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.extensions.plusAssign
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.automation_dialog_event.*
+import javax.inject.Inject
 
 class EditEventDialog : DialogFragmentWithDate() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var automationPlugin: AutomationPlugin
 
     private var actionListAdapter: ActionListAdapter? = null
-    private var event: AutomationEvent = AutomationEvent()
+    private lateinit var event: AutomationEvent
     private var position: Int = -1
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
+        event = AutomationEvent(mainApp)
         // load data from bundle
         (savedInstanceState ?: arguments)?.let { bundle ->
             position = bundle.getInt("position", -1)
-            bundle.getString("event")?.let { event = AutomationEvent().fromJSON(it) }
+            bundle.getString("event")?.let { event = AutomationEvent(mainApp).fromJSON(it) }
         }
 
         onCreateViewGeneral()
@@ -53,7 +70,7 @@ class EditEventDialog : DialogFragmentWithDate() {
         }
 
         // setup action list view
-        fragmentManager?.let { actionListAdapter = ActionListAdapter(it, event.actions) }
+        fragmentManager?.let { actionListAdapter = ActionListAdapter() }
         automation_actionListView.layoutManager = LinearLayoutManager(context)
         automation_actionListView.adapter = actionListAdapter
 
@@ -61,49 +78,40 @@ class EditEventDialog : DialogFragmentWithDate() {
 
         showPreconditions()
 
-        disposable.add(RxBus
-                .toObservable(EventAutomationUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    actionListAdapter?.notifyDataSetChanged()
-                    showPreconditions()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        )
-        disposable.add(RxBus
-                .toObservable(EventAutomationAddAction::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    event.addAction(it.action)
-                    actionListAdapter?.notifyDataSetChanged()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        )
-        disposable.add(RxBus
-                .toObservable(EventAutomationUpdateTrigger::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    event.trigger = it.trigger
-                    automation_triggerDescription.text = event.trigger.friendlyDescription()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        )
-        disposable.add(RxBus
-                .toObservable(EventAutomationUpdateAction::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    event.actions[it.position] = it.action
-                    actionListAdapter?.notifyDataSetChanged()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        )
+        disposable += rxBus
+            .toObservable(EventAutomationUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                actionListAdapter?.notifyDataSetChanged()
+                showPreconditions()
+            }, { fabricPrivacy.logException(it) }
+            )
+        disposable += rxBus
+            .toObservable(EventAutomationAddAction::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                event.addAction(it.action)
+                actionListAdapter?.notifyDataSetChanged()
+            }, { fabricPrivacy.logException(it) }
+            )
+        disposable += rxBus
+            .toObservable(EventAutomationUpdateTrigger::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                event.trigger = it.trigger
+                automation_triggerDescription.text = event.trigger.friendlyDescription()
+            }, { fabricPrivacy.logException(it) }
+            )
+        disposable += rxBus
+            .toObservable(EventAutomationUpdateAction::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                event.actions[it.position] = it.action
+                actionListAdapter?.notifyDataSetChanged()
+            }, { fabricPrivacy.logException(it) })
     }
 
-    override fun submit() : Boolean{
+    override fun submit(): Boolean {
         // check for title
         val title = automation_inputEventTitle.text.toString()
         if (title.isEmpty()) {
@@ -124,11 +132,11 @@ class EditEventDialog : DialogFragmentWithDate() {
         }
         // store
         if (position == -1)
-            AutomationPlugin.automationEvents.add(event)
+            automationPlugin.automationEvents.add(event)
         else
-            AutomationPlugin.automationEvents[position] = event
+            automationPlugin.automationEvents[position] = event
 
-        RxBus.send(EventAutomationDataChanged())
+        rxBus.send(EventAutomationDataChanged())
         return true
     }
 
@@ -144,7 +152,7 @@ class EditEventDialog : DialogFragmentWithDate() {
     }
 
     private fun showPreconditions() {
-        val forcedTriggers = event.preconditions
+        val forcedTriggers = event.getPreconditions()
         if (forcedTriggers.size() > 0) {
             automation_forcedTriggerDescription.visibility = View.VISIBLE
             automation_forcedTriggerDescriptionLabel.visibility = View.VISIBLE
@@ -154,4 +162,44 @@ class EditEventDialog : DialogFragmentWithDate() {
             automation_forcedTriggerDescriptionLabel.visibility = View.GONE
         }
     }
+
+    inner class ActionListAdapter : RecyclerView.Adapter<ActionListAdapter.ViewHolder>() {
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val v = LayoutInflater.from(parent.context).inflate(R.layout.automation_action_item, parent, false)
+            return ViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val action = event.actions[position]
+            holder.bind(action, this, position)
+        }
+
+        override fun getItemCount(): Int = event.actions.size
+
+        inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+
+            fun bind(action: Action, recyclerView: RecyclerView.Adapter<ViewHolder>, position: Int) {
+                view.findViewById<LinearLayout>(R.id.automation_layoutText).setOnClickListener {
+                    if (action.hasDialog()) {
+                        val args = Bundle()
+                        args.putInt("actionPosition", position)
+                        args.putString("action", action.toJSON())
+                        val dialog = EditActionDialog()
+                        dialog.arguments = args
+                        fragmentManager?.let {
+                            dialog.show(it, "EditActionDialog")
+                        }
+                    }
+                }
+                view.findViewById<ImageView>(R.id.automation_iconTrash).setOnClickListener {
+                    event.actions.remove(action)
+                    recyclerView.notifyDataSetChanged()
+                    rxBus.send(EventAutomationUpdateGui())
+                }
+                view.findViewById<ImageView>(R.id.automation_action_image).setImageResource(action.icon())
+                view.findViewById<TextView>(R.id.automation_viewActionTitle).text = action.shortDescription()
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
index b30a724ec5..550e7f4ad6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
@@ -4,22 +4,39 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateTrigger
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerRemove
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.automation_dialog_edit_trigger.*
+import org.json.JSONObject
+import javax.inject.Inject
 
 class EditTriggerDialog : DialogFragmentWithDate() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
 
-    private var trigger: Trigger? = null
+    private var disposable: CompositeDisposable = CompositeDisposable()
+
+    private var triggers: Trigger? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         // load data from bundle
         (savedInstanceState ?: arguments)?.let { bundle ->
-            bundle.getString("trigger")?.let { trigger = Trigger.instantiate(it) }
+            bundle.getString("trigger")?.let { triggers = TriggerDummy(mainApp).instantiate(JSONObject(it)) }
         }
 
         onCreateViewGeneral()
@@ -29,17 +46,58 @@ class EditTriggerDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        disposable += rxBus
+            .toObservable(EventTriggerChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                automation_layoutTrigger.removeAllViews()
+                triggers?.generateDialog(automation_layoutTrigger)
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventTriggerRemove::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                findParent(triggers, it.trigger)?.list?.remove(it.trigger)
+                automation_layoutTrigger.removeAllViews()
+                triggers?.generateDialog(automation_layoutTrigger)
+            }, { fabricPrivacy.logException(it) })
+
+        disposable += rxBus
+            .toObservable(EventTriggerClone::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                findParent(triggers, it.trigger)?.list?.add(it.trigger.duplicate())
+                automation_layoutTrigger.removeAllViews()
+                triggers?.generateDialog(automation_layoutTrigger)
+            }, { fabricPrivacy.logException(it) })
+
         // display root trigger
-        trigger?.generateDialog(automation_layoutTrigger, fragmentManager)
+        triggers?.generateDialog(automation_layoutTrigger)
     }
 
-    override fun submit():Boolean {
-        trigger?.let { trigger -> RxBus.send(EventAutomationUpdateTrigger(trigger)) }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        disposable.clear()
+    }
+
+    override fun submit(): Boolean {
+        triggers?.let { trigger -> rxBus.send(EventAutomationUpdateTrigger(trigger)) }
         return true
     }
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
-        trigger?.let { savedInstanceState.putString("trigger", it.toJSON()) }
+        triggers?.let { savedInstanceState.putString("trigger", it.toJSON()) }
+    }
+
+    private fun findParent(where: Trigger?, what: Trigger): TriggerConnector? {
+        if (where == null) return null
+        if (where is TriggerConnector) {
+            for (i in where.list) {
+                if (i == what) return where
+                if (i is TriggerConnector) return findParent(i, what)
+            }
+        }
+        return null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java
deleted file mode 100644
index 3daa0fbd17..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.dialogs;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import androidx.fragment.app.FragmentManager;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
-
-public class TriggerListAdapter {
-    private final LinearLayout mRootLayout;
-    private final FragmentManager mFragmentManager;
-    private final Context mContext;
-    private final TriggerConnector mRootConnector;
-
-    public TriggerListAdapter(FragmentManager fragmentManager, Context context, LinearLayout rootLayout, TriggerConnector rootTrigger) {
-        mRootLayout = rootLayout;
-        mFragmentManager = fragmentManager;
-        mContext = context;
-        mRootConnector = rootTrigger;
-        build(fragmentManager);
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    private FragmentManager getFM() {
-        return mFragmentManager;
-    }
-
-    private void destroy() {
-        mRootLayout.removeAllViews();
-    }
-
-    private void build(FragmentManager fragmentManager) {
-        for (int i = 0; i < mRootConnector.size(); ++i) {
-            final Trigger trigger = mRootConnector.get(i);
-
-            // spinner
-            if (i > 0) {
-                createSpinner(trigger);
-            }
-
-            // trigger layout
-            trigger.generateDialog(mRootLayout, fragmentManager);
-
-            // buttons
-            createButtons(fragmentManager, trigger);
-        }
-
-        if (mRootConnector.size() == 0) {
-            Button buttonAdd = new Button(mContext);
-            buttonAdd.setText(MainApp.gs(R.string.addnew));
-            buttonAdd.setOnClickListener(v -> {
-                ChooseTriggerDialog dialog = new ChooseTriggerDialog();
-                dialog.setOnClickListener(newTriggerObject -> {
-                    mRootConnector.add(newTriggerObject);
-                    rebuild(fragmentManager);
-                });
-                dialog.show(fragmentManager, "ChooseTriggerDialog");
-            });
-            mRootLayout.addView(buttonAdd);
-        }
-    }
-
-    private Spinner createSpinner() {
-        Spinner spinner = new Spinner(mContext);
-        ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(mContext, R.layout.spinner_centered, TriggerConnector.Type.labels());
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(spinnerArrayAdapter);
-        return spinner;
-    }
-
-    private void createSpinner(Trigger trigger) {
-        final TriggerConnector connector = trigger.getConnector();
-        final int initialPosition = connector.getConnectorType().ordinal();
-        Spinner spinner = createSpinner();
-        spinner.setSelection(initialPosition);
-        spinner.setBackgroundColor(MainApp.gc(R.color.black_overlay));
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        params.setMargins(0, MainApp.dpToPx(8), 0, MainApp.dpToPx(8));
-        spinner.setLayoutParams(params);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                if (position != initialPosition) {
-                    // connector type changed
-                    changeConnector(getFM(), trigger, connector, TriggerConnector.Type.values()[position]);
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        mRootLayout.addView(spinner);
-    }
-
-    private void createButtons(FragmentManager fragmentManager, Trigger trigger) {
-        // do not create buttons for TriggerConnector
-        if (trigger instanceof TriggerConnector) {
-            return;
-        }
-
-        // Button Layout
-        LinearLayout buttonLayout = new LinearLayout(mContext);
-        buttonLayout.setOrientation(LinearLayout.HORIZONTAL);
-        buttonLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        mRootLayout.addView(buttonLayout);
-
-        // Button [-]
-        Button buttonRemove = new Button(mContext);
-        buttonRemove.setText(MainApp.gs(R.string.delete_short));
-        buttonRemove.setOnClickListener(v -> {
-            final TriggerConnector connector = trigger.getConnector();
-            connector.remove(trigger);
-            connector.simplify().rebuildView(getFM());
-        });
-        buttonLayout.addView(buttonRemove);
-
-        // Button [+]
-        Button buttonAdd = new Button(mContext);
-        buttonAdd.setText(MainApp.gs(R.string.add_short));
-        buttonAdd.setOnClickListener(v -> {
-            ChooseTriggerDialog dialog = new ChooseTriggerDialog();
-            dialog.show(fragmentManager, "ChooseTriggerDialog");
-            dialog.setOnClickListener(newTriggerObject -> {
-                TriggerConnector connector = trigger.getConnector();
-                connector.add(connector.pos(trigger) + 1, newTriggerObject);
-                connector.simplify().rebuildView(getFM());
-            });
-        });
-        buttonLayout.addView(buttonAdd);
-
-        // Button [*]
-        Button buttonCopy = new Button(mContext);
-        buttonCopy.setText(MainApp.gs(R.string.copy_short));
-        buttonCopy.setOnClickListener(v -> {
-            TriggerConnector connector = trigger.getConnector();
-            connector.add(connector.pos(trigger) + 1, trigger.duplicate());
-            connector.simplify().rebuildView(getFM());
-        });
-        buttonLayout.addView(buttonCopy);
-    }
-
-    public void rebuild(FragmentManager fragmentManager) {
-        destroy();
-        build(fragmentManager);
-    }
-
-    public static void changeConnector(final FragmentManager fragmentManager, final Trigger trigger, final TriggerConnector connector, final TriggerConnector.Type newConnectorType) {
-        if (connector.size() > 2) {
-            // split connector
-            int pos = connector.pos(trigger) - 1;
-
-            TriggerConnector newConnector = new TriggerConnector(newConnectorType);
-
-            // move trigger from pos and pos+1 into new connector
-            for (int i = 0; i < 2; ++i) {
-                Trigger t = connector.get(pos);
-                newConnector.add(t);
-                connector.remove(t);
-            }
-
-            connector.add(pos, newConnector);
-        } else {
-            connector.changeConnectorType(newConnectorType);
-        }
-
-        connector.simplify().rebuildView(fragmentManager);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java
deleted file mode 100644
index c0e23d979c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import androidx.annotation.StringRes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-public class Comparator extends Element {
-    public enum Compare {
-        IS_LESSER,
-        IS_EQUAL_OR_LESSER,
-        IS_EQUAL,
-        IS_EQUAL_OR_GREATER,
-        IS_GREATER,
-        IS_NOT_AVAILABLE;
-
-        public @StringRes
-        int getStringRes() {
-            switch (this) {
-                case IS_LESSER:
-                    return R.string.islesser;
-                case IS_EQUAL_OR_LESSER:
-                    return R.string.isequalorlesser;
-                case IS_EQUAL:
-                    return R.string.isequal;
-                case IS_EQUAL_OR_GREATER:
-                    return R.string.isequalorgreater;
-                case IS_GREATER:
-                    return R.string.isgreater;
-                case IS_NOT_AVAILABLE:
-                    return R.string.isnotavailable;
-                default:
-                    return R.string.unknown;
-            }
-        }
-
-        public <T extends Comparable> boolean check(T obj1, T obj2) {
-            if (obj1 == null || obj2 == null)
-                return this.equals(IS_NOT_AVAILABLE);
-
-            int comparison = obj1.compareTo(obj2);
-            switch (this) {
-                case IS_LESSER:
-                    return comparison < 0;
-                case IS_EQUAL_OR_LESSER:
-                    return comparison <= 0;
-                case IS_EQUAL:
-                    return comparison == 0;
-                case IS_EQUAL_OR_GREATER:
-                    return comparison >= 0;
-                case IS_GREATER:
-                    return comparison > 0;
-                default:
-                    return false;
-            }
-        }
-
-        public static List<String> labels() {
-            List<String> list = new ArrayList<>();
-            for (Compare c : Compare.values()) {
-                list.add(MainApp.gs(c.getStringRes()));
-            }
-            return list;
-        }
-    }
-
-    private Compare compare = Compare.IS_EQUAL;
-
-    public Comparator() {
-        super();
-    }
-
-    public Comparator(Comparator another) {
-        super();
-        compare = another.getValue();
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        Spinner spinner = new Spinner(root.getContext());
-        ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(root.getContext(), R.layout.spinner_centered, Compare.labels());
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(spinnerArrayAdapter);
-        LinearLayout.LayoutParams spinnerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        spinnerParams.setMargins(0, MainApp.dpToPx(4), 0, MainApp.dpToPx(4));
-        spinner.setLayoutParams(spinnerParams);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                compare = Compare.values()[position];
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        spinner.setSelection(compare.ordinal());
-        root.addView(spinner);
-
-    }
-
-    public Compare getValue() {
-        return compare;
-    }
-
-    public Comparator setValue(Compare compare) {
-        this.compare = compare;
-        return this;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
new file mode 100644
index 0000000000..86fd8dc73e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class Comparator(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class Compare {
+        IS_LESSER,
+        IS_EQUAL_OR_LESSER,
+        IS_EQUAL,
+        IS_EQUAL_OR_GREATER,
+        IS_GREATER,
+        IS_NOT_AVAILABLE;
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                IS_LESSER           -> R.string.islesser
+                IS_EQUAL_OR_LESSER  -> R.string.isequalorlesser
+                IS_EQUAL            -> R.string.isequal
+                IS_EQUAL_OR_GREATER -> R.string.isequalorgreater
+                IS_GREATER          -> R.string.isgreater
+                IS_NOT_AVAILABLE    -> R.string.isnotavailable
+            }
+
+        fun <T : Comparable<T>> check(obj1: T, obj2: T): Boolean {
+            val comparison = obj1.compareTo(obj2)
+            return when (this) {
+                IS_LESSER           -> comparison < 0
+                IS_EQUAL_OR_LESSER  -> comparison <= 0
+                IS_EQUAL            -> comparison == 0
+                IS_EQUAL_OR_GREATER -> comparison >= 0
+                IS_GREATER          -> comparison > 0
+                else                -> false
+            }
+        }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (c in values()) {
+                    list.add(resourceHelper.gs(c.stringRes))
+                }
+                return list
+            }
+        }
+    }
+
+    constructor(injector: HasAndroidInjector, value: Compare) : this(injector) {
+        this.value = value
+    }
+
+    var value = Compare.IS_EQUAL
+
+    override fun addToLayout(root: LinearLayout) {
+        val spinner = Spinner(root.context)
+        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = spinnerArrayAdapter
+        val spinnerParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                value = Compare.values()[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(value.ordinal)
+        root.addView(spinner)
+    }
+
+    fun setValue(compare: Compare): Comparator {
+        value = compare
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
new file mode 100644
index 0000000000..3e293fef5a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class ComparatorConnect(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class Compare {
+        ON_CONNECT, ON_DISCONNECT;
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                ON_CONNECT    -> R.string.onconnect
+                ON_DISCONNECT -> R.string.ondisconnect
+            }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (c in values()) list.add(resourceHelper.gs(c.stringRes))
+                return list
+            }
+        }
+    }
+
+    constructor(injector: HasAndroidInjector, value: Compare) : this(injector) {
+        this.value = value
+    }
+
+    var value = Compare.ON_CONNECT
+
+    override fun addToLayout(root: LinearLayout) {
+        val spinner = Spinner(root.context)
+        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = spinnerArrayAdapter
+        val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                value = Compare.values()[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(value.ordinal)
+        root.addView(spinner)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java
deleted file mode 100644
index 4bc0082afa..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import androidx.annotation.StringRes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-public class ComparatorExists extends Element {
-    public enum Compare {
-        EXISTS,
-        NOT_EXISTS;
-
-        public @StringRes
-        int getStringRes() {
-            switch (this) {
-                case EXISTS:
-                    return R.string.exists;
-                case NOT_EXISTS:
-                    return R.string.notexists;
-                default:
-                    return R.string.unknown;
-            }
-        }
-
-        public static List<String> labels() {
-            List<String> list = new ArrayList<>();
-            for (Compare c : Compare.values()) {
-                list.add(MainApp.gs(c.getStringRes()));
-            }
-            return list;
-        }
-    }
-
-    private Compare compare = Compare.EXISTS;
-
-    public ComparatorExists() {
-        super();
-    }
-
-    public ComparatorExists(ComparatorExists another) {
-        super();
-        compare = another.getValue();
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        Spinner spinner = new Spinner(root.getContext());
-        ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(root.getContext(), R.layout.spinner_centered, Compare.labels());
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(spinnerArrayAdapter);
-        LinearLayout.LayoutParams spinnerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        spinnerParams.setMargins(0, MainApp.dpToPx(4), 0, MainApp.dpToPx(4));
-        spinner.setLayoutParams(spinnerParams);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                compare = Compare.values()[position];
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        spinner.setSelection(compare.ordinal());
-        root.addView(spinner);
-
-    }
-
-    public Compare getValue() {
-        return compare;
-    }
-
-    public ComparatorExists setValue(Compare compare) {
-        this.compare = compare;
-        return this;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
new file mode 100644
index 0000000000..2e7e437bd9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class ComparatorExists(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class Compare {
+        EXISTS, NOT_EXISTS;
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                EXISTS     -> R.string.exists
+                NOT_EXISTS -> R.string.notexists
+            }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (c in values()) list.add(resourceHelper.gs(c.stringRes))
+                return list
+            }
+        }
+    }
+
+    constructor(injector: HasAndroidInjector, value: Compare) : this(injector) {
+        this.value = value
+    }
+
+    var value = Compare.EXISTS
+
+    override fun addToLayout(root: LinearLayout) {
+        val spinner = Spinner(root.context)
+        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = spinnerArrayAdapter
+        val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                value = Compare.values()[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(value.ordinal)
+        root.addView(spinner)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.java
deleted file mode 100644
index a853fde1e7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.widget.LinearLayout;
-
-public abstract class Element {
-    public abstract void addToLayout(LinearLayout root);
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.kt
new file mode 100644
index 0000000000..e8c3e6580c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Element.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+
+abstract class Element(val injector: HasAndroidInjector) {
+
+    abstract fun addToLayout(root: LinearLayout)
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.java
deleted file mode 100644
index ff4781552a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputBg extends Element {
-    static final int MMOL_MIN = 3;
-    static final int MMOL_MAX = 20;
-    static final int MGDL_MIN = 54;
-    static final int MGDL_MAX = 360;
-
-    private String units = Constants.MGDL;
-    private double value;
-    double minValue;
-    private double maxValue;
-    private double step;
-    private DecimalFormat decimalFormat;
-
-    public InputBg() {
-        super();
-        setUnits(ProfileFunctions.getSystemUnits());
-        if (getUnits().equals(Constants.MMOL))
-            value = MMOL_MIN;
-        else
-            value = MGDL_MIN;
-    }
-
-    public InputBg(InputBg another) {
-        super();
-        value = another.getValue();
-        setUnits(another.getUnits());
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, null);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        root.addView(numberPicker);
-    }
-
-    public String getUnits() {
-        return units;
-    }
-
-    public InputBg setUnits(String units) {
-        // set default initial value
-        if (units.equals(Constants.MMOL)) {
-            // mmol
-            minValue = MMOL_MIN;
-            maxValue = MMOL_MAX;
-            step = 0.1;
-            decimalFormat = new DecimalFormat("0.0");
-        } else {
-            // mg/dL
-            minValue = MGDL_MIN;
-            maxValue = MGDL_MAX;
-            step = 1;
-            decimalFormat = new DecimalFormat("0");
-        }
-
-        this.units = units;
-        return this;
-    }
-
-    public InputBg setValue(double value) {
-        this.value = value;
-        return this;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
new file mode 100644
index 0000000000..c7ee4a5d6a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+import javax.inject.Inject
+
+class InputBg(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    var units = Constants.MGDL
+    var value = 0.0
+    var minValue = 0.0
+    private var maxValue = 0.0
+    private var step = 0.0
+    private var decimalFormat: DecimalFormat? = null
+
+    constructor(injector: HasAndroidInjector, value: Double, units: String) : this(injector) {
+        setUnits(units)
+        this.value = value
+    }
+
+    init {
+        setUnits(profileFunction.getUnits())
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val numberPicker = NumberPicker(root.context, null)
+        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, false, root.findViewById(R.id.ok))
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
+        root.addView(numberPicker)
+    }
+
+    fun setValue(value: Double) : InputBg {
+        this.value = value
+        return this
+    }
+
+    fun setUnits(units: String): InputBg {
+        if (units == Constants.MMOL) {
+            minValue = MMOL_MIN
+            maxValue = MMOL_MAX
+            step = 0.1
+            decimalFormat = DecimalFormat("0.0")
+        } else {
+            minValue = MGDL_MIN
+            maxValue = MGDL_MAX
+            step = 1.0
+            decimalFormat = DecimalFormat("0")
+        }
+        this.units = units
+        return this
+    }
+
+    companion object {
+        const val MMOL_MIN = 3.0
+        const val MMOL_MAX = 20.0
+        const val MGDL_MIN = 54.0
+        const val MGDL_MAX = 360.0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.java
deleted file mode 100644
index 6b0406abe0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-public class InputButton extends Element {
-
-    String text;
-    Runnable runnable;
-
-    public InputButton(String text, Runnable runnable) {
-        this.text = text;
-        this.runnable = runnable;
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        Button button = new Button(root.getContext());
-
-        button.setText(text);
-        button.setOnClickListener(view -> {
-            if (runnable != null)
-                runnable.run();
-        });
-
-        root.addView(button);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt
new file mode 100644
index 0000000000..dd4bd9b5d6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.Button
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+
+class InputButton(injector: HasAndroidInjector) : Element(injector) {
+    var text: String? = null
+    var runnable: Runnable? = null
+
+    constructor(injector: HasAndroidInjector, text: String, runnable: Runnable) : this(injector) {
+        this.text = text
+        this.runnable = runnable
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val button = Button(root.context)
+        button.text = text
+        button.setOnClickListener { runnable?.run() }
+        root.addView(button)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
new file mode 100644
index 0000000000..f61d1d5719
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.app.DatePickerDialog
+import android.app.TimePickerDialog
+import android.content.Context
+import android.graphics.Typeface
+import android.text.format.DateFormat
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class InputDateTime(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var context: Context
+
+    var value: Long = DateUtil.now()
+
+    constructor(injector: HasAndroidInjector, value: Long) : this(injector) {
+        this.value = value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val label = TextView(root.context)
+        val dateButton = TextView(root.context)
+        val timeButton = TextView(root.context)
+        dateButton.text = DateUtil.dateString(value)
+        timeButton.text = DateUtil.timeString(value)
+
+        // create an OnDateSetListener
+        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = value
+            cal.set(Calendar.YEAR, year)
+            cal.set(Calendar.MONTH, monthOfYear)
+            cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+            value = cal.timeInMillis
+            dateButton.text = DateUtil.dateString(value)
+        }
+
+        dateButton.setOnClickListener {
+            root.context?.let {
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = value
+                DatePickerDialog(it, dateSetListener,
+                    cal.get(Calendar.YEAR),
+                    cal.get(Calendar.MONTH),
+                    cal.get(Calendar.DAY_OF_MONTH)
+                ).show()
+            }
+        }
+
+        // create an OnTimeSetListener
+        val timeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = value
+            cal.set(Calendar.HOUR_OF_DAY, hour)
+            cal.set(Calendar.MINUTE, minute)
+            cal.set(Calendar.SECOND, 0) // randomize seconds to prevent creating record of the same time, if user choose time manually
+            value = cal.timeInMillis
+            timeButton.text = DateUtil.timeString(value)
+        }
+
+        timeButton.setOnClickListener {
+            root.context?.let {
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = value
+                TimePickerDialog(it, timeSetListener,
+                    cal.get(Calendar.HOUR_OF_DAY),
+                    cal.get(Calendar.MINUTE),
+                    DateFormat.is24HourFormat(context)
+                ).show()
+            }
+        }
+
+        val px = resourceHelper.dpToPx(10)
+        label.text = resourceHelper.gs(R.string.atspecifiedtime, "")
+        label.setTypeface(label.typeface, Typeface.BOLD)
+        label.setPadding(px, px, px, px)
+        dateButton.setPadding(px, px, px, px)
+        timeButton.setPadding(px, px, px, px)
+        val l = LinearLayout(root.context)
+        l.orientation = LinearLayout.HORIZONTAL
+        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        l.addView(label)
+        l.addView(dateButton)
+        l.addView(timeButton)
+        root.addView(l)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java
deleted file mode 100644
index 4dc9358f6c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import androidx.annotation.StringRes;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputDelta extends Element {
-    private Comparator.Compare compare = Comparator.Compare.IS_EQUAL;
-
-    public enum DeltaType {
-        DELTA,
-        SHORT_AVERAGE,
-        LONG_AVERAGE;
-
-        public @StringRes
-        int getStringRes() {
-            switch (this) {
-                case DELTA:
-                    return R.string.delta;
-                case SHORT_AVERAGE:
-                    return R.string.short_avgdelta;
-                case LONG_AVERAGE:
-                    return R.string.long_avgdelta;
-                default:
-                    return R.string.unknown;
-            }
-        }
-
-        public static List<String> labels() {
-            List<String> list = new ArrayList<>();
-            for (DeltaType d : DeltaType.values()) {
-                list.add(MainApp.gs(d.getStringRes()));
-            }
-            return list;
-        }
-    }
-
-    private double value;
-    double minValue;
-    double maxValue;
-    private double step;
-    private DecimalFormat decimalFormat;
-    private DeltaType deltaType;
-
-    NumberPicker numberPicker;
-
-    public InputDelta() {
-        super();
-    }
-
-    public InputDelta(double value, double minValue, double maxValue, double step, DecimalFormat decimalFormat, DeltaType deltaType) {
-        super();
-        this.value = value;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-        this.step = step;
-        this.decimalFormat = decimalFormat;
-        this.deltaType = deltaType;
-    }
-
-    public InputDelta(InputDelta another) {
-        super();
-        value = another.getValue();
-        minValue = another.minValue;
-        maxValue = another.maxValue;
-        step = another.step;
-        decimalFormat = another.decimalFormat;
-        deltaType = another.deltaType;
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        Spinner spinner = new Spinner(root.getContext());
-        ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(root.getContext(), R.layout.spinner_centered, DeltaType.labels());
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(spinnerArrayAdapter);
-        LinearLayout.LayoutParams spinnerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        spinnerParams.setMargins(0, MainApp.dpToPx(4), 0, MainApp.dpToPx(4));
-        spinner.setLayoutParams(spinnerParams);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                deltaType = DeltaType.values()[position];
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        spinner.setSelection(this.deltaType.ordinal());
-//        root.addView(spinner);
-        numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, null);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        LinearLayout l = new LinearLayout(root.getContext());
-        l.setOrientation(LinearLayout.VERTICAL);
-        l.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        l.addView(spinner);
-        l.addView(numberPicker);
-        root.addView(l);
-    }
-
-    public InputDelta setValue(double value, DeltaType type) {
-        this.value = value;
-        this.deltaType = type;
-        if (numberPicker != null)
-            numberPicker.setValue(value);
-        return this;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public DeltaType getDeltaType() {
-        return deltaType;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
new file mode 100644
index 0000000000..a667b51099
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.text.DecimalFormat
+import java.util.*
+import javax.inject.Inject
+
+class InputDelta(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class DeltaType {
+        DELTA, SHORT_AVERAGE, LONG_AVERAGE;
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                DELTA         -> R.string.delta
+                SHORT_AVERAGE -> R.string.short_avgdelta
+                LONG_AVERAGE  -> R.string.long_avgdelta
+            }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (d in values()) {
+                    list.add(resourceHelper.gs(d.stringRes))
+                }
+                return list
+            }
+        }
+    }
+
+    var value = 0.0
+    private var minValue = 0.0
+    private var maxValue = 0.0
+    private var step = 0.0
+    private var decimalFormat: DecimalFormat? = null
+    var deltaType: DeltaType = DeltaType.DELTA
+
+    constructor(injector: HasAndroidInjector, value: Double, minValue: Double, maxValue: Double, step: Double, decimalFormat: DecimalFormat, deltaType: DeltaType) : this(injector) {
+        this.value = value
+        this.minValue = minValue
+        this.maxValue = maxValue
+        this.step = step
+        this.decimalFormat = decimalFormat
+        this.deltaType = deltaType
+    }
+
+    constructor(injector: HasAndroidInjector, inputDelta: InputDelta) : this(injector) {
+        value = inputDelta.value
+        minValue = inputDelta.minValue
+        maxValue = inputDelta.maxValue
+        step = inputDelta.step
+        decimalFormat = inputDelta.decimalFormat
+        deltaType = inputDelta.deltaType
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val spinner = Spinner(root.context)
+        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, DeltaType.labels(resourceHelper))
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = spinnerArrayAdapter
+        val spinnerParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                deltaType = DeltaType.values()[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(deltaType.ordinal)
+        val numberPicker = NumberPicker(root.context, null)
+        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, null)
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
+        val l = LinearLayout(root.context)
+        l.orientation = LinearLayout.VERTICAL
+        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        l.addView(spinner)
+        l.addView(numberPicker)
+        root.addView(l)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.java
deleted file mode 100644
index 518b00f5b4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputDouble extends Element {
-
-    final TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-    };
-
-    private double value;
-    private double minValue;
-    private double maxValue;
-    private double step;
-    private DecimalFormat decimalFormat;
-
-    NumberPicker numberPicker;
-
-    public InputDouble() {
-        super();
-    }
-
-    public InputDouble(double value, double minValue, double maxValue, double step, DecimalFormat decimalFormat) {
-        super();
-        this.value = value;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-        this.step = step;
-        this.decimalFormat = decimalFormat;
-    }
-
-    public InputDouble(InputDouble another) {
-        super();
-        value = another.getValue();
-        minValue = another.minValue;
-        maxValue = another.maxValue;
-        step = another.step;
-        decimalFormat = another.decimalFormat;
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, textWatcher);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        root.addView(numberPicker);
-    }
-
-    public InputDouble setValue(double value) {
-        this.value = value;
-        if (numberPicker != null)
-            numberPicker.setValue(value);
-        return this;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
new file mode 100644
index 0000000000..7824b51960
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+
+class InputDouble(injector: HasAndroidInjector) : Element(injector) {
+    var value = 0.0
+    private var minValue = 0.0
+    private var maxValue = 0.0
+    private var step = 0.0
+    private var decimalFormat: DecimalFormat? = null
+    private var numberPicker: NumberPicker? = null
+
+    constructor(injector: HasAndroidInjector, value: Double, minValue: Double, maxValue: Double, step: Double, decimalFormat: DecimalFormat) : this(injector) {
+        this.value = value
+        this.minValue = minValue
+        this.maxValue = maxValue
+        this.step = step
+        this.decimalFormat = decimalFormat
+    }
+
+    constructor(injector: HasAndroidInjector, inputDouble: InputDouble) : this(injector) {
+        this.value = inputDouble.value
+        this.minValue = inputDouble.minValue
+        this.maxValue = inputDouble.maxValue
+        this.step = inputDouble.step
+        this.decimalFormat = inputDouble.decimalFormat
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        numberPicker = NumberPicker(root.context, null)
+        numberPicker?.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
+        numberPicker?.setOnValueChangedListener { value: Double -> this.value = value }
+        root.addView(numberPicker)
+    }
+
+    fun setValue(value: Double): InputDouble {
+        this.value = value
+        numberPicker?.value = value
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
new file mode 100644
index 0000000000..7f894293f9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class InputDropdownMenu(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    private var itemList: ArrayList<CharSequence> = ArrayList()
+    var value: String = ""
+
+    constructor(injector: HasAndroidInjector, name: String) : this(injector) {
+        value = name
+    }
+
+    constructor(injector: HasAndroidInjector, another: InputDropdownMenu) : this(injector) {
+        value = another.value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val spinner = Spinner(root.context)
+        spinner.adapter = ArrayAdapter(root.context,
+            R.layout.spinner_centered, itemList).also {
+            it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        }
+        spinner.layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        ).also { it.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4)) }
+
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                setValue(itemList[position].toString())
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(0)
+        root.addView(LinearLayout(root.context).also {
+            it.orientation = LinearLayout.VERTICAL
+            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            it.addView(spinner)
+        })
+    }
+
+    fun setValue(name: String): InputDropdownMenu {
+        value = name
+        return this
+    }
+
+    fun setList(values: ArrayList<CharSequence>) {
+        itemList = ArrayList(values)
+    }
+
+    // For testing only
+    fun add(item: String) {
+        itemList.add(item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.java
deleted file mode 100644
index aa19896471..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputDuration extends Element {
-    public enum TimeUnit {
-        MINUTES,
-        HOURS
-    }
-
-    private TimeUnit unit;
-    private int value;
-
-    public InputDuration(int value, TimeUnit unit) {
-        this.unit = unit;
-        this.value = value;
-    }
-
-    public InputDuration(InputDuration another) {
-        unit =  another.unit;
-        value = another.value;
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
-        if (unit.equals(TimeUnit.MINUTES)) {
-            // Minutes
-            numberPicker.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false, null);
-        } else {
-            // Hours
-            numberPicker.setParams(0d, 0d, 24d, 1d, new DecimalFormat("0"), false, null);
-        }
-        numberPicker.setValue((double) value);
-        numberPicker.setOnValueChangedListener(value -> this.value = (int) value);
-        root.addView(numberPicker);
-    }
-
-    TimeUnit getUnit() {
-        return unit;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public void setMinutes(int value) {
-        if (unit.equals(TimeUnit.MINUTES)) {
-            this.value = value;
-        } else {
-            this.value = value / 60;
-        }
-    }
-
-    public int getMinutes() {
-        if (unit.equals(TimeUnit.MINUTES)) {
-            return value;
-        } else {
-            return value * 60;
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
new file mode 100644
index 0000000000..cab16d2502
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+
+class InputDuration(injector: HasAndroidInjector) : Element(injector) {
+    enum class TimeUnit {
+        MINUTES, HOURS
+    }
+
+    constructor(injector: HasAndroidInjector, value: Int, unit: TimeUnit) : this(injector) {
+        this.unit = unit
+        this.value = value
+    }
+
+    var unit: TimeUnit = TimeUnit.MINUTES
+    var value: Int = 0
+
+    override fun addToLayout(root: LinearLayout) {
+        val numberPicker = NumberPicker(root.context, null)
+        if (unit == TimeUnit.MINUTES)
+            numberPicker.setParams(0.0, 0.0, 24 * 60.0, 10.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
+        else
+            numberPicker.setParams(0.0, 0.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
+        numberPicker.value = value.toDouble()
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value.toInt() }
+        root.addView(numberPicker)
+    }
+
+    fun duplicate(): InputDuration {
+        val i = InputDuration(injector)
+        i.unit = unit
+        i.value = value
+        return i
+    }
+
+    fun getMinutes(): Int = if (unit == TimeUnit.MINUTES) value else value * 60
+
+    fun setMinutes(value: Int): InputDuration {
+        if (unit == TimeUnit.MINUTES)
+            this.value = value
+        else
+            this.value = value / 60
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.java
deleted file mode 100644
index 8cf89d3b42..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputInsulin extends Element {
-
-    final TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-            value = Math.max(value, -20d);
-            value = Math.min(value, 20d);
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-    };
-
-    private double value;
-
-    public InputInsulin() {
-        super();
-    }
-
-    public InputInsulin(InputInsulin another) {
-        super();
-        value = another.getValue();
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(0d, -20d, 20d, 0.1, new DecimalFormat("0.0"), true, null, textWatcher);
-        numberPicker.setValue(value);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        root.addView(numberPicker);
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public InputInsulin setValue(double value) {
-        this.value = value;
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
new file mode 100644
index 0000000000..f822a971f4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+
+class InputInsulin(injector: HasAndroidInjector) : Element(injector) {
+    var value = 0.0
+
+    constructor(injector: HasAndroidInjector, another: InputInsulin) : this(injector) {
+        value = another.value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val numberPicker = NumberPicker(root.context, null)
+        numberPicker.setParams(0.0, -20.0, 20.0, 0.1, DecimalFormat("0.0"), true, root.findViewById(R.id.ok))
+        numberPicker.value = value
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
+        root.addView(numberPicker)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.java
deleted file mode 100644
index 3fea8b7c33..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import androidx.annotation.StringRes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-public class InputLocationMode extends Element {
-
-    public enum Mode {
-        INSIDE,
-        OUTSIDE,
-        GOING_IN,
-        GOING_OUT;
-
-        public @StringRes
-        int getStringRes() {
-            switch (this) {
-                case INSIDE:
-                    return R.string.location_inside;
-                case OUTSIDE:
-                    return R.string.location_outside;
-                case GOING_IN:
-                    return R.string.location_going_in;
-                case GOING_OUT:
-                    return R.string.location_going_out;
-                default:
-                    return R.string.unknown;
-            }
-        }
-
-        public static List<String> labels() {
-            List<String> list = new ArrayList<>();
-            for (Mode c : Mode.values()) {
-                list.add(MainApp.gs(c.getStringRes()));
-            }
-            return list;
-        }
-
-        public Mode fromString(String wanted){
-            for (Mode c : Mode.values()) {
-                if(c.toString() == wanted)
-                    return c;
-            }
-            return null;
-        }
-    }
-
-    private Mode mode;
-
-    public InputLocationMode() {
-        super();
-        mode = Mode.INSIDE;
-    }
-
-    public InputLocationMode(InputLocationMode another) {
-        super();
-        this.mode = another.mode;
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(root.getContext(),
-                R.layout.spinner_centered, Mode.labels());
-        Spinner spinner = new Spinner(root.getContext());
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-        LinearLayout.LayoutParams spinnerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        spinnerParams.setMargins(0, MainApp.dpToPx(4), 0, MainApp.dpToPx(4));
-        spinner.setLayoutParams(spinnerParams);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                setValue(Mode.values()[position]);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        spinner.setSelection(this.getValue().ordinal());
-        root.addView(spinner);
-
-    }
-
-    public Mode getValue() {
-        return mode;
-    }
-
-    public InputLocationMode setValue(Mode mode) {
-        this.mode = mode;
-        return this;
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
new file mode 100644
index 0000000000..9e3f7280cc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
@@ -0,0 +1,74 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class InputLocationMode(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class Mode {
+        INSIDE, OUTSIDE, GOING_IN, GOING_OUT;
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                INSIDE    -> R.string.location_inside
+                OUTSIDE   -> R.string.location_outside
+                GOING_IN  -> R.string.location_going_in
+                GOING_OUT -> R.string.location_going_out
+            }
+
+        fun fromString(wanted: String): Mode {
+            for (c in values()) {
+                if (c.toString() === wanted) return c
+            }
+            throw IllegalStateException("Invalid parameter")
+        }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (c in values()) {
+                    list.add(resourceHelper.gs(c.stringRes))
+                }
+                return list
+            }
+        }
+    }
+
+    var value: Mode = Mode.INSIDE
+
+    constructor(injector: HasAndroidInjector, value: InputLocationMode.Mode) : this(injector) {
+        this.value = value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Mode.labels(resourceHelper))
+        val spinner = Spinner(root.context)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = adapter
+        val spinnerParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                value = Mode.values()[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(value.ordinal)
+        root.addView(spinner)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.java
deleted file mode 100644
index bade9082a3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputPercent extends Element {
-
-    final TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-            value = Math.max(value, 70d);
-            value = Math.min(value, 130d);
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-    };
-
-    private double value;
-
-    public InputPercent() {
-        super();
-        value = 100d;
-    }
-
-    public InputPercent(InputPercent another) {
-        super();
-        value = another.getValue();
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(100d, 70d, 130d, 5d, new DecimalFormat("0"), true, null, textWatcher);
-        numberPicker.setValue(value);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        root.addView(numberPicker);
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public InputPercent setValue(double value) {
-        this.value = value;
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
new file mode 100644
index 0000000000..7b1f739ed7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+
+class InputPercent(injector: HasAndroidInjector) : Element(injector) {
+    var value: Double = 100.0
+
+    constructor(injector: HasAndroidInjector, value: Double) : this(injector) {
+        this.value = value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val numberPicker = NumberPicker(root.context, null)
+        numberPicker.setParams(100.0, MIN, MAX, 5.0, DecimalFormat("0"), true, root.findViewById(R.id.ok))
+        numberPicker.value = value
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
+        root.addView(numberPicker)
+    }
+
+    companion object {
+        const val MIN = 70.0
+        const val MAX = 130.0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.java
deleted file mode 100644
index 5431f47ede..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-
-public class InputProfileName extends Element {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    ProfileStore profileStore;
-
-    String profileName;
-
-    public InputProfileName(String name) {
-        super();
-        this.profileName = name;
-    }
-
-    public InputProfileName(InputProfileName another) {
-        super();
-        profileName = another.getValue();
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        ArrayList<CharSequence> profileList = new ArrayList<>();
-        profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
-        if (profileStore == null) {
-            log.error("ProfileStore is empty");
-        } else {
-            profileList = profileStore.getProfileList();
-        }
-        ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(root.getContext(),
-                R.layout.spinner_centered, profileList);
-        Spinner spinner = new Spinner(root.getContext());
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-        LinearLayout.LayoutParams spinnerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        spinnerParams.setMargins(0, MainApp.dpToPx(4), 0, MainApp.dpToPx(4));
-        spinner.setLayoutParams(spinnerParams);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                    setValue(listNames().get(position).toString());
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-        spinner.setSelection(0);
-        LinearLayout l = new LinearLayout(root.getContext());
-        l.setOrientation(LinearLayout.VERTICAL);
-        l.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        l.addView(spinner);
-        root.addView(l);
-    }
-
-    public InputProfileName setValue(String name) {
-        this.profileName = name;
-        return this;
-    }
-
-    public String getValue() {
-        return profileName;
-    }
-
-    public ArrayList<CharSequence> listNames(){
-        ArrayList<CharSequence> profileList = new ArrayList<>();
-        // profile
-        profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
-        if (profileStore == null) {
-            log.error("ProfileStore is empty");
-        } else {
-            profileList = profileStore.getProfileList();
-        }
-        return profileList;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
new file mode 100644
index 0000000000..57e010eabe
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class InputProfileName(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    var value: String = ""
+
+    constructor(injector: HasAndroidInjector, name: String) : this(injector) {
+        value = name
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val profileStore = activePlugin.activeProfileInterface.profile ?: return
+        val profileList = profileStore.getProfileList()
+        val adapter = ArrayAdapter(root.context, R.layout.spinner_centered, profileList)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        val spinner = Spinner(root.context)
+        spinner.adapter = adapter
+        val spinnerParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
+        spinner.layoutParams = spinnerParams
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                value = profileList[position].toString()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        spinner.setSelection(0)
+        val l = LinearLayout(root.context)
+        l.orientation = LinearLayout.VERTICAL
+        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        l.addView(spinner)
+        root.addView(l)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.java
deleted file mode 100644
index 75ddb4b61a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-public class InputString extends Element {
-
-    TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            value = s.toString();
-        }
-    };
-
-    private String value = "";
-
-    public InputString() {
-        super();
-    }
-
-    public InputString(InputString another) {
-        super();
-        value = another.getValue();
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        EditText editText = new EditText(root.getContext());
-        editText.setText(value);
-        editText.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        editText.addTextChangedListener(textWatcher);
-        root.addView(editText);
-    }
-
-    public InputString setValue(String value) {
-        this.value = value;
-        return this;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt
new file mode 100644
index 0000000000..0af3e88318
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+
+class InputString(injector: HasAndroidInjector) : Element(injector) {
+    var textWatcher: TextWatcher = object : TextWatcher {
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+        override fun afterTextChanged(s: Editable) {
+            value = s.toString()
+        }
+    }
+    var value = ""
+
+    constructor(injector: HasAndroidInjector, value: String) : this(injector) {
+        this.value = value
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val editText = EditText(root.context)
+        editText.setText(value)
+        editText.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        editText.addTextChangedListener(textWatcher)
+        root.addView(editText)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.java
deleted file mode 100644
index e0fabcf0dd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.widget.LinearLayout;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.utils.NumberPicker;
-
-public class InputTempTarget extends Element {
-
-    private String units = Constants.MGDL;
-    private double value;
-    double minValue;
-    private double maxValue;
-    private double step;
-    private DecimalFormat decimalFormat;
-
-    private final TextWatcher textWatcher = new TextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-            value = Math.max(minValue, value);
-            value = Math.min(maxValue, value);
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-        }
-    };
-
-    public InputTempTarget() {
-        super();
-        setUnits(ProfileFunctions.getSystemUnits());
-        if (getUnits().equals(Constants.MMOL))
-            value = 6;
-        else
-            value = 110;
-    }
-
-    public InputTempTarget(InputTempTarget another) {
-        super();
-        value = another.getValue();
-        setUnits(another.getUnits());
-    }
-
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        NumberPicker numberPicker = new NumberPicker(root.getContext(), null);
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, textWatcher);
-        numberPicker.setOnValueChangedListener(value -> this.value = value);
-        root.addView(numberPicker);
-    }
-
-    public String getUnits() {
-        return units;
-    }
-
-    public InputTempTarget setUnits(String units) {
-        // set default initial value
-        if (units.equals(Constants.MMOL)) {
-            // mmol
-            minValue = Constants.MIN_TT_MMOL;
-            maxValue = Constants.MAX_TT_MMOL;
-            step = 0.1;
-            decimalFormat = new DecimalFormat("0.0");
-        } else {
-            // mg/dL
-            minValue = Constants.MIN_TT_MGDL;
-            maxValue = Constants.MAX_TT_MGDL;
-            step = 1;
-            decimalFormat = new DecimalFormat("0");
-        }
-
-        this.units = units;
-        return this;
-    }
-
-    public InputTempTarget setValue(double value) {
-        this.value = value;
-        return this;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
new file mode 100644
index 0000000000..fa1939e951
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.NumberPicker
+import java.text.DecimalFormat
+
+class InputTempTarget(injector: HasAndroidInjector) : Element(injector) {
+    var units = Constants.MGDL
+    var value = 0.0
+
+    init {
+        value = if (units == Constants.MMOL) 6.0 else 110.0
+    }
+
+    constructor(injector: HasAndroidInjector, inputTempTarget: InputTempTarget) : this(injector) {
+        value = inputTempTarget.value
+        units = inputTempTarget.units
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        var minValue: Double
+        var maxValue: Double
+        var step: Double
+        var decimalFormat: DecimalFormat?
+        if (units == Constants.MMOL) { // mmol
+            minValue = Constants.MIN_TT_MMOL
+            maxValue = Constants.MAX_TT_MMOL
+            step = 0.1
+            decimalFormat = DecimalFormat("0.0")
+        } else { // mg/dL
+            minValue = Constants.MIN_TT_MGDL
+            maxValue = Constants.MAX_TT_MGDL
+            step = 1.0
+            decimalFormat = DecimalFormat("0")
+        }
+        val numberPicker = NumberPicker(root.context, null)
+        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
+        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
+        root.addView(numberPicker)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
new file mode 100644
index 0000000000..01a7854e35
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.app.TimePickerDialog
+import android.content.Context
+import android.graphics.Typeface
+import android.text.format.DateFormat
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class InputTime(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var context: Context
+
+    var value: Int = getMinSinceMidnight(DateUtil.now())
+
+    override fun addToLayout(root: LinearLayout) {
+        val label = TextView(root.context)
+        val startButton = TextView(root.context)
+        startButton.text = DateUtil.timeString(toMills(value))
+
+        val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+            value = 60 * hour + minute
+            startButton.text = DateUtil.timeString(toMills(value))
+        }
+
+        startButton.setOnClickListener {
+            root.context?.let {
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = toMills(value)
+                TimePickerDialog(it, startTimeSetListener,
+                    cal.get(Calendar.HOUR_OF_DAY),
+                    cal.get(Calendar.MINUTE),
+                    DateFormat.is24HourFormat(context)
+                ).show()
+            }
+        }
+
+        val px = resourceHelper.dpToPx(10)
+        label.text = resourceHelper.gs(R.string.atspecifiedtime, "")
+        label.setTypeface(label.typeface, Typeface.BOLD)
+        startButton.setPadding(px, px, px, px)
+        val l = LinearLayout(root.context)
+        l.orientation = LinearLayout.HORIZONTAL
+        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        l.addView(label)
+        l.addView(startButton)
+        root.addView(l)
+    }
+
+    private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
+
+    private fun getMinSinceMidnight(time: Long): Int = Profile.secondsFromMidnight(time) / 60
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
new file mode 100644
index 0000000000..4775990d16
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
@@ -0,0 +1,86 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.app.TimePickerDialog
+import android.content.Context
+import android.graphics.Typeface
+import android.text.format.DateFormat
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class InputTimeRange(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var context: Context
+
+    var start: Int = getMinSinceMidnight(DateUtil.now())
+    var end: Int = getMinSinceMidnight(DateUtil.now())
+
+    override fun addToLayout(root: LinearLayout) {
+        val label = TextView(root.context)
+        val startButton = TextView(root.context)
+        val endButton = TextView(root.context)
+        startButton.text = DateUtil.timeString(toMills(start))
+        @Suppress("SetTextI18n")
+        endButton.text = resourceHelper.gs(R.string.and) + "      " + DateUtil.timeString(toMills(end))
+
+        val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+            start = 60 * hour + minute
+            startButton.text = DateUtil.timeString(toMills(start))
+        }
+
+        startButton.setOnClickListener {
+            root.context?.let {
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = toMills(start)
+                TimePickerDialog(it, startTimeSetListener,
+                    cal.get(Calendar.HOUR_OF_DAY),
+                    cal.get(Calendar.MINUTE),
+                    DateFormat.is24HourFormat(context)
+                ).show()
+            }
+        }
+
+        val endTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+            end = 60 * hour + minute
+            endButton.text = DateUtil.timeString(toMills(end))
+        }
+
+        endButton.setOnClickListener {
+            root.context?.let {
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = toMills(end)
+                TimePickerDialog(it, endTimeSetListener,
+                    cal.get(Calendar.HOUR_OF_DAY),
+                    cal.get(Calendar.MINUTE),
+                    DateFormat.is24HourFormat(context)
+                ).show()
+            }
+        }
+
+        val px = resourceHelper.dpToPx(10)
+        label.text = resourceHelper.gs(R.string.between)
+        label.setTypeface(label.typeface, Typeface.BOLD)
+        startButton.setPadding(px, px, px, px)
+        endButton.setPadding(px, px, px, px)
+        val l = LinearLayout(root.context)
+        l.orientation = LinearLayout.HORIZONTAL
+        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        l.addView(label)
+        l.addView(startButton)
+        l.addView(endButton)
+        root.addView(l)
+    }
+
+    private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
+
+    private fun getMinSinceMidnight(time: Long): Int = Profile.secondsFromMidnight(time) / 60
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt
new file mode 100644
index 0000000000..1f2531d95b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt
@@ -0,0 +1,90 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.annotation.StringRes
+import com.dpro.widgets.WeekdaysPicker
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import java.util.*
+
+class InputWeekDay(injector: HasAndroidInjector) : Element(injector) {
+
+    enum class DayOfWeek {
+        MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY;
+
+        fun toCalendarInt(): Int {
+            return calendarInts[ordinal]
+        }
+
+        @get:StringRes val shortName: Int
+            get() = shortNames[ordinal]
+
+        companion object {
+            private val calendarInts = intArrayOf(
+                Calendar.MONDAY,
+                Calendar.TUESDAY,
+                Calendar.WEDNESDAY,
+                Calendar.THURSDAY,
+                Calendar.FRIDAY,
+                Calendar.SATURDAY,
+                Calendar.SUNDAY
+            )
+            private val shortNames = intArrayOf(
+                R.string.weekday_monday_short,
+                R.string.weekday_tuesday_short,
+                R.string.weekday_wednesday_short,
+                R.string.weekday_thursday_short,
+                R.string.weekday_friday_short,
+                R.string.weekday_saturday_short,
+                R.string.weekday_sunday_short
+            )
+
+            fun fromCalendarInt(day: Int): DayOfWeek {
+                for (i in calendarInts.indices) {
+                    if (calendarInts[i] == day) return values()[i]
+                }
+                throw IllegalStateException("Invalid day")
+            }
+        }
+    }
+
+    val weekdays = BooleanArray(DayOfWeek.values().size)
+
+    init {
+        for (day in DayOfWeek.values()) set(day, false)
+    }
+
+    fun setAll(value:Boolean) {
+        for (day in DayOfWeek.values()) set(day, value)
+    }
+
+    operator fun set(day: DayOfWeek, value: Boolean): InputWeekDay {
+        weekdays[day.ordinal] = value
+        return this
+    }
+
+    fun isSet(day: DayOfWeek): Boolean = weekdays[day.ordinal]
+
+    fun getSelectedDays(): List<Int> {
+        val selectedDays: MutableList<Int> = ArrayList()
+        for (i in weekdays.indices) {
+            val day = DayOfWeek.values()[i]
+            val selected = weekdays[i]
+            if (selected) selectedDays.add(day.toCalendarInt())
+        }
+        return selectedDays
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val weekdaysPicker = WeekdaysPicker(root.context)
+        weekdaysPicker.setEditable(true)
+        weekdaysPicker.selectedDays = getSelectedDays()
+        weekdaysPicker.setOnWeekdaysChangeListener { _: View?, i: Int, list: List<Int?> -> set(DayOfWeek.fromCalendarInt(i), list.contains(i)) }
+        weekdaysPicker.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        weekdaysPicker.sundayFirstDay = Calendar.getInstance().firstDayOfWeek == Calendar.SUNDAY
+        weekdaysPicker.redrawDays()
+        root.addView(weekdaysPicker)
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.java
deleted file mode 100644
index 145d8c2d2c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.graphics.Typeface;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-
-public class LabelWithElement extends Element {
-    final Element element;
-    final String textPre;
-    final String textPost;
-
-    public LabelWithElement(String textPre, String textPost, Element element) {
-        this.element = element;
-        this.textPre = textPre;
-        this.textPost = textPost;
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        // container layout
-        LinearLayout layout = new LinearLayout(root.getContext());
-        layout.setOrientation(LinearLayout.HORIZONTAL);
-        layout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        // text view pre element
-        int px = MainApp.dpToPx(10);
-        TextView textViewPre = new TextView(root.getContext());
-        textViewPre.setText(textPre);
-        textViewPre.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-        //textViewPre.setWidth(MainApp.dpToPx(120));
-        textViewPre.setPadding(px, px, px, px);
-        textViewPre.setTypeface(textViewPre.getTypeface(), Typeface.BOLD);
-        layout.addView(textViewPre);
-
-        TextView spacer = new TextView(root.getContext());
-        spacer.setLayoutParams(new TableLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
-        layout.addView(spacer);
-
-        // add element to layout
-        element.addToLayout(layout);
-
-        // text view post element
-        if (textPost != null) {
-            px = MainApp.dpToPx(5);
-            TextView textViewPost = new TextView(root.getContext());
-            textViewPost.setText(textPost);
-            textViewPost.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT));
-            //textViewPost.setWidth(MainApp.dpToPx(45));
-            textViewPost.setPadding(px, px, px, px);
-            textViewPost.setTypeface(textViewPost.getTypeface(), Typeface.BOLD);
-            layout.addView(textViewPost);
-        }
-
-        // add layout to root layout
-        root.addView(layout);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt
new file mode 100644
index 0000000000..cb2a3ffc0a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.graphics.Typeface
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TableLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class LabelWithElement(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var element: Element? = null
+    var textPre: String = ""
+    var textPost: String = ""
+
+    constructor(injector: HasAndroidInjector, textPre: String, textPost: String, element: Element) : this(injector) {
+        this.textPre = textPre
+        this.textPost = textPost
+        this.element = element
+    }
+
+    override fun addToLayout(root: LinearLayout) { // container layout
+        val layout = LinearLayout(root.context)
+        layout.orientation = LinearLayout.HORIZONTAL
+        layout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT)
+        // text view pre element
+        var px = resourceHelper.dpToPx(10)
+        val textViewPre = TextView(root.context)
+        textViewPre.text = textPre
+        textViewPre.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT)
+        //textViewPre.setWidth(MainApp.dpToPx(120));
+        textViewPre.setPadding(px, px, px, px)
+        textViewPre.setTypeface(textViewPre.typeface, Typeface.BOLD)
+        layout.addView(textViewPre)
+        val spacer = TextView(root.context)
+        spacer.layoutParams = TableLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)
+        layout.addView(spacer)
+        // add element to layout
+        element?.addToLayout(layout)
+        // text view post element
+        px = resourceHelper.dpToPx(5)
+        val textViewPost = TextView(root.context)
+        textViewPost.text = textPost
+        textViewPost.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT)
+        //textViewPost.setWidth(MainApp.dpToPx(45));
+        textViewPost.setPadding(px, px, px, px)
+        textViewPost.setTypeface(textViewPost.typeface, Typeface.BOLD)
+        layout.addView(textViewPost)
+        // add layout to root layout
+        root.addView(layout)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.java
deleted file mode 100644
index 5853e50be0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.widget.LinearLayout;
-
-import java.util.ArrayList;
-
-public class LayoutBuilder {
-    ArrayList<Element> mElements = new ArrayList<>();
-
-    public LayoutBuilder add(Element element) {
-        mElements.add(element);
-        return this;
-    }
-
-    public LayoutBuilder add(Element element, boolean condition) {
-        if (condition) mElements.add(element);
-        return this;
-    }
-
-    public void build(LinearLayout layout) {
-        for (Element e : mElements) {
-            e.addToLayout(layout);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt
new file mode 100644
index 0000000000..a23467ea3d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.widget.LinearLayout
+import java.util.*
+
+class LayoutBuilder {
+    var mElements = ArrayList<Element>()
+    fun add(element: Element): LayoutBuilder {
+        mElements.add(element)
+        return this
+    }
+
+    fun add(element: Element, condition: Boolean): LayoutBuilder {
+        if (condition) mElements.add(element)
+        return this
+    }
+
+    fun build(layout: LinearLayout) {
+        for (e in mElements) {
+            e.addToLayout(layout)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.java
deleted file mode 100644
index 3c8cf38074..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.graphics.Typeface;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-public class StaticLabel extends Element {
-    String label;
-
-    public StaticLabel(String label) {
-        super();
-        this.label = label;
-    }
-
-    public StaticLabel(int resourceId) {
-        super();
-        this.label = MainApp.gs(resourceId);
-    }
-
-    @Override
-    public void addToLayout(LinearLayout root) {
-        // text view pre element
-        int px = MainApp.dpToPx(10);
-        TextView textView = new TextView(root.getContext());
-        textView.setText(label);
-//       textViewPre.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,                ViewGroup.LayoutParams.WRAP_CONTENT));
-        textView.setPadding(px, px, px, px);
-        textView.setTypeface(textView.getTypeface(), Typeface.BOLD);
-        textView.setBackgroundColor(MainApp.gc(R.color.mdtp_line_dark));
-        // add element to layout
-        root.addView(textView);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
new file mode 100644
index 0000000000..2f7b4bcc25
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.graphics.Typeface
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class StaticLabel(injector: HasAndroidInjector) : Element(injector) {
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var label = ""
+    var trigger: Trigger? = null
+
+    constructor(injector: HasAndroidInjector, label: String, trigger: Trigger) : this(injector) {
+        this.label = label
+        this.trigger = trigger
+    }
+
+    constructor(injector: HasAndroidInjector, resourceId: Int, trigger: Trigger) : this(injector) {
+        label = resourceHelper.gs(resourceId)
+        this.trigger = trigger
+    }
+
+    override fun addToLayout(root: LinearLayout) {
+        val headerLayout = LinearLayout(root.context)
+        headerLayout.orientation = LinearLayout.HORIZONTAL
+        headerLayout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        headerLayout.setBackgroundColor(resourceHelper.gc(android.R.color.black))
+        // text
+        val px = resourceHelper.dpToPx(10)
+        val textView = TextView(root.context)
+        textView.text = label
+        val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        params.weight = 1.0f
+        textView.layoutParams = params
+        textView.setPadding(px, px, px, px)
+        textView.setTypeface(textView.typeface, Typeface.BOLD)
+        headerLayout.addView(textView)
+        trigger?.let {
+            headerLayout.addView(it.createDeleteButton(root.context, it))
+            headerLayout.addView(it.createCloneButton(root.context, it))
+        }
+        root.addView(headerLayout)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateAction.kt
index 6fa6709cf1..3def1053ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateAction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateAction.kt
@@ -3,5 +3,4 @@ package info.nightscout.androidaps.plugins.general.automation.events
 import info.nightscout.androidaps.events.Event
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 
-class EventAutomationUpdateAction(val action: Action, val position : Int) : Event() {
-}
\ No newline at end of file
+class EventAutomationUpdateAction(val action: Action, val position: Int) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerChanged.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerChanged.kt
new file mode 100644
index 0000000000..7e0eaaad45
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerChanged.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.automation.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventTriggerChanged : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerClone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerClone.kt
new file mode 100644
index 0000000000..3bb996a642
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerClone.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.general.automation.events
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+
+class EventTriggerClone(val trigger: Trigger) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerRemove.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerRemove.kt
new file mode 100644
index 0000000000..6c502a10f5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventTriggerRemove.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.general.automation.events
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+
+class EventTriggerRemove(val trigger: Trigger) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
deleted file mode 100644
index c1bca15028..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-
-public abstract class Trigger {
-    private static final Logger log = LoggerFactory.getLogger(Trigger.class);
-
-    TriggerConnector connector = null;
-    long lastRun;
-
-    Trigger() {
-    }
-
-    public TriggerConnector getConnector() {
-        return connector;
-    }
-
-    public abstract boolean shouldRun();
-
-
-    public abstract String toJSON();
-
-    /*package*/
-    abstract Trigger fromJSON(String data);
-
-    public abstract int friendlyName();
-
-    public abstract String friendlyDescription();
-
-    public abstract Optional<Integer> icon();
-
-    public void executed(long time) {
-        lastRun = time;
-    }
-
-    public long getLastRun() {
-        return lastRun;
-    }
-
-    public abstract Trigger duplicate();
-
-    public static Trigger instantiate(String json) {
-        try {
-            return instantiate(new JSONObject(json));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    @Nullable
-    public static Trigger instantiate(JSONObject object) {
-        try {
-            String type = object.getString("type");
-            JSONObject data = object.getJSONObject("data");
-            Class clazz = Class.forName(type);
-            return ((Trigger) clazz.newInstance()).fromJSON(data.toString());
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        TextView title = new TextView(root.getContext());
-        title.setText(friendlyName());
-        root.addView(title);
-    }
-
-    @Nullable
-    AppCompatActivity scanForActivity(Context cont) {
-        if (cont == null)
-            return null;
-        else if (cont instanceof AppCompatActivity)
-            return (AppCompatActivity) cont;
-        else if (cont instanceof ContextWrapper)
-            return scanForActivity(((ContextWrapper) cont).getBaseContext());
-
-        return null;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
new file mode 100644
index 0000000000..3890deb60d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
@@ -0,0 +1,151 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.view.Gravity
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTriggerDialog
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
+import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerRemove
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.services.LastLocationDataContainer
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import kotlin.reflect.full.primaryConstructor
+
+abstract class Trigger(val injector: HasAndroidInjector) {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var sp: SP
+    @Inject lateinit var locationDataContainer: LastLocationDataContainer
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    abstract fun shouldRun(): Boolean
+    abstract fun toJSON(): String
+    abstract fun fromJSON(data: String): Trigger
+
+    abstract fun friendlyName(): Int
+    abstract fun friendlyDescription(): String
+    abstract fun icon(): Optional<Int?>
+    abstract fun duplicate(): Trigger
+
+    companion object {
+        @JvmStatic
+        fun scanForActivity(cont: Context?): AppCompatActivity? {
+            when (cont) {
+                null                 -> return null
+                is AppCompatActivity -> return cont
+                is ContextWrapper    -> return scanForActivity(cont.baseContext)
+                else                 -> return null
+            }
+        }
+    }
+
+    open fun generateDialog(root: LinearLayout) {
+        val title = TextView(root.context)
+        title.setText(friendlyName())
+        root.addView(title)
+    }
+
+    fun instantiate(obj: JSONObject): Trigger? {
+        try {
+            val type = obj.getString("type")
+            val data = obj.getJSONObject("data")
+            val clazz = Class.forName(type).kotlin
+            return (clazz.primaryConstructor?.call(injector) as Trigger).fromJSON(data?.toString()
+                ?: "")
+        } catch (e: ClassNotFoundException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: InstantiationException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: IllegalAccessException) {
+            aapsLogger.error("Unhandled exception", e)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return null
+    }
+
+    fun createAddButton(context: Context, trigger: TriggerConnector): ImageButton {
+        // Button [+]
+        val buttonAdd = ImageButton(context)
+        val params = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        params.gravity = Gravity.CENTER
+        buttonAdd.layoutParams = params
+        buttonAdd.setImageResource(R.drawable.add)
+        buttonAdd.contentDescription = resourceHelper.gs(R.string.add_short)
+        buttonAdd.setOnClickListener {
+            scanForActivity(context)?.supportFragmentManager?.let {
+                val dialog = ChooseTriggerDialog()
+                dialog.show(it, "ChooseTriggerDialog")
+                dialog.setOnClickListener(object : ChooseTriggerDialog.OnClickListener {
+                    override fun onClick(newTriggerObject: Trigger) {
+                        trigger.list.add(newTriggerObject)
+                        rxBus.send(EventTriggerChanged())
+                    }
+                })
+            }
+        }
+        return buttonAdd
+    }
+
+    fun createDeleteButton(context: Context, trigger: Trigger): ImageButton {
+        // Button [-]
+        val buttonRemove = ImageButton(context)
+        val params = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        params.gravity = Gravity.CENTER
+        buttonRemove.layoutParams = params
+        buttonRemove.setImageResource(R.drawable.remove)
+        buttonRemove.contentDescription = resourceHelper.gs(R.string.delete_short)
+        buttonRemove.setOnClickListener {
+            rxBus.send(EventTriggerRemove(trigger))
+        }
+        return buttonRemove
+    }
+
+    fun createCloneButton(context: Context, trigger: Trigger): ImageButton {
+        // Button [*]
+        val buttonClone = ImageButton(context)
+        val params = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        params.gravity = Gravity.CENTER
+        buttonClone.layoutParams = params
+        buttonClone.setImageResource(R.drawable.clone)
+        buttonClone.contentDescription = resourceHelper.gs(R.string.copy_short)
+        buttonClone.setOnClickListener {
+            rxBus.send(EventTriggerClone(trigger))
+        }
+        return buttonClone
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java
deleted file mode 100644
index ce0a8f63bb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDouble;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerAutosensValue extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    private final int minValue = (int) (SP.getDouble("openapsama_autosens_min", 0.7d) * 100);
-    private final int maxValue = (int) (SP.getDouble("openapsama_autosens_max", 1.2d) * 100);
-    private final double step = 1;
-    private DecimalFormat decimalFormat = new DecimalFormat("1");
-    private InputDouble value = new InputDouble(100, (double) minValue, (double) maxValue, step, decimalFormat);
-    private Comparator comparator = new Comparator();
-
-    public TriggerAutosensValue() {
-        super();
-    }
-
-    private TriggerAutosensValue(TriggerAutosensValue triggerAutosensValue) {
-        super();
-        value = new InputDouble(triggerAutosensValue.value);
-        lastRun = triggerAutosensValue.lastRun;
-        comparator = new Comparator(triggerAutosensValue.comparator);
-    }
-
-    public double getValue() {
-        return value.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Automation trigger");
-        if (autosensData == null)
-            if (comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE)
-                return true;
-            else
-                return false;
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        boolean doRun = comparator.getValue().check((autosensData.autosensResult.ratio), getValue() / 100d);
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerAutosensValue.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("value", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            value.setValue(JsonHelper.safeGetDouble(d, "value"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.autosenslabel;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.autosenscompared, MainApp.gs(comparator.getValue().getStringRes()), getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.as);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerAutosensValue(this);
-    }
-
-    TriggerAutosensValue setValue(int requestedValue) {
-        this.value.setValue(requestedValue);
-        return this;
-    }
-
-    TriggerAutosensValue lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerAutosensValue comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.autosenslabel))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.autosenslabel) + ": ", "", value))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
new file mode 100644
index 0000000000..d6f8a607ff
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
@@ -0,0 +1,82 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDouble
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import org.json.JSONObject
+import java.text.DecimalFormat
+
+class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
+    private val minValue = (sp.getDouble(R.string.key_openapsama_autosens_min, 0.7) * 100).toInt()
+    private val maxValue = (sp.getDouble(R.string.key_openapsama_autosens_max, 1.2) * 100).toInt()
+    private val step = 1.0
+    private val decimalFormat = DecimalFormat("1")
+    var autosens: InputDouble = InputDouble(injector, 100.0, minValue.toDouble(), maxValue.toDouble(), step, decimalFormat)
+
+    var comparator: Comparator = Comparator(injector)
+
+    private constructor(injector: HasAndroidInjector, triggerAutosensValue: TriggerAutosensValue) : this(injector) {
+        autosens = InputDouble(injector, triggerAutosensValue.autosens)
+        comparator = Comparator(injector, triggerAutosensValue.comparator.value)
+    }
+
+    override fun shouldRun(): Boolean {
+        val autosensData = iobCobCalculatorPlugin.getLastAutosensData("Automation trigger")
+            ?: return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                true
+            } else {
+                aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+                false
+            }
+        if (comparator.value.check(autosensData.autosensResult.ratio, autosens.value / 100.0)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("value", autosens.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        autosens.setValue(safeGetDouble(d, "value"))
+        comparator.setValue(Comparator.Compare.valueOf(safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.autosenslabel
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.autosenscompared, resourceHelper.gs(comparator.value.stringRes), autosens.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.`as`)
+
+    override fun duplicate(): Trigger = TriggerAutosensValue(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.autosenslabel, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.autosenslabel) + ": ", "", autosens))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
new file mode 100644
index 0000000000..6dfb45be67
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.bluetooth.BluetoothAdapter
+import android.content.Context
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventBTChange
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorConnect
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDropdownMenu
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+
+class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
+    @Inject lateinit var context: Context
+    @Inject lateinit var automationPlugin: AutomationPlugin
+
+    var btDevice = InputDropdownMenu(injector, "")
+    var comparator: ComparatorConnect = ComparatorConnect(injector)
+
+    private constructor(injector: HasAndroidInjector, triggerBTDevice: TriggerBTDevice) : this(injector) {
+        comparator = ComparatorConnect(injector, triggerBTDevice.comparator.value)
+        btDevice.value = triggerBTDevice.btDevice.value
+    }
+
+    @Synchronized
+    override fun shouldRun(): Boolean {
+        if (eventExists()) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        return false
+    }
+
+    @Synchronized override fun toJSON(): String {
+        val data = JSONObject()
+            .put("comparator", comparator.value.toString())
+            .put("name", btDevice.value)
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        btDevice.value = JsonHelper.safeGetString(d, "name")!!
+        comparator.value = ComparatorConnect.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!)
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.btdevice
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.btdevicecompared, btDevice.value, resourceHelper.gs(comparator.value.stringRes))
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bluetooth_white_48dp)
+
+    override fun duplicate(): Trigger = TriggerBTDevice(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        val pairedDevices = devicesPaired()
+        btDevice.setList(pairedDevices)
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.btdevice, this))
+            .add(btDevice)
+            .add(comparator)
+            .build(root)
+    }
+
+    // Get the list of paired BT devices to use in dropdown menu
+    private fun devicesPaired(): ArrayList<CharSequence> {
+        val s = ArrayList<CharSequence>()
+        BluetoothAdapter.getDefaultAdapter()?.bondedDevices?.forEach { s.add(it.name) }
+        return s
+    }
+
+    private fun eventExists(): Boolean {
+        automationPlugin.btConnects.forEach {
+            if (btDevice.value == it.deviceName) {
+                if (comparator.value == ComparatorConnect.Compare.ON_CONNECT && it.state == EventBTChange.Change.CONNECT) return true
+                if (comparator.value == ComparatorConnect.Compare.ON_DISCONNECT && it.state == EventBTChange.Change.DISCONNECT) return true
+            }
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
deleted file mode 100644
index 3733859b96..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputBg;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerBg extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private InputBg bg = new InputBg();
-    private Comparator comparator = new Comparator();
-
-    public TriggerBg() {
-        super();
-    }
-
-    private TriggerBg(TriggerBg triggerBg) {
-        super();
-        bg = new InputBg(triggerBg.bg);
-        comparator = new Comparator(triggerBg.comparator);
-        lastRun = triggerBg.lastRun;
-    }
-
-    public double getValue() {
-        return bg.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    public String getUnits() {
-        return bg.getUnits();
-    }
-
-    public long getLastRun() {
-        return lastRun;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs()) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("NOT ready for execution: " + friendlyDescription());
-            return false;
-        }
-
-        if (glucoseStatus == null && comparator.getValue().equals(Comparator.Compare.IS_NOT_AVAILABLE)) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        if (glucoseStatus == null) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("NOT ready for execution: " + friendlyDescription());
-            return false;
-        }
-
-        boolean doRun = comparator.getValue().check(glucoseStatus.glucose, Profile.toMgdl(bg.getValue(), bg.getUnits()));
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-
-        if (L.isEnabled(L.AUTOMATION))
-            log.debug("NOT ready for execution: " + friendlyDescription());
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerBg.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("bg", bg.getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            data.put("units", bg.getUnits());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            bg.setUnits(JsonHelper.safeGetString(d, "units"));
-            bg.setValue(JsonHelper.safeGetDouble(d, "bg"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.glucose;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        if (comparator.getValue().equals(Comparator.Compare.IS_NOT_AVAILABLE))
-            return MainApp.gs(R.string.glucoseisnotavailable);
-        else {
-            return MainApp.gs(bg.getUnits().equals(Constants.MGDL) ? R.string.glucosecomparedmgdl : R.string.glucosecomparedmmol, MainApp.gs(comparator.getValue().getStringRes()), bg.getValue(), bg.getUnits());
-        }
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_cp_bgcheck);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerBg(this);
-    }
-
-    TriggerBg setValue(double value) {
-        bg.setValue(value);
-        return this;
-    }
-
-    TriggerBg lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerBg comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    TriggerBg setUnits(String units) {
-        bg.setUnits(units);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.glucose))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.glucose_u, bg.getUnits()), "", bg))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
new file mode 100644
index 0000000000..75b30edb3b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
@@ -0,0 +1,105 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
+    var bg = InputBg(injector)
+    var comparator = Comparator(injector)
+
+    constructor(injector: HasAndroidInjector, value: Double, units: String, compare: Comparator.Compare) : this(injector) {
+        bg = InputBg(injector, value, units)
+        comparator = Comparator(injector, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerBg: TriggerBg) : this(injector) {
+        bg = InputBg(injector, triggerBg.bg.value, triggerBg.bg.units)
+        comparator = Comparator(injector, triggerBg.comparator.value)
+    }
+
+    fun setUnits(units: String): TriggerBg {
+        bg.units = units
+        return this
+    }
+
+    fun setValue(value: Double): TriggerBg {
+        bg.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerBg {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+        if (glucoseStatus == null && comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        if (glucoseStatus == null) {
+            aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+            return false
+        }
+        if (comparator.value.check(glucoseStatus.glucose, Profile.toMgdl(bg.value, bg.units))) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("bg", bg.value)
+            .put("comparator", comparator.value.toString())
+            .put("units", bg.units)
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        bg.setUnits(JsonHelper.safeGetString(d, "units")!!)
+        bg.value = JsonHelper.safeGetDouble(d, "bg")
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.glucose
+
+    override fun friendlyDescription(): String {
+        return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE)
+            resourceHelper.gs(R.string.glucoseisnotavailable)
+        else
+            resourceHelper.gs(if (bg.units == Constants.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, resourceHelper.gs(comparator.value.stringRes), bg.value, bg.units)
+    }
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_cp_bgcheck)
+
+    override fun duplicate(): Trigger = TriggerBg(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.glucose, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.glucose_u, bg.units), "", bg))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java
deleted file mode 100644
index 0a038112e2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerBolusAgo extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    private InputDuration minutesAgo = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
-    private Comparator comparator = new Comparator();
-
-    public TriggerBolusAgo() {
-        super();
-    }
-
-    private TriggerBolusAgo(TriggerBolusAgo triggerBolusAgo) {
-        super();
-        minutesAgo = new InputDuration(triggerBolusAgo.minutesAgo);
-        lastRun = triggerBolusAgo.lastRun;
-        comparator = new Comparator(triggerBolusAgo.comparator);
-    }
-
-    public double getValue() {
-        return minutesAgo.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        long lastBolusTime = TreatmentsPlugin.getPlugin().getLastBolusTime(false);
-
-        if (lastBolusTime == 0)
-            if (comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE)
-                return true;
-            else
-                return false;
-
-        double minutesAgo = (double) (DateUtil.now() - lastBolusTime) / (60 * 1000);
-        if (L.isEnabled(L.AUTOMATION))
-            log.debug("LastBolus min ago: " + minutesAgo);
-
-        boolean doRun = comparator.getValue().check((minutesAgo), getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerBolusAgo.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("minutesAgo", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            minutesAgo.setMinutes(JsonHelper.safeGetInt(d, "minutesAgo"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.lastboluslabel;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.lastboluscompared, MainApp.gs(comparator.getValue().getStringRes()), (int) getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_bolus);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerBolusAgo(this);
-    }
-
-    TriggerBolusAgo setValue(int requestedValue) {
-        this.minutesAgo.setMinutes(requestedValue);
-        return this;
-    }
-
-    TriggerBolusAgo lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerBolusAgo comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.lastboluslabel))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.lastboluslabel) + ": ", "", minutesAgo))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
new file mode 100644
index 0000000000..db57bb159a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import org.json.JSONObject
+
+class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
+    var minutesAgo: InputDuration = InputDuration(injector, 0, InputDuration.TimeUnit.MINUTES)
+    var comparator: Comparator = Comparator(injector)
+
+    private constructor(injector: HasAndroidInjector, triggerBolusAgo: TriggerBolusAgo) : this(injector) {
+        minutesAgo = InputDuration(injector, triggerBolusAgo.minutesAgo.value, InputDuration.TimeUnit.MINUTES)
+        comparator = Comparator(injector, triggerBolusAgo.comparator.value)
+    }
+
+    fun setValue(value: Int): TriggerBolusAgo {
+        minutesAgo.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerBolusAgo {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val lastBolusTime = treatmentsPlugin.getLastBolusTime(false)
+        if (lastBolusTime == 0L)
+            return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                true
+            } else {
+                aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+                false
+            }
+        val last = (DateUtil.now() - lastBolusTime).toDouble() / (60 * 1000)
+        aapsLogger.debug(LTag.AUTOMATION, "LastBolus min ago: $minutesAgo")
+        val doRun = comparator.value.check(last.toInt(), minutesAgo.getMinutes())
+        if (doRun) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("minutesAgo", minutesAgo.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        minutesAgo.setMinutes(JsonHelper.safeGetInt(d, "minutesAgo"))
+        comparator.setValue(Comparator.Compare.valueOf(safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.lastboluslabel
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.lastboluscompared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.getMinutes())
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_bolus)
+
+    override fun duplicate(): Trigger = TriggerBolusAgo(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.lastboluslabel, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.lastboluslabel) + ": ", "", minutesAgo))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java
deleted file mode 100644
index bf17dc72d1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDouble;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerCOB extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    private final int minValue = 0;
-    private final int maxValue = SP.getInt(R.string.key_treatmentssafety_maxcarbs, 48);
-    private InputDouble value = new InputDouble(0, (double) minValue, (double) maxValue, 1, new DecimalFormat("1"));
-    private Comparator comparator = new Comparator();
-
-    public TriggerCOB() {
-        super();
-    }
-
-    private TriggerCOB(TriggerCOB triggerCOB) {
-        super();
-        value = new InputDouble(triggerCOB.value);
-        lastRun = triggerCOB.lastRun;
-        comparator = new Comparator(triggerCOB.comparator);
-    }
-
-    public double getValue() {
-        return value.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "AutomationTriggerCOB");
-        if (cobInfo == null)
-            if (comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE)
-                return true;
-            else
-                return false;
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        boolean doRun = comparator.getValue().check((cobInfo.displayCob), getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerCOB.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("carbs", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            value.setValue(JsonHelper.safeGetDouble(d, "carbs"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.triggercoblabel;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.cobcompared, MainApp.gs(comparator.getValue().getStringRes()), getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_cp_bolus_carbs);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerCOB(this);
-    }
-
-    TriggerCOB setValue(int requestedValue) {
-        this.value.setValue(requestedValue);
-        return this;
-    }
-
-    TriggerCOB lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerCOB comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.triggercoblabel))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.triggercoblabel) + ": ", "", value))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
new file mode 100644
index 0000000000..82aa8cd6f1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDouble
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble
+import org.json.JSONObject
+import java.text.DecimalFormat
+
+class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
+    private val minValue = 0
+    private val maxValue = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48)
+    var cob: InputDouble = InputDouble(injector, 0.0, minValue.toDouble(), maxValue.toDouble(), 1.0, DecimalFormat("1"))
+    var comparator: Comparator = Comparator(injector)
+
+    private constructor(injector: HasAndroidInjector, triggerCOB: TriggerCOB) : this(injector) {
+        cob = InputDouble(injector, triggerCOB.cob)
+        comparator = Comparator(injector, triggerCOB.comparator.value)
+    }
+
+    fun setValue(value:Double) : TriggerCOB {
+        cob.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare) : TriggerCOB {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "AutomationTriggerCOB")
+        if (cobInfo.displayCob == null) {
+            return if (comparator.value === Comparator.Compare.IS_NOT_AVAILABLE) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                true
+            } else {
+                aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+                false
+            }
+        }
+        if (comparator.value.check(cobInfo.displayCob, cob.value)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    @Synchronized override fun toJSON(): String {
+        val data = JSONObject()
+            .put("carbs", cob.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        cob.setValue(safeGetDouble(d, "carbs"))
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.triggercoblabel
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.cobcompared, resourceHelper.gs(comparator.value.stringRes), cob.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_cp_bolus_carbs)
+
+    override fun duplicate(): Trigger = TriggerCOB(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.triggercoblabel, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.triggercoblabel) + ": ", "", cob))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
deleted file mode 100644
index 549925528a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.annotation.StringRes;
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.dialogs.TriggerListAdapter;
-import info.nightscout.androidaps.utils.JsonHelper;
-
-public class TriggerConnector extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    public enum Type {
-        AND,
-        OR,
-        XOR;
-
-        public boolean apply(boolean a, boolean b) {
-            switch (this) {
-                case AND:
-                    return a && b;
-                case OR:
-                    return a || b;
-                case XOR:
-                    return a ^ b;
-            }
-            return false;
-        }
-
-        public @StringRes
-        int getStringRes() {
-            switch (this) {
-                case OR:
-                    return R.string.or;
-                case XOR:
-                    return R.string.xor;
-
-                default:
-                case AND:
-                    return R.string.and;
-            }
-        }
-
-        public static List<String> labels() {
-            List<String> list = new ArrayList<>();
-            for (Type t : values()) {
-                list.add(MainApp.gs(t.getStringRes()));
-            }
-            return list;
-        }
-    }
-
-    public static void fillIconSet(TriggerConnector connector, HashSet<Integer> set) {
-        for (Trigger t : connector.list) {
-            if (t instanceof TriggerConnector) {
-                fillIconSet((TriggerConnector) t, set);
-            } else {
-                Optional<Integer> icon = t.icon();
-                if (icon.isPresent()) {
-                    set.add(icon.get());
-                }
-            }
-        }
-    }
-
-    protected List<Trigger> list = new ArrayList<>();
-    private Type connectorType;
-
-    public TriggerConnector() {
-        connectorType = Type.AND;
-    }
-
-    public TriggerConnector(Type connectorType) {
-        this.connectorType = connectorType;
-    }
-
-    public void changeConnectorType(Type type) {
-        this.connectorType = type;
-    }
-
-    public Type getConnectorType() {
-        return connectorType;
-    }
-
-    public synchronized void add(Trigger t) {
-        list.add(t);
-        t.connector = this;
-    }
-
-    public synchronized void add(int pos, Trigger t) {
-        list.add(pos, t);
-        t.connector = this;
-    }
-
-    public synchronized boolean remove(Trigger t) {
-        return list.remove(t);
-    }
-
-    public int size() {
-        return list.size();
-    }
-
-    public Trigger get(int i) {
-        return list.get(i);
-    }
-
-    public int pos(Trigger trigger) {
-        for (int i = 0; i < list.size(); ++i) {
-            if (list.get(i) == trigger) return i;
-        }
-        return -1;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        boolean result = true;
-
-        // check first trigger
-        if (list.size() > 0)
-            result = list.get(0).shouldRun();
-
-        // check all others
-        for (int i = 1; i < list.size(); ++i) {
-            result = connectorType.apply(result, list.get(i).shouldRun());
-        }
-        if (result)
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription().replace("\n", " "));
-
-        return result;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerConnector.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("connectorType", connectorType.toString());
-            JSONArray array = new JSONArray();
-            for (Trigger t : list) {
-                array.put(t.toJSON());
-            }
-            data.put("triggerList", array);
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            connectorType = Type.valueOf(JsonHelper.safeGetString(d, "connectorType"));
-            JSONArray array = d.getJSONArray("triggerList");
-            list.clear();
-            for (int i = 0; i < array.length(); i++) {
-                Trigger newItem = instantiate(new JSONObject(array.getString(i)));
-                add(newItem);
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return connectorType.getStringRes();
-    }
-
-    @Override
-    public String friendlyDescription() {
-        int counter = 0;
-        StringBuilder result = new StringBuilder();
-        for (Trigger t : list) {
-            if (counter++ > 0) result.append("\n").append(MainApp.gs(friendlyName())).append("\n");
-            result.append(t.friendlyDescription());
-        }
-        return result.toString();
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.absent();
-    }
-
-    @Override
-    public void executed(long time) {
-        for (int i = 0; i < list.size(); ++i) {
-            list.get(i).executed(time);
-        }
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return null;
-    }
-
-    private TriggerListAdapter adapter;
-
-    public void rebuildView(FragmentManager fragmentManager) {
-        if (adapter != null)
-            adapter.rebuild(fragmentManager);
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        final int padding = MainApp.dpToPx(5);
-
-        root.setPadding(padding, padding, padding, padding);
-        root.setBackgroundResource(R.drawable.border_automation_unit);
-
-        LinearLayout triggerListLayout = new LinearLayout(root.getContext());
-        triggerListLayout.setOrientation(LinearLayout.VERTICAL);
-        triggerListLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        root.addView(triggerListLayout);
-
-        adapter = new TriggerListAdapter(fragmentManager, root.getContext(), triggerListLayout, this);
-    }
-
-    public TriggerConnector simplify() {
-        // simplify children
-        for (int i = 0; i < size(); ++i) {
-            if (get(i) instanceof TriggerConnector) {
-                TriggerConnector t = (TriggerConnector) get(i);
-                t.simplify();
-            }
-        }
-
-        // drop connector with only 1 element
-        if (size() == 1 && get(0) instanceof TriggerConnector) {
-            TriggerConnector c = (TriggerConnector) get(0);
-            remove(c);
-            changeConnectorType(c.getConnectorType());
-            for (Trigger t : c.list) {
-                add(t);
-            }
-            c.list.clear();
-            return simplify();
-        }
-
-        // merge connectors
-        if (connector != null && (connector.getConnectorType().equals(connectorType) || size() == 1)) {
-            final int pos = connector.pos(this);
-            connector.remove(this);
-            // move triggers of child connector into parent connector
-            for (int i = size() - 1; i >= 0; --i) {
-                connector.add(pos, get(i));
-            }
-            list.clear();
-            return connector.simplify();
-        }
-
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
new file mode 100644
index 0000000000..8574bfa05c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
@@ -0,0 +1,171 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.StringRes
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.*
+
+class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
+    var list: MutableList<Trigger> = ArrayList()
+    private var connectorType: Type = Type.AND
+
+    enum class Type {
+        AND, OR, XOR;
+
+        fun apply(a: Boolean, b: Boolean): Boolean =
+            when (this) {
+                AND -> a && b
+                OR  -> a || b
+                XOR -> a xor b
+            }
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                OR  -> R.string.or
+                XOR -> R.string.xor
+                AND -> R.string.and
+            }
+
+        companion object {
+            fun labels(resourceHelper: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (t in values()) {
+                    list.add(resourceHelper.gs(t.stringRes))
+                }
+                return list
+            }
+        }
+    }
+
+    constructor(injector: HasAndroidInjector, connectorType: Type) : this(injector) {
+        this.connectorType = connectorType
+    }
+
+    fun setType(type: Type) {
+        connectorType = type
+    }
+
+    fun size(): Int = list.size
+
+    fun pos(trigger: Trigger): Int {
+        for (i in list.indices) {
+            if (list[i] === trigger) return i
+        }
+        return -1
+    }
+
+    @Synchronized override fun shouldRun(): Boolean {
+        var result = true
+        // check first trigger
+        if (list.size > 0) result = list[0].shouldRun()
+        // check all others
+        for (i in 1 until list.size) {
+            result = connectorType.apply(result, list[i].shouldRun())
+        }
+        if (result) aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription().replace("\n", " "))
+        return result
+    }
+
+    @Synchronized override fun toJSON(): String {
+        val array = JSONArray()
+        for (t in list) array.put(t.toJSON())
+        val data = JSONObject()
+            .put("connectorType", connectorType.toString())
+            .put("triggerList", array)
+        return JSONObject()
+            .put("type", TriggerConnector::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        connectorType = Type.valueOf(safeGetString(d, "connectorType")!!)
+        val array = d.getJSONArray("triggerList")
+        list.clear()
+        for (i in 0 until array.length()) {
+            instantiate(JSONObject(array.getString(i)))?.let {
+                list.add(it)
+            }
+        }
+        return this
+    }
+
+    override fun friendlyName(): Int = connectorType.stringRes
+
+    override fun friendlyDescription(): String {
+        val result = StringBuilder()
+        for ((counter, t) in list.withIndex()) {
+            if (counter > 0)
+                result.append("\n").append(resourceHelper.gs(friendlyName())).append("\n")
+            result.append(t.friendlyDescription())
+        }
+        return result.toString()
+    }
+
+    override fun icon(): Optional<Int?> = Optional.absent()
+
+    override fun duplicate(): Trigger = TriggerConnector(injector, connectorType)
+
+    override fun generateDialog(root: LinearLayout) {
+        val padding = resourceHelper.dpToPx(5)
+        root.setPadding(padding, padding, padding, padding)
+        root.setBackgroundResource(R.drawable.border_automation_unit)
+        // Header with spinner
+        val headerLayout = LinearLayout(root.context)
+        headerLayout.orientation = LinearLayout.HORIZONTAL
+        headerLayout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        headerLayout.addView(createSpinner(root.context))
+        headerLayout.addView(createAddButton(root.context, this))
+        headerLayout.addView(createDeleteButton(root.context, this))
+        root.addView(headerLayout)
+        // Child triggers
+        val listLayout = LinearLayout(root.context)
+        listLayout.orientation = LinearLayout.VERTICAL
+        listLayout.setBackgroundColor(resourceHelper.gc(R.color.mdtp_line_dark))
+        //listLayout.setPadding(resourceHelper.dpToPx(5), resourceHelper.dpToPx(5), resourceHelper.dpToPx(5), 0)
+        val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        params.setMargins(resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(5), resourceHelper.dpToPx(4))
+        listLayout.layoutParams = params
+        for (t in list) t.generateDialog(listLayout)
+        root.addView(listLayout)
+    }
+
+    private fun createSpinner(context: Context): Spinner {
+        val initialPosition = connectorType.ordinal
+        val spinner = Spinner(context)
+        val spinnerArrayAdapter = ArrayAdapter(context, R.layout.spinner_centered, Type.labels(resourceHelper))
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = spinnerArrayAdapter
+        spinner.setSelection(initialPosition)
+        spinner.setBackgroundColor(resourceHelper.gc(R.color.black_overlay))
+        val params = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.WRAP_CONTENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        params.setMargins(0, resourceHelper.dpToPx(8), 0, resourceHelper.dpToPx(8))
+        params.weight = 1.0f
+        spinner.layoutParams = params
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                setType(Type.values()[position])
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+        return spinner
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java
deleted file mode 100644
index 6fb2053fbc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerDelta extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private final int MMOL_MAX = 4;
-    private final int MGDL_MAX = 72;
-
-    private String units;
-    private DeltaType deltaType;
-
-    private InputDelta value;
-    private Comparator comparator;
-
-    public TriggerDelta() {
-        super();
-        this.units = ProfileFunctions.getSystemUnits();
-        initializer();
-    }
-
-    private TriggerDelta(TriggerDelta triggerDelta) {
-        super();
-        lastRun = triggerDelta.lastRun;
-        this.units = triggerDelta.units;
-        deltaType = triggerDelta.deltaType;
-        value = new InputDelta(triggerDelta.value);
-        comparator = new Comparator(triggerDelta.comparator);
-    }
-
-    public double getValue() {
-        deltaType = value.getDeltaType();
-        return value.getValue();
-    }
-
-    private void initializer() {
-        this.deltaType = DeltaType.DELTA;
-        comparator = new Comparator();
-        if (units.equals(Constants.MMOL))
-            value = new InputDelta(0, -MMOL_MAX, MMOL_MAX, 0.1d, new DecimalFormat("0.1"), DeltaType.DELTA);
-        else
-            value = new InputDelta(0, -MGDL_MAX, MGDL_MAX, 1d, new DecimalFormat("1"), DeltaType.DELTA);
-    }
-
-
-    public DeltaType getType() {
-        return deltaType;
-    }
-
-    public String getUnits() {
-        return this.units;
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        if (glucoseStatus == null)
-            if (comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE)
-                return true;
-            else
-                return false;
-
-        // Setting type of delta
-        double delta;
-
-        if (deltaType == DeltaType.SHORT_AVERAGE)
-            delta = glucoseStatus.short_avgdelta;
-        else if (deltaType == DeltaType.LONG_AVERAGE)
-            delta = glucoseStatus.long_avgdelta;
-        else
-            delta = glucoseStatus.delta;
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        boolean doRun = comparator.getValue().check(delta, Profile.toMgdl(value.getValue(), this.units));
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: delta is " + delta + " " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerDelta.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("value", getValue());
-            data.put("units", units);
-            data.put("lastRun", lastRun);
-            data.put("deltaType", getType());
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            units = JsonHelper.safeGetString(d, "units");
-            deltaType = DeltaType.valueOf(JsonHelper.safeGetString(d, "deltaType", ""));
-            value.setValue(JsonHelper.safeGetDouble(d, "value"), deltaType);
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.deltalabel;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.deltacompared, MainApp.gs(comparator.getValue().getStringRes()), getValue(), MainApp.gs(deltaType.getStringRes()));
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_auto_delta);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerDelta(this);
-    }
-
-    TriggerDelta setValue(double requestedValue, DeltaType requestedType) {
-        this.value.setValue(requestedValue, requestedType);
-        this.deltaType = requestedType;
-        return this;
-    }
-
-    TriggerDelta setUnits(String units) {
-        this.units = units;
-        return this;
-    }
-
-    TriggerDelta lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerDelta comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.deltalabel))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.deltalabel_u, getUnits()) + ": ", "", value))
-                .build(root);
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
new file mode 100644
index 0000000000..0a7972461a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
@@ -0,0 +1,122 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+import java.text.DecimalFormat
+
+class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
+
+    var units: String = Constants.MGDL
+    var delta: InputDelta = InputDelta(injector)
+    var comparator: Comparator = Comparator(injector)
+
+    companion object {
+        private const val MMOL_MAX = 4.0
+        private const val MGDL_MAX = 72.0
+    }
+
+    init {
+        units = profileFunction.getUnits()
+        delta = if (units == Constants.MMOL) InputDelta(injector, 0.0, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), DeltaType.DELTA)
+        else InputDelta(injector, 0.0, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), DeltaType.DELTA)
+    }
+
+    private constructor(injector: HasAndroidInjector, triggerDelta: TriggerDelta) : this(injector) {
+        units = triggerDelta.units
+        delta = InputDelta(injector, triggerDelta.delta)
+        comparator = Comparator(injector, triggerDelta.comparator.value)
+    }
+
+    fun units(units: String): TriggerDelta {
+        this.units = units
+        return this
+    }
+
+    fun setValue(value: Double, type: DeltaType): TriggerDelta {
+        this.delta.value = value
+        this.delta.deltaType = type
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerDelta {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+            ?: return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                true
+            } else {
+                aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+                false
+            }
+        val calculatedDelta = when (delta.deltaType) {
+            DeltaType.SHORT_AVERAGE -> glucoseStatus.short_avgdelta
+            DeltaType.LONG_AVERAGE  -> glucoseStatus.long_avgdelta
+            else                    -> glucoseStatus.delta
+        }
+        if (comparator.value.check(calculatedDelta, Profile.toMgdl(delta.value, units))) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: delta is " + calculatedDelta + " " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("value", delta.value)
+            .put("units", units)
+            .put("deltaType", delta.deltaType)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        units = JsonHelper.safeGetString(d, "units")!!
+        val type = DeltaType.valueOf(JsonHelper.safeGetString(d, "deltaType", ""))
+        val value = JsonHelper.safeGetDouble(d, "value")
+        delta =
+            if (units == Constants.MMOL) InputDelta(injector, value, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), type)
+            else InputDelta(injector, value, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), type)
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.deltalabel
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.deltacompared, resourceHelper.gs(comparator.value.stringRes), delta.value, resourceHelper.gs(delta.deltaType.stringRes))
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_auto_delta)
+
+    override fun duplicate(): Trigger = TriggerDelta(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.deltalabel, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.deltalabel_u, units) + ": ", "", delta))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDummy.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDummy.kt
new file mode 100644
index 0000000000..84a5177a3f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDummy.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+
+// Used for instantiation of other triggers only
+class TriggerDummy(injector: HasAndroidInjector, val shouldRun: Boolean = false) : Trigger(injector) {
+
+    override fun shouldRun(): Boolean {
+        return shouldRun
+    }
+
+    override fun toJSON(): String {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun friendlyName(): Int {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun friendlyDescription(): String {
+        return "TriggerDummy"
+    }
+
+    override fun icon(): Optional<Int?> {
+        throw NotImplementedError("An operation is not implemented")
+    }
+
+    override fun duplicate(): Trigger {
+        throw NotImplementedError("An operation is not implemented")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java
deleted file mode 100644
index a3935d7cec..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputInsulin;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerIob extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private InputInsulin insulin = new InputInsulin();
-    private Comparator comparator = new Comparator();
-
-    public TriggerIob() {
-        super();
-    }
-
-    private TriggerIob(TriggerIob triggerIob) {
-        super();
-        insulin = new InputInsulin(triggerIob.insulin);
-        comparator = new Comparator(triggerIob.comparator);
-        lastRun = triggerIob.lastRun;
-    }
-
-    public double getValue() {
-        return insulin.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile == null)
-            return false;
-        IobTotal iob = IobCobCalculatorPlugin.getPlugin().calculateFromTreatmentsAndTempsSynchronized(DateUtil.now(), profile);
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        boolean doRun = comparator.getValue().check(iob.iob, getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerIob.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("insulin", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            insulin.setValue(JsonHelper.safeGetDouble(d, "insulin"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.iob;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.iobcompared, MainApp.gs(comparator.getValue().getStringRes()), getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_keyboard_capslock);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerIob(this);
-    }
-
-    TriggerIob setValue(double threshold) {
-        insulin.setValue(threshold);
-        return this;
-    }
-
-    TriggerIob lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerIob comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.iob))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.iob_u), "", insulin))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
new file mode 100644
index 0000000000..0db45fcf9c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
@@ -0,0 +1,80 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputInsulin
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {
+    var insulin = InputInsulin(injector)
+    var comparator: Comparator = Comparator(injector)
+
+    constructor(injector: HasAndroidInjector, triggerIob: TriggerIob) : this(injector) {
+        insulin = InputInsulin(injector, triggerIob.insulin)
+        comparator = Comparator(injector, triggerIob.comparator.value)
+    }
+
+    fun setValue(value: Double): TriggerIob {
+        insulin.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerIob {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val profile = profileFunction.getProfile() ?: return false
+        val iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(DateUtil.now(), profile)
+        if (comparator.value.check(iob.iob, insulin.value)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    @Synchronized override fun toJSON(): String {
+        val data = JSONObject()
+            .put("insulin", insulin.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        insulin.value = JsonHelper.safeGetDouble(d, "insulin")
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.iob
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.iobcompared, resourceHelper.gs(comparator.value.stringRes), insulin.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_capslock)
+
+    override fun duplicate(): Trigger = TriggerIob(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.iob, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.iob_u), "", insulin))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java
deleted file mode 100644
index 8070e074be..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.location.Location;
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputButton;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDouble;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputLocationMode;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.services.LocationService;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-import static info.nightscout.androidaps.plugins.general.automation.elements.InputLocationMode.Mode.*;
-
-public class TriggerLocation extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    InputDouble latitude = new InputDouble(0d, -90d, +90d, 0.000001d, new DecimalFormat("0.000000"));
-    InputDouble longitude = new InputDouble(0d, -180d, +180d, 0.000001d, new DecimalFormat("0.000000"));
-    InputDouble distance = new InputDouble(200d, 0, 100000, 10d, new DecimalFormat("0"));
-    InputLocationMode modeSelected = new InputLocationMode();
-    InputLocationMode.Mode lastMode = INSIDE;
-
-    InputString name = new InputString();
-
-    private Runnable buttonAction = () -> {
-        Location location = LocationService.getLastLocation();
-        if (location != null) {
-            latitude.setValue(location.getLatitude());
-            longitude.setValue(location.getLongitude());
-            log.debug(String.format("Grabbed location: %f %f", latitude.getValue(), longitude.getValue()));
-        }
-    };
-
-    public TriggerLocation() {
-        super();
-    }
-
-    private TriggerLocation(TriggerLocation triggerLocation) {
-        super();
-        latitude = new InputDouble(triggerLocation.latitude);
-        longitude = new InputDouble(triggerLocation.longitude);
-        distance = new InputDouble(triggerLocation.distance);
-        modeSelected = new InputLocationMode(triggerLocation.modeSelected);
-        if (modeSelected.getValue() == GOING_OUT)
-            lastMode = OUTSIDE;
-        lastRun = triggerLocation.lastRun;
-        name = triggerLocation.name;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        Location location = this.getCurrentLocation();
-        if (location == null)
-            return false;
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        Location a = new Location("Trigger");
-        a.setLatitude(latitude.getValue());
-        a.setLongitude(longitude.getValue());
-        double calculatedDistance = location.distanceTo(a);
-
-//        log.debug("Moded(current/last/wanted): "+(currentMode(calculatedDistance))+"/"+lastMode+"/"+modeSelected.getValue());
-//        log.debug("Distance: "+calculatedDistance + "("+distance.getValue()+")");
-
-        if ((modeSelected.getValue() == INSIDE) && (calculatedDistance <= distance.getValue()) ||
-                ((modeSelected.getValue() == OUTSIDE) && (calculatedDistance > distance.getValue())) ||
-                ((modeSelected.getValue() == GOING_IN) && (calculatedDistance <= distance.getValue()) && (lastMode == OUTSIDE)) ||
-                ((modeSelected.getValue() == GOING_OUT) && (calculatedDistance > distance.getValue()) && (lastMode == INSIDE))
-            ) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            lastMode = currentMode(calculatedDistance);
-            return true;
-        }
-        lastMode = currentMode(calculatedDistance); // current mode will be last mode for the next check
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerLocation.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("latitude", latitude.getValue());
-            data.put("longitude", longitude.getValue());
-            data.put("distance", distance.getValue());
-            data.put("name", name.getValue());
-            data.put("mode", modeSelected.getValue());
-            data.put("lastRun", lastRun);
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            latitude.setValue(JsonHelper.safeGetDouble(d, "latitude"));
-            longitude.setValue(JsonHelper.safeGetDouble(d, "longitude"));
-            distance.setValue(JsonHelper.safeGetDouble(d, "distance"));
-            name.setValue(JsonHelper.safeGetString(d, "name"));
-            modeSelected.setValue(InputLocationMode.Mode.valueOf(JsonHelper.safeGetString(d, "mode")));
-            if (modeSelected.getValue() == GOING_OUT)
-                lastMode = OUTSIDE;
-            lastRun = DateUtil.now(); // set lastRun to now to give the service 5 mins to get the location properly
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.location;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.locationis, MainApp.gs(modeSelected.getValue().getStringRes()), " " + name.getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_location_on);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerLocation(this);
-    }
-
-
-    TriggerLocation setLatitude(double value) {
-        latitude.setValue(value);
-        return this;
-    }
-
-    TriggerLocation setLongitude(double value) {
-        longitude.setValue(value);
-        return this;
-    }
-
-    TriggerLocation setdistance(double value) {
-        distance.setValue(value);
-        return this;
-    }
-
-    TriggerLocation lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerLocation setMode(InputLocationMode.Mode value) {
-        modeSelected.setValue(value);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.location))
-                .add(new LabelWithElement(MainApp.gs(R.string.name_short), "", name))
-                .add(new LabelWithElement(MainApp.gs(R.string.latitude_short), "", latitude))
-                .add(new LabelWithElement(MainApp.gs(R.string.longitude_short), "", longitude))
-                .add(new LabelWithElement(MainApp.gs(R.string.distance_short), "", distance))
-                .add(new LabelWithElement(MainApp.gs(R.string.location_mode), "", modeSelected))
-                .add(new InputButton(MainApp.gs(R.string.currentlocation), buttonAction), LocationService.getLastLocation() != null)
-                .build(root);
-    }
-
-    // Method to return the actual mode based on the current distance
-    InputLocationMode.Mode currentMode(double currentDistance){
-        if ( currentDistance <= this.distance.getValue() )
-            return INSIDE;
-        else
-            return OUTSIDE;
-    }
-
-    static Location getCurrentLocation(){
-        return LocationService.getLastLocation();
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
new file mode 100644
index 0000000000..a9f3c936d9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
@@ -0,0 +1,108 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.location.Location
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.*
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+import java.text.DecimalFormat
+
+class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
+    var latitude = InputDouble(injector, 0.0, -90.0, +90.0, 0.000001, DecimalFormat("0.000000"))
+    var longitude = InputDouble(injector, 0.0, -180.0, +180.0, 0.000001, DecimalFormat("0.000000"))
+    var distance = InputDouble(injector, 200.0, 0.0, 100000.0, 10.0, DecimalFormat("0"))
+    var modeSelected = InputLocationMode(injector)
+    var name: InputString = InputString(injector)
+
+    var lastMode = InputLocationMode.Mode.INSIDE
+    private val buttonAction = Runnable {
+        locationDataContainer.lastLocation?.let {
+            latitude.value = it.latitude
+            longitude.value = it.longitude
+            aapsLogger.debug(LTag.AUTOMATION, String.format("Grabbed location: %f %f", latitude.value, longitude.value))
+        }
+    }
+
+    private constructor(injector: HasAndroidInjector, triggerLocation: TriggerLocation) : this(injector) {
+        latitude = InputDouble(injector, triggerLocation.latitude)
+        longitude = InputDouble(injector, triggerLocation.longitude)
+        distance = InputDouble(injector, triggerLocation.distance)
+        modeSelected = InputLocationMode(injector, triggerLocation.modeSelected.value)
+        if (modeSelected.value == InputLocationMode.Mode.GOING_OUT)
+            lastMode = InputLocationMode.Mode.OUTSIDE
+        name = triggerLocation.name
+    }
+
+    @Synchronized override fun shouldRun(): Boolean {
+        val location: Location = locationDataContainer.lastLocation ?: return false
+        val a = Location("Trigger")
+        a.latitude = latitude.value
+        a.longitude = longitude.value
+        val calculatedDistance = location.distanceTo(a).toDouble()
+        if (modeSelected.value == InputLocationMode.Mode.INSIDE && calculatedDistance <= distance.value ||
+            modeSelected.value == InputLocationMode.Mode.OUTSIDE && calculatedDistance > distance.value ||
+            modeSelected.value == InputLocationMode.Mode.GOING_IN && calculatedDistance <= distance.value && lastMode == InputLocationMode.Mode.OUTSIDE ||
+            modeSelected.value == InputLocationMode.Mode.GOING_OUT && calculatedDistance > distance.value && lastMode == InputLocationMode.Mode.INSIDE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            lastMode = currentMode(calculatedDistance)
+            return true
+        }
+        lastMode = currentMode(calculatedDistance) // current mode will be last mode for the next check
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("latitude", latitude.value)
+            .put("longitude", longitude.value)
+            .put("distance", distance.value)
+            .put("name", name.value)
+            .put("mode", modeSelected.value)
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        latitude.value = JsonHelper.safeGetDouble(d, "latitude")
+        longitude.value = JsonHelper.safeGetDouble(d, "longitude")
+        distance.value = JsonHelper.safeGetDouble(d, "distance")
+        name.value = JsonHelper.safeGetString(d, "name")!!
+        modeSelected.value = InputLocationMode.Mode.valueOf(JsonHelper.safeGetString(d, "mode")!!)
+        if (modeSelected.value == InputLocationMode.Mode.GOING_OUT) lastMode = InputLocationMode.Mode.OUTSIDE
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.location
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.locationis, resourceHelper.gs(modeSelected.value.stringRes), " " + name.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_location_on)
+
+    override fun duplicate(): Trigger = TriggerLocation(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.location, this))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.name_short), "", name))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.latitude_short), "", latitude))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.longitude_short), "", longitude))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.distance_short), "", distance))
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.location_mode), "", modeSelected))
+            .add(InputButton(injector, resourceHelper.gs(R.string.currentlocation), buttonAction), locationDataContainer.lastLocation != null)
+            .build(root)
+    }
+
+    // Method to return the actual mode based on the current distance
+    fun currentMode(currentDistance: Double): InputLocationMode.Mode {
+        return if (currentDistance <= distance.value) InputLocationMode.Mode.INSIDE else InputLocationMode.Mode.OUTSIDE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
deleted file mode 100644
index e4c0ae4346..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerProfilePercent extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private InputPercent pct = new InputPercent();
-    private Comparator comparator = new Comparator();
-
-    public TriggerProfilePercent() {
-        super();
-    }
-
-    private TriggerProfilePercent(TriggerProfilePercent triggerProfilePercent) {
-        super();
-        pct = new InputPercent(triggerProfilePercent.pct);
-        comparator = new Comparator(triggerProfilePercent.comparator);
-        lastRun = triggerProfilePercent.lastRun;
-    }
-
-    public double getValue() {
-        return pct.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    public long getLastRun() {
-        return lastRun;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile == null && comparator.getValue().equals(Comparator.Compare.IS_NOT_AVAILABLE)) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        if (profile == null)
-            return false;
-
-        boolean doRun = comparator.getValue().check((double) profile.getPercentage(), pct.getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerProfilePercent.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("percentage", pct.getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            pct.setValue(JsonHelper.safeGetDouble(d, "percentage"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.profilepercentage;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.percentagecompared, MainApp.gs(comparator.getValue().getStringRes()), (int) pct.getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.icon_actions_profileswitch);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerProfilePercent(this);
-    }
-
-    public TriggerProfilePercent setValue(double value) {
-        pct.setValue(value);
-        return this;
-    }
-
-    TriggerProfilePercent lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    public TriggerProfilePercent comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.profilepercentage))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.percent_u), "", pct))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
new file mode 100644
index 0000000000..1dea3cd15f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
+    var pct = InputPercent(injector)
+    var comparator = Comparator(injector)
+
+    constructor(injector: HasAndroidInjector, value: Double, compare: Comparator.Compare) : this(injector) {
+        pct = InputPercent(injector, value)
+        comparator = Comparator(injector, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerProfilePercent: TriggerProfilePercent) : this(injector) {
+        pct = InputPercent(injector, triggerProfilePercent.pct.value)
+        comparator = Comparator(injector, triggerProfilePercent.comparator.value)
+    }
+
+    fun setValue(value: Double): TriggerProfilePercent {
+        this.pct.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerProfilePercent {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val profile = profileFunction.getProfile()
+        if (profile == null && comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        if (profile == null) {
+            aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+            return false
+        }
+        if (comparator.value.check(profile.percentage.toDouble(), pct.value)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    @Synchronized override fun toJSON(): String {
+        val data = JSONObject()
+            .put("percentage", pct.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        pct.value = JsonHelper.safeGetDouble(d, "percentage")
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.profilepercentage
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt())
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_actions_profileswitch)
+
+    override fun duplicate(): Trigger = TriggerProfilePercent(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.profilepercentage, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.percent_u), "", pct))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java
deleted file mode 100644
index ff8bb335f9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerPumpLastConnection extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-    private InputDuration minutesAgo = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
-    private Comparator comparator = new Comparator();
-
-    public TriggerPumpLastConnection() {
-        super();
-    }
-
-    private TriggerPumpLastConnection(TriggerPumpLastConnection triggerPumpLastConnection) {
-        super();
-        minutesAgo = new InputDuration(triggerPumpLastConnection.minutesAgo);
-        lastRun = triggerPumpLastConnection.lastRun;
-        comparator = new Comparator(triggerPumpLastConnection.comparator);
-    }
-
-    public double getValue() {
-        return minutesAgo.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-        long lastConnection = ConfigBuilderPlugin.getPlugin().getActivePump().lastDataTime();
-
-        if (lastConnection == 0 && comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE)
-            return true;
-
-        double minutesAgo = (double) (DateUtil.now() - lastConnection) / (60 * 1000);
-        if (L.isEnabled(L.AUTOMATION))
-            log.debug("Last connection min ago: " + minutesAgo);
-
-        boolean doRun = comparator.getValue().check((minutesAgo), getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerPumpLastConnection.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("minutesAgo", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            minutesAgo.setMinutes(JsonHelper.safeGetInt(d, "minutesAgo"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.automation_trigger_pump_last_connection_label;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.automation_trigger_pump_last_connection_compared, MainApp.gs(comparator.getValue().getStringRes()), (int) getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.remove);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerPumpLastConnection(this);
-    }
-
-    TriggerPumpLastConnection setValue(int requestedValue) {
-        this.minutesAgo.setMinutes(requestedValue);
-        return this;
-    }
-
-    TriggerPumpLastConnection lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerPumpLastConnection comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.automation_trigger_pump_last_connection_label))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.automation_trigger_pump_last_connection_description) + ": ", "", minutesAgo))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
new file mode 100644
index 0000000000..0e2228cf5e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper.safeGetInt
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import org.json.JSONObject
+
+class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector) {
+    var minutesAgo = InputDuration(injector)
+    var comparator = Comparator(injector)
+
+    constructor(injector: HasAndroidInjector, value: Int, unit: InputDuration.TimeUnit, compare: Comparator.Compare) : this(injector) {
+        minutesAgo = InputDuration(injector, value, unit)
+        comparator = Comparator(injector, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerPumpLastConnection: TriggerPumpLastConnection) : this(injector) {
+        minutesAgo = InputDuration(injector, triggerPumpLastConnection.minutesAgo.value, triggerPumpLastConnection.minutesAgo.unit)
+        comparator = Comparator(injector, triggerPumpLastConnection.comparator.value)
+    }
+
+    fun setValue(value: Int): TriggerPumpLastConnection {
+        minutesAgo.value = value
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerPumpLastConnection {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val lastConnection = activePlugin.activePump.lastDataTime()
+        if (lastConnection == 0L && comparator.value === Comparator.Compare.IS_NOT_AVAILABLE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        val connectionAgo = (DateUtil.now() - lastConnection) / (60 * 1000)
+        aapsLogger.debug(LTag.AUTOMATION, "Last connection min ago: $connectionAgo")
+        if (comparator.value.check(connectionAgo.toInt(), minutesAgo.value)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("minutesAgo", minutesAgo.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        minutesAgo.setMinutes(safeGetInt(d, "minutesAgo"))
+        comparator.setValue(Comparator.Compare.valueOf(safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.automation_trigger_pump_last_connection_label
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.automation_trigger_pump_last_connection_compared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.remove)
+
+    override fun duplicate(): Trigger = TriggerPumpLastConnection(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.automation_trigger_pump_last_connection_label, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.automation_trigger_pump_last_connection_description) + ": ", "", minutesAgo))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
deleted file mode 100644
index 2031dbc74c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.graphics.Typeface;
-import android.text.format.DateFormat;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.dpro.widgets.WeekdaysPicker;
-import com.google.common.base.Optional;
-import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Objects;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerRecurringTime extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    public enum DayOfWeek {
-        MONDAY,
-        TUESDAY,
-        WEDNESDAY,
-        THURSDAY,
-        FRIDAY,
-        SATURDAY,
-        SUNDAY;
-
-        private static final int[] calendarInts = new int[]{
-                Calendar.MONDAY,
-                Calendar.TUESDAY,
-                Calendar.WEDNESDAY,
-                Calendar.THURSDAY,
-                Calendar.FRIDAY,
-                Calendar.SATURDAY,
-                Calendar.SUNDAY
-        };
-
-        private static final int[] shortNames = new int[]{
-                R.string.weekday_monday_short,
-                R.string.weekday_tuesday_short,
-                R.string.weekday_wednesday_short,
-                R.string.weekday_thursday_short,
-                R.string.weekday_friday_short,
-                R.string.weekday_saturday_short,
-                R.string.weekday_sunday_short
-        };
-
-        public int toCalendarInt() {
-            return calendarInts[ordinal()];
-        }
-
-        @Nullable
-        public static DayOfWeek fromCalendarInt(int day) {
-            for (int i = 0; i < calendarInts.length; ++i) {
-                if (calendarInts[i] == day)
-                    return values()[i];
-            }
-            return null;
-        }
-
-        public @StringRes
-        int getShortName() {
-            return shortNames[ordinal()];
-        }
-    }
-
-    private final boolean[] weekdays = new boolean[DayOfWeek.values().length];
-
-    // Recurring
-    private int hour;
-    private int minute;
-
-    private long validTo;
-
-    public TriggerRecurringTime() {
-        super();
-        setAll(false);
-    }
-
-    private TriggerRecurringTime(TriggerRecurringTime triggerTime) {
-        super();
-        lastRun = triggerTime.lastRun;
-        hour = triggerTime.hour;
-        minute = triggerTime.minute;
-        validTo = triggerTime.validTo;
-
-        if (weekdays.length >= 0)
-            System.arraycopy(triggerTime.weekdays, 0, weekdays, 0, weekdays.length);
-    }
-
-    public void setAll(boolean value) {
-        for (DayOfWeek day : DayOfWeek.values()) {
-            set(day, value);
-        }
-    }
-
-    public TriggerRecurringTime set(DayOfWeek day, boolean value) {
-        weekdays[day.ordinal()] = value;
-        return this;
-    }
-
-    private boolean isSet(DayOfWeek day) {
-        return weekdays[day.ordinal()];
-    }
-
-    @Override
-    public boolean shouldRun() {
-        if (validTo != 0 && DateUtil.now() > validTo)
-            return false;
-        Calendar c = Calendar.getInstance();
-        int scheduledDayOfWeek = c.get(Calendar.DAY_OF_WEEK);
-
-        Calendar scheduledCal = DateUtil.gregorianCalendar();
-        scheduledCal.set(Calendar.HOUR_OF_DAY, hour);
-        scheduledCal.set(Calendar.MINUTE, minute);
-        scheduledCal.set(Calendar.SECOND, 0);
-        long scheduled = scheduledCal.getTimeInMillis();
-
-        if (isSet(Objects.requireNonNull(DayOfWeek.fromCalendarInt(scheduledDayOfWeek)))) {
-            if (DateUtil.now() >= scheduled && DateUtil.now() - scheduled < T.mins(5).msecs()) {
-                if (lastRun < scheduled) {
-                    if (L.isEnabled(L.AUTOMATION))
-                        log.debug("Ready for execution: " + friendlyDescription());
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject object = new JSONObject();
-        JSONObject data = new JSONObject();
-        try {
-            data.put("lastRun", lastRun);
-            for (int i = 0; i < weekdays.length; ++i) {
-                data.put(DayOfWeek.values()[i].name(), weekdays[i]);
-            }
-            data.put("hour", hour);
-            data.put("minute", minute);
-            data.put("validTo", validTo);
-            object.put("type", TriggerRecurringTime.class.getName());
-            object.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return object.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        JSONObject o;
-        try {
-            o = new JSONObject(data);
-            lastRun = JsonHelper.safeGetLong(o, "lastRun");
-            for (int i = 0; i < weekdays.length; ++i) {
-                weekdays[i] = JsonHelper.safeGetBoolean(o, DayOfWeek.values()[i].name());
-            }
-            hour = JsonHelper.safeGetInt(o, "hour");
-            minute = JsonHelper.safeGetInt(o, "minute");
-            validTo = JsonHelper.safeGetLong(o, "validTo");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.recurringTime;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        int counter = 0;
-        StringBuilder sb = new StringBuilder();
-        sb.append(MainApp.gs(R.string.every));
-        sb.append(" ");
-        for (Integer i : getSelectedDays()) {
-            if (counter > 0)
-                sb.append(",");
-            sb.append(MainApp.gs(Objects.requireNonNull(DayOfWeek.fromCalendarInt(i)).getShortName()));
-            counter++;
-        }
-        sb.append(" ");
-
-        Calendar scheduledCal = DateUtil.gregorianCalendar();
-        scheduledCal.set(Calendar.HOUR_OF_DAY, hour);
-        scheduledCal.set(Calendar.MINUTE, minute);
-        scheduledCal.set(Calendar.SECOND, 0);
-        long scheduled = scheduledCal.getTimeInMillis();
-
-        sb.append(DateUtil.timeString(scheduled));
-
-        if (counter == 0)
-            return MainApp.gs(R.string.never);
-        return sb.toString();
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_access_alarm_24dp);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerRecurringTime(this);
-    }
-
-    TriggerRecurringTime lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    @SuppressWarnings("SameParameterValue")
-    TriggerRecurringTime validTo(long validTo) {
-        this.validTo = validTo;
-        return this;
-    }
-
-    TriggerRecurringTime hour(int hour) {
-        this.hour = hour;
-        return this;
-    }
-
-    TriggerRecurringTime minute(int minute) {
-        this.minute = minute;
-        return this;
-    }
-
-    private List<Integer> getSelectedDays() {
-        List<Integer> selectedDays = new ArrayList<>();
-        for (int i = 0; i < weekdays.length; ++i) {
-            DayOfWeek day = DayOfWeek.values()[i];
-            boolean selected = weekdays[i];
-            if (selected) selectedDays.add(day.toCalendarInt());
-        }
-        return selectedDays;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        TextView label = new TextView(root.getContext());
-
-        // TODO: Replace external tool WeekdaysPicker with a self-made GUI element
-        WeekdaysPicker weekdaysPicker = new WeekdaysPicker(root.getContext());
-        weekdaysPicker.setEditable(true);
-        weekdaysPicker.setSelectedDays(getSelectedDays());
-        weekdaysPicker.setOnWeekdaysChangeListener((view, i, list) -> set(DayOfWeek.fromCalendarInt(i), list.contains(i)));
-        weekdaysPicker.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        weekdaysPicker.setSundayFirstDay(Calendar.getInstance().getFirstDayOfWeek() == Calendar.SUNDAY);
-        weekdaysPicker.redrawDays();
-
-        root.addView(weekdaysPicker);
-
-        TextView timeButton = new TextView(root.getContext());
-
-        GregorianCalendar runAt = new GregorianCalendar();
-        //Date runAt = new Date();
-        runAt.set(Calendar.HOUR_OF_DAY, hour);
-        runAt.set(Calendar.MINUTE, minute);
-        timeButton.setText(DateUtil.timeString(runAt.getTimeInMillis()));
-        timeButton.setOnClickListener(view -> {
-            TimePickerDialog tpd = TimePickerDialog.newInstance(
-                    (view12, hourOfDay, minute, second) -> {
-                        hour(hourOfDay);
-                        minute(minute);
-                        runAt.set(Calendar.HOUR_OF_DAY, hour);
-                        runAt.set(Calendar.MINUTE, minute);
-                        timeButton.setText(DateUtil.timeString(runAt.getTimeInMillis()));
-                    },
-                    runAt.get(Calendar.HOUR_OF_DAY),
-                    runAt.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(root.getContext())
-            );
-            tpd.setThemeDark(true);
-            tpd.dismissOnPause(true);
-            AppCompatActivity a = scanForActivity(root.getContext());
-            if (a != null)
-                tpd.show(a.getSupportFragmentManager(), "TimePickerDialog");
-        });
-
-        int px = MainApp.dpToPx(10);
-        label.setText(MainApp.gs(R.string.atspecifiedtime, ""));
-        label.setTypeface(label.getTypeface(), Typeface.BOLD);
-        label.setPadding(px, px, px, px);
-        timeButton.setPadding(px, px, px, px);
-
-        LinearLayout l = new LinearLayout(root.getContext());
-        l.setOrientation(LinearLayout.HORIZONTAL);
-        l.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        l.addView(label);
-        l.addView(timeButton);
-        root.addView(l);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
new file mode 100644
index 0000000000..8982a12669
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
@@ -0,0 +1,107 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTime
+import info.nightscout.androidaps.plugins.general.automation.elements.InputWeekDay
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import org.json.JSONObject
+import java.util.*
+
+class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
+    val days = InputWeekDay(injector)
+    val time = InputTime(injector)
+
+    constructor(injector: HasAndroidInjector, triggerRecurringTime: TriggerRecurringTime) : this(injector) {
+        this.time.value = triggerRecurringTime.time.value
+        if (days.weekdays.size >= 0)
+            System.arraycopy(triggerRecurringTime.days.weekdays, 0, days.weekdays, 0, triggerRecurringTime.days.weekdays.size)
+    }
+
+    fun time(minutes:Int): TriggerRecurringTime {
+        time.value = minutes
+        return  this
+    }
+
+    override fun shouldRun(): Boolean {
+        val currentMinSinceMidnight = getMinSinceMidnight(DateUtil.now())
+        val scheduledDayOfWeek = Calendar.getInstance()[Calendar.DAY_OF_WEEK]
+        val scheduled = getMinSinceMidnight(time.value.toLong())
+        if (days.isSet(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(scheduledDayOfWeek)))) {
+            if (currentMinSinceMidnight >= scheduled && currentMinSinceMidnight - scheduled < 5) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                return true
+            }
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("time", time.value)
+        for (i in days.weekdays.indices) {
+            data.put(InputWeekDay.DayOfWeek.values()[i].name, days.weekdays[i])
+        }
+        return JSONObject()
+            .put("type", TriggerRecurringTime::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val o = JSONObject(data)
+        for (i in days.weekdays.indices)
+            days.weekdays[i] = JsonHelper.safeGetBoolean(o, InputWeekDay.DayOfWeek.values()[i].name)
+        if (o.has("hour")) {
+            // do conversion from 2.5.1 format
+            val hour = JsonHelper.safeGetInt(o, "hour")
+            val minute = JsonHelper.safeGetInt(o, "minute")
+            time.value = 60 * hour + minute
+        } else {
+            time.value = JsonHelper.safeGetInt(o, "time")
+        }
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.recurringTime
+
+    override fun friendlyDescription(): String {
+        val sb = StringBuilder()
+        sb.append(resourceHelper.gs(R.string.every))
+        sb.append(" ")
+        var counter = 0
+        for (i in days.getSelectedDays()) {
+            if (counter++ > 0) sb.append(",")
+            sb.append(resourceHelper.gs(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(i)).shortName))
+        }
+        sb.append(" ")
+        sb.append(DateUtil.timeString(toMills(time.value)))
+        return if (counter == 0) resourceHelper.gs(R.string.never) else sb.toString()
+    }
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
+
+    override fun duplicate(): Trigger = TriggerRecurringTime(injector, this)
+
+    private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
+
+    private fun getMinSinceMidnight(time: Long): Int = Profile.secondsFromMidnight(time) / 60
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.recurringTime, this))
+            .add(days)
+            .add(time)
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java
deleted file mode 100644
index a5fc6ba092..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerTempTarget extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private ComparatorExists comparator = new ComparatorExists();
-
-    public TriggerTempTarget() {
-        super();
-    }
-
-    private TriggerTempTarget(TriggerTempTarget triggerTempTarget) {
-        super();
-        comparator = new ComparatorExists(triggerTempTarget.comparator);
-        lastRun = triggerTempTarget.lastRun;
-    }
-
-    public ComparatorExists getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        TempTarget tt = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        if (tt == null && comparator.getValue() == ComparatorExists.Compare.NOT_EXISTS) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-
-        if (tt != null && comparator.getValue() == ComparatorExists.Compare.EXISTS) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerTempTarget.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(ComparatorExists.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.careportal_temporarytarget;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.temptargetcompared, MainApp.gs(comparator.getValue().getStringRes()));
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_keyboard_tab);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerTempTarget(this);
-    }
-
-    TriggerTempTarget lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    public TriggerTempTarget comparator(ComparatorExists.Compare compare) {
-        this.comparator = new ComparatorExists().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.careportal_temporarytarget))
-                .add(comparator)
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
new file mode 100644
index 0000000000..015cfce079
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
@@ -0,0 +1,75 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {
+    var comparator = ComparatorExists(injector)
+
+    constructor(injector: HasAndroidInjector, compare: ComparatorExists.Compare) : this(injector) {
+        comparator = ComparatorExists(injector, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerTempTarget: TriggerTempTarget) : this(injector) {
+        comparator = ComparatorExists(injector, triggerTempTarget.comparator.value)
+    }
+
+    fun comparator(comparator: ComparatorExists.Compare): TriggerTempTarget {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val tt = treatmentsPlugin.tempTargetFromHistory
+        if (tt == null && comparator.value == ComparatorExists.Compare.NOT_EXISTS) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        if (tt != null && comparator.value == ComparatorExists.Compare.EXISTS) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", TriggerTempTarget::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        comparator.value = ComparatorExists.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!)
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.careportal_temporarytarget
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.temptargetcompared, resourceHelper.gs(comparator.value.stringRes))
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
+
+    override fun duplicate(): Trigger = TriggerTempTarget(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.careportal_temporarytarget, this))
+            .add(comparator)
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
deleted file mode 100644
index 91e739ca45..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.graphics.Typeface;
-import android.text.format.DateFormat;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
-import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerTime extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private long runAt;
-
-    public TriggerTime() {
-        runAt = DateUtil.now();
-    }
-
-    private TriggerTime(TriggerTime triggerTime) {
-        super();
-        lastRun = triggerTime.lastRun;
-        runAt = triggerTime.runAt;
-    }
-
-    @Override
-    public boolean shouldRun() {
-        long now = DateUtil.now();
-        if (now >= runAt && now - runAt < T.mins(5).msecs())
-            if (lastRun < runAt) {
-                if (L.isEnabled(L.AUTOMATION))
-                    log.debug("Ready for execution: " + friendlyDescription());
-                return true;
-            }
-        return false;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject object = new JSONObject();
-        JSONObject data = new JSONObject();
-        try {
-            data.put("runAt", runAt);
-            data.put("lastRun", lastRun);
-            object.put("type", TriggerTime.class.getName());
-            object.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return object.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        JSONObject o;
-        try {
-            o = new JSONObject(data);
-            lastRun = JsonHelper.safeGetLong(o, "lastRun");
-            runAt = JsonHelper.safeGetLong(o, "runAt");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.time;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.atspecifiedtime, DateUtil.dateAndTimeString(runAt));
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_access_alarm_24dp);
-    }
-
-    TriggerTime runAt(long runAt) {
-        this.runAt = runAt;
-        return this;
-    }
-
-    TriggerTime lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerTime(this);
-    }
-
-    long getRunAt() {
-        return runAt;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        TextView label = new TextView(root.getContext());
-        TextView dateButton = new TextView(root.getContext());
-        TextView timeButton = new TextView(root.getContext());
-
-        dateButton.setText(DateUtil.dateString(runAt));
-        timeButton.setText(DateUtil.timeString(runAt));
-        dateButton.setOnClickListener(view -> {
-            GregorianCalendar calendar = new GregorianCalendar();
-            calendar.setTimeInMillis(runAt);
-            DatePickerDialog dpd = DatePickerDialog.newInstance(
-                    (view1, year, monthOfYear, dayOfMonth) -> {
-                        calendar.set(Calendar.YEAR, year);
-                        calendar.set(Calendar.MONTH, monthOfYear);
-                        calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-                        runAt = calendar.getTimeInMillis();
-                        dateButton.setText(DateUtil.dateString(runAt));
-                    },
-                    calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH)
-            );
-            dpd.setThemeDark(true);
-            dpd.dismissOnPause(true);
-            AppCompatActivity a = scanForActivity(root.getContext());
-            if (a != null)
-                dpd.show(a.getSupportFragmentManager(), "DatePickerDialog");
-        });
-        timeButton.setOnClickListener(view -> {
-            GregorianCalendar calendar = new GregorianCalendar();
-            calendar.setTimeInMillis(runAt);
-            TimePickerDialog tpd = TimePickerDialog.newInstance(
-                    (view12, hourOfDay, minute, second) -> {
-                        calendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
-                        calendar.set(Calendar.MINUTE, minute);
-                        runAt = calendar.getTimeInMillis();
-                        timeButton.setText(DateUtil.timeString(runAt));
-                    },
-                    calendar.get(Calendar.HOUR_OF_DAY),
-                    calendar.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(root.getContext())
-            );
-            tpd.setThemeDark(true);
-            tpd.dismissOnPause(true);
-            AppCompatActivity a = scanForActivity(root.getContext());
-            if (a != null)
-                tpd.show(a.getSupportFragmentManager(), "TimePickerDialog");
-        });
-
-        int px = MainApp.dpToPx(10);
-        label.setText(MainApp.gs(R.string.atspecifiedtime, ""));
-        label.setTypeface(label.getTypeface(), Typeface.BOLD);
-        label.setPadding(px, px, px, px);
-        dateButton.setPadding(px, px, px, px);
-        timeButton.setPadding(px, px, px, px);
-
-        LinearLayout l = new LinearLayout(root.getContext());
-        l.setOrientation(LinearLayout.HORIZONTAL);
-        l.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        l.addView(label);
-        l.addView(dateButton);
-        l.addView(timeButton);
-        root.addView(l);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
new file mode 100644
index 0000000000..4726eb5e95
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDateTime
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.T
+import org.json.JSONObject
+
+class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
+    var time = InputDateTime(injector)
+
+    constructor(injector: HasAndroidInjector, runAt: Long) : this(injector) {
+        this.time.value = runAt
+    }
+
+    constructor(injector: HasAndroidInjector, triggerTime: TriggerTime) : this(injector) {
+        this.time.value = triggerTime.time.value
+    }
+
+    fun runAt(time: Long): TriggerTime {
+        this.time.value = time
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val now = DateUtil.now()
+        if (now >= time.value && now - time.value < T.mins(5).msecs()) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("runAt", time.value)
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val o = JSONObject(data)
+        time.value = JsonHelper.safeGetLong(o, "runAt")
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.time
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.atspecifiedtime, DateUtil.dateAndTimeString(time.value))
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
+
+    override fun duplicate(): Trigger = TriggerTime(injector, time.value)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.time, this))
+            .add(time)
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java
deleted file mode 100644
index 082c5af75c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.graphics.Typeface;
-import android.text.format.DateFormat;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-
-// Trigger for time range ( from 10:00AM till 13:00PM )
-
-public class TriggerTimeRange extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    // in minutes since midnight 60 means 1AM
-    private int start;
-    private int end;
-    long timeZoneOffset = DateUtil.getTimeZoneOffsetMs();
-
-    public TriggerTimeRange() {
-
-        start = getMinSinceMidnight(DateUtil.now());
-        end = getMinSinceMidnight(DateUtil.now());
-    }
-
-    private TriggerTimeRange(TriggerTimeRange triggerTimeRange) {
-        super();
-        lastRun = triggerTimeRange.lastRun;
-        start = triggerTimeRange.start;
-        end = triggerTimeRange.end;
-    }
-
-    @Override
-    public boolean shouldRun() {
-        int currentMinSinceMidnight = getMinSinceMidnight(DateUtil.now());
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        boolean doRun = false;
-        if (start < end && start < currentMinSinceMidnight && currentMinSinceMidnight < end)
-            doRun = true;
-
-            // handle cases like 10PM to 6AM
-        else if (start > end && (start < currentMinSinceMidnight || currentMinSinceMidnight < end))
-            doRun = true;
-
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String toJSON() {
-        JSONObject object = new JSONObject();
-        JSONObject data = new JSONObject();
-
-        // check for too big values
-        if (start > 1440)
-            start = getMinSinceMidnight(start);
-        if (end > 1440)
-            end = getMinSinceMidnight(end);
-
-        try {
-            data.put("start", getMinSinceMidnight(start));
-            data.put("end", getMinSinceMidnight(end));
-            data.put("lastRun", lastRun);
-            object.put("type", TriggerTimeRange.class.getName());
-            object.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        log.debug(object.toString());
-        return object.toString();
-    }
-
-    @Override
-    TriggerTimeRange fromJSON(String data) {
-        JSONObject o;
-        try {
-            o = new JSONObject(data);
-            lastRun = JsonHelper.safeGetLong(o, "lastRun");
-            start = JsonHelper.safeGetInt(o, "start");
-            end = JsonHelper.safeGetInt(o, "end");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.time_range;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.timerange_value, DateUtil.timeString(toMilis(start) - timeZoneOffset), DateUtil.timeString(toMilis(end) - timeZoneOffset));
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_access_alarm_24dp);
-    }
-
-    TriggerTimeRange period(int start, int end) {
-        this.start = getMinSinceMidnight(start * 60000);
-        this.end = getMinSinceMidnight(end * 60000);
-        return this;
-    }
-
-    TriggerTimeRange lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerTimeRange(this);
-    }
-
-    long toMilis(long minutesSinceMidnight) {
-        return minutesSinceMidnight * 60 * 1000;
-    }
-
-    public int getMinSinceMidnight(long time) {
-        // if passed argument is smaller than 1440 ( 24 h * 60 min ) that value is already converted
-        if (0 < time && time < 1441)
-            return (int) time;
-        Calendar calendar = DateUtil.gregorianCalendar();
-        calendar.setTimeInMillis(time);
-        return (calendar.get(Calendar.HOUR_OF_DAY) * 60) + calendar.get(Calendar.MINUTE);
-    }
-
-    int getStart() {
-        return start;
-    }
-
-    int getEnd() {
-        return end;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        TextView label = new TextView(root.getContext());
-        TextView startButton = new TextView(root.getContext());
-        TextView endButton = new TextView(root.getContext());
-        log.debug("Start is: " + start);
-        log.debug("End is: " + end);
-        startButton.setText(DateUtil.timeString(toMilis(start) - timeZoneOffset));
-        endButton.setText(MainApp.gs(R.string.and) + " " + DateUtil.timeString(toMilis(end) - timeZoneOffset));
-
-        startButton.setOnClickListener(view -> {
-            GregorianCalendar calendar = new GregorianCalendar();
-            //setTimeInMillis sets time in milliseconds after
-            //     * January 1, 1970, 0:00:00 GMT., but our time contains timezone offsset
-            calendar.setTimeInMillis(toMilis(start) - timeZoneOffset);
-            TimePickerDialog tpd = TimePickerDialog.newInstance(
-                    (view12, hourOfDay, minute, second) -> {
-                        calendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
-                        calendar.set(Calendar.MINUTE, minute);
-                        start = getMinSinceMidnight(calendar.getTimeInMillis());
-                        startButton.setText(DateUtil.timeString(toMilis(start) - timeZoneOffset));
-                    },
-                    calendar.get(Calendar.HOUR_OF_DAY),
-                    calendar.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(root.getContext())
-            );
-            tpd.setThemeDark(true);
-            tpd.dismissOnPause(true);
-            AppCompatActivity a = scanForActivity(root.getContext());
-            if (a != null)
-                tpd.show(a.getSupportFragmentManager(), "TimePickerDialog");
-        });
-        endButton.setOnClickListener(view -> {
-            GregorianCalendar calendar = new GregorianCalendar();
-            calendar.setTimeInMillis(toMilis(end) - timeZoneOffset);
-            TimePickerDialog tpd = TimePickerDialog.newInstance(
-                    (view12, hourOfDay, minute, second) -> {
-                        calendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
-                        calendar.set(Calendar.MINUTE, minute);
-                        end = getMinSinceMidnight(calendar.getTimeInMillis());
-                        endButton.setText(MainApp.gs(R.string.and) + " " + DateUtil.timeString(toMilis(end) - timeZoneOffset));
-                    },
-                    calendar.get(Calendar.HOUR_OF_DAY),
-                    calendar.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(root.getContext())
-            );
-            tpd.setThemeDark(true);
-            tpd.dismissOnPause(true);
-            AppCompatActivity a = scanForActivity(root.getContext());
-            if (a != null)
-                tpd.show(a.getSupportFragmentManager(), "TimePickerDialog");
-        });
-
-        int px = MainApp.dpToPx(10);
-        label.setText(MainApp.gs(R.string.between));
-        label.setTypeface(label.getTypeface(), Typeface.BOLD);
-        startButton.setPadding(px, px, px, px);
-        endButton.setPadding(px, px, px, px);
-
-        LinearLayout l = new LinearLayout(root.getContext());
-        l.setOrientation(LinearLayout.HORIZONTAL);
-        l.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        l.addView(label);
-        l.addView(startButton);
-        l.addView(endButton);
-        root.addView(l);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
new file mode 100644
index 0000000000..2c565fa733
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
@@ -0,0 +1,89 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTimeRange
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper.safeGetInt
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import org.json.JSONObject
+
+// Trigger for time range ( from 10:00AM till 13:00PM )
+class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
+
+    // in minutes since midnight 60 means 1AM
+    var range = InputTimeRange(injector)
+
+    constructor(injector: HasAndroidInjector, start: Int, end: Int) : this(injector) {
+        range.start = start
+        range.end = end
+    }
+
+    constructor(injector: HasAndroidInjector, triggerTimeRange: TriggerTimeRange) : this(injector) {
+        range.start = triggerTimeRange.range.start
+        range.end = triggerTimeRange.range.end
+    }
+
+    fun period(start: Int, end:Int) : TriggerTimeRange {
+        this.range.start = start
+        this.range.end = end
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val currentMinSinceMidnight = getMinSinceMidnight(DateUtil.now())
+        var doRun = false
+        if (range.start < range.end && range.start < currentMinSinceMidnight && currentMinSinceMidnight < range.end) doRun = true
+        else if (range.start > range.end && (range.start < currentMinSinceMidnight || currentMinSinceMidnight < range.end)) doRun = true
+        if (doRun) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("start", range.start)
+            .put("end", range.end)
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): TriggerTimeRange {
+        val o = JSONObject(data)
+        range.start = safeGetInt(o, "start")
+        range.end = safeGetInt(o, "end")
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.time_range
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.timerange_value, DateUtil.timeString(toMills(range.start)), DateUtil.timeString(toMills(range.end)))
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
+
+    override fun duplicate(): Trigger = TriggerTimeRange(injector, range.start, range.end)
+
+    private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
+
+    private fun getMinSinceMidnight(time: Long): Int = Profile.secondsFromMidnight(time) / 60
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.time_range, this))
+            .add(range)
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java
deleted file mode 100644
index dd2c34bcb8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement;
-import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
-import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel;
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.T;
-
-public class TriggerWifiSsid extends Trigger {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOMATION);
-
-    private InputString ssid = new InputString();
-    private Comparator comparator = new Comparator();
-
-    public TriggerWifiSsid() {
-        super();
-    }
-
-    private TriggerWifiSsid(TriggerWifiSsid triggerWifiSsid) {
-        super();
-        ssid = new InputString(triggerWifiSsid.ssid);
-        comparator = new Comparator(triggerWifiSsid.comparator);
-        lastRun = triggerWifiSsid.lastRun;
-    }
-
-    public String getValue() {
-        return ssid.getValue();
-    }
-
-    public Comparator getComparator() {
-        return comparator;
-    }
-
-    @Override
-    public synchronized boolean shouldRun() {
-        EventNetworkChange eventNetworkChange = NetworkChangeReceiver.getLastEvent();
-        if (eventNetworkChange == null)
-            return false;
-
-        if (lastRun > DateUtil.now() - T.mins(5).msecs())
-            return false;
-
-        if (!eventNetworkChange.getWifiConnected() && comparator.getValue() == Comparator.Compare.IS_NOT_AVAILABLE) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-
-        boolean doRun = eventNetworkChange.getWifiConnected() && comparator.getValue().check(eventNetworkChange.connectedSsid(), getValue());
-        if (doRun) {
-            if (L.isEnabled(L.AUTOMATION))
-                log.debug("Ready for execution: " + friendlyDescription());
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public synchronized String toJSON() {
-        JSONObject o = new JSONObject();
-        try {
-            o.put("type", TriggerWifiSsid.class.getName());
-            JSONObject data = new JSONObject();
-            data.put("ssid", getValue());
-            data.put("lastRun", lastRun);
-            data.put("comparator", comparator.getValue().toString());
-            o.put("data", data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return o.toString();
-    }
-
-    @Override
-    Trigger fromJSON(String data) {
-        try {
-            JSONObject d = new JSONObject(data);
-            ssid.setValue(JsonHelper.safeGetString(d, "ssid"));
-            lastRun = JsonHelper.safeGetLong(d, "lastRun");
-            comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return this;
-    }
-
-    @Override
-    public int friendlyName() {
-        return R.string.ns_wifi_ssids;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return MainApp.gs(R.string.wifissidcompared, MainApp.gs(comparator.getValue().getStringRes()), getValue());
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.of(R.drawable.ic_network_wifi);
-    }
-
-    @Override
-    public Trigger duplicate() {
-        return new TriggerWifiSsid(this);
-    }
-
-    TriggerWifiSsid setValue(String value) {
-        ssid.setValue(value);
-        return this;
-    }
-
-    TriggerWifiSsid lastRun(long lastRun) {
-        this.lastRun = lastRun;
-        return this;
-    }
-
-    TriggerWifiSsid comparator(Comparator.Compare compare) {
-        this.comparator = new Comparator().setValue(compare);
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout root, FragmentManager fragmentManager) {
-        new LayoutBuilder()
-                .add(new StaticLabel(R.string.ns_wifi_ssids))
-                .add(comparator)
-                .add(new LabelWithElement(MainApp.gs(R.string.ns_wifi_ssids) + ": ", "", ssid))
-                .build(root);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
new file mode 100644
index 0000000000..cef73c1339
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
@@ -0,0 +1,92 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.receivers.NetworkChangeReceiver
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+import javax.inject.Inject
+
+class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
+    @Inject lateinit var receiverStatusStore: ReceiverStatusStore
+
+    var ssid = InputString(injector)
+    var comparator = Comparator(injector)
+
+    constructor(injector: HasAndroidInjector, ssid: String, compare: Comparator.Compare) : this(injector) {
+        this.ssid = InputString(injector, ssid)
+        comparator = Comparator(injector, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerWifiSsid: TriggerWifiSsid) : this(injector) {
+        this.ssid = InputString(injector, triggerWifiSsid.ssid.value)
+        comparator = Comparator(injector, triggerWifiSsid.comparator.value)
+    }
+
+    fun setValue(ssid: String): TriggerWifiSsid {
+        this.ssid.value = ssid
+        return this
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerWifiSsid {
+        this.comparator.value = comparator
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val eventNetworkChange = receiverStatusStore.lastNetworkEvent ?: return false
+        if (!eventNetworkChange.wifiConnected && comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        if (eventNetworkChange.wifiConnected && comparator.value.check(eventNetworkChange.connectedSsid(), ssid.value)) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("ssid", ssid.value)
+            .put("comparator", comparator.value.toString())
+        return JSONObject()
+            .put("type", this::class.java.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        ssid.value = JsonHelper.safeGetString(d, "ssid")!!
+        comparator.value = Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!)
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.ns_wifi_ssids
+
+    override fun friendlyDescription(): String =
+        resourceHelper.gs(R.string.wifissidcompared, resourceHelper.gs(comparator.value.stringRes), ssid.value)
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_network_wifi)
+
+    override fun duplicate(): Trigger = TriggerWifiSsid(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(injector, R.string.ns_wifi_ssids, this))
+            .add(comparator)
+            .add(LabelWithElement(injector, resourceHelper.gs(R.string.ns_wifi_ssids) + ": ", "", ssid))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java
deleted file mode 100644
index 5dd9292343..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal;
-
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.events.EventCareportalEventChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.general.overview.OverviewFragment;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class CareportalFragment extends Fragment implements View.OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(CareportalFragment.class);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    TextView iage;
-    TextView cage;
-    TextView sage;
-    TextView pbage;
-
-    View statsLayout;
-    LinearLayout butonsLayout;
-    View noProfileView;
-
-    //                                                    date,bg,insulin,carbs,prebolus,duration,percent,absolute,profile,split,temptarget
-    public static final OptionsToShow BGCHECK = new OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg();
-    public static final OptionsToShow SNACKBOLUS = new OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus();
-    public static final OptionsToShow MEALBOLUS = new OptionsToShow(R.id.careportal_mealbolus, R.string.careportal_mealbolus).date().bg().insulin().carbs().prebolus();
-    public static final OptionsToShow CORRECTIONBOLUS = new OptionsToShow(R.id.careportal_correctionbolus, R.string.careportal_correctionbolus).date().bg().insulin().carbs().prebolus();
-    public static final OptionsToShow CARBCORRECTION = new OptionsToShow(R.id.careportal_carbscorrection, R.string.careportal_carbscorrection).date().bg().carbs();
-    public static final OptionsToShow COMBOBOLUS = new OptionsToShow(R.id.careportal_combobolus, R.string.careportal_combobolus).date().bg().insulin().carbs().prebolus().duration().split();
-    public static final OptionsToShow ANNOUNCEMENT = new OptionsToShow(R.id.careportal_announcement, R.string.careportal_announcement).date().bg();
-    public static final OptionsToShow NOTE = new OptionsToShow(R.id.careportal_note, R.string.careportal_note).date().bg().duration();
-    public static final OptionsToShow QUESTION = new OptionsToShow(R.id.careportal_question, R.string.careportal_question).date().bg();
-    public static final OptionsToShow EXERCISE = new OptionsToShow(R.id.careportal_exercise, R.string.careportal_exercise).date().duration();
-    public static final OptionsToShow SITECHANGE = new OptionsToShow(R.id.careportal_pumpsitechange, R.string.careportal_pumpsitechange).date().bg();
-    public static final OptionsToShow SENSORSTART = new OptionsToShow(R.id.careportal_cgmsensorstart, R.string.careportal_cgmsensorstart).date().bg();
-    public static final OptionsToShow SENSORCHANGE = new OptionsToShow(R.id.careportal_cgmsensorinsert, R.string.careportal_cgmsensorinsert).date().bg();
-    public static final OptionsToShow INSULINCHANGE = new OptionsToShow(R.id.careportal_insulincartridgechange, R.string.careportal_insulincartridgechange).date().bg();
-    public static final OptionsToShow PUMPBATTERYCHANGE = new OptionsToShow(R.id.careportal_pumpbatterychange, R.string.careportal_pumpbatterychange).date().bg();
-    public static final OptionsToShow TEMPBASALSTART = new OptionsToShow(R.id.careportal_tempbasalstart, R.string.careportal_tempbasalstart).date().bg().duration().percent().absolute();
-    public static final OptionsToShow TEMPBASALEND = new OptionsToShow(R.id.careportal_tempbasalend, R.string.careportal_tempbasalend).date().bg();
-    public static final OptionsToShow PROFILESWITCH = new OptionsToShow(R.id.careportal_profileswitch, R.string.careportal_profileswitch).date().duration().profile();
-    public static final OptionsToShow OPENAPSOFFLINE = new OptionsToShow(R.id.careportal_openapsoffline, R.string.careportal_openapsoffline).date().duration();
-    public static final OptionsToShow TEMPTARGET = new OptionsToShow(R.id.careportal_temporarytarget, R.string.careportal_temporarytarget).date().duration().tempTarget();
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.careportal_fragment, container, false);
-
-        view.findViewById(R.id.careportal_bgcheck).setOnClickListener(this);
-        view.findViewById(R.id.careportal_announcement).setOnClickListener(this);
-        view.findViewById(R.id.careportal_cgmsensorinsert).setOnClickListener(this);
-        view.findViewById(R.id.careportal_cgmsensorstart).setOnClickListener(this);
-        view.findViewById(R.id.careportal_combobolus).setOnClickListener(this);
-        view.findViewById(R.id.careportal_correctionbolus).setOnClickListener(this);
-        view.findViewById(R.id.careportal_carbscorrection).setOnClickListener(this);
-        view.findViewById(R.id.careportal_exercise).setOnClickListener(this);
-        view.findViewById(R.id.careportal_insulincartridgechange).setOnClickListener(this);
-        view.findViewById(R.id.careportal_pumpbatterychange).setOnClickListener(this);
-        view.findViewById(R.id.careportal_mealbolus).setOnClickListener(this);
-        view.findViewById(R.id.careportal_note).setOnClickListener(this);
-        view.findViewById(R.id.careportal_profileswitch).setOnClickListener(this);
-        view.findViewById(R.id.careportal_pumpsitechange).setOnClickListener(this);
-        view.findViewById(R.id.careportal_question).setOnClickListener(this);
-        view.findViewById(R.id.careportal_snackbolus).setOnClickListener(this);
-        view.findViewById(R.id.careportal_tempbasalend).setOnClickListener(this);
-        view.findViewById(R.id.careportal_tempbasalstart).setOnClickListener(this);
-        view.findViewById(R.id.careportal_openapsoffline).setOnClickListener(this);
-        view.findViewById(R.id.careportal_temporarytarget).setOnClickListener(this);
-
-        iage = view.findViewById(R.id.careportal_insulinage);
-        cage = view.findViewById(R.id.careportal_canulaage);
-        sage = view.findViewById(R.id.careportal_sensorage);
-        pbage = view.findViewById(R.id.careportal_pbage);
-
-        statsLayout = view.findViewById(R.id.careportal_stats);
-
-        noProfileView = view.findViewById(R.id.profileview_noprofile);
-        butonsLayout = view.findViewById(R.id.careportal_buttons);
-
-        ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null ? ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() : null;
-        if (profileStore == null) {
-            noProfileView.setVisibility(View.VISIBLE);
-            butonsLayout.setVisibility(View.GONE);
-        } else {
-            noProfileView.setVisibility(View.GONE);
-            butonsLayout.setVisibility(View.VISIBLE);
-        }
-
-        if (Config.NSCLIENT)
-            statsLayout.setVisibility(View.GONE); // visible on overview
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventCareportalEventChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGUI(), FabricPrivacy::logException)
-        );
-        updateGUI();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    @Override
-    public void onClick(View view) {
-        action(view.getId(), getFragmentManager());
-    }
-
-    public static void action(int id, FragmentManager manager) {
-        NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
-        switch (id) {
-            case R.id.careportal_bgcheck:
-                newDialog.setOptions(BGCHECK, R.string.careportal_bgcheck);
-                break;
-            case R.id.careportal_announcement:
-                newDialog.setOptions(ANNOUNCEMENT, R.string.careportal_announcement);
-                break;
-            case R.id.careportal_cgmsensorinsert:
-                newDialog.setOptions(SENSORCHANGE, R.string.careportal_cgmsensorinsert);
-                break;
-            case R.id.careportal_cgmsensorstart:
-                newDialog.setOptions(SENSORSTART, R.string.careportal_cgmsensorstart);
-                break;
-            case R.id.careportal_combobolus:
-                newDialog.setOptions(COMBOBOLUS, R.string.careportal_combobolus);
-                break;
-            case R.id.careportal_correctionbolus:
-                newDialog.setOptions(CORRECTIONBOLUS, R.string.careportal_correctionbolus);
-                break;
-            case R.id.careportal_carbscorrection:
-                newDialog.setOptions(CARBCORRECTION, R.string.careportal_carbscorrection);
-                break;
-            case R.id.careportal_exercise:
-                newDialog.setOptions(EXERCISE, R.string.careportal_exercise);
-                break;
-            case R.id.careportal_insulincartridgechange:
-                newDialog.setOptions(INSULINCHANGE, R.string.careportal_insulincartridgechange);
-                break;
-            case R.id.careportal_pumpbatterychange:
-                newDialog.setOptions(PUMPBATTERYCHANGE, R.string.careportal_pumpbatterychange);
-                break;
-            case R.id.careportal_mealbolus:
-                newDialog.setOptions(MEALBOLUS, R.string.careportal_mealbolus);
-                break;
-            case R.id.careportal_note:
-                newDialog.setOptions(NOTE, R.string.careportal_note);
-                break;
-            case R.id.careportal_profileswitch:
-                newDialog.setOptions(PROFILESWITCH, R.string.careportal_profileswitch);
-                break;
-            case R.id.careportal_pumpsitechange:
-                newDialog.setOptions(SITECHANGE, R.string.careportal_pumpsitechange);
-                break;
-            case R.id.careportal_question:
-                newDialog.setOptions(QUESTION, R.string.careportal_question);
-                break;
-            case R.id.careportal_snackbolus:
-                newDialog.setOptions(SNACKBOLUS, R.string.careportal_snackbolus);
-                break;
-            case R.id.careportal_tempbasalstart:
-                newDialog.setOptions(TEMPBASALSTART, R.string.careportal_tempbasalstart);
-                break;
-            case R.id.careportal_tempbasalend:
-                newDialog.setOptions(TEMPBASALEND, R.string.careportal_tempbasalend);
-                break;
-            case R.id.careportal_openapsoffline:
-                newDialog.setOptions(OPENAPSOFFLINE, R.string.careportal_openapsoffline);
-                break;
-            case R.id.careportal_temporarytarget:
-                newDialog.setOptions(TEMPTARGET, R.string.careportal_temporarytarget);
-                break;
-            default:
-                newDialog = null;
-        }
-        if (newDialog != null)
-            newDialog.show(manager, "NewNSTreatmentDialog");
-    }
-
-    protected void updateGUI() {
-        Activity activity = getActivity();
-        updateAge(activity, sage, iage, cage, pbage);
-    }
-
-    public static void updateAge(Activity activity, final TextView sage, final TextView iage, final TextView cage, final TextView pbage) {
-        if (activity != null) {
-            activity.runOnUiThread(
-                    () -> {
-                        CareportalEvent careportalEvent;
-                        NSSettingsStatus nsSettings = NSSettingsStatus.getInstance();
-
-                        double iageUrgent = nsSettings.getExtendedWarnValue("iage", "urgent", 96);
-                        double iageWarn = nsSettings.getExtendedWarnValue("iage", "warn", 72);
-                        handleAge(iage, CareportalEvent.INSULINCHANGE, iageWarn, iageUrgent);
-
-                        double cageUrgent = nsSettings.getExtendedWarnValue("cage", "urgent", 72);
-                        double cageWarn = nsSettings.getExtendedWarnValue("cage", "warn", 48);
-                        handleAge(cage, CareportalEvent.SITECHANGE, cageWarn, cageUrgent);
-
-                        double sageUrgent = nsSettings.getExtendedWarnValue("sage", "urgent", 166);
-                        double sageWarn = nsSettings.getExtendedWarnValue("sage", "warn", 164);
-                        handleAge(sage, CareportalEvent.SENSORCHANGE, sageWarn, sageUrgent);
-
-                        double pbageUrgent = nsSettings.getExtendedWarnValue("bage", "urgent", 360);
-                        double pbageWarn = nsSettings.getExtendedWarnValue("bage", "warn", 240);
-                        handleAge(pbage, CareportalEvent.PUMPBATTERYCHANGE, pbageWarn, pbageUrgent);
-                    }
-            );
-        }
-    }
-
-    public static int determineTextColor(CareportalEvent careportalEvent, double warnThreshold, double urgentThreshold) {
-        if (careportalEvent.isOlderThan(urgentThreshold)) {
-            return MainApp.gc(R.color.low);
-        } else if (careportalEvent.isOlderThan(warnThreshold)) {
-            return MainApp.gc(R.color.high);
-        } else {
-            return Color.WHITE;
-        }
-
-    }
-
-    private static TextView handleAge(final TextView age, String eventType, double warnThreshold, double urgentThreshold) {
-        return handleAge(age, "", eventType, warnThreshold, urgentThreshold, OverviewFragment.shorttextmode);
-    }
-
-    public static TextView handleAge(final TextView age, String prefix, String eventType, double warnThreshold, double urgentThreshold, boolean useShortText) {
-        String notavailable = useShortText ? "-" : MainApp.gs(R.string.notavailable);
-
-        if (age != null) {
-            CareportalEvent careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(eventType);
-            if (careportalEvent != null) {
-                age.setTextColor(CareportalFragment.determineTextColor(careportalEvent, warnThreshold, urgentThreshold));
-                age.setText(prefix + careportalEvent.age(useShortText));
-            } else {
-                age.setText(notavailable);
-            }
-        }
-
-        return age;
-    }
-}
-
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt
new file mode 100644
index 0000000000..876a067ac4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt
@@ -0,0 +1,138 @@
+package info.nightscout.androidaps.plugins.general.careportal
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventCareportalEventChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.careportal_fragment.*
+import kotlinx.android.synthetic.main.careportal_stats_fragment.*
+import javax.inject.Inject
+
+class CareportalFragment : DaggerFragment(), View.OnClickListener {
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var nsSettingsStatus: NSSettingsStatus
+    @Inject lateinit var statusLightHandler: StatusLightHandler
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    private val disposable = CompositeDisposable()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.careportal_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        careportal_bgcheck.setOnClickListener(this)
+        careportal_announcement.setOnClickListener(this)
+        careportal_cgmsensorinsert.setOnClickListener(this)
+        careportal_cgmsensorstart.setOnClickListener(this)
+        careportal_combobolus.setOnClickListener(this)
+        careportal_correctionbolus.setOnClickListener(this)
+        careportal_carbscorrection.setOnClickListener(this)
+        careportal_exercise.setOnClickListener(this)
+        careportal_insulincartridgechange.setOnClickListener(this)
+        careportal_pumpbatterychange.setOnClickListener(this)
+        careportal_mealbolus.setOnClickListener(this)
+        careportal_note.setOnClickListener(this)
+        careportal_profileswitch.setOnClickListener(this)
+        careportal_pumpsitechange.setOnClickListener(this)
+        careportal_question.setOnClickListener(this)
+        careportal_snackbolus.setOnClickListener(this)
+        careportal_tempbasalend.setOnClickListener(this)
+        careportal_tempbasalstart.setOnClickListener(this)
+        careportal_openapsoffline.setOnClickListener(this)
+        careportal_temporarytarget.setOnClickListener(this)
+
+        val profileStore = activePlugin.activeProfileInterface.profile
+        if (profileStore == null) {
+            profileview_noprofile.visibility = View.VISIBLE
+            careportal_buttons.visibility = View.GONE
+        } else {
+            profileview_noprofile.visibility = View.GONE
+            careportal_buttons.visibility = View.VISIBLE
+        }
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventCareportalEventChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }) { fabricPrivacy.logException(it) }
+        )
+        updateGUI()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    override fun onClick(view: View) {
+        val BGCHECK = OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg()
+        val SNACKBOLUS = OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus()
+        val MEALBOLUS = OptionsToShow(R.id.careportal_mealbolus, R.string.careportal_mealbolus).date().bg().insulin().carbs().prebolus()
+        val CORRECTIONBOLUS = OptionsToShow(R.id.careportal_correctionbolus, R.string.careportal_correctionbolus).date().bg().insulin().carbs().prebolus()
+        val CARBCORRECTION = OptionsToShow(R.id.careportal_carbscorrection, R.string.careportal_carbscorrection).date().bg().carbs()
+        val COMBOBOLUS = OptionsToShow(R.id.careportal_combobolus, R.string.careportal_combobolus).date().bg().insulin().carbs().prebolus().duration().split()
+        val ANNOUNCEMENT = OptionsToShow(R.id.careportal_announcement, R.string.careportal_announcement).date().bg()
+        val NOTE = OptionsToShow(R.id.careportal_note, R.string.careportal_note).date().bg().duration()
+        val QUESTION = OptionsToShow(R.id.careportal_question, R.string.careportal_question).date().bg()
+        val EXERCISE = OptionsToShow(R.id.careportal_exercise, R.string.careportal_exercise).date().duration()
+        val SITECHANGE = OptionsToShow(R.id.careportal_pumpsitechange, R.string.careportal_pumpsitechange).date().bg()
+        val SENSORSTART = OptionsToShow(R.id.careportal_cgmsensorstart, R.string.careportal_cgmsensorstart).date().bg()
+        val SENSORCHANGE = OptionsToShow(R.id.careportal_cgmsensorinsert, R.string.careportal_cgmsensorinsert).date().bg()
+        val INSULINCHANGE = OptionsToShow(R.id.careportal_insulincartridgechange, R.string.careportal_insulincartridgechange).date().bg()
+        val PUMPBATTERYCHANGE = OptionsToShow(R.id.careportal_pumpbatterychange, R.string.careportal_pumpbatterychange).date().bg()
+        val TEMPBASALSTART = OptionsToShow(R.id.careportal_tempbasalstart, R.string.careportal_tempbasalstart).date().bg().duration().percent().absolute()
+        val TEMPBASALEND = OptionsToShow(R.id.careportal_tempbasalend, R.string.careportal_tempbasalend).date().bg()
+        val PROFILESWITCH = OptionsToShow(R.id.careportal_profileswitch, R.string.careportal_profileswitch).date().duration().profile()
+        val OPENAPSOFFLINE = OptionsToShow(R.id.careportal_openapsoffline, R.string.careportal_openapsoffline).date().duration()
+        val TEMPTARGET = OptionsToShow(R.id.careportal_temporarytarget, R.string.careportal_temporarytarget).date().duration().tempTarget()
+
+        val newDialog = NewNSTreatmentDialog()
+        when (view.id) {
+            R.id.careportal_bgcheck                -> newDialog.setOptions(BGCHECK, R.string.careportal_bgcheck)
+            R.id.careportal_announcement           -> newDialog.setOptions(ANNOUNCEMENT, R.string.careportal_announcement)
+            R.id.careportal_cgmsensorinsert        -> newDialog.setOptions(SENSORCHANGE, R.string.careportal_cgmsensorinsert)
+            R.id.careportal_cgmsensorstart         -> newDialog.setOptions(SENSORSTART, R.string.careportal_cgmsensorstart)
+            R.id.careportal_combobolus             -> newDialog.setOptions(COMBOBOLUS, R.string.careportal_combobolus)
+            R.id.careportal_correctionbolus        -> newDialog.setOptions(CORRECTIONBOLUS, R.string.careportal_correctionbolus)
+            R.id.careportal_carbscorrection        -> newDialog.setOptions(CARBCORRECTION, R.string.careportal_carbscorrection)
+            R.id.careportal_exercise               -> newDialog.setOptions(EXERCISE, R.string.careportal_exercise)
+            R.id.careportal_insulincartridgechange -> newDialog.setOptions(INSULINCHANGE, R.string.careportal_insulincartridgechange)
+            R.id.careportal_pumpbatterychange      -> newDialog.setOptions(PUMPBATTERYCHANGE, R.string.careportal_pumpbatterychange)
+            R.id.careportal_mealbolus              -> newDialog.setOptions(MEALBOLUS, R.string.careportal_mealbolus)
+            R.id.careportal_note                   -> newDialog.setOptions(NOTE, R.string.careportal_note)
+            R.id.careportal_profileswitch          -> newDialog.setOptions(PROFILESWITCH, R.string.careportal_profileswitch)
+            R.id.careportal_pumpsitechange         -> newDialog.setOptions(SITECHANGE, R.string.careportal_pumpsitechange)
+            R.id.careportal_question               -> newDialog.setOptions(QUESTION, R.string.careportal_question)
+            R.id.careportal_snackbolus             -> newDialog.setOptions(SNACKBOLUS, R.string.careportal_snackbolus)
+            R.id.careportal_tempbasalstart         -> newDialog.setOptions(TEMPBASALSTART, R.string.careportal_tempbasalstart)
+            R.id.careportal_tempbasalend           -> newDialog.setOptions(TEMPBASALEND, R.string.careportal_tempbasalend)
+            R.id.careportal_openapsoffline         -> newDialog.setOptions(OPENAPSOFFLINE, R.string.careportal_openapsoffline)
+            R.id.careportal_temporarytarget        -> newDialog.setOptions(TEMPTARGET, R.string.careportal_temporarytarget)
+        }
+        fragmentManager?.let {
+            NewNSTreatmentDialog().show(it, "CareportalFragment")
+        }
+    }
+
+    private fun updateGUI() {
+        statusLightHandler.updateAge(careportal_sensorage, careportal_insulinage, careportal_canulaage, careportal_pbage)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.java
deleted file mode 100644
index fc28d23188..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-
-public class CareportalPlugin extends PluginBase {
-
-    static CareportalPlugin careportalPlugin;
-
-    static public CareportalPlugin getPlugin() {
-        if (careportalPlugin == null) {
-            careportalPlugin = new CareportalPlugin();
-        }
-        return careportalPlugin;
-    }
-
-    public CareportalPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(CareportalFragment.class.getName())
-                .pluginName(R.string.careportal)
-                .shortName(R.string.careportal_shortname)
-                .visibleByDefault(Config.NSCLIENT)
-                .enableByDefault(Config.NSCLIENT)
-                .description(R.string.description_careportal)
-        );
-    }
-
-    @Override
-    public boolean specialEnableCondition() {
-        return Config.NSCLIENT;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
new file mode 100644
index 0000000000..e3328aefc9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.general.careportal
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CareportalPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(CareportalFragment::class.java.name)
+    .pluginName(R.string.careportal)
+    .shortName(R.string.careportal_shortname)
+    .visibleByDefault(Config.NSCLIENT)
+    .enableByDefault(Config.NSCLIENT)
+    .description(R.string.description_careportal),
+    aapsLogger, resourceHelper, injector
+)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 38ad5bb879..211aec3c30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -19,7 +19,8 @@ import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import androidx.fragment.app.DialogFragment;
 
 import com.google.common.collect.Lists;
@@ -29,7 +30,6 @@ import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -37,6 +37,10 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import dagger.android.support.DaggerDialogFragment;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -45,8 +49,12 @@ import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
@@ -57,15 +65,25 @@ import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.NumberPicker;
 import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.SafeParse;
 import info.nightscout.androidaps.utils.Translator;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-public class NewNSTreatmentDialog extends AppCompatDialogFragment implements View.OnClickListener, DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
-    private static Logger log = LoggerFactory.getLogger(NewNSTreatmentDialog.class);
+public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.OnClickListener, DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject DefaultValueHelper defaultValueHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject SP sp;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject HardLimits hardLimits;
 
     private static OptionsToShow options;
-    private static String event;
+    private static @StringRes int event;
 
     private Profile profile;
     public ProfileStore profileStore;
@@ -106,7 +124,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
 
     public NewNSTreatmentDialog setOptions(OptionsToShow options, int event) {
         this.options = options;
-        this.event = MainApp.gs(event);
+        this.event = event;
         return this;
     }
 
@@ -119,7 +137,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         if (options == null) return null;
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
@@ -129,28 +147,28 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         setStyle(DialogFragment.STYLE_NORMAL, getTheme());
         View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
 
-        layoutPercent = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
-        layoutAbsolute = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
+        layoutPercent = view.findViewById(R.id.careportal_newnstreatment_percent_layout);
+        layoutAbsolute = view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
 
-        layoutReuse = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_reuse_layout);
+        layoutReuse = view.findViewById(R.id.careportal_newnstreatment_reuse_layout);
 
-        eventTypeText = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventtype);
+        eventTypeText = view.findViewById(R.id.careportal_newnstreatment_eventtype);
         eventTypeText.setText(event);
-        bgUnitsView = (TextView) view.findViewById(R.id.careportal_newnstreatment_bgunits);
-        meterRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_meter);
-        sensorRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_sensor);
-        otherRadioButton = (RadioButton) view.findViewById(R.id.careportal_newnstreatment_other);
-        profileSpinner = (Spinner) view.findViewById(R.id.careportal_newnstreatment_profile);
+        bgUnitsView = view.findViewById(R.id.careportal_newnstreatment_bgunits);
+        meterRadioButton = view.findViewById(R.id.careportal_newnstreatment_meter);
+        sensorRadioButton = view.findViewById(R.id.careportal_newnstreatment_sensor);
+        otherRadioButton = view.findViewById(R.id.careportal_newnstreatment_other);
+        profileSpinner = view.findViewById(R.id.careportal_newnstreatment_profile);
 
-        reuseButton = (Button) view.findViewById(R.id.careportal_newnstreatment_reusebutton);
+        reuseButton = view.findViewById(R.id.careportal_newnstreatment_reusebutton);
 
-        notesEdit = (EditText) view.findViewById(R.id.careportal_newnstreatment_notes);
+        notesEdit = view.findViewById(R.id.careportal_newnstreatment_notes);
 
-        reasonSpinner = (Spinner) view.findViewById(R.id.careportal_newnstreatment_temptarget_reason);
+        reasonSpinner = view.findViewById(R.id.careportal_newnstreatment_temptarget_reason);
 
         eventTime = new Date();
-        dateButton = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventdate);
-        timeButton = (TextView) view.findViewById(R.id.careportal_newnstreatment_eventtime);
+        dateButton = view.findViewById(R.id.careportal_newnstreatment_eventdate);
+        timeButton = view.findViewById(R.id.careportal_newnstreatment_eventtime);
         dateButton.setText(DateUtil.dateString(eventTime));
         timeButton.setText(DateUtil.timeString(eventTime));
         dateButton.setOnClickListener(this);
@@ -160,11 +178,11 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         view.findViewById(R.id.cancel).setOnClickListener(this);
 
         // profile
-        profile = ProfileFunctions.getInstance().getProfile();
-        profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
+        profile = profileFunction.getProfile();
+        profileStore = activePlugin.getActiveProfileInterface().getProfile();
         if (profileStore == null) {
             if (options.eventType == R.id.careportal_profileswitch) {
-                log.error("Profile switch called but plugin doesn't contain valid profile");
+                aapsLogger.error("Profile switch called but plugin doesn't contain valid profile");
             }
         } else {
             ArrayList<CharSequence> profileList;
@@ -174,18 +192,18 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
             profileSpinner.setAdapter(adapter);
             // set selected to actual profile
             for (int p = 0; p < profileList.size(); p++) {
-                if (profileList.get(p).equals(ProfileFunctions.getInstance().getProfileName(false)))
+                if (profileList.get(p).equals(profileFunction.getProfileName(false)))
                     profileSpinner.setSelection(p);
             }
         }
-        final Double bg = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData() != null ? GlucoseStatus.getGlucoseStatusData().glucose : 0d, ProfileFunctions.getSystemUnits());
+        final Double bg = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
 
         // temp target
         final List<String> reasonList = Lists.newArrayList(
-                MainApp.gs(R.string.manual),
-                MainApp.gs(R.string.eatingsoon),
-                MainApp.gs(R.string.activity),
-                MainApp.gs(R.string.hypo));
+                resourceHelper.gs(R.string.manual),
+                resourceHelper.gs(R.string.eatingsoon),
+                resourceHelper.gs(R.string.activity),
+                resourceHelper.gs(R.string.hypo));
         ArrayAdapter<String> adapterReason = new ArrayAdapter<>(getContext(),
                 R.layout.spinner_centered, reasonList);
         reasonSpinner.setAdapter(adapterReason);
@@ -202,16 +220,15 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
                 }
                 boolean erase = false;
 
-                String units = ProfileFunctions.getSystemUnits();
-                if (MainApp.gs(R.string.eatingsoon).equals(reasonList.get(position))) {
-                    defaultDuration = DefaultValueHelper.determineEatingSoonTTDuration();
-                    defaultTarget = DefaultValueHelper.determineEatingSoonTT();
-                } else if (MainApp.gs(R.string.activity).equals(reasonList.get(position))) {
-                    defaultDuration = DefaultValueHelper.determineActivityTTDuration();
-                    defaultTarget = DefaultValueHelper.determineActivityTT();
-                } else if (MainApp.gs(R.string.hypo).equals(reasonList.get(position))) {
-                    defaultDuration = DefaultValueHelper.determineHypoTTDuration();
-                    defaultTarget = DefaultValueHelper.determineHypoTT();
+                if (resourceHelper.gs(R.string.eatingsoon).equals(reasonList.get(position))) {
+                    defaultDuration = defaultValueHelper.determineEatingSoonTTDuration();
+                    defaultTarget = defaultValueHelper.determineEatingSoonTT();
+                } else if (resourceHelper.gs(R.string.activity).equals(reasonList.get(position))) {
+                    defaultDuration = defaultValueHelper.determineActivityTTDuration();
+                    defaultTarget = defaultValueHelper.determineActivityTT();
+                } else if (resourceHelper.gs(R.string.hypo).equals(reasonList.get(position))) {
+                    defaultDuration = defaultValueHelper.determineHypoTTDuration();
+                    defaultTarget = defaultValueHelper.determineHypoTT();
                 } else if (editDuration.getValue() != 0) {
                     defaultDuration = editDuration.getValue();
                 } else {
@@ -236,7 +253,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         });
 
         // bg
-        bgUnitsView.setText(ProfileFunctions.getSystemUnits());
+        bgUnitsView.setText(profileFunction.getUnits());
 
         TextWatcher bgTextWatcher = new TextWatcher() {
 
@@ -255,7 +272,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         if (profile == null) {
             editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
             editTemptarget.setParams(Constants.MIN_TT_MGDL, Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
-        } else if (ProfileFunctions.getSystemUnits().equals(Constants.MMOL)) {
+        } else if (profileFunction.getUnits().equals(Constants.MMOL)) {
             editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), bgTextWatcher);
             editTemptarget.setParams(Constants.MIN_TT_MMOL, Constants.MIN_TT_MMOL, Constants.MAX_TT_MMOL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
         } else {
@@ -264,7 +281,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         }
 
         sensorRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            Double bg1 = Profile.fromMgdlToUnits(GlucoseStatus.getGlucoseStatusData() != null ? GlucoseStatus.getGlucoseStatusData().glucose : 0d, ProfileFunctions.getSystemUnits());
+            double bg1 = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
             if (savedInstanceState != null && savedInstanceState.getDouble("editBg") != bg1) {
                 editBg.setValue(savedInstanceState.getDouble("editBg"));
             } else {
@@ -272,11 +289,11 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
             }
         });
 
-        Integer maxCarbs = MainApp.getConstraintChecker().getMaxCarbsAllowed().value();
+        Integer maxCarbs = constraintChecker.getMaxCarbsAllowed().value();
         editCarbs = view.findViewById(R.id.careportal_newnstreatment_carbsinput);
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
-        Double maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
+        Double maxInsulin = constraintChecker.getMaxBolusAllowed().value();
         editInsulin = view.findViewById(R.id.careportal_newnstreatment_insulininput);
         editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
 
@@ -305,7 +322,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
 
         Integer maxPercent = 200;
         if (profile != null)
-            maxPercent = MainApp.getConstraintChecker().getMaxBasalPercentAllowed(profile).value();
+            maxPercent = constraintChecker.getMaxBasalPercentAllowed(profile).value();
         editPercent = view.findViewById(R.id.careportal_newnstreatment_percentinput);
         editPercent.setParams(0d, -100d, (double) maxPercent, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok), percentTextWatcher);
 
@@ -327,9 +344,9 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
             }
         };
 
-        Double maxAbsolute = HardLimits.maxBasal();
+        Double maxAbsolute = hardLimits.maxBasal();
         if (profile != null)
-            maxAbsolute = MainApp.getConstraintChecker().getMaxBasalAllowed(profile).value();
+            maxAbsolute = constraintChecker.getMaxBasalAllowed(profile).value();
         editAbsolute = view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
         editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true, view.findViewById(R.id.ok), absoluteTextWatcher);
 
@@ -342,7 +359,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         editTimeshift = view.findViewById(R.id.careportal_newnstreatment_timeshift);
         editTimeshift.setParams(0d, (double) Constants.CPP_MIN_TIMESHIFT, (double) Constants.CPP_MAX_TIMESHIFT, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
-        ProfileSwitch ps = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(DateUtil.now());
+        ProfileSwitch ps = treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now());
         if (ps != null && ps.isCPP) {
             final int percentage = ps.percentage;
             final int timeshift = ps.timeshift;
@@ -451,7 +468,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         if ((data.size() > 0) &&
                 (data.get(0).date > millis - 7 * 60 * 1000L) &&
                 (data.get(0).date < millis + 7 * 60 * 1000L)) {
-            editBg.setValue(Profile.fromMgdlToUnits(data.get(0).value, ProfileFunctions.getSystemUnits()));
+            editBg.setValue(Profile.fromMgdlToUnits(data.get(0).value, profileFunction.getUnits()));
         }
     }
 
@@ -473,8 +490,8 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
         updateBGforDateTime();
     }
 
-    JSONObject gatherData() {
-        String enteredBy = SP.getString("careportal_enteredby", "");
+    private JSONObject gatherData() {
+        String enteredBy = sp.getString("careportal_enteredby", "");
         JSONObject data = new JSONObject();
         try {
             boolean allowZeroDuration = false;
@@ -578,7 +595,7 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
                 data.put("preBolus", SafeParse.stringToDouble(editCarbTime.getText()));
             if (!notesEdit.getText().toString().equals(""))
                 data.put("notes", notesEdit.getText().toString());
-            data.put("units", ProfileFunctions.getSystemUnits());
+            data.put("units", profileFunction.getUnits());
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             if (options.eventType == R.id.careportal_combobolus) {
                 Double enteredInsulin = SafeParse.stringToDouble(editInsulin.getText());
@@ -587,93 +604,93 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
                 data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return data;
     }
 
-    String buildConfirmText(JSONObject data) {
+    private String buildConfirmText(JSONObject data) {
         String ret = "";
 //        if (data.has("eventType")) {
-//            ret += MainApp.gs(R.string.careportal_newnstreatment_eventtype);
+//            ret += resourceHelper.gs(R.string.careportal_newnstreatment_eventtype);
 //            ret += ": ";
 //            ret += Translator.translate(JsonHelper.safeGetString(data, "eventType", ""));
 //            ret += "\n";
 //        }
         if (data.has("glucose")) {
-            ret += MainApp.gs(R.string.treatments_wizard_bg_label);
+            ret += resourceHelper.gs(R.string.treatments_wizard_bg_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "glucose", "");
-            ret += " " + ProfileFunctions.getSystemUnits() + "\n";
+            ret += " " + profileFunction.getUnits() + "\n";
         }
         if (data.has("glucoseType")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_glucosetype);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype);
             ret += ": ";
             ret += Translator.translate(JsonHelper.safeGetString(data, "glucoseType", ""));
             ret += "\n";
         }
         if (data.has("carbs")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_carbs_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbs_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "carbs", "");
             ret += " g\n";
         }
         if (data.has("insulin")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_insulin_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_insulin_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "insulin", "");
             ret += " U\n";
         }
         if (data.has("duration")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_duration_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_duration_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "duration", "");
             ret += " min\n";
         }
         if (data.has("percent")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_percent_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_percent_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "percent", "");
             ret += " %\n";
         }
         if (data.has("absolute")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_absolute_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_absolute_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "absolute", "");
             ret += " U/h\n";
         }
         if (data.has("preBolus")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_carbtime_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbtime_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "preBolus", "");
             ret += " min\n";
         }
         if (data.has("notes")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_notes_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_notes_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "notes", "");
             ret += "\n";
         }
         if (data.has("profile")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_profile_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_profile_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "profile", "");
             ret += "\n";
         }
         if (data.has("percentage")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_percentage_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_percentage_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "percentage", "");
             ret += " %\n";
         }
         if (data.has("timeshift")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_timeshift_label);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "timeshift", "");
             ret += " h\n";
         }
         if (data.has("targetBottom") && data.has("targetTop")) {
-            ret += MainApp.gs(R.string.target_range);
+            ret += resourceHelper.gs(R.string.target_range);
             ret += " ";
             ret += JsonHelper.safeGetObject(data, "targetBottom", "");
             ret += " - ";
@@ -681,13 +698,13 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
             ret += "\n";
         }
         if (data.has("created_at")) {
-            ret += MainApp.gs(R.string.event_time_label);
+            ret += resourceHelper.gs(R.string.event_time_label);
             ret += ": ";
-            ret += eventTime.toLocaleString();
+            ret += DateUtil.dateAndTimeString(eventTime);
             ret += "\n";
         }
         if (data.has("enteredBy")) {
-            ret += MainApp.gs(R.string.careportal_newnstreatment_enteredby_title);
+            ret += resourceHelper.gs(R.string.careportal_newnstreatment_enteredby_title);
             ret += ": ";
             ret += JsonHelper.safeGetObject(data, "enteredBy", "");
             ret += "\n";
@@ -698,26 +715,10 @@ public class NewNSTreatmentDialog extends AppCompatDialogFragment implements Vie
 
     private void confirmNSTreatmentCreation() {
         final JSONObject data = gatherData();
-        OKDialog.showConfirmation(getContext(), Translator.translate(JsonHelper.safeGetString(data, "eventType", MainApp.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> createNSTreatment(data));
+        OKDialog.showConfirmation(getContext(), Translator.translate(JsonHelper.safeGetString(data, "eventType", resourceHelper.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> NSUpload.createNSTreatment(data, profileStore, profileFunction, eventTime.getTime()));
     }
 
 
-    void createNSTreatment(JSONObject data) {
-        if (JsonHelper.safeGetString(data, "eventType", "").equals(CareportalEvent.PROFILESWITCH)) {
-            ProfileSwitch profileSwitch = ProfileFunctions.prepareProfileSwitch(
-                    profileStore,
-                    JsonHelper.safeGetString(data, "profile"),
-                    JsonHelper.safeGetInt(data, "duration"),
-                    JsonHelper.safeGetInt(data, "percentage"),
-                    JsonHelper.safeGetInt(data, "timeshift"),
-                    eventTime.getTime()
-            );
-            NSUpload.uploadProfileSwitch(profileSwitch);
-        } else {
-            NSUpload.uploadCareportalEntryToNS(data);
-        }
-    }
-
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         savedInstanceState.putString("notesEdit", notesEdit.getText().toString());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
new file mode 100644
index 0000000000..d2c552c184
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
@@ -0,0 +1,214 @@
+package info.nightscout.androidaps.plugins.general.dataBroadcaster
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ResolveInfo
+import android.os.Bundle
+import dagger.Lazy
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.events.EventNewBasalProfile
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.events.EventTreatmentChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+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.services.Intents
+import info.nightscout.androidaps.utils.BatteryLevel
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DataBroadcastPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val fabricPrivacy: FabricPrivacy,
+    private val rxBus: RxBusWrapper,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val profileFunction: ProfileFunction,
+    private val defaultValueHelper: DefaultValueHelper,
+    private val nsDeviceStatus: NSDeviceStatus,
+    private val lazyLoopPlugin: Lazy<LoopPlugin>,
+    private val activePlugin: ActivePluginProvider
+
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .pluginName(R.string.databroadcaster)
+    .alwaysEnabled(true)
+    .neverVisible(true)
+    .showInList(false),
+    aapsLogger, resourceHelper, injector
+) {
+
+    private val disposable = CompositeDisposable()
+    override fun onStart() {
+        super.onStart()
+        disposable.add(rxBus
+            .toObservable(EventOpenAPSUpdateGui::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTreatmentChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventNewBasalProfile::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventOverviewBolusProgress::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendData(it) }) { fabricPrivacy.logException(it) })
+    }
+
+    override fun onStop() {
+        disposable.clear()
+        super.onStop()
+    }
+
+    private fun sendData(event: Event) {
+        val bundle = Bundle()
+        bgStatus(bundle)
+        iobCob(bundle)
+        loopStatus(bundle)
+        basalStatus(bundle)
+        pumpStatus(bundle)
+
+        if (event is EventOverviewBolusProgress && !event.isSMB()) {
+            bundle.putInt("progressPercent", event.percent)
+            bundle.putString("progressStatus", event.status)
+        }
+
+        //aapsLogger.debug("Prepared bundle:\n" + BundleLogger.log(bundle))
+        sendBroadcast(
+            Intent(Intents.AAPS_BROADCAST) // "info.nightscout.androidaps.status"
+                .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                .putExtras(bundle)
+        )
+    }
+
+    private fun bgStatus(bundle: Bundle) {
+        val lastBG: BgReading = iobCobCalculatorPlugin.lastBg() ?: return
+        val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData() ?: return
+
+        bundle.putDouble("glucoseMgdl", lastBG.value)   // last BG in mgdl
+        bundle.putLong("glucoseTimeStamp", lastBG.date) // timestamp
+        bundle.putString("units", profileFunction.getUnits()) // units used in AAPS "mg/dl" or "mmol"
+        bundle.putString("slopeArrow", lastBG.directionToSymbol()) // direction arrow as string
+        bundle.putDouble("deltaMgdl", glucoseStatus.delta) // bg delta in mgdl
+        bundle.putDouble("avgDeltaMgdl", glucoseStatus.avgdelta) // average bg delta
+        bundle.putDouble("high", defaultValueHelper.determineHighLine()) // predefined top value of in range (green area)
+        bundle.putDouble("low", defaultValueHelper.determineLowLine()) // predefined bottom  value of in range
+    }
+
+    private fun iobCob(bundle: Bundle) {
+        profileFunction.getProfile() ?: return
+        activePlugin.activeTreatments.updateTotalIOBTreatments()
+        val bolusIob: IobTotal = activePlugin.activeTreatments.lastCalculationTreatments.round()
+        activePlugin.activeTreatments.updateTotalIOBTempBasals()
+        val basalIob: IobTotal = activePlugin.activeTreatments.lastCalculationTempBasals.round()
+        bundle.putDouble("bolusIob", bolusIob.iob)
+        bundle.putDouble("basalIob", basalIob.basaliob)
+        bundle.putDouble("iob", bolusIob.iob + basalIob.basaliob) // total IOB
+
+        val cob = iobCobCalculatorPlugin.getCobInfo(false, "broadcast")
+        bundle.putDouble("cob", cob.displayCob ?: -1.0) // COB [g] or -1 if N/A
+        bundle.putDouble("futureCarbs", cob.futureCarbs) // future scheduled carbs
+    }
+
+    private fun loopStatus(bundle: Bundle) {
+        //batteries
+        bundle.putInt("phoneBattery", BatteryLevel.getBatteryLevel())
+        bundle.putInt("rigBattery", nsDeviceStatus.uploaderStatus.replace("%", "").trim { it <= ' ' }.toInt())
+
+        if (Config.APS && lazyLoopPlugin.get().lastRun?.lastTBREnact != 0L) { //we are AndroidAPS
+            bundle.putLong("suggestedTimeStamp", lazyLoopPlugin.get().lastRun?.lastAPSRun?.time
+                ?: -1L)
+            bundle.putString("suggested", lazyLoopPlugin.get().lastRun?.request?.json().toString())
+            if (lazyLoopPlugin.get().lastRun.tbrSetByPump != null && lazyLoopPlugin.get().lastRun.tbrSetByPump.enacted) {
+                bundle.putLong("enactedTimeStamp", lazyLoopPlugin.get().lastRun?.lastTBREnact
+                    ?: -1L)
+                bundle.putString("enacted", lazyLoopPlugin.get().lastRun?.request?.json().toString())
+            }
+        } else { //NSClient or remote
+            val data = NSDeviceStatus.deviceStatusOpenAPSData
+            if (data.clockSuggested != 0L && data.suggested != null) {
+                bundle.putLong("suggestedTimeStamp", data.clockSuggested)
+                bundle.putString("suggested", data.suggested.toString())
+            }
+            if (data.clockEnacted != 0L && data.enacted != null) {
+                bundle.putLong("enactedTimeStamp", data.clockEnacted)
+                bundle.putString("enacted", data.enacted.toString())
+            }
+        }
+    }
+
+    private fun basalStatus(bundle: Bundle) {
+        val now = System.currentTimeMillis()
+        val profile = profileFunction.getProfile() ?: return
+        bundle.putLong("basalTimeStamp", now)
+        bundle.putDouble("baseBasal", profile.basal)
+        bundle.putString("profile", profileFunction.getProfileName())
+        activePlugin.activeTreatments.getTempBasalFromHistory(now)?.let {
+            bundle.putLong("tempBasalStart", it.date)
+            bundle.putInt("tempBasalDurationInMinutes", it.durationInMinutes)
+            if (it.isAbsolute) bundle.putDouble("tempBasalAbsolute", it.absoluteRate) // U/h for absolute TBR
+            else bundle.putInt("tempBasalPercent", it.percentRate) // % for percent type TBR
+            bundle.putString("tempBasalString", it.toStringFull()) // user friendly string
+        }
+    }
+
+    private fun pumpStatus(bundle: Bundle) {
+        val pump = activePlugin.activePump
+        bundle.putLong("pumpTimeStamp", pump.lastDataTime())
+        bundle.putInt("pumpBattery", pump.batteryLevel)
+        bundle.putDouble("pumpReservoir", pump.reservoirLevel)
+        bundle.putString("pumpStatus", pump.shortStatus(false))
+    }
+
+    private fun sendBroadcast(intent: Intent) {
+        val receivers: List<ResolveInfo> = context.packageManager.queryBroadcastReceivers(intent, 0)
+        for (resolveInfo in receivers)
+            resolveInfo.activityInfo.packageName?.let {
+                intent.setPackage(it)
+                context.sendBroadcast(intent)
+                aapsLogger.debug(LTag.CORE, "Sending broadcast " + intent.action + " to: " + it)
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.java
deleted file mode 100644
index 074310a8dd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package info.nightscout.androidaps.plugins.general.food;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SpinnerHelper;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-/**
- * Created by mike on 16.10.2017.
- */
-
-public class FoodFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private EditText filter;
-    private SpinnerHelper category;
-    private SpinnerHelper subcategory;
-    private RecyclerView recyclerView;
-
-    private List<Food> unfiltered;
-    private List<Food> filtered;
-
-    private final String EMPTY = MainApp.gs(R.string.none);
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.food_fragment, container, false);
-        filter = view.findViewById(R.id.food_filter);
-        ImageView clearFilter = view.findViewById(R.id.food_clearfilter);
-        category = new SpinnerHelper(view.findViewById(R.id.food_category));
-        subcategory = new SpinnerHelper(view.findViewById(R.id.food_subcategory));
-        recyclerView = view.findViewById(R.id.food_recyclerview);
-        recyclerView.setHasFixedSize(true);
-        LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-        recyclerView.setLayoutManager(llm);
-
-        clearFilter.setOnClickListener(v -> {
-            filter.setText("");
-            category.setSelection(0);
-            subcategory.setSelection(0);
-            filterData();
-        });
-
-        category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                fillSubcategories();
-                filterData();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                fillSubcategories();
-                filterData();
-            }
-        });
-
-        subcategory.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                filterData();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                filterData();
-            }
-        });
-
-        filter.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                filterData();
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(FoodPlugin.getPlugin().getService().getFoodData());
-        recyclerView.setAdapter(adapter);
-
-        loadData();
-        fillCategories();
-        fillSubcategories();
-        filterData();
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventFoodDatabaseChanged.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    private void loadData() {
-        unfiltered = FoodPlugin.getPlugin().getService().getFoodData();
-    }
-
-    private void fillCategories() {
-        Set<CharSequence> catSet = new HashSet<>();
-
-        for (Food f : unfiltered) {
-            if (f.category != null && !f.category.equals(""))
-                catSet.add(f.category);
-        }
-
-        // make it unique
-        ArrayList<CharSequence> categories = new ArrayList<>(catSet);
-        categories.add(0, MainApp.gs(R.string.none));
-
-        ArrayAdapter<CharSequence> adapterCategories = new ArrayAdapter<>(getContext(),
-                R.layout.spinner_centered, categories);
-        category.setAdapter(adapterCategories);
-    }
-
-    private void fillSubcategories() {
-        String categoryFilter = category.getSelectedItem().toString();
-
-        Set<CharSequence> subCatSet = new HashSet<>();
-
-        if (!categoryFilter.equals(EMPTY)) {
-            for (Food f : unfiltered) {
-                if (f.category != null && f.category.equals(categoryFilter))
-                    if (f.subcategory != null && !f.subcategory.equals(""))
-                        subCatSet.add(f.subcategory);
-            }
-        }
-
-        // make it unique
-        ArrayList<CharSequence> subcategories = new ArrayList<>(subCatSet);
-        subcategories.add(0, MainApp.gs(R.string.none));
-
-        ArrayAdapter<CharSequence> adapterSubcategories = new ArrayAdapter<>(getContext(),
-                R.layout.spinner_centered, subcategories);
-        subcategory.setAdapter(adapterSubcategories);
-    }
-
-    private void filterData() {
-        String textFilter = filter.getText().toString();
-        String categoryFilter = category.getSelectedItem().toString();
-        String subcategoryFilter = subcategory.getSelectedItem().toString();
-
-        filtered = new ArrayList<>();
-
-        for (Food f : unfiltered) {
-            if (f.name == null || f.category == null || f.subcategory == null)
-                continue;
-
-            if (!subcategoryFilter.equals(EMPTY) && !f.subcategory.equals(subcategoryFilter))
-                continue;
-            if (!categoryFilter.equals(EMPTY) && !f.category.equals(categoryFilter))
-                continue;
-            if (!textFilter.equals("") && !f.name.toLowerCase().contains(textFilter.toLowerCase()))
-                continue;
-            filtered.add(f);
-        }
-
-        updateGui();
-    }
-
-    protected void updateGui() {
-        recyclerView.swapAdapter(new FoodFragment.RecyclerViewAdapter(filtered), true);
-    }
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.FoodsViewHolder> {
-
-        List<Food> foodList;
-
-        RecyclerViewAdapter(List<Food> foodList) {
-            this.foodList = foodList;
-        }
-
-        @NonNull
-        @Override
-        public FoodsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.food_item, viewGroup, false);
-            return new FoodsViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(FoodsViewHolder holder, int position) {
-            Food food = foodList.get(position);
-            holder.ns.setVisibility(food._id != null ? View.VISIBLE : View.GONE);
-            holder.name.setText(food.name);
-            holder.portion.setText(food.portion + food.units);
-            holder.carbs.setText(food.carbs + MainApp.gs(R.string.shortgramm));
-            holder.fat.setText(MainApp.gs(R.string.shortfat) + ": " + food.fat + MainApp.gs(R.string.shortgramm));
-            if (food.fat == 0)
-                holder.fat.setVisibility(View.INVISIBLE);
-            holder.protein.setText(MainApp.gs(R.string.shortprotein) + ": " + food.protein + MainApp.gs(R.string.shortgramm));
-            if (food.protein == 0)
-                holder.protein.setVisibility(View.INVISIBLE);
-            holder.energy.setText(MainApp.gs(R.string.shortenergy) + ": " + food.energy + MainApp.gs(R.string.shortkilojoul));
-            if (food.energy == 0)
-                holder.energy.setVisibility(View.INVISIBLE);
-            holder.remove.setTag(food);
-        }
-
-        @Override
-        public int getItemCount() {
-            return foodList.size();
-        }
-
-        class FoodsViewHolder extends RecyclerView.ViewHolder {
-            TextView name;
-            TextView portion;
-            TextView carbs;
-            TextView fat;
-            TextView protein;
-            TextView energy;
-            TextView ns;
-            TextView remove;
-
-            FoodsViewHolder(View itemView) {
-                super(itemView);
-                name = itemView.findViewById(R.id.food_name);
-                portion = itemView.findViewById(R.id.food_portion);
-                carbs = itemView.findViewById(R.id.food_carbs);
-                fat = itemView.findViewById(R.id.food_fat);
-                protein = itemView.findViewById(R.id.food_protein);
-                energy = itemView.findViewById(R.id.food_energy);
-                ns = itemView.findViewById(R.id.ns_sign);
-                remove = itemView.findViewById(R.id.food_remove);
-                remove.setOnClickListener(v -> {
-                    final Food food = (Food) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.confirmation), MainApp.gs(R.string.removerecord) + "\n" + food.name, (dialog, id) -> {
-                        final String _id = food._id;
-                        if (_id != null && !_id.equals("")) {
-                            NSUpload.removeFoodFromNS(_id);
-                        }
-                        FoodPlugin.getPlugin().getService().delete(food);
-                    }, null);
-                });
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
new file mode 100644
index 0000000000..754000cac4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -0,0 +1,213 @@
+package info.nightscout.androidaps.plugins.general.food
+
+import android.content.DialogInterface
+import android.graphics.Paint
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventFoodDatabaseChanged
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.food.FoodFragment.RecyclerViewAdapter.FoodsViewHolder
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.food_fragment.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
+
+class FoodFragment : DaggerFragment() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var foodPlugin: FoodPlugin
+
+    private val disposable = CompositeDisposable()
+    private lateinit var unfiltered: List<Food>
+    private lateinit var filtered: MutableList<Food>
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.food_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        food_recyclerview.setHasFixedSize(true)
+        food_recyclerview.setLayoutManager(LinearLayoutManager(view.context))
+        food_recyclerview.adapter = RecyclerViewAdapter(foodPlugin.service?.foodData ?: ArrayList())
+
+        food_clearfilter.setOnClickListener {
+            food_filter.setText("")
+            food_category.setSelection(0)
+            food_subcategory.setSelection(0)
+            filterData()
+        }
+        food_category.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                fillSubcategories()
+                filterData()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                fillSubcategories()
+                filterData()
+            }
+        }
+        food_subcategory.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                filterData()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                filterData()
+            }
+        })
+        food_filter.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                filterData()
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        })
+        loadData()
+        fillCategories()
+        fillSubcategories()
+        filterData()
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventFoodDatabaseChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun loadData() {
+        unfiltered = foodPlugin.service?.foodData ?: ArrayList()
+    }
+
+    private fun fillCategories() {
+        val catSet: MutableSet<CharSequence> = HashSet()
+        for (f in unfiltered) {
+            if (f.category != null && f.category != "") catSet.add(f.category)
+        }
+        // make it unique
+        val categories = ArrayList(catSet)
+        categories.add(0, resourceHelper.gs(R.string.none))
+        context?.let { context ->
+            val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
+            food_category.adapter = adapterCategories
+        }
+    }
+
+    private fun fillSubcategories() {
+        val categoryFilter = food_category.selectedItem.toString()
+        val subCatSet: MutableSet<CharSequence> = HashSet()
+        if (categoryFilter != resourceHelper.gs(R.string.none)) {
+            for (f in unfiltered) {
+                if (f.category != null && f.category == categoryFilter) if (f.subcategory != null && f.subcategory != "") subCatSet.add(f.subcategory)
+            }
+        }
+        // make it unique
+        val subcategories = ArrayList(subCatSet)
+        subcategories.add(0, resourceHelper.gs(R.string.none))
+        context?.let { context ->
+            val adapterSubcategories = ArrayAdapter(context, R.layout.spinner_centered, subcategories)
+            food_subcategory.adapter = adapterSubcategories
+        }
+    }
+
+    private fun filterData() {
+        val textFilter = food_filter.text.toString()
+        val categoryFilter = food_category.selectedItem.toString()
+        val subcategoryFilter = food_subcategory.selectedItem.toString()
+        val newfiltered = ArrayList<Food>()
+        for (f in unfiltered) {
+            if (f.name == null || f.category == null || f.subcategory == null) continue
+            if (subcategoryFilter != resourceHelper.gs(R.string.none) && f.subcategory != subcategoryFilter) continue
+            if (categoryFilter != resourceHelper.gs(R.string.none) && f.category != categoryFilter) continue
+            if (textFilter != "" && !f.name.toLowerCase(Locale.getDefault()).contains(textFilter.toLowerCase(Locale.getDefault()))) continue
+            newfiltered.add(f)
+        }
+        filtered = newfiltered
+        updateGui()
+    }
+
+    protected fun updateGui() {
+        food_recyclerview?.swapAdapter(RecyclerViewAdapter(filtered), true)
+    }
+
+    inner class RecyclerViewAdapter internal constructor(var foodList: List<Food>) : RecyclerView.Adapter<FoodsViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoodsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.food_item, viewGroup, false)
+            return FoodsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: FoodsViewHolder, position: Int) {
+            val food = foodList[position]
+            holder.ns.visibility = if (food._id != null) View.VISIBLE else View.GONE
+            holder.name.text = food.name
+            holder.portion.text = food.portion.toString() + food.units
+            holder.carbs.text = food.carbs.toString() + resourceHelper.gs(R.string.shortgramm)
+            holder.fat.text = resourceHelper.gs(R.string.shortfat) + ": " + food.fat + resourceHelper.gs(R.string.shortgramm)
+            if (food.fat == 0) holder.fat.visibility = View.INVISIBLE
+            holder.protein.text = resourceHelper.gs(R.string.shortprotein) + ": " + food.protein + resourceHelper.gs(R.string.shortgramm)
+            if (food.protein == 0) holder.protein.visibility = View.INVISIBLE
+            holder.energy.text = resourceHelper.gs(R.string.shortenergy) + ": " + food.energy + resourceHelper.gs(R.string.shortkilojoul)
+            if (food.energy == 0) holder.energy.visibility = View.INVISIBLE
+            holder.remove.tag = food
+        }
+
+        override fun getItemCount(): Int = foodList.size
+
+        inner class FoodsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var name: TextView = itemView.findViewById(R.id.food_name)
+            var portion: TextView = itemView.findViewById(R.id.food_portion)
+            var carbs: TextView = itemView.findViewById(R.id.food_carbs)
+            var fat: TextView = itemView.findViewById(R.id.food_fat)
+            var protein: TextView = itemView.findViewById(R.id.food_protein)
+            var energy: TextView = itemView.findViewById(R.id.food_energy)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+            var remove: TextView = itemView.findViewById(R.id.food_remove)
+
+            init {
+                remove.setOnClickListener { v: View ->
+                    val food = v.tag as Food
+                    activity?.let { activity ->
+                        showConfirmation(activity, resourceHelper.gs(R.string.confirmation), resourceHelper.gs(R.string.removerecord) + "\n" + food.name, DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
+                            if (food._id != null && food._id != "") {
+                                NSUpload.removeFoodFromNS(food._id)
+                            }
+                            foodPlugin.service?.delete(food)
+                        }, null)
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.java
deleted file mode 100644
index e5548417a2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.general.food;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class FoodPlugin extends PluginBase {
-
-    private static FoodPlugin plugin = null;
-
-    public static FoodPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new FoodPlugin();
-        return plugin;
-    }
-
-    private FoodService service;
-
-    private FoodPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(FoodFragment.class.getName())
-                .pluginName(R.string.food)
-                .shortName(R.string.food_short)
-                .description(R.string.description_food)
-        );
-        this.service = new FoodService();
-    }
-
-    public FoodService getService() {
-        return this.service;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
new file mode 100644
index 0000000000..9c41df2666
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.plugins.general.food
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FoodPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(FoodFragment::class.java.name)
+    .pluginName(R.string.food)
+    .shortName(R.string.food_short)
+    .description(R.string.description_food),
+    aapsLogger, resourceHelper, injector
+) {
+
+    var service: FoodService? = null
+
+    override fun onStart() {
+        super.onStart()
+        service = FoodService()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
index 065c74eabb..19ceb73ca6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.general.food;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.os.IBinder;
 
 import androidx.annotation.Nullable;
@@ -27,13 +26,13 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.ICallback;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
 import info.nightscout.androidaps.events.EventNsFood;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import io.reactivex.disposables.CompositeDisposable;
@@ -44,7 +43,7 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
-    private Logger log = LoggerFactory.getLogger(L.DATAFOOD);
+    private Logger log = StacktraceLoggerWrapper.getLogger(L.DATAFOOD);
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private static final ScheduledExecutorService foodEventWorker = Executors.newSingleThreadScheduledExecutor();
@@ -53,33 +52,17 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
     public FoodService() {
         onCreate();
         dbInitialize();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(RxBus.Companion.getINSTANCE()
                 .toObservable(EventNsFood.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     int mode = event.getMode();
-                    Bundle payload = event.getPayload();
-
-                    try {
-                        if (payload.containsKey("food")) {
-                            JSONObject json = new JSONObject(payload.getString("food"));
-                            if (mode == EventNsFood.Companion.getADD() || mode == EventNsFood.Companion.getUPDATE())
-                                this.createFoodFromJsonIfNotExists(json);
-                            else
-                                this.deleteNS(json);
-                        }
-
-                        if (payload.containsKey("foods")) {
-                            JSONArray array = new JSONArray(payload.getString("foods"));
-                            if (mode == EventNsFood.Companion.getADD() || mode == EventNsFood.Companion.getUPDATE())
-                                this.createFoodFromJsonIfNotExists(array);
-                            else
-                                this.deleteNS(array);
-                        }
-                    } catch (JSONException e) {
-                        log.error("Unhandled Exception", e);
-                    }
-                }, FabricPrivacy::logException)
+                    JSONArray array = event.getFoods();
+                    if (mode == EventNsFood.Companion.getADD() || mode == EventNsFood.Companion.getUPDATE())
+                        this.createFoodFromJsonIfNotExists(array);
+                    else
+                        this.deleteNS(array);
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
@@ -166,7 +149,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
             public void run() {
                 if (L.isEnabled(L.DATAFOOD))
                     log.debug("Firing EventFoodChange");
-                RxBus.INSTANCE.send(event);
+                RxBus.Companion.getINSTANCE().send(event);
                 callback.setPost(null);
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java
deleted file mode 100644
index 3a776ab541..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-/**
- * Created by mike on 03.07.2016.
- */
-
-public class ImportExportPrefs {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-    private static File path = new File(Environment.getExternalStorageDirectory().toString());
-    static public final File file = new File(path, MainApp.gs(R.string.app_name) + "Preferences");
-
-    private static final int REQUEST_EXTERNAL_STORAGE = 1;
-    private static String[] PERMISSIONS_STORAGE = {
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
-    };
-
-    static void verifyStoragePermissions(Fragment fragment) {
-        int permission = ContextCompat.checkSelfPermission(fragment.getContext(),
-                Manifest.permission.WRITE_EXTERNAL_STORAGE);
-
-        if (permission != PackageManager.PERMISSION_GRANTED) {
-            // We don't have permission so prompt the user
-            fragment.requestPermissions(PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
-        }
-
-    }
-
-    static void exportSharedPreferences(final Fragment f) {
-        exportSharedPreferences(f.getContext());
-    }
-
-    private static void exportSharedPreferences(final Context context) {
-        OKDialog.showConfirmation(context, MainApp.gs(R.string.maintenance), MainApp.gs(R.string.export_to) + " " + file + " ?", () -> {
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            try {
-                FileWriter fw = new FileWriter(file);
-                PrintWriter pw = new PrintWriter(fw);
-                Map<String, ?> prefsMap = prefs.getAll();
-                for (Map.Entry<String, ?> entry : prefsMap.entrySet()) {
-                    pw.println(entry.getKey() + "::" + entry.getValue().toString());
-                }
-                pw.close();
-                fw.close();
-                ToastUtils.showToastInUiThread(context, MainApp.gs(R.string.exported));
-            } catch (FileNotFoundException e) {
-                ToastUtils.showToastInUiThread(context, MainApp.gs(R.string.filenotfound) + " " + file);
-                log.error("Unhandled exception", e);
-            } catch (IOException e) {
-                log.error("Unhandled exception", e);
-            }
-        });
-    }
-
-    static void importSharedPreferences(final Fragment fragment) {
-        importSharedPreferences(fragment.getContext());
-    }
-
-    public static void importSharedPreferences(final Context context) {
-        OKDialog.showConfirmation(context, MainApp.gs(R.string.maintenance), MainApp.gs(R.string.import_from) + " " + file + " ?", () -> {
-            String line;
-            String[] lineParts;
-            try {
-                SP.clear();
-
-                BufferedReader reader = new BufferedReader(new FileReader(file));
-                while ((line = reader.readLine()) != null) {
-                    lineParts = line.split("::");
-                    if (lineParts.length == 2) {
-                        if (lineParts[1].equals("true") || lineParts[1].equals("false")) {
-                            SP.putBoolean(lineParts[0], Boolean.parseBoolean(lineParts[1]));
-                        } else {
-                            SP.putString(lineParts[0], lineParts[1]);
-                        }
-                    }
-                }
-                reader.close();
-                SP.putBoolean(R.string.key_setupwizard_processed, true);
-                OKDialog.show(context, MainApp.gs(R.string.setting_imported), MainApp.gs(R.string.restartingapp), () -> {
-                    log.debug("Exiting");
-                    RxBus.INSTANCE.send(new EventAppExit());
-                    if (context instanceof Activity) {
-                        ((Activity) context).finish();
-                    }
-                    System.runFinalization();
-                    System.exit(0);
-                });
-            } catch (FileNotFoundException e) {
-                ToastUtils.showToastInUiThread(context, MainApp.gs(R.string.filenotfound) + " " + file);
-                log.error("Unhandled exception", e);
-            } catch (IOException e) {
-                log.error("Unhandled exception", e);
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
new file mode 100644
index 0000000000..356fc918e1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -0,0 +1,340 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import android.Manifest
+import android.app.Activity
+import android.bluetooth.BluetoothAdapter
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.PreferencesActivity
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.maintenance.formats.*
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.OKDialog.show
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.alertDialogs.PrefImportSummaryDialog
+import info.nightscout.androidaps.utils.alertDialogs.TwoMessagesAlertDialog
+import info.nightscout.androidaps.utils.alertDialogs.WarningDialog
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.protection.PasswordCheck
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import org.joda.time.Days
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by mike on 03.07.2016.
+ */
+
+private const val REQUEST_EXTERNAL_STORAGE = 1
+private val PERMISSIONS_STORAGE = arrayOf(
+    Manifest.permission.READ_EXTERNAL_STORAGE,
+    Manifest.permission.WRITE_EXTERNAL_STORAGE
+)
+
+private const val IMPORT_AGE_NOT_YET_OLD_DAYS = 60
+
+@Singleton
+class ImportExportPrefs @Inject constructor(
+    private var log: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val buildHelper: BuildHelper,
+    private val otp: OneTimePassword,
+    private val rxBus: RxBusWrapper,
+    private val passwordCheck: PasswordCheck,
+    private val classicPrefsFormat: ClassicPrefsFormat,
+    private val encryptedPrefsFormat: EncryptedPrefsFormat
+) {
+
+    val TAG = LTag.CORE
+
+    private val path = File(Environment.getExternalStorageDirectory().toString())
+
+    private val file = File(path, resourceHelper.gs(R.string.app_name) + "Preferences")
+    private val encFile = File(path, resourceHelper.gs(R.string.app_name) + "Preferences.json")
+
+    fun prefsImportFile(): File {
+        return if (encFile.exists()) encFile else file
+    }
+
+    fun prefsFileExists(): Boolean {
+        return encFile.exists() || file.exists()
+    }
+
+
+    fun exportSharedPreferences(f: Fragment) {
+        f.activity?.let { exportSharedPreferences(it) }
+    }
+
+    fun verifyStoragePermissions(fragment: Fragment) {
+        fragment.context?.let {
+            val permission = ContextCompat.checkSelfPermission(it,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            if (permission != PackageManager.PERMISSION_GRANTED) {
+                // We don't have permission so prompt the user
+                fragment.requestPermissions(PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE)
+            }
+        }
+    }
+
+    private fun prepareMetadata(context: Context): Map<PrefsMetadataKey, PrefMetadata> {
+
+        val metadata: MutableMap<PrefsMetadataKey, PrefMetadata> = mutableMapOf()
+
+        metadata[PrefsMetadataKey.DEVICE_NAME] = PrefMetadata(detectUserName(context), PrefsStatus.OK)
+        metadata[PrefsMetadataKey.CREATED_AT] = PrefMetadata(DateUtil.toISOString(Date()), PrefsStatus.OK)
+        metadata[PrefsMetadataKey.AAPS_VERSION] = PrefMetadata(BuildConfig.VERSION_NAME, PrefsStatus.OK)
+        metadata[PrefsMetadataKey.AAPS_FLAVOUR] = PrefMetadata(BuildConfig.FLAVOR, PrefsStatus.OK)
+        metadata[PrefsMetadataKey.DEVICE_MODEL] = PrefMetadata(getCurrentDeviceModelString(), PrefsStatus.OK)
+
+        if (prefsEncryptionIsDisabled()) {
+            metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata("Disabled", PrefsStatus.DISABLED)
+        } else {
+            metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata("Enabled", PrefsStatus.OK)
+        }
+
+        return metadata
+    }
+
+    private fun detectUserName(context: Context): String {
+        // based on https://medium.com/@pribble88/how-to-get-an-android-device-nickname-4b4700b3068c
+        val n1 = Settings.System.getString(context.contentResolver, "bluetooth_name")
+        val n2 = Settings.Secure.getString(context.contentResolver, "bluetooth_name")
+        val n3 = BluetoothAdapter.getDefaultAdapter()?.name
+        val n4 = Settings.System.getString(context.contentResolver, "device_name")
+        val n5 = Settings.Secure.getString(context.contentResolver, "lock_screen_owner_info")
+        val n6 = Settings.Global.getString(context.contentResolver, "device_name")
+
+        // name we use for SMS OTP token in communicator
+        val otpName = otp.name().trim()
+        val defaultOtpName = resourceHelper.gs(R.string.smscommunicator_default_user_display_name)
+
+        // name we detect from OS
+        val systemName = n1 ?: n2 ?: n3 ?: n4 ?: n5 ?: n6 ?: defaultOtpName
+        val name = if (otpName.length > 0 && otpName != defaultOtpName) otpName else systemName
+        return name
+    }
+
+    private fun getCurrentDeviceModelString() =
+        Build.MANUFACTURER + " " + Build.MODEL + " (" + Build.DEVICE + ")"
+
+    private fun prefsEncryptionIsDisabled() =
+        buildHelper.isEngineeringMode() && !sp.getBoolean(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs), true)
+
+    private fun askForMasterPass(activity: Activity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) {
+        passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, { password ->
+            then(password)
+        }, {
+            ToastUtils.warnToast(activity, resourceHelper.gs(canceledMsg))
+        })
+    }
+
+    private fun askForMasterPassIfNeeded(activity: Activity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) {
+        if (prefsEncryptionIsDisabled()) {
+            then("")
+        } else {
+            askForMasterPass(activity, canceledMsg, then)
+        }
+    }
+
+    private fun assureMasterPasswordSet(activity: Activity, @StringRes wrongPwdTitle: Int): Boolean {
+        if (!sp.contains(R.string.key_master_password) || (sp.getString(R.string.key_master_password, "") == "")) {
+            WarningDialog.showWarning(activity,
+                resourceHelper.gs(wrongPwdTitle),
+                resourceHelper.gs(R.string.master_password_missing, resourceHelper.gs(R.string.configbuilder_general), resourceHelper.gs(R.string.protection)),
+                R.string.nav_preferences, {
+                val intent = Intent(activity, PreferencesActivity::class.java).apply {
+                    putExtra("id", R.xml.pref_general)
+                }
+                activity.startActivity(intent)
+            })
+            return false
+        }
+        return true
+    }
+
+    private fun askToConfirmExport(activity: Activity, then: ((password: String) -> Unit)) {
+        if (!prefsEncryptionIsDisabled() && !assureMasterPasswordSet(activity, R.string.nav_export)) return
+
+        TwoMessagesAlertDialog.showAlert(activity, resourceHelper.gs(R.string.nav_export),
+            resourceHelper.gs(R.string.export_to) + " " + encFile + " ?",
+            resourceHelper.gs(R.string.password_preferences_encrypt_prompt), {
+            askForMasterPassIfNeeded(activity, R.string.preferences_export_canceled, then)
+        }, null,  R.drawable.ic_header_export)
+    }
+
+    private fun askToConfirmImport(activity: Activity, fileToImport: File, then: ((password: String) -> Unit)) {
+
+        if (encFile.exists()) {
+            if (!assureMasterPasswordSet(activity, R.string.nav_import)) return
+
+            TwoMessagesAlertDialog.showAlert(activity, resourceHelper.gs(R.string.nav_import),
+                resourceHelper.gs(R.string.import_from) + " " + fileToImport + " ?",
+                resourceHelper.gs(R.string.password_preferences_decrypt_prompt), {
+                askForMasterPass(activity, R.string.preferences_import_canceled, then)
+            }, null, R.drawable.ic_header_import)
+
+        } else {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.nav_import),
+                resourceHelper.gs(R.string.import_from) + " " + fileToImport + " ?",
+                Runnable { then("") })
+        }
+    }
+
+    private fun exportSharedPreferences(activity: Activity) {
+        askToConfirmExport(activity) { password ->
+            try {
+                val entries: MutableMap<String, String> = mutableMapOf()
+                for ((key, value) in sp.getAll()) {
+                    entries[key] = value.toString()
+                }
+
+                val prefs = Prefs(entries, prepareMetadata(activity))
+
+                classicPrefsFormat.savePreferences(file, prefs)
+                encryptedPrefsFormat.savePreferences(encFile, prefs, password)
+
+                ToastUtils.okToast(activity, resourceHelper.gs(R.string.exported))
+            } catch (e: FileNotFoundException) {
+                ToastUtils.errorToast(activity, resourceHelper.gs(R.string.filenotfound) + " " + encFile)
+                log.error(TAG, "Unhandled exception", e)
+            } catch (e: IOException) {
+                ToastUtils.errorToast(activity, e.message)
+                log.error(TAG, "Unhandled exception", e)
+            }
+        }
+    }
+
+    fun importSharedPreferences(fragment: Fragment) {
+        fragment.activity?.let { importSharedPreferences(it) }
+    }
+
+    fun importSharedPreferences(activity: Activity) {
+
+        val importFile = prefsImportFile()
+
+        askToConfirmImport(activity, importFile) { password ->
+
+            val format: PrefsFormat = if (encFile.exists()) encryptedPrefsFormat else classicPrefsFormat
+
+            try {
+
+                val prefs = format.loadPreferences(importFile, password)
+                prefs.metadata = checkMetadata(prefs.metadata)
+
+                // import is OK when we do not have errors (warnings are allowed)
+                val importOk = checkIfImportIsOk(prefs)
+
+                // if at end we allow to import preferences
+                val importPossible = (importOk || buildHelper.isEngineeringMode()) && (prefs.values.size > 0)
+
+                PrefImportSummaryDialog.showSummary(activity, importOk, importPossible, prefs, {
+                    if (importPossible) {
+                        sp.clear()
+                        for ((key, value) in prefs.values) {
+                            if (value == "true" || value == "false") {
+                                sp.putBoolean(key, value.toBoolean())
+                            } else {
+                                sp.putString(key, value)
+                            }
+                        }
+
+                        restartAppAfterImport(activity)
+                    } else {
+                        // for impossible imports it should not be called
+                        ToastUtils.errorToast(activity, "Cannot import preferences!")
+                    }
+                })
+
+            } catch (e: PrefFileNotFoundError) {
+                ToastUtils.errorToast(activity, resourceHelper.gs(R.string.filenotfound) + " " + importFile)
+                log.error(TAG, "Unhandled exception", e)
+            } catch (e: PrefIOError) {
+                log.error(TAG, "Unhandled exception", e)
+                ToastUtils.errorToast(activity, e.message)
+            }
+        }
+    }
+
+    // check metadata for known issues, change their status and add info with explanations
+    private fun checkMetadata(metadata: Map<PrefsMetadataKey, PrefMetadata>): Map<PrefsMetadataKey, PrefMetadata> {
+        val meta = metadata.toMutableMap()
+
+         meta[PrefsMetadataKey.AAPS_FLAVOUR]?.let { flavour ->
+             val flavourOfPrefs = flavour.value
+             if (flavour.value != BuildConfig.FLAVOR) {
+                 flavour.status = PrefsStatus.WARN
+                 flavour.info = resourceHelper.gs(R.string.metadata_warning_different_flavour, flavourOfPrefs, BuildConfig.FLAVOR)
+             }
+         }
+
+        meta[PrefsMetadataKey.DEVICE_MODEL]?.let { model ->
+            if (model.value != getCurrentDeviceModelString()) {
+                model.status = PrefsStatus.WARN
+                model.info = resourceHelper.gs(R.string.metadata_warning_different_device)
+            }
+        }
+
+        meta[PrefsMetadataKey.CREATED_AT]?.let { createdAt ->
+            try {
+                val date1 = DateTime.parse(createdAt.value);
+                val date2 = DateTime.now()
+
+                val daysOld = Days.daysBetween(date1.toLocalDate(), date2.toLocalDate()).getDays()
+
+                if (daysOld > IMPORT_AGE_NOT_YET_OLD_DAYS) {
+                    createdAt.status = PrefsStatus.WARN
+                    createdAt.info = resourceHelper.gs(R.string.metadata_warning_old_export, daysOld.toString())
+                }
+            } catch (e: Exception) {
+                createdAt.status = PrefsStatus.WARN
+                createdAt.info = resourceHelper.gs(R.string.metadata_warning_date_format)
+            }
+        }
+
+        return meta
+    }
+
+    private fun checkIfImportIsOk(prefs: Prefs): Boolean {
+        var importOk = true
+
+        for ((_, value) in prefs.metadata) {
+            if (value.status == PrefsStatus.ERROR)
+                importOk = false;
+        }
+        return importOk
+    }
+
+    private fun restartAppAfterImport(context: Context) {
+        sp.putBoolean(R.string.key_setupwizard_processed, true)
+        show(context, resourceHelper.gs(R.string.setting_imported), resourceHelper.gs(R.string.restartingapp), Runnable {
+            log.debug(TAG, "Exiting")
+            rxBus.send(EventAppExit())
+            if (context is Activity) {
+                context.finish()
+            }
+            System.runFinalization()
+            System.exit(0)
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
index 29eeabdf5f..9205dc0ccd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
@@ -5,13 +5,14 @@ import org.slf4j.LoggerFactory;
 
 import ch.qos.logback.classic.LoggerContext;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * This class provides serveral methods for log-handling (eg. sending logs as emails).
  */
 public class LoggerUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(L.CORE);
+    private static final Logger LOGGER = StacktraceLoggerWrapper.getLogger(L.CORE);
 
     public static String SUFFIX = ".log.zip";
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.java
deleted file mode 100644
index ae1262b651..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.general.food.FoodPlugin;
-import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.OKDialog;
-
-/**
- *
- */
-public class MaintenanceFragment extends Fragment {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.maintenance_fragment, container, false);
-
-        view.findViewById(R.id.log_send).setOnClickListener(view1 -> MaintenancePlugin.getPlugin().sendLogs());
-
-        view.findViewById(R.id.log_delete).setOnClickListener(view1 -> MaintenancePlugin.getPlugin().deleteLogs());
-
-        view.findViewById(R.id.nav_resetdb).setOnClickListener(view1 ->
-                OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.maintenance), MainApp.gs(R.string.reset_db_confirm), () -> {
-                    MainApp.getDbHelper().resetDatabases();
-                    // should be handled by Plugin-Interface and
-                    // additional service interface and plugin registry
-                    FoodPlugin.getPlugin().getService().resetFood();
-                    TreatmentsPlugin.getPlugin().getService().resetTreatments();
-                })
-        );
-        view.findViewById(R.id.nav_export).setOnClickListener(view1 -> {
-            // start activity for checking permissions...
-            ImportExportPrefs.verifyStoragePermissions(this);
-            ImportExportPrefs.exportSharedPreferences(this);
-        });
-
-        view.findViewById(R.id.nav_import).setOnClickListener(view1 -> {
-            // start activity for checking permissions...
-            ImportExportPrefs.verifyStoragePermissions(this);
-            ImportExportPrefs.importSharedPreferences(this);
-        });
-
-        view.findViewById(R.id.nav_logsettings).setOnClickListener(view1 -> {
-            startActivity(new Intent(getActivity(), LogSettingActivity.class));
-        });
-
-        return view;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
new file mode 100644
index 0000000000..2e42294fc1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.food.FoodPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.maintenance_fragment.*
+import javax.inject.Inject
+
+class MaintenanceFragment : DaggerFragment() {
+
+    @Inject lateinit var maintenancePlugin: MaintenancePlugin
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var foodPlugin: FoodPlugin
+    @Inject lateinit var importExportPrefs: ImportExportPrefs
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.maintenance_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        log_send.setOnClickListener { maintenancePlugin.sendLogs() }
+        log_delete.setOnClickListener { maintenancePlugin.deleteLogs() }
+        nav_resetdb.setOnClickListener {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.maintenance), resourceHelper.gs(R.string.reset_db_confirm), Runnable {
+                    MainApp.getDbHelper().resetDatabases()
+                    // should be handled by Plugin-Interface and
+                    // additional service interface and plugin registry
+                    foodPlugin.service?.resetFood()
+                    treatmentsPlugin.service.resetTreatments()
+                })
+            }
+        }
+        nav_export.setOnClickListener {
+            // start activity for checking permissions...
+            importExportPrefs.verifyStoragePermissions(this)
+            importExportPrefs.exportSharedPreferences(this)
+        }
+        nav_import.setOnClickListener {
+            // start activity for checking permissions...
+            importExportPrefs.verifyStoragePermissions(this)
+            importExportPrefs.importSharedPreferences(this)
+        }
+        nav_logsettings.setOnClickListener { startActivity(Intent(activity, LogSettingActivity::class.java)) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.java
deleted file mode 100644
index f9a55f53dd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import androidx.core.content.FileProvider;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.utils.SP;
-
-public class MaintenancePlugin extends PluginBase {
-
-    private static final Logger LOG = LoggerFactory.getLogger(L.CORE);
-
-    private final Context ctx;
-
-    private static MaintenancePlugin maintenancePlugin;
-
-    public static MaintenancePlugin getPlugin() {
-        return maintenancePlugin;
-    }
-
-    public static MaintenancePlugin initPlugin(Context ctx) {
-
-        if (maintenancePlugin == null) {
-            maintenancePlugin = new MaintenancePlugin(ctx);
-        }
-
-        return maintenancePlugin;
-    }
-
-    public MaintenancePlugin() {
-        // required for testing
-        super(null);
-        this.ctx = null;
-    }
-
-    MaintenancePlugin(Context ctx) {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(MaintenanceFragment.class.getName())
-                .alwaysVisible(false)
-                .alwaysEnabled(true)
-                .pluginName(R.string.maintenance)
-                .shortName(R.string.maintenance_shortname)
-                .preferencesId(R.xml.pref_maintenance)
-                .description(R.string.description_maintenance)
-        );
-        this.ctx = ctx;
-    }
-
-    public void sendLogs() {
-        String recipient = SP.getString(R.string.key_maintenance_logs_email, "logs@androidaps.org");
-        int amount = SP.getInt(R.string.key_maintenance_logs_amount, 2);
-
-        String logDirectory = LoggerUtils.getLogDirectory();
-        List<File> logs = this.getLogfiles(logDirectory, amount);
-
-        File zipDir = this.ctx.getExternalFilesDir("exports");
-        File zipFile = new File(zipDir, this.constructName());
-
-        LOG.debug("zipFile: {}", zipFile.getAbsolutePath());
-        File zip = this.zipLogs(zipFile, logs);
-
-        Uri attachementUri = FileProvider.getUriForFile(this.ctx, BuildConfig.APPLICATION_ID + ".fileprovider", zip);
-        Intent emailIntent = this.sendMail(attachementUri, recipient, "Log Export");
-        LOG.debug("sending emailIntent");
-        ctx.startActivity(emailIntent);
-    }
-
-    //todo replace this with a call on startup of the application, specifically to remove
-    // unnecessary garbage from the log exports
-    public void deleteLogs() {
-        String logDirectory = LoggerUtils.getLogDirectory();
-        File logDir = new File(logDirectory);
-
-        File[] files = logDir.listFiles((file, name) -> name.startsWith("AndroidAPS")
-                    && name.endsWith(".zip"));
-
-        Arrays.sort(files, (f1, f2) -> f1.getName().compareTo(f2.getName()));
-
-        List<File> delFiles = Arrays.asList(files);
-        int amount = SP.getInt(R.string.key_logshipper_amount, 2);
-        int keepIndex = amount - 1;
-
-        if (keepIndex < delFiles.size()) {
-            delFiles = delFiles.subList(keepIndex, delFiles.size());
-
-            for (File file : delFiles) {
-                file.delete();
-            }
-        }
-
-        File exportDir = new File(logDirectory, "exports");
-
-        if (exportDir.exists()) {
-            File[] expFiles = exportDir.listFiles();
-
-            for (File file : expFiles) {
-                file.delete();
-            }
-            exportDir.delete();
-        }
-    }
-
-    /**
-     * returns a list of log files. The number of returned logs is given via the amount
-     * parameter.
-     *
-     * The log files are sorted by the name descending.
-     *
-     * @param directory
-     * @param amount
-     * @return
-     */
-    public List<File> getLogfiles(String directory, int amount) {
-        LOG.debug("getting {} logs from directory {}", amount, directory);
-        File logDir = new File(directory);
-
-        File[] files = logDir.listFiles((file, name) -> name.startsWith("AndroidAPS")
-                && (name.endsWith(".log")
-                || (name.endsWith(".zip") && !name.endsWith(LoggerUtils.SUFFIX))));
-
-        Arrays.sort(files, (f1, f2) -> f2.getName().compareTo(f1.getName()));
-
-        List<File> result = Arrays.asList(files);
-        int toIndex = amount++;
-
-        if (toIndex > result.size()) {
-            toIndex = result.size();
-        }
-
-        LOG.debug("returning sublist 0 to {}", toIndex);
-        return result.subList(0, toIndex);
-    }
-
-    public File zipLogs(File zipFile, List<File> files) {
-        LOG.debug("creating zip {}", zipFile.getAbsolutePath());
-
-        try {
-            zip(zipFile, files);
-        } catch (IOException e) {
-            LOG.error("Cannot retrieve zip", e);
-        }
-
-        return zipFile;
-    }
-
-    /**
-     * construct the name of zip file which is used to export logs.
-     *
-     * The name is constructed using the following scheme:
-     * AndroidAPS_LOG_ + Long Time + .log.zip
-     *
-     * @return
-     */
-    public String constructName() {
-        return "AndroidAPS_LOG_" + new Date().getTime() + LoggerUtils.SUFFIX;
-    }
-
-    public void zip(File zipFile, List<File> files) throws IOException {
-        final int BUFFER_SIZE = 2048;
-
-        ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFile)));
-
-        for (File file : files) {
-            byte[] data = new byte[BUFFER_SIZE];
-
-            try(FileInputStream fileInputStream = new FileInputStream( file )) {
-
-                try(BufferedInputStream origin = new BufferedInputStream(fileInputStream, BUFFER_SIZE)) {
-                    ZipEntry entry = new ZipEntry(file.getName());
-
-                    out.putNextEntry(entry);
-                    int count;
-                    while ((count = origin.read(data, 0, BUFFER_SIZE)) != -1) {
-                        out.write(data, 0, count);
-                    }
-
-                }
-            }
-        }
-
-        out.close();
-    }
-
-    public static Intent sendMail(Uri attachementUri, String recipient, String subject)  {
-        StringBuilder builder =new StringBuilder();
-        
-        builder.append("ADD TIME OF EVENT HERE: " + System.lineSeparator());
-        builder.append("ADD ISSUE DESCRIPTION OR GITHUB ISSUE REFERENCE NUMBER: " + System.lineSeparator());
-        builder.append("-------------------------------------------------------" + System.lineSeparator());
-        builder.append("(Please remember this will send only very recent logs." + System.lineSeparator());
-        builder.append("If you want to provide logs for event older than a few hours," + System.lineSeparator());
-        builder.append("you have to do it manually)" + System.lineSeparator());
-        builder.append("-------------------------------------------------------" + System.lineSeparator());
-        builder.append(MainApp.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator());
-        if (Config.NSCLIENT)
-            builder.append("NSCLIENT" + System.lineSeparator());
-
-        builder.append("Build: " + BuildConfig.BUILDVERSION + System.lineSeparator());
-        builder.append("Remote: " + BuildConfig.REMOTE + System.lineSeparator());
-        builder.append("Flavor: " + BuildConfig.FLAVOR + BuildConfig.BUILD_TYPE + System.lineSeparator());
-        builder.append(MainApp.gs(R.string.configbuilder_nightscoutversion_label) + " " + NSSettingsStatus.getInstance().nightscoutVersionName + System.lineSeparator());
-        if (MainApp.engineeringMode)
-            builder.append(MainApp.gs(R.string.engineering_mode_enabled));
-
-        return sendMail(attachementUri, recipient, subject, builder.toString());
-    }
-
-
-    /**
-     * send a mail with the given file to the recipients with the given subject.
-     *
-     * the returned intent should be used to really send the mail using
-     *
-     * startActivity(Intent.createChooser(emailIntent , "Send email..."));
-     *
-     * @param attachementUri
-     * @param recipient
-     * @param subject
-     * @param body
-     *
-     * @return
-     */
-    public static Intent sendMail(Uri attachementUri, String recipient, String subject, String body) {
-        LOG.debug("sending email to {} with subject {}", recipient, subject);
-        Intent emailIntent = new Intent(Intent.ACTION_SEND);
-
-        emailIntent.setType("text/plain");
-        emailIntent.putExtra(Intent.EXTRA_EMAIL  , new String[]{recipient});
-        emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        emailIntent.putExtra(Intent.EXTRA_TEXT, body);
-
-        LOG.debug("put path {}", attachementUri.toString());
-        emailIntent.putExtra(Intent.EXTRA_STREAM, attachementUri);
-        emailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        return emailIntent;
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
new file mode 100644
index 0000000000..4a3e5e83ab
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
@@ -0,0 +1,218 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.content.FileProvider
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+import java.io.*
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MaintenancePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val context: Context,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val nsSettingsStatus: NSSettingsStatus,
+    aapsLogger: AAPSLogger,
+    private val buildHelper: BuildHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(MaintenanceFragment::class.java.name)
+    .alwaysVisible(false)
+    .alwaysEnabled(true)
+    .pluginName(R.string.maintenance)
+    .shortName(R.string.maintenance_shortname)
+    .preferencesId(R.xml.pref_maintenance)
+    .description(R.string.description_maintenance),
+    aapsLogger, resourceHelper, injector
+) {
+
+    fun sendLogs() {
+        val recipient = sp.getString(R.string.key_maintenance_logs_email, "logs@androidaps.org")
+        val amount = sp.getInt(R.string.key_maintenance_logs_amount, 2)
+        val logDirectory = LoggerUtils.getLogDirectory()
+        val logs = getLogFiles(logDirectory, amount)
+        val zipDir = context.getExternalFilesDir("exports")
+        val zipFile = File(zipDir, constructName())
+        aapsLogger.debug("zipFile: ${zipFile.absolutePath}")
+        val zip = zipLogs(zipFile, logs)
+        val attachmentUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", zip)
+        val emailIntent: Intent = this.sendMail(attachmentUri, recipient, "Log Export")
+        aapsLogger.debug("sending emailIntent")
+        context.startActivity(emailIntent)
+    }
+
+    //todo replace this with a call on startup of the application, specifically to remove
+// unnecessary garbage from the log exports
+    fun deleteLogs() {
+        val logDirectory = LoggerUtils.getLogDirectory()
+        val logDir = File(logDirectory)
+        val files = logDir.listFiles { _: File?, name: String ->
+            (name.startsWith("AndroidAPS")
+                && name.endsWith(".zip"))
+        }
+        Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
+        var delFiles = listOf(*files)
+        val amount = sp.getInt(R.string.key_logshipper_amount, 2)
+        val keepIndex = amount - 1
+        if (keepIndex < delFiles.size) {
+            delFiles = delFiles.subList(keepIndex, delFiles.size)
+            for (file in delFiles) {
+                file.delete()
+            }
+        }
+        val exportDir = File(logDirectory, "exports")
+        if (exportDir.exists()) {
+            val expFiles = exportDir.listFiles()
+            for (file in expFiles) {
+                file.delete()
+            }
+            exportDir.delete()
+        }
+    }
+
+    /**
+     * returns a list of log files. The number of returned logs is given via the amount
+     * parameter.
+     *
+     * The log files are sorted by the name descending.
+     *
+     * @param directory
+     * @param amount
+     * @return
+     */
+    fun getLogFiles(directory: String, amount: Int): List<File> {
+        aapsLogger.debug("getting $amount logs from directory $directory")
+        val logDir = File(directory)
+        val files = logDir.listFiles { _: File?, name: String ->
+            (name.startsWith("AndroidAPS")
+                && (name.endsWith(".log")
+                || name.endsWith(".zip") && !name.endsWith(LoggerUtils.SUFFIX)))
+        }
+        Arrays.sort(files) { f1: File, f2: File -> f2.name.compareTo(f1.name) }
+        val result = listOf(*files)
+        var toIndex = amount
+        if (toIndex > result.size) {
+            toIndex = result.size
+        }
+        aapsLogger.debug("returning sublist 0 to $toIndex")
+        return result.subList(0, toIndex)
+    }
+
+    fun zipLogs(zipFile: File, files: List<File>): File {
+        aapsLogger.debug("creating zip ${zipFile.absolutePath}")
+        try {
+            zip(zipFile, files)
+        } catch (e: IOException) {
+            aapsLogger.error("Cannot retrieve zip", e)
+        }
+        return zipFile
+    }
+
+    /**
+     * construct the name of zip file which is used to export logs.
+     *
+     * The name is constructed using the following scheme:
+     * AndroidAPS_LOG_ + Long Time + .log.zip
+     *
+     * @return
+     */
+    private fun constructName(): String {
+        return "AndroidAPS_LOG_" + Date().time + LoggerUtils.SUFFIX
+    }
+
+    private fun zip(zipFile: File?, files: List<File>) {
+        val bufferSize = 2048
+        val out = ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile)))
+        for (file in files) {
+            val data = ByteArray(bufferSize)
+            FileInputStream(file).use { fileInputStream ->
+                BufferedInputStream(fileInputStream, bufferSize).use { origin ->
+                    val entry = ZipEntry(file.name)
+                    out.putNextEntry(entry)
+                    var count: Int
+                    while (origin.read(data, 0, bufferSize).also { count = it } != -1) {
+                        out.write(data, 0, count)
+                    }
+                }
+            }
+        }
+        out.close()
+    }
+
+    @Suppress("SameParameterValue")
+    private fun sendMail(attachmentUri: Uri, recipient: String, subject: String): Intent {
+        val builder = StringBuilder()
+        builder.append("ADD TIME OF EVENT HERE: " + System.lineSeparator())
+        builder.append("ADD ISSUE DESCRIPTION OR GITHUB ISSUE REFERENCE NUMBER: " + System.lineSeparator())
+        builder.append("-------------------------------------------------------" + System.lineSeparator())
+        builder.append("(Please remember this will send only very recent logs." + System.lineSeparator())
+        builder.append("If you want to provide logs for event older than a few hours," + System.lineSeparator())
+        builder.append("you have to do it manually)" + System.lineSeparator())
+        builder.append("-------------------------------------------------------" + System.lineSeparator())
+        builder.append(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator())
+        if (Config.NSCLIENT) builder.append("NSCLIENT" + System.lineSeparator())
+        builder.append("Build: " + BuildConfig.BUILDVERSION + System.lineSeparator())
+        builder.append("Remote: " + BuildConfig.REMOTE + System.lineSeparator())
+        builder.append("Flavor: " + BuildConfig.FLAVOR + BuildConfig.BUILD_TYPE + System.lineSeparator())
+        builder.append(resourceHelper.gs(R.string.configbuilder_nightscoutversion_label) + " " + nsSettingsStatus.nightscoutVersionName + System.lineSeparator())
+        if (buildHelper.isEngineeringMode()) builder.append(resourceHelper.gs(R.string.engineering_mode_enabled))
+        return sendMail(attachmentUri, recipient, subject, builder.toString())
+    }
+
+    /**
+     * send a mail with the given file to the recipients with the given subject.
+     *
+     * the returned intent should be used to really send the mail using
+     *
+     * startActivity(Intent.createChooser(emailIntent , "Send email..."));
+     *
+     * @param attachmentUri
+     * @param recipient
+     * @param subject
+     * @param body
+     *
+     * @return
+     */
+    private fun sendMail(attachmentUri: Uri, recipient: String, subject: String, body: String): Intent {
+        aapsLogger.debug("sending email to $recipient with subject $subject")
+        val emailIntent = Intent(Intent.ACTION_SEND)
+        emailIntent.type = "text/plain"
+        emailIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf(recipient))
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
+        emailIntent.putExtra(Intent.EXTRA_TEXT, body)
+        aapsLogger.debug("put path $attachmentUri")
+        emailIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri)
+        emailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        return emailIntent
+    }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+        super.preprocessPreferences(preferenceFragment)
+        val encryptSwitch = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs)) as SwitchPreference?
+            ?: return
+        encryptSwitch.isVisible = buildHelper.isEngineeringMode()
+        encryptSwitch.isEnabled = buildHelper.isEngineeringMode()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt
index d9ed0c590c..c6cdaa4397 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt
@@ -22,6 +22,7 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
             L.resetToDefaults()
             createViewsForSettings()
         }
+        ok.setOnClickListener { finish() }
     }
 
     private fun createViewsForSettings() {
@@ -34,13 +35,14 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
     }
 
     internal inner class LogViewHolder(element: L.LogElement) {
-        var baseView: LinearLayout = layoutInflater.inflate(R.layout.logsettings_item, null) as LinearLayout
+        @Suppress("InflateParams")
+        var baseView = layoutInflater.inflate(R.layout.logsettings_item, null) as LinearLayout
 
         init {
             (baseView.findViewById<View>(R.id.logsettings_description) as TextView).text = element.name
             val enabled = baseView.findViewById<CheckBox>(R.id.logsettings_visibility)
             enabled.isChecked = element.enabled
-            enabled.setOnClickListener { element.setEnabled(enabled.isChecked) }
+            enabled.setOnClickListener { element.enable(enabled.isChecked) }
         }
 
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
new file mode 100644
index 0000000000..4689f549a6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.general.maintenance.formats
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.storage.Storage
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ClassicPrefsFormat @Inject constructor(
+    private var resourceHelper: ResourceHelper,
+    private var storage: Storage
+) : PrefsFormat {
+
+    companion object {
+        val FORMAT_KEY = "aaps_old"
+    }
+
+    override fun savePreferences(file: File, prefs: Prefs, masterPassword: String?) {
+        try {
+            val contents = prefs.values.entries.joinToString("\n") { entry ->
+                "${entry.key}::${entry.value}"
+            }
+            storage.putFileContents(file, contents)
+        } catch (e: FileNotFoundException) {
+            throw PrefFileNotFoundError(file.absolutePath)
+        } catch (e: IOException) {
+            throw PrefIOError(file.absolutePath)
+        }
+    }
+
+    override fun loadPreferences(file: File, masterPassword: String?): Prefs {
+        var lineParts: Array<String>
+        val entries: MutableMap<String, String> = mutableMapOf()
+        val metadata: MutableMap<PrefsMetadataKey, PrefMetadata> = mutableMapOf()
+        try {
+
+            val rawLines = storage.getFileContents(file).split("\n")
+            rawLines.forEach { line ->
+                lineParts = line.split("::").toTypedArray()
+                if (lineParts.size == 2) {
+                    entries[lineParts[0]] = lineParts[1]
+                }
+            }
+
+            metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(FORMAT_KEY, PrefsStatus.WARN, resourceHelper.gs(R.string.metadata_warning_outdated_format))
+
+            return Prefs(entries, metadata)
+
+        } catch (e: FileNotFoundException) {
+            throw PrefFileNotFoundError(file.absolutePath)
+        } catch (e: IOException) {
+            throw PrefIOError(file.absolutePath)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
new file mode 100644
index 0000000000..cec2ae9b5f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
@@ -0,0 +1,225 @@
+package info.nightscout.androidaps.plugins.general.maintenance.formats
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.CryptoUtil
+import info.nightscout.androidaps.utils.hexStringToByteArray
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.storage.Storage
+import info.nightscout.androidaps.utils.toHex
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EncryptedPrefsFormat @Inject constructor(
+    private var resourceHelper: ResourceHelper,
+    private var storage: Storage
+) : PrefsFormat {
+
+    companion object {
+        val FORMAT_KEY_ENC = "aaps_encrypted"
+        val FORMAT_KEY_NOENC = "aaps_structured"
+
+        private val KEY_CONSCIENCE = "if you remove/change this, please make sure you know the consequences!"
+    }
+
+    override fun savePreferences(file: File, prefs: Prefs, masterPassword: String?) {
+
+        val container = JSONObject()
+        val content = JSONObject()
+        val meta = JSONObject()
+
+        val encStatus = prefs.metadata[PrefsMetadataKey.ENCRYPTION]?.status ?: PrefsStatus.OK
+        var encrypted = encStatus == PrefsStatus.OK && masterPassword != null
+
+        try {
+            for ((key, value) in prefs.values.toSortedMap()) {
+                content.put(key, value)
+            }
+
+            for ((metaKey, metaEntry) in prefs.metadata) {
+                if (metaKey == PrefsMetadataKey.FILE_FORMAT)
+                    continue;
+                if (metaKey == PrefsMetadataKey.ENCRYPTION)
+                    continue;
+                meta.put(metaKey.key, metaEntry.value)
+            }
+
+            container.put(PrefsMetadataKey.FILE_FORMAT.key, if (encrypted) FORMAT_KEY_ENC else FORMAT_KEY_NOENC);
+            container.put("metadata", meta)
+
+            val security = JSONObject()
+            security.put("file_hash", "--to-be-calculated--")
+            var encodedContent = ""
+
+            if (encrypted) {
+                val salt = CryptoUtil.mineSalt()
+                val rawContent = content.toString()
+                val contentAttempt = CryptoUtil.encrypt(masterPassword!!, salt, rawContent)
+                if (contentAttempt != null) {
+                    encodedContent = contentAttempt
+                    security.put("algorithm", "v1")
+                    security.put("salt", salt.toHex())
+                    security.put("content_hash", CryptoUtil.sha256(rawContent))
+                } else {
+                    // fallback when encryption does not work
+                    encrypted = false
+                }
+            }
+
+            if (!encrypted) {
+                security.put("algorithm", "none")
+            }
+
+            container.put("security", security)
+            container.put("content", if (encrypted) encodedContent else content)
+
+            var fileContents = container.toString(2)
+            val fileHash = CryptoUtil.hmac256(fileContents, KEY_CONSCIENCE)
+
+            fileContents = fileContents.replace(Regex("(\\\"file_hash\\\"\\s*\\:\\s*\\\")(--to-be-calculated--)(\\\")"), "$1" + fileHash + "$3")
+
+            storage.putFileContents(file, fileContents)
+
+        } catch (e: FileNotFoundException) {
+            throw PrefFileNotFoundError(file.absolutePath)
+        } catch (e: IOException) {
+            throw PrefIOError(file.absolutePath)
+        }
+    }
+
+    override fun loadPreferences(file: File, masterPassword: String?): Prefs {
+
+        val entries: MutableMap<String, String> = mutableMapOf()
+        val metadata: MutableMap<PrefsMetadataKey, PrefMetadata> = mutableMapOf()
+        val issues = LinkedList<String>()
+        try {
+
+            val jsonBody = storage.getFileContents(file)
+            val fileContents = jsonBody.replace(Regex("(?is)(\\\"file_hash\\\"\\s*\\:\\s*\\\")([^\"]*)(\\\")"), "$1--to-be-calculated--$3")
+            val calculatedFileHash = CryptoUtil.hmac256(fileContents, KEY_CONSCIENCE)
+            val container = JSONObject(jsonBody)
+
+            if (container.has(PrefsMetadataKey.FILE_FORMAT.key) && container.has("security") && container.has("content") && container.has("metadata")) {
+                val fileFormat = container.getString(PrefsMetadataKey.FILE_FORMAT.key)
+
+                if ((fileFormat != FORMAT_KEY_ENC) && (fileFormat != FORMAT_KEY_NOENC)) {
+                    throw PrefFormatError("Unsupported file format: " + fileFormat)
+                }
+
+                val meta = container.getJSONObject("metadata")
+                val security = container.getJSONObject("security")
+
+                metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(fileFormat, PrefsStatus.OK)
+                for (key in meta.keys()) {
+                    val metaKey = PrefsMetadataKey.fromKey(key)
+                    if (metaKey != null) {
+                        metadata[metaKey] = PrefMetadata(meta.getString(key), PrefsStatus.OK)
+                    }
+                }
+
+                val encrypted = fileFormat == FORMAT_KEY_ENC
+                var secure: PrefsStatus = PrefsStatus.OK
+                var decryptedOk = false
+                var contentJsonObj: JSONObject? = null
+                var insecurityReason = resourceHelper.gs(R.string.prefdecrypt_settings_tampered)
+
+                if (security.has("file_hash")) {
+                    if (calculatedFileHash != security.getString("file_hash")) {
+                        secure = PrefsStatus.ERROR
+                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_modified))
+                    }
+                } else {
+                    secure = PrefsStatus.ERROR
+                    issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_missing_file_hash))
+                }
+
+                if (encrypted) {
+                    if (security.has("algorithm") && security.get("algorithm") == "v1") {
+                        if (security.has("salt") && security.has("content_hash")) {
+
+                            val salt = security.getString("salt").hexStringToByteArray()
+                            val decrypted = CryptoUtil.decrypt(masterPassword!!, salt, container.getString("content"))
+
+                            if (decrypted != null) {
+                                try {
+                                    val contentHash = CryptoUtil.sha256(decrypted)
+
+                                    if (contentHash == security.getString("content_hash")) {
+                                        contentJsonObj = JSONObject(decrypted)
+                                        decryptedOk = true
+                                    } else {
+                                        secure = PrefsStatus.ERROR
+                                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_modified))
+                                    }
+
+                                } catch (e: JSONException) {
+                                    secure = PrefsStatus.ERROR
+                                    issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_parsing))
+                                }
+
+                            } else {
+                                secure = PrefsStatus.ERROR
+                                issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_pass))
+                                insecurityReason = resourceHelper.gs(R.string.prefdecrypt_wrong_password)
+                            }
+
+                        } else {
+                            secure = PrefsStatus.ERROR
+                            issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_format))
+                        }
+                    } else {
+                        secure = PrefsStatus.ERROR
+                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_algorithm))
+                    }
+
+                } else {
+
+                    if (secure == PrefsStatus.OK) {
+                        secure = PrefsStatus.WARN
+                    }
+
+                    if (!(security.has("algorithm") && security.get("algorithm") == "none")) {
+                        secure = PrefsStatus.ERROR
+                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_algorithm))
+                    }
+
+                    contentJsonObj = container.getJSONObject("content")
+                    decryptedOk = true
+                }
+
+                if (decryptedOk && contentJsonObj != null) {
+                    for (key in contentJsonObj.keys()) {
+                        entries.put(key, contentJsonObj[key].toString())
+                    }
+                }
+
+                val issuesStr: String? = if (issues.size > 0) issues.joinToString("\n") else null
+                val encryptionDescStr = if (encrypted) {
+                    if (secure == PrefsStatus.OK) resourceHelper.gs(R.string.prefdecrypt_settings_secure) else insecurityReason
+                } else {
+                    if (secure != PrefsStatus.ERROR) resourceHelper.gs(R.string.prefdecrypt_settings_unencrypted) else resourceHelper.gs(R.string.prefdecrypt_settings_tampered)
+                }
+
+                metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata(encryptionDescStr, secure, issuesStr)
+            } else {
+                metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(resourceHelper.gs(R.string.prefdecrypt_wrong_json), PrefsStatus.ERROR)
+            }
+
+            return Prefs(entries, metadata)
+
+        } catch (e: FileNotFoundException) {
+            throw PrefFileNotFoundError(file.absolutePath)
+        } catch (e: IOException) {
+            throw PrefIOError(file.absolutePath)
+        } catch (e: JSONException) {
+            throw PrefFormatError("Mallformed preferences JSON file: " + e)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt
new file mode 100644
index 0000000000..a47add0dd7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt
@@ -0,0 +1,73 @@
+package info.nightscout.androidaps.plugins.general.maintenance.formats
+
+import android.content.Context
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.R
+import java.io.File
+
+enum class PrefsMetadataKey(val key: String, @DrawableRes val icon:Int, @StringRes val label:Int) {
+
+    FILE_FORMAT("format", R.drawable.ic_meta_format, R.string.metadata_label_format),
+    CREATED_AT("created_at", R.drawable.ic_meta_date, R.string.metadata_label_created_at),
+    AAPS_VERSION("aaps_version", R.drawable.ic_meta_version, R.string.metadata_label_aaps_version),
+    AAPS_FLAVOUR("aaps_flavour", R.drawable.ic_meta_flavour, R.string.metadata_label_aaps_flavour),
+    DEVICE_NAME("device_name", R.drawable.ic_meta_name, R.string.metadata_label_device_name),
+    DEVICE_MODEL("device_model", R.drawable.ic_meta_model, R.string.metadata_label_device_model),
+    ENCRYPTION("encryption", R.drawable.ic_meta_encryption, R.string.metadata_label_encryption);
+
+    companion object {
+        private val keyToEnumMap = HashMap<String, PrefsMetadataKey>()
+
+        init {
+            for (value in values()) {
+                keyToEnumMap.put(value.key, value)
+            }
+        }
+
+        fun fromKey(key: String): PrefsMetadataKey? {
+            if (keyToEnumMap.containsKey(key)) {
+                return keyToEnumMap.get(key)
+            } else {
+                return null
+            }
+        }
+
+
+    }
+
+    fun formatForDisplay(context: Context, value:String): String {
+        return when (this) {
+            FILE_FORMAT -> when (value) {
+                ClassicPrefsFormat.FORMAT_KEY -> context.getString(R.string.metadata_format_old)
+                EncryptedPrefsFormat.FORMAT_KEY_ENC -> context.getString(R.string.metadata_format_new)
+                EncryptedPrefsFormat.FORMAT_KEY_NOENC -> context.getString(R.string.metadata_format_debug)
+                else       -> context.getString(R.string.metadata_format_other)
+            }
+            CREATED_AT  -> value.replace("T", " ").replace("Z", " (UTC)")
+            else        -> value
+        }
+    }
+
+}
+
+data class PrefMetadata(var value : String, var status : PrefsStatus, var info : String? = null)
+
+data class Prefs(val values : Map<String, String>, var metadata : Map<PrefsMetadataKey, PrefMetadata>)
+
+interface PrefsFormat {
+    fun savePreferences(file: File, prefs: Prefs, masterPassword: String? = null)
+    fun loadPreferences(file: File, masterPassword: String? = null) : Prefs
+}
+
+enum class PrefsStatus(@DrawableRes val icon:Int) {
+    OK(R.drawable.ic_meta_ok),
+    WARN(R.drawable.ic_meta_warning),
+    ERROR(R.drawable.ic_meta_error),
+    UNKNOWN(R.drawable.ic_meta_error),
+    DISABLED(R.drawable.ic_meta_error)
+}
+
+class PrefFileNotFoundError(message: String) : Exception(message)
+class PrefIOError(message: String) : Exception(message)
+class PrefFormatError(message: String) : Exception(message)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
index ea3ee3f9a7..047272f754 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
@@ -13,21 +13,28 @@ import android.widget.CompoundButton;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import androidx.fragment.app.Fragment;
+import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
+import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class NSClientFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
+public class NSClientFragment extends DaggerFragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
+    @Inject NSClientPlugin nsClientPlugin;
+    @Inject SP sp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject RxBusWrapper rxBus;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private TextView logTextView;
@@ -48,31 +55,31 @@ public class NSClientFragment extends Fragment implements View.OnClickListener,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.nsclientinternal_fragment, container, false);
 
-        logScrollview = (ScrollView) view.findViewById(R.id.nsclientinternal_logscrollview);
-        autoscrollCheckbox = (CheckBox) view.findViewById(R.id.nsclientinternal_autoscroll);
-        autoscrollCheckbox.setChecked(NSClientPlugin.getPlugin().autoscroll);
+        logScrollview = view.findViewById(R.id.nsclientinternal_logscrollview);
+        autoscrollCheckbox = view.findViewById(R.id.nsclientinternal_autoscroll);
+        autoscrollCheckbox.setChecked(nsClientPlugin.autoscroll);
         autoscrollCheckbox.setOnCheckedChangeListener(this);
-        pausedCheckbox = (CheckBox) view.findViewById(R.id.nsclientinternal_paused);
-        pausedCheckbox.setChecked(NSClientPlugin.getPlugin().paused);
+        pausedCheckbox = view.findViewById(R.id.nsclientinternal_paused);
+        pausedCheckbox.setChecked(nsClientPlugin.paused);
         pausedCheckbox.setOnCheckedChangeListener(this);
-        logTextView = (TextView) view.findViewById(R.id.nsclientinternal_log);
-        queueTextView = (TextView) view.findViewById(R.id.nsclientinternal_queue);
-        urlTextView = (TextView) view.findViewById(R.id.nsclientinternal_url);
-        statusTextView = (TextView) view.findViewById(R.id.nsclientinternal_status);
+        logTextView = view.findViewById(R.id.nsclientinternal_log);
+        queueTextView = view.findViewById(R.id.nsclientinternal_queue);
+        urlTextView = view.findViewById(R.id.nsclientinternal_url);
+        statusTextView = view.findViewById(R.id.nsclientinternal_status);
 
-        clearlog = (TextView) view.findViewById(R.id.nsclientinternal_clearlog);
+        clearlog = view.findViewById(R.id.nsclientinternal_clearlog);
         clearlog.setOnClickListener(this);
         clearlog.setPaintFlags(clearlog.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        restart = (TextView) view.findViewById(R.id.nsclientinternal_restart);
+        restart = view.findViewById(R.id.nsclientinternal_restart);
         restart.setOnClickListener(this);
         restart.setPaintFlags(restart.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        delivernow = (TextView) view.findViewById(R.id.nsclientinternal_delivernow);
+        delivernow = view.findViewById(R.id.nsclientinternal_delivernow);
         delivernow.setOnClickListener(this);
         delivernow.setPaintFlags(delivernow.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        clearqueue = (TextView) view.findViewById(R.id.nsclientinternal_clearqueue);
+        clearqueue = view.findViewById(R.id.nsclientinternal_clearqueue);
         clearqueue.setOnClickListener(this);
         clearqueue.setPaintFlags(clearqueue.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        showqueue = (TextView) view.findViewById(R.id.nsclientinternal_showqueue);
+        showqueue = view.findViewById(R.id.nsclientinternal_showqueue);
         showqueue.setOnClickListener(this);
         showqueue.setPaintFlags(showqueue.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
@@ -82,10 +89,10 @@ public class NSClientFragment extends Fragment implements View.OnClickListener,
     @Override
     public synchronized void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNSClientUpdateGUI.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
+                .subscribe(event -> updateGui(), fabricPrivacy::logException)
         );
         updateGui();
     }
@@ -100,25 +107,25 @@ public class NSClientFragment extends Fragment implements View.OnClickListener,
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.nsclientinternal_restart:
-                RxBus.INSTANCE.send(new EventNSClientRestart());
-                FabricPrivacy.getInstance().logCustom("NSClientRestart");
+                rxBus.send(new EventNSClientRestart());
+                fabricPrivacy.logCustom("NSClientRestart");
                 break;
             case R.id.nsclientinternal_delivernow:
-                NSClientPlugin.getPlugin().resend("GUI");
-                FabricPrivacy.getInstance().logCustom("NSClientDeliverNow");
+                nsClientPlugin.resend("GUI");
+                fabricPrivacy.logCustom("NSClientDeliverNow");
                 break;
             case R.id.nsclientinternal_clearlog:
-                NSClientPlugin.getPlugin().clearLog();
+                nsClientPlugin.clearLog();
                 break;
             case R.id.nsclientinternal_clearqueue:
-                OKDialog.showConfirmation(getContext(),MainApp.gs(R.string.nsclientinternal), MainApp.gs(R.string.clearqueueconfirm), () -> {
+                OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.nsclientinternal), resourceHelper.gs(R.string.clearqueueconfirm), () -> {
                     UploadQueue.clearQueue();
                     updateGui();
-                    FabricPrivacy.getInstance().logCustom("NSClientClearQueue");
+                    fabricPrivacy.logCustom("NSClientClearQueue");
                 });
                 break;
             case R.id.nsclientinternal_showqueue:
-                RxBus.INSTANCE.send(new EventNSClientNewLog("QUEUE", NSClientPlugin.getPlugin().queue().textList()));
+                rxBus.send(new EventNSClientNewLog("QUEUE", nsClientPlugin.queue().textList()));
                 break;
         }
     }
@@ -127,29 +134,29 @@ public class NSClientFragment extends Fragment implements View.OnClickListener,
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         switch (buttonView.getId()) {
             case R.id.nsclientinternal_paused:
-                NSClientPlugin.getPlugin().pause(isChecked);
+                nsClientPlugin.pause(isChecked);
                 updateGui();
-                FabricPrivacy.getInstance().logCustom("NSClientPause");
+                fabricPrivacy.logCustom("NSClientPause");
                 break;
             case R.id.nsclientinternal_autoscroll:
-                SP.putBoolean(R.string.key_nsclientinternal_autoscroll, isChecked);
-                NSClientPlugin.getPlugin().autoscroll = isChecked;
+                sp.putBoolean(R.string.key_nsclientinternal_autoscroll, isChecked);
+                nsClientPlugin.autoscroll = isChecked;
                 updateGui();
                 break;
         }
     }
 
     protected void updateGui() {
-        NSClientPlugin.getPlugin().updateLog();
-        pausedCheckbox.setChecked(SP.getBoolean(R.string.key_nsclientinternal_paused, false));
-        logTextView.setText(NSClientPlugin.getPlugin().textLog);
-        if (NSClientPlugin.getPlugin().autoscroll) {
+        nsClientPlugin.updateLog();
+        pausedCheckbox.setChecked(sp.getBoolean(R.string.key_nsclientinternal_paused, false));
+        logTextView.setText(nsClientPlugin.textLog);
+        if (nsClientPlugin.autoscroll) {
             logScrollview.fullScroll(ScrollView.FOCUS_DOWN);
         }
-        urlTextView.setText(NSClientPlugin.getPlugin().url());
-        Spanned queuetext = Html.fromHtml(MainApp.gs(R.string.queue) + " <b>" + UploadQueue.size() + "</b>");
+        urlTextView.setText(nsClientPlugin.url());
+        Spanned queuetext = Html.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + UploadQueue.size() + "</b>");
         queueTextView.setText(queuetext);
-        statusTextView.setText(NSClientPlugin.getPlugin().status);
+        statusTextView.setText(nsClientPlugin.status);
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index 957d69a935..8c6480ea86 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -7,21 +7,23 @@ import android.content.ServiceConnection;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
 import android.text.Html;
 import android.text.Spanned;
 
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventChargingState;
@@ -30,32 +32,32 @@ import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
 import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
+@Singleton
 public class NSClientPlugin extends PluginBase {
-    private Logger log = LoggerFactory.getLogger(L.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    static NSClientPlugin nsClientPlugin;
-
-    static public NSClientPlugin getPlugin() {
-        if (nsClientPlugin == null) {
-            nsClientPlugin = new NSClientPlugin();
-        }
-        return nsClientPlugin;
-    }
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final Context context;
+    private final SP sp;
 
     public Handler handler;
 
@@ -71,30 +73,42 @@ public class NSClientPlugin extends PluginBase {
 
     private NsClientReceiverDelegate nsClientReceiverDelegate;
 
-    private NSClientPlugin() {
+    @Inject
+    public NSClientPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            Context context,
+            SP sp,
+            NsClientReceiverDelegate nsClientReceiverDelegate
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(NSClientFragment.class.getName())
-                .pluginName(R.string.nsclientinternal)
-                .shortName(R.string.nsclientinternal_shortname)
-                .preferencesId(R.xml.pref_nsclientinternal)
-                .description(R.string.description_ns_client)
+                        .mainType(PluginType.GENERAL)
+                        .fragmentClass(NSClientFragment.class.getName())
+                        .pluginName(R.string.nsclientinternal)
+                        .shortName(R.string.nsclientinternal_shortname)
+                        .preferencesId(R.xml.pref_nsclientinternal)
+                        .description(R.string.description_ns_client),
+                aapsLogger, resourceHelper, injector
         );
 
-        if (Config.NSCLIENT) {
-            pluginDescription.alwaysEnabled(true).visibleByDefault(true);
-        }
-        paused = SP.getBoolean(R.string.key_nsclientinternal_paused, false);
-        autoscroll = SP.getBoolean(R.string.key_nsclientinternal_autoscroll, true);
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.context = context;
+        this.sp = sp;
+        this.nsClientReceiverDelegate = nsClientReceiverDelegate;
 
+        if (Config.NSCLIENT) {
+            getPluginDescription().alwaysEnabled(true).visibleByDefault(true);
+        }
         if (handler == null) {
             HandlerThread handlerThread = new HandlerThread(NSClientPlugin.class.getSimpleName() + "Handler");
             handlerThread.start();
             handler = new Handler(handlerThread.getLooper());
         }
 
-        nsClientReceiverDelegate =
-                new NsClientReceiverDelegate();
     }
 
     public boolean isAllowed() {
@@ -104,75 +118,81 @@ public class NSClientPlugin extends PluginBase {
 
     @Override
     protected void onStart() {
-        Context context = MainApp.instance().getApplicationContext();
+        paused = sp.getBoolean(R.string.key_nsclientinternal_paused, false);
+        autoscroll = sp.getBoolean(R.string.key_nsclientinternal_autoscroll, true);
+
         Intent intent = new Intent(context, NSClientService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
         super.onStart();
 
         nsClientReceiverDelegate.grabReceiversState();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNSClientStatus.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    status = event.getStatus();
-                    RxBus.INSTANCE.send(new EventNSClientUpdateGUI());
-                }, FabricPrivacy::logException)
+                    status = event.getStatus(resourceHelper);
+                    rxBus.send(new EventNSClientUpdateGUI());
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNetworkChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), FabricPrivacy::logException)
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), FabricPrivacy::logException)
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     if (nsClientService != null) {
-                        MainApp.instance().getApplicationContext().unbindService(mConnection);
+                        context.unbindService(mConnection);
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNSClientNewLog.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     addToLog(event);
-                    if (L.isEnabled(L.NSCLIENT))
-                        log.debug(event.getAction() + " " + event.getLogText());
-                }, FabricPrivacy::logException)
+                    aapsLogger.debug(LTag.NSCLIENT, event.getAction() + " " + event.getLogText());
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventChargingState.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), FabricPrivacy::logException)
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
+        );
+        disposable.add(rxBus
+                .toObservable(EventNSClientResend.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> resend(event.getReason()), exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
     @Override
     protected void onStop() {
-        MainApp.instance().getApplicationContext().unbindService(mConnection);
+        context.getApplicationContext().unbindService(mConnection);
         disposable.clear();
         super.onStop();
     }
 
     @Override
-    public void preprocessPreferences(@NotNull PreferenceFragment preferenceFragment) {
+    public void preprocessPreferences(@NotNull PreferenceFragmentCompat preferenceFragment) {
         super.preprocessPreferences(preferenceFragment);
 
         if (Config.NSCLIENT) {
-            PreferenceScreen scrnAdvancedSettings = (PreferenceScreen) preferenceFragment.findPreference(MainApp.gs(R.string.key_advancedsettings));
+            PreferenceScreen scrnAdvancedSettings = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_advancedsettings));
             if (scrnAdvancedSettings != null) {
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_res_warning)));
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_res_critical)));
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_bat_warning)));
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_bat_critical)));
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_show_statuslights)));
-                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_show_statuslights_extended)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_statuslights_res_warning)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_statuslights_res_critical)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_statuslights_bat_warning)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_statuslights_bat_critical)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_statuslights)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_statuslights_extended)));
             }
         }
     }
@@ -180,14 +200,12 @@ public class NSClientPlugin extends PluginBase {
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug("Service is disconnected");
+            aapsLogger.debug(LTag.NSCLIENT, "Service is disconnected");
             nsClientService = null;
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug("Service is connected");
+            aapsLogger.debug(LTag.NSCLIENT, "Service is connected");
             NSClientService.LocalBinder mLocalBinder = (NSClientService.LocalBinder) service;
             if (mLocalBinder != null) // is null when running in roboelectric
                 nsClientService = mLocalBinder.getServiceInstance();
@@ -199,7 +217,7 @@ public class NSClientPlugin extends PluginBase {
             synchronized (listLog) {
                 listLog.clear();
             }
-            RxBus.INSTANCE.send(new EventNSClientUpdateGUI());
+            rxBus.send(new EventNSClientUpdateGUI());
         });
     }
 
@@ -212,7 +230,7 @@ public class NSClientPlugin extends PluginBase {
                     listLog.remove(0);
                 }
             }
-            RxBus.INSTANCE.send(new EventNSClientUpdateGUI());
+            rxBus.send(new EventNSClientUpdateGUI());
         });
     }
 
@@ -226,7 +244,7 @@ public class NSClientPlugin extends PluginBase {
             }
             textLog = Html.fromHtml(newTextLog.toString());
         } catch (OutOfMemoryError e) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), "Out of memory!\nStop using this phone !!!", R.raw.error);
+            ToastUtils.showToastInUiThread(context, rxBus, "Out of memory!\nStop using this phone !!!", R.raw.error);
         }
     }
 
@@ -236,9 +254,9 @@ public class NSClientPlugin extends PluginBase {
     }
 
     public void pause(boolean newState) {
-        SP.putBoolean(R.string.key_nsclientinternal_paused, newState);
+        sp.putBoolean(R.string.key_nsclientinternal_paused, newState);
         paused = newState;
-        RxBus.INSTANCE.send(new EventPreferenceChange(R.string.key_nsclientinternal_paused));
+        rxBus.send(new EventPreferenceChange(resourceHelper, R.string.key_nsclientinternal_paused));
     }
 
     public UploadQueue queue() {
@@ -258,15 +276,14 @@ public class NSClientPlugin extends PluginBase {
         if (!isEnabled(PluginType.GENERAL)) {
             return;
         }
-        if (SP.getBoolean(R.string.key_ns_noupload, false)) {
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug("Upload disabled. Message dropped");
+        if (sp.getBoolean(R.string.key_ns_noupload, false)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Upload disabled. Message dropped");
             return;
         }
 
         AlarmAck ack = new AlarmAck();
-        ack.level = originalAlarm.getLevel();
-        ack.group = originalAlarm.getGroup();
+        ack.level = originalAlarm.level();
+        ack.group = originalAlarm.group();
         ack.silenceTime = silenceTimeInMsec;
 
         if (nsClientService != null)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index b735a153fb..c27b3896c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -5,16 +5,15 @@ import android.content.SharedPreferences;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 
 import androidx.annotation.Nullable;
+import androidx.preference.PreferenceManager;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,6 +25,7 @@ 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.DbRequest;
@@ -33,23 +33,26 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus;
 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.configBuilder.PluginStore;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.BatteryLevel;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.05.2017.
  */
-
 public class NSUpload {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
 
     public static void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
         try {
@@ -74,7 +77,7 @@ public class NSUpload {
         try {
             SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
             boolean useAbsolute = SP.getBoolean("ns_sync_use_absolute", false);
-            Profile profile = ProfileFunctions.getInstance().getProfile(temporaryBasal.date);
+            Profile profile = ConfigBuilderPlugin.getPlugin().getProfileFunction().getProfile(temporaryBasal.date);
             double absoluteRate = 0;
             if (profile != null) {
                 absoluteRate = profile.getBasal(temporaryBasal.date) * temporaryBasal.percentRate / 100d;
@@ -158,9 +161,9 @@ public class NSUpload {
         }
     }
 
-    public static void uploadDeviceStatus() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        String profileName = ProfileFunctions.getInstance().getProfileName();
+    public static void uploadDeviceStatus(LoopPlugin loopPlugin, IobCobCalculatorPlugin iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface) {
+        Profile profile = profileFunction.getProfile();
+        String profileName = profileFunction.getProfileName();
 
         if (profile == null || profileName == null) {
             log.error("Profile is null. Skipping upload");
@@ -169,7 +172,7 @@ public class NSUpload {
 
         DeviceStatus deviceStatus = new DeviceStatus();
         try {
-            LoopPlugin.LastRun lastRun = LoopPlugin.lastRun;
+            LoopPlugin.LastRun lastRun = loopPlugin.lastRun;
             if (lastRun != null && lastRun.lastAPSRun.getTime() > System.currentTimeMillis() - 300 * 1000L) {
                 // do not send if result is older than 1 min
                 APSResult apsResult = lastRun.request;
@@ -202,14 +205,14 @@ public class NSUpload {
             } else {
                 if (L.isEnabled(L.NSCLIENT))
                     log.debug("OpenAPS data too old to upload, sending iob only");
-                IobTotal[] iob = IobCobCalculatorPlugin.getPlugin().calculateIobArrayInDia(profile);
+                IobTotal[] iob = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
                 if (iob.length > 0) {
                     deviceStatus.iob = iob[0].json();
                     deviceStatus.iob.put("time", DateUtil.toISOString(DateUtil.now()));
                 }
             }
             deviceStatus.device = "openaps://" + Build.MANUFACTURER + " " + Build.MODEL;
-            JSONObject pumpstatus = ConfigBuilderPlugin.getPlugin().getActivePump().getJSONStatus(profile, profileName);
+            JSONObject pumpstatus = pumpInterface.getJSONStatus(profile, profileName);
             if (pumpstatus != null) {
                 deviceStatus.pump = pumpstatus;
             }
@@ -268,9 +271,9 @@ public class NSUpload {
             data.put("duration", tempTarget.durationInMinutes);
             if (tempTarget.low > 0) {
                 data.put("reason", tempTarget.reason);
-                data.put("targetBottom", Profile.fromMgdlToUnits(tempTarget.low, ProfileFunctions.getSystemUnits()));
-                data.put("targetTop", Profile.fromMgdlToUnits(tempTarget.high, ProfileFunctions.getSystemUnits()));
-                data.put("units", ProfileFunctions.getSystemUnits());
+                data.put("targetBottom", Profile.fromMgdlToUnits(tempTarget.low, ConfigBuilderPlugin.getPlugin().getProfileFunction().getUnits()));
+                data.put("targetTop", Profile.fromMgdlToUnits(tempTarget.high, ConfigBuilderPlugin.getPlugin().getProfileFunction().getUnits()));
+                data.put("units", ConfigBuilderPlugin.getPlugin().getProfileFunction().getUnits());
             }
             data.put("created_at", DateUtil.toISOString(tempTarget.date));
             data.put("enteredBy", MainApp.gs(R.string.app_name));
@@ -323,7 +326,9 @@ public class NSUpload {
                 prebolus.put("created_at", DateUtil.toISOString(preBolusDate));
                 uploadCareportalEntryToNS(prebolus);
             }
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            DbRequest dbr = new DbRequest("dbAdd", "treatments", data);
+            log.debug("Prepared: " + dbr.log());
+            UploadQueue.add(dbr);
         } catch (Exception e) {
             log.error("Unhandled exception", e);
         }
@@ -334,12 +339,10 @@ public class NSUpload {
         UploadQueue.add(new DbRequest("dbRemove", "treatments", _id));
     }
 
-    public static void uploadOpenAPSOffline(double durationInMinutes) {
+    public static void uploadOpenAPSOffline(CareportalEvent event) {
         try {
-            JSONObject data = new JSONObject();
-            data.put("eventType", "OpenAPS Offline");
-            data.put("duration", durationInMinutes);
-            data.put("created_at", DateUtil.toISOString(new Date()));
+            JSONObject data = new JSONObject(event.json);
+            data.put("created_at", DateUtil.toISOString(event.date));
             data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
             UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
@@ -396,7 +399,7 @@ public class NSUpload {
 
     public static void uploadProfileStore(JSONObject profileStore) {
         if (SP.getBoolean(R.string.key_ns_uploadlocalprofile, false)) {
-            UploadQueue.add(new DbRequest("dbAdd", "profile", String.valueOf(profileStore)));
+            UploadQueue.add(new DbRequest("dbAdd", "profile", profileStore));
         }
     }
 
@@ -464,6 +467,22 @@ public class NSUpload {
 
     }
 
+    public static void createNSTreatment(JSONObject data, ProfileStore profileStore, ProfileFunction profileFunction, long eventTime) {
+        if (JsonHelper.safeGetString(data, "eventType", "").equals(CareportalEvent.PROFILESWITCH)) {
+            ProfileSwitch profileSwitch = profileFunction.prepareProfileSwitch(
+                    profileStore,
+                    JsonHelper.safeGetString(data, "profile"),
+                    JsonHelper.safeGetInt(data, "duration"),
+                    JsonHelper.safeGetInt(data, "percentage"),
+                    JsonHelper.safeGetInt(data, "timeshift"),
+                    eventTime
+            );
+            uploadProfileSwitch(profileSwitch);
+        } else {
+            uploadCareportalEntryToNS(data);
+        }
+    }
+
     public static boolean isIdValid(String _id) {
         if (_id == null)
             return false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
index fd05b133f5..3bc2bde171 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
@@ -1,50 +1,55 @@
 package info.nightscout.androidaps.plugins.general.nsclient;
 
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventChargingState;
 import info.nightscout.androidaps.events.EventNetworkChange;
 import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.receivers.ChargingStateReceiver;
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.receivers.ReceiverStatusStore;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
+@Singleton
 class NsClientReceiverDelegate {
 
     private boolean allowedChargingState = true;
     private boolean allowedNetworkState = true;
     boolean allowed = true;
 
+    private RxBusWrapper rxBus;
+    private ResourceHelper resourceHelper;
+    private SP sp;
+    private ReceiverStatusStore receiverStatusStore;
+
+    @Inject
+    public NsClientReceiverDelegate(
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            SP sp,
+            ReceiverStatusStore receiverStatusStore
+    ) {
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.sp = sp;
+        this.receiverStatusStore = receiverStatusStore;
+    }
+
     void grabReceiversState() {
-        Context context = MainApp.instance().getApplicationContext();
-
-        EventNetworkChange event = NetworkChangeReceiver.grabNetworkStatus(context);
-        if (event != null) RxBus.INSTANCE.send(event);
-
-        EventChargingState eventChargingState = ChargingStateReceiver.grabChargingState(context);
-        if (eventChargingState != null) RxBus.INSTANCE.send(eventChargingState);
 
+        receiverStatusStore.updateNetworkStatus();
     }
 
     void onStatusEvent(EventPreferenceChange ev) {
-        if (ev.isChanged(R.string.key_ns_wifionly) ||
-                ev.isChanged(R.string.key_ns_wifi_ssids) ||
-                ev.isChanged(R.string.key_ns_allowroaming)
+        if (ev.isChanged(resourceHelper, R.string.key_ns_wifionly) ||
+                ev.isChanged(resourceHelper, R.string.key_ns_wifi_ssids) ||
+                ev.isChanged(resourceHelper, R.string.key_ns_allowroaming)
         ) {
-            EventNetworkChange event = NetworkChangeReceiver.grabNetworkStatus(MainApp.instance().getApplicationContext());
-            if (event != null)
-                RxBus.INSTANCE.send(event);
-        } else if (ev.isChanged(R.string.key_ns_chargingonly)) {
-            EventChargingState event = ChargingStateReceiver.grabChargingState(MainApp.instance().getApplicationContext());
-            if (event != null)
-                RxBus.INSTANCE.send(event);
+            receiverStatusStore.updateNetworkStatus();
+        } else if (ev.isChanged(resourceHelper, R.string.key_ns_chargingonly)) {
+            receiverStatusStore.broadcastChargingState();
         }
     }
 
@@ -70,12 +75,12 @@ class NsClientReceiverDelegate {
         boolean newAllowedState = allowedChargingState && allowedNetworkState;
         if (newAllowedState != allowed) {
             allowed = newAllowedState;
-            RxBus.INSTANCE.send(new EventPreferenceChange(R.string.key_nsclientinternal_paused));
+            rxBus.send(new EventPreferenceChange(resourceHelper.gs(R.string.key_nsclientinternal_paused)));
         }
     }
 
     boolean calculateStatus(final EventChargingState ev) {
-        boolean chargingOnly = SP.getBoolean(R.string.key_ns_chargingonly, false);
+        boolean chargingOnly = sp.getBoolean(R.string.key_ns_chargingonly, false);
         boolean newAllowedState = true;
 
         if (!ev.isCharging() && chargingOnly) {
@@ -86,9 +91,9 @@ class NsClientReceiverDelegate {
     }
 
     boolean calculateStatus(final EventNetworkChange ev) {
-        boolean wifiOnly = SP.getBoolean(R.string.key_ns_wifionly, false);
-        String allowedSSIDs = SP.getString(R.string.key_ns_wifi_ssids, "");
-        boolean allowRoaming = SP.getBoolean(R.string.key_ns_allowroaming, true);
+        boolean wifiOnly = sp.getBoolean(R.string.key_ns_wifionly, false);
+        String allowedSSIDs = sp.getString(R.string.key_ns_wifi_ssids, "");
+        boolean allowRoaming = sp.getBoolean(R.string.key_ns_allowroaming, true);
 
         boolean newAllowedState = true;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index c2bb0d21ab..fb425a23df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -14,16 +14,21 @@ import org.slf4j.LoggerFactory;
 import java.sql.SQLException;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
 import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 21.02.2016.
  */
 public class UploadQueue {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
 
     public static String status() {
         return "QUEUE: " + MainApp.getDbHelper().size(DatabaseHelper.DATABASE_DBREQUESTS);
@@ -42,21 +47,18 @@ public class UploadQueue {
     }
 
     public static void add(final DbRequest dbr) {
-        startService();
-        if (NSClientService.handler != null) {
-            NSClientService.handler.post(() -> {
-                if (L.isEnabled(L.NSCLIENT))
-                    log.debug("Adding to queue: " + dbr.data);
-                MainApp.getDbHelper().create(dbr);
-                NSClientPlugin plugin = NSClientPlugin.getPlugin();
-                if (plugin != null) {
-                    plugin.resend("newdata");
-                }
-            });
+        if (SP.getBoolean(R.string.key_ns_noupload, false)) return;
+        if (L.isEnabled(L.NSCLIENT))
+            log.debug("Adding to queue: " + dbr.log());
+        try {
+            MainApp.getDbHelper().create(dbr);
+        } catch (Exception e) {
+            log.error("Unhandled exception", e);
         }
+        RxBus.getINSTANCE().send(new EventNSClientResend("newdata"));
     }
 
-    public static void clearQueue() {
+    static void clearQueue() {
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(() -> {
@@ -104,7 +106,7 @@ public class UploadQueue {
         }
     }
 
-    public String textList() {
+    String textList() {
         String result = "";
         CloseableIterator<DbRequest> iterator;
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
index 01d1f26c33..cd1b525d59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import io.socket.client.Ack;
@@ -15,7 +16,7 @@ import io.socket.client.Ack;
  * Created by mike on 29.12.2015.
  */
 public class NSAddAck extends Event implements Ack {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
     public String _id = null;
     public String nsClientID = null;
     public JSONObject json = null;
@@ -33,7 +34,7 @@ public class NSAddAck extends Event implements Ack {
                     nsClientID = response.getString("NSCLIENT_ID");
                 }
             }
-            RxBus.INSTANCE.send(this);
+            RxBus.Companion.getINSTANCE().send(this);
             return;
         } catch (Exception e) {
             log.error("Unhandled exception", e);
@@ -44,7 +45,7 @@ public class NSAddAck extends Event implements Ack {
             if (response.has("result")) {
                 _id = null;
                 if (response.getString("result").contains("Not")) {
-                    RxBus.INSTANCE.send(new EventNSClientRestart());
+                    RxBus.Companion.getINSTANCE().send(new EventNSClientRestart());
                     return;
                 }
                 if (L.isEnabled(L.NSCLIENT))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
index 754ff6684b..dd6267308a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
@@ -16,6 +16,6 @@ public class NSAuthAck extends Event implements Ack{
         read = response.optBoolean("read");
         write = response.optBoolean("write");
         write_treatment = response.optBoolean("write_treatment");
-        RxBus.INSTANCE.send(this);
+        RxBus.Companion.getINSTANCE().send(this);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
index 2a4022980d..805a1495a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import io.socket.client.Ack;
 
@@ -14,7 +15,7 @@ import io.socket.client.Ack;
  * Created by mike on 21.02.2016.
  */
 public class NSUpdateAck extends Event implements Ack {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
     public boolean result = false;
     public String _id;
     public String action;
@@ -28,7 +29,7 @@ public class NSUpdateAck extends Event implements Ack {
                     result = true;
                     log.debug("Internal error: Missing _id returned on dbUpdate ack");
                 }
-                RxBus.INSTANCE.send(this);
+                RxBus.Companion.getINSTANCE().send(this);
             } catch (JSONException e) {
                 log.error("Unhandled exception", e);
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAlarm.java
deleted file mode 100644
index ce1de70900..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAlarm.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastAlarm {
-    public static void handleAlarm(JSONObject alarm, Context context) {
-        Bundle bundle = new Bundle();
-        bundle.putString("data", alarm.toString());
-        Intent intent = new Intent(Intents.ACTION_ALARM);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("data", alarm.toString());
-            intent = new Intent(Intents.ACTION_ALARM);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAnnouncement.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAnnouncement.java
deleted file mode 100644
index f97f750287..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAnnouncement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastAnnouncement {
-    public static void handleAnnouncement(JSONObject announcement, Context context) {
-        Bundle bundle = new Bundle();
-        bundle.putString("data", announcement.toString());
-        Intent intent = new Intent(Intents.ACTION_ANNOUNCEMENT);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("data", announcement.toString());
-            intent = new Intent(Intents.ACTION_ANNOUNCEMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastCals.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastCals.java
deleted file mode 100644
index 83f3c0a0e4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastCals.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastCals {
-    public static void handleNewCal(JSONArray cals, Context context, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("cals", cals.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_CAL);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("cals", cals.toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_NEW_CAL);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastClearAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastClearAlarm.java
deleted file mode 100644
index 3f0586e65e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastClearAlarm.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastClearAlarm {
-    public static void handleClearAlarm(JSONObject clearalarm, Context context) {
-        Bundle bundle = new Bundle();
-        bundle.putString("data", clearalarm.toString());
-        Intent intent = new Intent(Intents.ACTION_CLEAR_ALARM);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("data", clearalarm.toString());
-            intent = new Intent(Intents.ACTION_CLEAR_ALARM);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastDeviceStatus.java
deleted file mode 100644
index 4631834d9b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastDeviceStatus.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-
-public class BroadcastDeviceStatus {
-    public static void handleNewDeviceStatus(JSONArray statuses, Context context, boolean isDelta) {
-
-        List<JSONArray> splitted = BroadcastTreatment.splitArray(statuses);
-        for (JSONArray part: splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("devicestatuses", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_NEW_DEVICESTATUS);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            splitted = BroadcastTreatment.splitArray(statuses);
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("devicestatuses", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_NEW_DEVICESTATUS);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastFood.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastFood.java
deleted file mode 100644
index 35a2315ff2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastFood.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 20.02.2016.
- */
-public class BroadcastFood {
-    public static void handleNewFood(JSONArray foods, Context context, boolean isDelta) {
-
-        List<JSONArray> splitted = BroadcastTreatment.splitArray(foods);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("foods", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("foods", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
-            }
-        }
-    }
-
-    public static void handleChangedFood(JSONArray foods, Context context, boolean isDelta) {
-
-        List<JSONArray> splitted = BroadcastTreatment.splitArray(foods);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("foods", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_CHANGED_FOOD);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("foods", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_CHANGED_FOOD);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
-            }
-        }
-    }
-
-    public static void handleRemovedFood(JSONArray foods, Context context, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("foods", foods.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_REMOVED_FOOD);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("foods", foods.toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_REMOVED_FOOD);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastMbgs.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastMbgs.java
deleted file mode 100644
index 248e5d627f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastMbgs.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastMbgs {
-    public static void handleNewMbg(JSONArray mbgs, Context context, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("mbgs", mbgs.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_MBG);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("mbgs", mbgs.toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_NEW_MBG);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastProfile.java
deleted file mode 100644
index d6d051e327..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastProfile.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.utils.SP;
-
-
-/**
- * Created by mike on 20.02.2016.
- */
-public class BroadcastProfile {
-    public static void handleNewTreatment(ProfileStore profile, Context context, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("profile", profile.getData().toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_PROFILE);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("profile", profile.getData().toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_NEW_PROFILE);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastSgvs.java
deleted file mode 100644
index 06fd3c0a35..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastSgvs.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 22.02.2016.
- */
-public class BroadcastSgvs {
-    public static void handleNewSgv(JSONArray sgvs, Context context, boolean isDelta) {
-
-        List<JSONArray> splitted = BroadcastTreatment.splitArray(sgvs);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("sgvs", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_NEW_SGV);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("sgvs", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_NEW_SGV);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastStatus.java
deleted file mode 100644
index 81de2248e4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 24.02.2016.
- */
-public class BroadcastStatus {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-
-    public static void handleNewStatus(NSSettingsStatus status, Context context, boolean isDelta) {
-        LocalBroadcastManager.getInstance(MainApp.instance())
-                .sendBroadcast(createIntent(status, isDelta));
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            context.sendBroadcast(createIntent(status, isDelta));
-        }
-    }
-
-    private static Intent createIntent(NSSettingsStatus status, boolean isDelta) {
-        Bundle bundle = new Bundle();
-
-        try {
-            bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName);
-            bundle.putInt("nsclientversioncode", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode);
-        } catch (PackageManager.NameNotFoundException e) {
-            log.error("Unhandled exception", e);
-        }
-
-        bundle.putString("nightscoutversionname", NSClientService.nightscoutVersionName);
-        bundle.putInt("nightscoutversioncode", NSClientService.nightscoutVersionCode);
-        bundle.putString("status", status.getData().toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_STATUS);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-
-        return intent;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastTreatment.java
deleted file mode 100644
index 7b722f562d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastTreatment.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 20.02.2016.
- */
-public class BroadcastTreatment {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-
-    public static void handleNewTreatment(JSONObject treatment, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("treatment", treatment.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("treatment", treatment.toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            MainApp.instance().getApplicationContext().sendBroadcast(intent);
-        }
-    }
-
-    public static void handleNewTreatment(JSONArray treatments, boolean isDelta) {
-
-        List<JSONArray> splitted = splitArray(treatments);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("treatments", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            splitted = splitArray(treatments);
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("treatments", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                MainApp.instance().getApplicationContext().sendBroadcast(intent);
-            }
-        }
-    }
-
-    public static void handleChangedTreatment(JSONArray treatments, boolean isDelta) {
-
-        List<JSONArray> splitted = splitArray(treatments);
-        for (JSONArray part : splitted) {
-            Bundle bundle = new Bundle();
-            bundle.putString("treatments", part.toString());
-            bundle.putBoolean("delta", isDelta);
-            Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-        }
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            splitted = splitArray(treatments);
-            for (JSONArray part : splitted) {
-                Bundle bundle = new Bundle();
-                bundle.putString("treatments", part.toString());
-                bundle.putBoolean("delta", isDelta);
-                Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
-                intent.putExtras(bundle);
-                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                MainApp.instance().getApplicationContext().sendBroadcast(intent);
-            }
-        }
-    }
-
-    public static void handleRemovedTreatment(JSONArray treatments, boolean isDelta) {
-
-        Bundle bundle = new Bundle();
-        bundle.putString("treatments", treatments.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-
-        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("treatments", treatments.toString());
-            bundle.putBoolean("delta", isDelta);
-            intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            MainApp.instance().getApplicationContext().sendBroadcast(intent);
-        }
-    }
-
-
-    public static List<JSONArray> splitArray(JSONArray array) {
-        List<JSONArray> ret = new ArrayList<>();
-        try {
-            int size = array.length();
-            int count = 0;
-            JSONArray newarr = null;
-            for (int i = 0; i < size; i++) {
-                if (count == 0) {
-                    if (newarr != null) {
-                        ret.add(newarr);
-                    }
-                    newarr = new JSONArray();
-                    count = 20;
-                }
-                newarr.put(array.get(i));
-                --count;
-            }
-            if (newarr != null && newarr.length() > 0) {
-                ret.add(newarr);
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-            ret = new ArrayList<>();
-            ret.add(array);
-        }
-        return ret;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastUrgentAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastUrgentAlarm.java
deleted file mode 100644
index b6b1c4f8d9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastUrgentAlarm.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 26.06.2016.
- */
-public class BroadcastUrgentAlarm {
-    public static void handleUrgentAlarm(JSONObject urgentalarm, Context context) {
-        Bundle bundle = new Bundle();
-        bundle.putString("data", urgentalarm.toString());
-        Intent intent = new Intent(Intents.ACTION_URGENT_ALARM);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
-
-        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-            bundle = new Bundle();
-            bundle.putString("data", urgentalarm.toString());
-            intent = new Intent(Intents.ACTION_URGENT_ALARM);
-            intent.putExtras(bundle);
-            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.java
deleted file mode 100644
index 305a09d560..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.data;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 11.06.2017.
- */
-
-public class NSAlarm {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-
-    JSONObject data;
-
-    public NSAlarm(JSONObject data) {
-        this.data = data;
-    }
-
-    public int getLevel() {
-        int retval = 0;
-        if (data.has("level")) {
-            try {
-                retval = data.getInt("level");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-         return retval;
-    }
-
-    public String getGroup() {
-        String retval = "N/A";
-        if (data.has("group")) {
-            try {
-                retval = data.getString("group");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-         return retval;
-    }
-
-    public String getTile() {
-        String retval = "N/A";
-        if (data.has("title")) {
-            try {
-                retval = data.getString("title");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-         return retval;
-    }
-
-    public String getMessage() {
-        String retval = "N/A";
-        if (data.has("message")) {
-            try {
-                retval = data.getString("message");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-         return retval;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.kt
new file mode 100644
index 0000000000..2705b5ba56
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSAlarm.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.general.nsclient.data
+
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class NSAlarm(private var data: JSONObject) {
+    /*
+    {
+    "level":2,
+    "title":"Urgent HIGH",
+    "message":"BG Now: 5.2 -0.1 → mmol\/L\nRaw BG: 5 mmol\/L Čistý\nBG 15m: 5 mmol\/L\nIOB: 0.00U\nCOB: 0g",
+    "eventName":"high",
+    "plugin":{"name":"simplealarms","label":"Simple Alarms","pluginType":"notification","enabled":true},
+    "pushoverSound":"persistent",
+    "debug":{"lastSGV":5.2,"thresholds":{"bgHigh":80,"bgTargetTop":75,"bgTargetBottom":72,"bgLow":70}},
+    "group":"default",
+    "key":"simplealarms_2"
+    }
+     */
+
+    fun level(): Int =
+        JsonHelper.safeGetInt(data, "level", 0)
+
+    fun group(): String =
+        JsonHelper.safeGetString(data, "group", "N/A")
+
+    fun title(): String =
+        JsonHelper.safeGetString(data, "title", "N/A")
+
+    fun message(): String =
+        JsonHelper.safeGetString(data, "message", "N/A")
+
+    fun low() :Boolean =
+        JsonHelper.safeGetString(data, "eventName", "") == "low"
+
+    fun high() :Boolean =
+        JsonHelper.safeGetString(data, "eventName", "") == "high"
+
+    fun timeago() :Boolean =
+        JsonHelper.safeGetString(data, "eventName", "") == "timeago"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSCal.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSCal.java
deleted file mode 100644
index b3e59d9448..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSCal.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.data;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class NSCal {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-    public long date;
-    public double slope;
-    public double intercept;
-    public double scale = 1;
-
-    public void set(JSONObject json) {
-        try {
-            date = json.getLong("date");
-            slope = json.getDouble("slope");
-            intercept = json.getDouble("intercept");
-            scale = json.getDouble("scale");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-            log.error("Data: " + json.toString());
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
index 89f95608b5..8e5da2448d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
@@ -1,28 +1,28 @@
 package info.nightscout.androidaps.plugins.general.nsclient.data;
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.text.Html;
 import android.text.Spanned;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 25.06.2017.
@@ -78,58 +78,50 @@ import info.nightscout.androidaps.utils.SP;
     "NSCLIENT_ID": 1498406118857
 }
  */
+@Singleton
 public class NSDeviceStatus {
-    private Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-
-    private static NSDeviceStatus instance = null;
-
-    public static NSDeviceStatus getInstance() {
-        if (instance == null)
-            instance = new NSDeviceStatus();
-        return instance;
-    }
+    private final AAPSLogger aapsLogger;
+    private final SP sp;
+    private final ResourceHelper resourceHelper;
+    private final NSSettingsStatus nsSettingsStatus;
 
     private JSONObject data = null;
 
-    public NSDeviceStatus() {
+    @Inject
+    public NSDeviceStatus(
+            AAPSLogger aapsLogger,
+            SP sp,
+            ResourceHelper resourceHelper,
+            NSSettingsStatus nsSettingsStatus
+    ) {
+        this.aapsLogger = aapsLogger;
+        this.sp = sp;
+        this.resourceHelper = resourceHelper;
+        this.nsSettingsStatus = nsSettingsStatus;
     }
 
-    public void handleNewData(Intent intent) {
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
+    public void handleNewData(JSONArray devicestatuses) {
 
-        if (L.isEnabled(L.NSCLIENT))
-            log.debug("Got NS devicestatus: " + BundleLogger.log(bundle));
+        aapsLogger.debug(LTag.NSCLIENT, "Got NS devicestatus: $devicestatuses}");
 
-        try {
-            if (bundle.containsKey("devicestatus")) {
-                JSONObject devicestatusJson = new JSONObject(bundle.getString("devicestatus"));
-                setData(devicestatusJson);
-                if (devicestatusJson.has("pump")) {
-                    // Objectives 0
-                    SP.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, true);
-                }
-            }
-            if (bundle.containsKey("devicestatuses")) {
-                String devicestatusesstring = bundle.getString("devicestatuses");
-                JSONArray jsonArray = new JSONArray(devicestatusesstring);
-                for (int i = 0; i < jsonArray.length(); i++) {
-                    JSONObject devicestatusJson = jsonArray.getJSONObject(i);
+        for (int i = 0; i < devicestatuses.length(); i++) {
+            try {
+                JSONObject devicestatusJson = devicestatuses.getJSONObject(i);
+                if (devicestatusJson != null) {
                     setData(devicestatusJson);
                     if (devicestatusJson.has("pump")) {
                         // Objectives 0
-                        SP.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, true);
+                        sp.putBoolean(R.string.key_ObjectivespumpStatusIsAvailableInNS, true);
                     }
                 }
+            } catch (JSONException ignored) {
             }
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
         }
     }
 
     public NSDeviceStatus setData(JSONObject obj) {
         this.data = obj;
-        updatePumpData(obj);
+        updatePumpData();
         updateOpenApsData(obj);
         updateUploaderData(obj);
         return this;
@@ -145,7 +137,7 @@ public class NSDeviceStatus {
                 }
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return "";
     }
@@ -161,7 +153,7 @@ public class NSDeviceStatus {
 
     // ***** PUMP DATA ******
 
-    static DeviceStatusPumpData deviceStatusPumpData = null;
+    private DeviceStatusPumpData deviceStatusPumpData = null;
 
     public Spanned getExtendedPumpStatus() {
         if (deviceStatusPumpData != null && deviceStatusPumpData.extended != null)
@@ -173,8 +165,8 @@ public class NSDeviceStatus {
         //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"};
 
         StringBuilder string = new StringBuilder();
-        string.append("<span style=\"color:" + MainApp.gs(R.color.defaulttext).replace("#ff", "#") + "\">");
-        string.append(MainApp.gs(R.string.pump));
+        string.append("<span style=\"color:" + resourceHelper.gcs(R.color.defaulttext) + "\">");
+        string.append(resourceHelper.gs(R.string.pump));
         string.append(": </span>");
 
         if (deviceStatusPumpData == null)
@@ -183,21 +175,21 @@ public class NSDeviceStatus {
         // test warning level
         int level = Levels.INFO;
         long now = System.currentTimeMillis();
-        if (deviceStatusPumpData.clock + NSSettingsStatus.getInstance().extendedPumpSettings("urgentClock") * 60 * 1000L < now)
+        if (deviceStatusPumpData.clock + nsSettingsStatus.extendedPumpSettings("urgentClock") * 60 * 1000L < now)
             level = Levels.URGENT;
-        else if (deviceStatusPumpData.reservoir < NSSettingsStatus.getInstance().extendedPumpSettings("urgentRes"))
+        else if (deviceStatusPumpData.reservoir < nsSettingsStatus.extendedPumpSettings("urgentRes"))
             level = Levels.URGENT;
-        else if (deviceStatusPumpData.isPercent && deviceStatusPumpData.percent < NSSettingsStatus.getInstance().extendedPumpSettings("urgentBattP"))
+        else if (deviceStatusPumpData.isPercent && deviceStatusPumpData.percent < nsSettingsStatus.extendedPumpSettings("urgentBattP"))
             level = Levels.URGENT;
-        else if (!deviceStatusPumpData.isPercent && deviceStatusPumpData.voltage < NSSettingsStatus.getInstance().extendedPumpSettings("urgentBattV"))
+        else if (!deviceStatusPumpData.isPercent && deviceStatusPumpData.voltage < nsSettingsStatus.extendedPumpSettings("urgentBattV"))
             level = Levels.URGENT;
-        else if (deviceStatusPumpData.clock + NSSettingsStatus.getInstance().extendedPumpSettings("warnClock") * 60 * 1000L < now)
+        else if (deviceStatusPumpData.clock + nsSettingsStatus.extendedPumpSettings("warnClock") * 60 * 1000L < now)
             level = Levels.WARN;
-        else if (deviceStatusPumpData.reservoir < NSSettingsStatus.getInstance().extendedPumpSettings("warnRes"))
+        else if (deviceStatusPumpData.reservoir < nsSettingsStatus.extendedPumpSettings("warnRes"))
             level = Levels.WARN;
-        else if (deviceStatusPumpData.isPercent && deviceStatusPumpData.percent < NSSettingsStatus.getInstance().extendedPumpSettings("warnBattP"))
+        else if (deviceStatusPumpData.isPercent && deviceStatusPumpData.percent < nsSettingsStatus.extendedPumpSettings("warnBattP"))
             level = Levels.WARN;
-        else if (!deviceStatusPumpData.isPercent && deviceStatusPumpData.voltage < NSSettingsStatus.getInstance().extendedPumpSettings("warnBattV"))
+        else if (!deviceStatusPumpData.isPercent && deviceStatusPumpData.voltage < nsSettingsStatus.extendedPumpSettings("warnBattV"))
             level = Levels.WARN;
 
         string.append("<span style=\"color:");
@@ -205,7 +197,7 @@ public class NSDeviceStatus {
         if (level == Levels.WARN) string.append("yellow\">");
         if (level == Levels.URGENT) string.append("red\">");
 
-        String fields = NSSettingsStatus.getInstance().pumpExtentendedSettingsFields();
+        String fields = nsSettingsStatus.pumpExtendedSettingsFields();
 
         if (fields.contains("reservoir")) {
             string.append((int) deviceStatusPumpData.reservoir).append("U ");
@@ -219,7 +211,7 @@ public class NSDeviceStatus {
         }
 
         if (fields.contains("clock")) {
-            string.append(DateUtil.minAgo(deviceStatusPumpData.clock)).append(" ");
+            string.append(DateUtil.minAgo(resourceHelper, deviceStatusPumpData.clock)).append(" ");
         }
 
         if (fields.contains("status")) {
@@ -248,7 +240,7 @@ public class NSDeviceStatus {
         Spanned extended = null;
     }
 
-    public void updatePumpData(JSONObject object) {
+    private void updatePumpData() {
         try {
             JSONObject pump = data != null && data.has("pump") ? data.getJSONObject("pump") : new JSONObject();
 
@@ -284,24 +276,24 @@ public class NSDeviceStatus {
                 deviceStatusPumpData.extended = Html.fromHtml(exteneded.toString());
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
 
     // ********* OpenAPS data ***********
 
-    static DeviceStatusOpenAPSData deviceStatusOpenAPSData = new DeviceStatusOpenAPSData();
+    public static DeviceStatusOpenAPSData deviceStatusOpenAPSData = new DeviceStatusOpenAPSData();
 
-    static class DeviceStatusOpenAPSData {
-        long clockSuggested = 0L;
-        long clockEnacted = 0L;
+    public static class DeviceStatusOpenAPSData {
+        public long clockSuggested = 0L;
+        public long clockEnacted = 0L;
 
-        JSONObject suggested = null;
+        public JSONObject suggested = null;
         public JSONObject enacted = null;
     }
 
-    public void updateOpenApsData(JSONObject object) {
+    private void updateOpenApsData(JSONObject object) {
         try {
             JSONObject openaps = object.has("openaps") ? object.getJSONObject("openaps") : new JSONObject();
             JSONObject suggested = openaps.has("suggested") ? openaps.getJSONObject("suggested") : new JSONObject();
@@ -325,22 +317,22 @@ public class NSDeviceStatus {
                 deviceStatusOpenAPSData.clockEnacted = clock;
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
     public Spanned getOpenApsStatus() {
         StringBuilder string = new StringBuilder();
-        string.append("<span style=\"color:" + MainApp.gs(R.color.defaulttext).replace("#ff", "#") + "\">");
-        string.append(MainApp.gs(R.string.openaps_short));
+        string.append("<span style=\"color:" + resourceHelper.gcs(R.color.defaulttext) + "\">");
+        string.append(resourceHelper.gs(R.string.openaps_short));
         string.append(": </span>");
 
         // test warning level
         int level = Levels.INFO;
         long now = System.currentTimeMillis();
-        if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + SP.getInt(R.string.key_nsalarm_urgent_staledatavalue, 16) * 60 * 1000L < now)
+        if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + sp.getInt(R.string.key_nsalarm_urgent_staledatavalue, 16) * 60 * 1000L < now)
             level = Levels.URGENT;
-        else if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + SP.getInt(R.string.key_nsalarm_staledatavalue, 16) * 60 * 1000L < now)
+        else if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + sp.getInt(R.string.key_nsalarm_staledatavalue, 16) * 60 * 1000L < now)
             level = Levels.WARN;
 
         string.append("<span style=\"color:");
@@ -349,7 +341,7 @@ public class NSDeviceStatus {
         if (level == Levels.URGENT) string.append("red\">");
 
         if (deviceStatusOpenAPSData.clockSuggested != 0) {
-            string.append(DateUtil.minAgo(deviceStatusOpenAPSData.clockSuggested)).append(" ");
+            string.append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append(" ");
         }
         string.append("</span>"); // color
 
@@ -370,26 +362,26 @@ public class NSDeviceStatus {
 
         try {
             if (deviceStatusOpenAPSData.enacted != null && deviceStatusOpenAPSData.clockEnacted != deviceStatusOpenAPSData.clockSuggested)
-                string.append("<b>").append(DateUtil.minAgo(deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted.getString("reason")).append("<br>");
+                string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted.getString("reason")).append("<br>");
             if (deviceStatusOpenAPSData.suggested != null)
-                string.append("<b>").append(DateUtil.minAgo(deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested.getString("reason")).append("<br>");
+                string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested.getString("reason")).append("<br>");
             return Html.fromHtml(string.toString());
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return Html.fromHtml("");
     }
 
     // ********* Uploader data ***********
 
-    public static HashMap<String, Uploader> uploaders = new HashMap<>();
+    private static HashMap<String, Uploader> uploaders = new HashMap<>();
 
     static class Uploader {
         long clock = 0L;
         int battery = 0;
     }
 
-    public void updateUploaderData(JSONObject object) {
+    private void updateUploaderData(JSONObject object) {
         try {
 
             long clock = 0L;
@@ -407,7 +399,7 @@ public class NSDeviceStatus {
             }
             Uploader uploader = uploaders.get(device);
             // check if this is new data
-            if (clock != 0 && battery != null && (uploader != null && clock > uploader.clock || uploader == null)) {
+            if (clock != 0 && battery != null && (uploader == null || clock > uploader.clock)) {
                 if (uploader == null)
                     uploader = new Uploader();
                 uploader.battery = battery;
@@ -415,7 +407,7 @@ public class NSDeviceStatus {
                 uploaders.put(device, uploader);
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -434,8 +426,8 @@ public class NSDeviceStatus {
 
     public Spanned getUploaderStatusSpanned() {
         StringBuilder string = new StringBuilder();
-        string.append("<span style=\"color:" + MainApp.gs(R.color.defaulttext).replace("#ff", "#") + "\">");
-        string.append(MainApp.gs(R.string.uploader_short));
+        string.append("<span style=\"color:" + resourceHelper.gcs(R.color.defaulttext) + "\">");
+        string.append(resourceHelper.gs(R.string.uploader_short));
         string.append(": </span>");
 
         Iterator iter = uploaders.entrySet().iterator();
@@ -466,8 +458,8 @@ public class NSDeviceStatus {
         return Html.fromHtml(string.toString());
     }
 
-    public static APSResult getAPSResult() {
-        APSResult result = new APSResult();
+    public static APSResult getAPSResult(HasAndroidInjector injector) {
+        APSResult result = new APSResult(injector);
         result.json = deviceStatusOpenAPSData.suggested;
         result.date = deviceStatusOpenAPSData.clockSuggested;
         return result;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
index 9e3475c27e..537a08e363 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
@@ -6,9 +6,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 public class NSMbg {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
     public long date;
     public double mbg;
     public String json;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.java
deleted file mode 100644
index ba59c6297a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.java
+++ /dev/null
@@ -1,446 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.data;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-import java.util.Objects;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-
-/*
- {
- "status": "ok",
- "name": "Nightscout",
- "version": "0.10.0-dev-20170423",
- "versionNum": 1000,
- "serverTime": "2017-06-12T07:46:56.006Z",
- "apiEnabled": true,
- "careportalEnabled": true,
- "boluscalcEnabled": true,
- "head": "96ee154",
- "settings": {
-     "units": "mmol",
-     "timeFormat": 24,
-     "nightMode": false,
-     "editMode": true,
-     "showRawbg": "always",
-     "customTitle": "Bara's CGM",
-     "theme": "colors",
-     "alarmUrgentHigh": true,
-     "alarmUrgentHighMins": [30, 60, 90, 120],
-     "alarmHigh": true,
-     "alarmHighMins": [30, 60, 90, 120],
-     "alarmLow": true,
-     "alarmLowMins": [15, 30, 45, 60],
-     "alarmUrgentLow": true,
-     "alarmUrgentLowMins": [15, 30, 45],
-     "alarmUrgentMins": [30, 60, 90, 120],
-     "alarmWarnMins": [30, 60, 90, 120],
-     "alarmTimeagoWarn": true,
-     "alarmTimeagoWarnMins": 15,
-     "alarmTimeagoUrgent": true,
-     "alarmTimeagoUrgentMins": 30,
-     "language": "cs",
-     "scaleY": "linear",
-     "showPlugins": "careportal boluscalc food bwp cage sage iage iob cob basal ar2 delta direction upbat rawbg",
-     "showForecast": "ar2",
-     "focusHours": 3,
-     "heartbeat": 60,
-     "baseURL": "http:\/\/barascgm.sysop.cz:82",
-     "authDefaultRoles": "readable",
-     "thresholds": {
-         "bgHigh": 252,
-         "bgTargetTop": 180,
-         "bgTargetBottom": 72,
-         "bgLow": 71
-     },
-     "DEFAULT_FEATURES": ["bgnow", "delta", "direction", "timeago", "devicestatus", "upbat", "errorcodes", "profile"],
-     "alarmTypes": ["predict"],
-     "enable": ["careportal", "boluscalc", "food", "bwp", "cage", "sage", "iage", "iob", "cob", "basal", "ar2", "rawbg", "pushover", "bgi", "pump", "openaps", "pushover", "treatmentnotify", "bgnow", "delta", "direction", "timeago", "devicestatus", "upbat", "profile", "ar2"]
- },
- "extendedSettings": {
-     "pump": {
-         "fields": "reservoir battery clock",
-         "urgentBattP": 26,
-         "warnBattP": 51
-     },
-     "openaps": {
-         "enableAlerts": true
-     },
-     "cage": {
-         "alerts": true,
-         "display": "days",
-         "urgent": 96,
-         "warn": 72
-     },
-     "sage": {
-         "alerts": true,
-         "urgent": 336,
-         "warn": 168
-     },
-     "iage": {
-         "alerts": true,
-         "urgent": 150,
-         "warn": 120
-     },
-     "basal": {
-         "render": "default"
-     },
-     "profile": {
-         "history": true,
-         "multiple": true
-     },
-     "devicestatus": {
-         "advanced": true
-     }
- },
- "activeProfile": "2016 +30%"
- }
- */
-public class NSSettingsStatus {
-    private Logger log = LoggerFactory.getLogger(L.NSCLIENT);
-
-    private static NSSettingsStatus instance = null;
-
-    public static NSSettingsStatus getInstance() {
-        if (instance == null)
-            instance = new NSSettingsStatus();
-        return instance;
-    }
-
-    public String nightscoutVersionName = "";
-
-    private JSONObject data = null;
-
-    public NSSettingsStatus() {
-    }
-
-    public NSSettingsStatus setData(JSONObject obj) {
-        this.data = obj;
-        return this;
-    }
-
-    public void handleNewData(Intent intent) {
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        if (L.isEnabled(L.NSCLIENT))
-            log.debug("Got NS status: " + BundleLogger.log(bundle));
-
-        if (bundle.containsKey("nsclientversioncode")) {
-
-            Integer nightscoutVersionCode = bundle.getInt("nightscoutversioncode");
-            nightscoutVersionName = bundle.getString("nightscoutversionname");
-            Integer nsClientVersionCode = bundle.getInt("nsclientversioncode");
-            String nsClientVersionName = bundle.getString("nsclientversionname");
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug("Got versions: NSClient: " + nsClientVersionName + " Nightscout: " + nightscoutVersionName);
-            try {
-                if (nsClientVersionCode < MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode) {
-                    Notification notification = new Notification(Notification.OLD_NSCLIENT, MainApp.gs(R.string.unsupportedclientver), Notification.URGENT);
-                    RxBus.INSTANCE.send(new EventNewNotification(notification));
-                } else {
-                    RxBus.INSTANCE.send(new EventDismissNotification(Notification.OLD_NSCLIENT));
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                log.error("Unhandled exception", e);
-            }
-            if (nightscoutVersionCode < Config.SUPPORTEDNSVERSION) {
-                Notification notification = new Notification(Notification.OLD_NS, MainApp.gs(R.string.unsupportednsversion), Notification.NORMAL);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
-            } else {
-                RxBus.INSTANCE.send(new EventDismissNotification(Notification.OLD_NS));
-            }
-        } else {
-            Notification notification = new Notification(Notification.OLD_NSCLIENT, MainApp.gs(R.string.unsupportedclientver), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        }
-        if (bundle.containsKey("status")) {
-            try {
-                JSONObject statusJson = new JSONObject(bundle.getString("status"));
-                setData(statusJson);
-                if (L.isEnabled(L.NSCLIENT))
-                    log.debug("Received status: " + statusJson.toString());
-                Double targetHigh = getThreshold("bgTargetTop");
-                Double targetlow = getThreshold("bgTargetBottom");
-                if (targetHigh != null)
-                    OverviewPlugin.INSTANCE.setBgTargetHigh(targetHigh);
-                if (targetlow != null)
-                    OverviewPlugin.INSTANCE.setBgTargetLow(targetlow);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-    }
-
-    public String getName() {
-        return getStringOrNull("name");
-    }
-
-    public String getVersion() {
-        return getStringOrNull("version");
-    }
-
-    public Integer getVersionNum() {
-        return getIntegerOrNull("versionNum");
-    }
-
-    public Date getServerTime() {
-        return getDateOrNull("serverTime");
-    }
-
-    public boolean getApiEnabled() {
-        return getBooleanOrNull("apiEnabled");
-    }
-
-    public boolean getCareportalEnabled() {
-        return getBooleanOrNull("careportalEnabled");
-    }
-
-    public boolean getBoluscalcEnabled() {
-        return getBooleanOrNull("boluscalcEnabled");
-    }
-
-    public String getHead() {
-        return getStringOrNull("head");
-    }
-
-    public String getSettings() {
-        return getStringOrNull("settings");
-    }
-
-    public JSONObject getExtendedSettings() {
-        try {
-            String extended = getStringOrNull("extendedSettings");
-            if (extended != null)
-                return new JSONObject(extended);
-
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-
-    }
-
-    // valid property is "warn" or "urgent"
-    // plugings "iage" "sage" "cage" "pbage"
-
-    public double getExtendedWarnValue(String plugin, String property, double defaultvalue) {
-        JSONObject extendedSettings = this.getExtendedSettings();
-        if (extendedSettings == null)
-            return defaultvalue;
-        JSONObject pluginJson = extendedSettings.optJSONObject(plugin);
-        if (pluginJson == null)
-            return defaultvalue;
-        return pluginJson.optDouble(property, defaultvalue);
-    }
-
-    public String getActiveProfile() {
-        return getStringOrNull("activeProfile");
-    }
-
-    // "bgHigh": 252,
-    // "bgTargetTop": 180,
-    // "bgTargetBottom": 72,
-    // "bgLow": 71
-    @Nullable
-    public Double getThreshold(String what) {
-        try {
-            if (data == null)
-                return null;
-            String settings = getSettings();
-            if (settings != null) {
-                JSONObject settingsO = new JSONObject(settings);
-                if (settingsO.has("thresholds")) {
-                    JSONObject tObject = settingsO.getJSONObject("thresholds");
-                    if (tObject.has(what)) {
-                        return tObject.getDouble(what);
-                    }
-                }
-                if (settingsO.has("alarmTimeagoWarnMins") && Objects.equals(what, "alarmTimeagoWarnMins")) {
-                    return settingsO.getDouble(what);
-                }
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    private String getStringOrNull(String key) {
-        String ret = null;
-        if (data == null) return null;
-        if (data.has(key)) {
-            try {
-                ret = data.getString(key);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        return ret;
-    }
-
-    private Integer getIntegerOrNull(String key) {
-        Integer ret = null;
-        if (data.has(key)) {
-            try {
-                ret = data.getInt(key);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        return ret;
-    }
-
-    private Long getLongOrNull(String key) {
-        Long ret = null;
-        if (data.has(key)) {
-            try {
-                ret = data.getLong(key);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        return ret;
-    }
-
-    private Date getDateOrNull(String key) {
-        Date ret = null;
-        if (data.has(key)) {
-            try {
-                ret = new Date(data.getString(key));
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        return ret;
-    }
-
-    private boolean getBooleanOrNull(String key) {
-        boolean ret = false;
-        if (data.has(key)) {
-            try {
-                ret = data.getBoolean(key);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        return ret;
-    }
-
-    // ***** PUMP STATUS ******
-
-    public JSONObject getData() {
-        return data;
-    }
-
-    /*
-      , warnClock: sbx.extendedSettings.warnClock || 30
-      , urgentClock: sbx.extendedSettings.urgentClock || 60
-      , warnRes: sbx.extendedSettings.warnRes || 10
-      , urgentRes: sbx.extendedSettings.urgentRes || 5
-      , warnBattV: sbx.extendedSettings.warnBattV || 1.35
-      , urgentBattV: sbx.extendedSettings.urgentBattV || 1.3
-      , warnBattP: sbx.extendedSettings.warnBattP || 30
-      , urgentBattP: sbx.extendedSettings.urgentBattP || 20
-      , enableAlerts: sbx.extendedSettings.enableAlerts || false
-     */
-
-    public double extendedPumpSettings(String setting) {
-        try {
-            JSONObject pump = extentendedPumpSettings();
-            switch (setting) {
-                case "warnClock":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "urgentClock":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "warnRes":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "urgentRes":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "warnBattV":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "urgentBattV":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "warnBattP":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-                case "urgentBattP":
-                    return pump != null && pump.has(setting) ? pump.getDouble(setting) : 30;
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return 0d;
-    }
-
-
-    @Nullable
-    public JSONObject extentendedPumpSettings() {
-        try {
-            JSONObject extended = getExtendedSettings();
-            if (extended == null) return null;
-            if (extended.has("pump")) {
-                JSONObject pump = extended.getJSONObject("pump");
-                return pump;
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    public boolean pumpExtentendedSettingsEnabledAlerts() {
-        try {
-            JSONObject pump = extentendedPumpSettings();
-            if (pump != null && pump.has("enableAlerts")) {
-                return pump.getBoolean("enableAlerts");
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return false;
-    }
-
-    public String pumpExtentendedSettingsFields() {
-        try {
-            JSONObject pump = extentendedPumpSettings();
-            if (pump != null && pump.has("fields")) {
-                return pump.getString("fields");
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return "";
-    }
-
-    public boolean openAPSEnabledAlerts() {
-        try {
-            JSONObject pump = extentendedPumpSettings();
-            if (pump != null && pump.has("openaps")) {
-                return pump.getBoolean("enableAlerts");
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return false;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
new file mode 100644
index 0000000000..ae3ec534cd
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
@@ -0,0 +1,214 @@
+package info.nightscout.androidaps.plugins.general.nsclient.data
+
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/*
+ {
+ "status": "ok",
+ "name": "Nightscout",
+ "version": "0.10.0-dev-20170423",
+ "versionNum": 1000,
+ "serverTime": "2017-06-12T07:46:56.006Z",
+ "apiEnabled": true,
+ "careportalEnabled": true,
+ "boluscalcEnabled": true,
+ "head": "96ee154",
+ "settings": {
+     "units": "mmol",
+     "timeFormat": 24,
+     "nightMode": false,
+     "editMode": true,
+     "showRawbg": "always",
+     "customTitle": "Bara's CGM",
+     "theme": "colors",
+     "alarmUrgentHigh": true,
+     "alarmUrgentHighMins": [30, 60, 90, 120],
+     "alarmHigh": true,
+     "alarmHighMins": [30, 60, 90, 120],
+     "alarmLow": true,
+     "alarmLowMins": [15, 30, 45, 60],
+     "alarmUrgentLow": true,
+     "alarmUrgentLowMins": [15, 30, 45],
+     "alarmUrgentMins": [30, 60, 90, 120],
+     "alarmWarnMins": [30, 60, 90, 120],
+     "alarmTimeagoWarn": true,
+     "alarmTimeagoWarnMins": 15,
+     "alarmTimeagoUrgent": true,
+     "alarmTimeagoUrgentMins": 30,
+     "language": "cs",
+     "scaleY": "linear",
+     "showPlugins": "careportal boluscalc food bwp cage sage iage iob cob basal ar2 delta direction upbat rawbg",
+     "showForecast": "ar2",
+     "focusHours": 3,
+     "heartbeat": 60,
+     "baseURL": "http:\/\/barascgm.sysop.cz:82",
+     "authDefaultRoles": "readable",
+     "thresholds": {
+         "bgHigh": 252,
+         "bgTargetTop": 180,
+         "bgTargetBottom": 72,
+         "bgLow": 71
+     },
+     "DEFAULT_FEATURES": ["bgnow", "delta", "direction", "timeago", "devicestatus", "upbat", "errorcodes", "profile"],
+     "alarmTypes": ["predict"],
+     "enable": ["careportal", "boluscalc", "food", "bwp", "cage", "sage", "iage", "iob", "cob", "basal", "ar2", "rawbg", "pushover", "bgi", "pump", "openaps", "pushover", "treatmentnotify", "bgnow", "delta", "direction", "timeago", "devicestatus", "upbat", "profile", "ar2"]
+ },
+ "extendedSettings": {
+     "pump": {
+         "fields": "reservoir battery clock",
+         "urgentBattP": 26,
+         "warnBattP": 51
+     },
+     "openaps": {
+         "enableAlerts": true
+     },
+     "cage": {
+         "alerts": true,
+         "display": "days",
+         "urgent": 96,
+         "warn": 72
+     },
+     "sage": {
+         "alerts": true,
+         "urgent": 336,
+         "warn": 168
+     },
+     "iage": {
+         "alerts": true,
+         "urgent": 150,
+         "warn": 120
+     },
+     "basal": {
+         "render": "default"
+     },
+     "profile": {
+         "history": true,
+         "multiple": true
+     },
+     "devicestatus": {
+         "advanced": true
+     }
+ },
+ "activeProfile": "2016 +30%"
+ }
+ */
+@Singleton
+class NSSettingsStatus @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBusWrapper,
+    private val defaultValueHelper: DefaultValueHelper
+) {
+
+    var nightscoutVersionName = ""
+    // ***** PUMP STATUS ******
+    var data: JSONObject? = null
+
+    fun handleNewData(nightscoutVersionName: String, nightscoutVersionCode: Int, status: JSONObject) {
+        this.nightscoutVersionName = nightscoutVersionName
+        aapsLogger.debug(LTag.NSCLIENT, "Got versions: Nightscout: $nightscoutVersionName")
+        if (nightscoutVersionCode < Config.SUPPORTEDNSVERSION) {
+            val notification = Notification(Notification.OLD_NS, resourceHelper.gs(R.string.unsupportednsversion), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.OLD_NS))
+        }
+        data = status
+        aapsLogger.debug(LTag.NSCLIENT, "Received status: $status")
+        val targetHigh = getSettingsThreshold("bgTargetTop")
+        val targetlow = getSettingsThreshold("bgTargetBottom")
+        if (targetHigh != null) defaultValueHelper.bgTargetHigh = targetHigh
+        if (targetlow != null) defaultValueHelper.bgTargetLow = targetlow
+    }
+
+    fun getName(): String? =
+        JsonHelper.safeGetStringAllowNull(data, "name", null)
+
+    fun getVersion(): String? =
+        JsonHelper.safeGetStringAllowNull(data, "version", null)
+
+    fun getVersionNum(): Int =
+        JsonHelper.safeGetInt(data, "versionNum")
+
+    private fun getSettings() =
+        JsonHelper.safeGetJSONObject(data, "settings", null)
+
+    private fun getExtendedSettings(): JSONObject? =
+        JsonHelper.safeGetJSONObject(data, "extendedSettings", null)
+
+    // valid property is "warn" or "urgent"
+    // plugings "iage" "sage" "cage" "pbage"
+    fun getExtendedWarnValue(plugin: String, property: String, defaultValue: Double): Double {
+        val extendedSettings = getExtendedSettings() ?: return defaultValue
+        val pluginJson = extendedSettings.optJSONObject(plugin) ?: return defaultValue
+        return pluginJson.optDouble(property, defaultValue)
+    }
+
+    // "bgHigh": 252,
+    // "bgTargetTop": 180,
+    // "bgTargetBottom": 72,
+    // "bgLow": 71
+    fun getSettingsThreshold(what: String): Double? {
+        val threshold = JsonHelper.safeGetJSONObject(getSettings(), "thresholds", null)
+        return JsonHelper.safeGetDoubleAllowNull(threshold, what)
+    }
+
+    /*
+      , warnClock: sbx.extendedSettings.warnClock || 30
+      , urgentClock: sbx.extendedSettings.urgentClock || 60
+      , warnRes: sbx.extendedSettings.warnRes || 10
+      , urgentRes: sbx.extendedSettings.urgentRes || 5
+      , warnBattV: sbx.extendedSettings.warnBattV || 1.35
+      , urgentBattV: sbx.extendedSettings.urgentBattV || 1.3
+      , warnBattP: sbx.extendedSettings.warnBattP || 30
+      , urgentBattP: sbx.extendedSettings.urgentBattP || 20
+      , enableAlerts: sbx.extendedSettings.enableAlerts || false
+     */
+    fun extendedPumpSettings(setting: String?): Double {
+        try {
+            val pump = extendedPumpSettings()
+            return when (setting) {
+                "warnClock"   -> JsonHelper.safeGetDouble(pump, setting, 30.0)
+                "urgentClock" -> JsonHelper.safeGetDouble(pump, setting, 60.0)
+                "warnRes"     -> JsonHelper.safeGetDouble(pump, setting, 10.0)
+                "urgentRes"   -> JsonHelper.safeGetDouble(pump, setting, 5.0)
+                "warnBattV"   -> JsonHelper.safeGetDouble(pump, setting, 1.35)
+                "urgentBattV" -> JsonHelper.safeGetDouble(pump, setting, 1.3)
+                "warnBattP"   -> JsonHelper.safeGetDouble(pump, setting, 30.0)
+                "urgentBattP" -> JsonHelper.safeGetDouble(pump, setting, 20.0)
+                else          -> 0.0
+            }
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return 0.0
+    }
+
+    private fun extendedPumpSettings(): JSONObject? =
+        JsonHelper.safeGetJSONObject(getExtendedSettings(), "pump", null)
+
+    fun pumpExtendedSettingsEnabledAlerts(): Boolean =
+        JsonHelper.safeGetBoolean(extendedPumpSettings(), "enableAlerts")
+
+    fun pumpExtendedSettingsFields(): String =
+        JsonHelper.safeGetString(extendedPumpSettings(), "fields", "")
+
+    fun openAPSEnabledAlerts(): Boolean {
+        val openaps = JsonHelper.safeGetJSONObject(getExtendedSettings(), "openaps", null)
+        return JsonHelper.safeGetBoolean(openaps, "enableAlerts")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
index 391b363d99..ac6225813e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
@@ -6,13 +6,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  *
  * {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100}
  */
 public class NSSgv {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
 
     private JSONObject data;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
index 39491445a0..1c31922949 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
@@ -8,9 +8,10 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 public class NSTreatment {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
 
     private JSONObject data;
     private String action = null; // "update", "remove" or null (add)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientResend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientResend.kt
new file mode 100644
index 0000000000..26f70b8a82
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientResend.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.nsclient.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventNSClientResend(val reason: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
index 4d0c9dcd6e..dfe4ede8d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
@@ -1,7 +1,8 @@
 package info.nightscout.androidaps.plugins.general.nsclient.events
 
 import info.nightscout.androidaps.events.EventStatus
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventNSClientStatus(var text: String) : EventStatus() {
-    override fun getStatus(): String = text
+    override fun getStatus(resourceHelper: ResourceHelper): String = text
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index e1c57cc7c2..5c43c96771 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -1,15 +1,17 @@
 package info.nightscout.androidaps.plugins.general.nsclient.services;
 
-import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.SystemClock;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.google.common.base.Charsets;
 import com.google.common.hash.Hashing;
 import com.j256.ormlite.dao.CloseableIterator;
@@ -23,7 +25,13 @@ import org.slf4j.LoggerFactory;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.DaggerService;
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -31,28 +39,22 @@ import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
+import info.nightscout.androidaps.events.EventNsFood;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck;
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAuthAck;
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSUpdateAck;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastAlarm;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastAnnouncement;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastCals;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastClearAlarm;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastDeviceStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastFood;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastMbgs;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastProfile;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastSgvs;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastTreatment;
-import info.nightscout.androidaps.plugins.general.nsclient.broadcasts.BroadcastUrgentAlarm;
 import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck;
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSTreatment;
@@ -63,19 +65,34 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientU
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction;
+import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
-public class NSClientService extends Service {
-    private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+public class NSClientService extends DaggerService {
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject NSSettingsStatus nsSettingsStatus;
+    @Inject NSDeviceStatus nsDeviceStatus;
+    @Inject MainApp mainApp;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject SP sp;
+    @Inject NSClientPlugin nsClientPlugin;
+    @Inject BuildHelper buildHelper;
+
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
 
     static public PowerManager.WakeLock mWakeLock;
@@ -99,7 +116,7 @@ public class NSClientService extends Service {
     static public String nsURL = "";
     private String nsAPISecret = "";
     private String nsDevice = "";
-    private Integer nsHours = 48;
+    private final Integer nsHours = 48;
 
     public long lastResendTime = 0;
 
@@ -109,53 +126,55 @@ public class NSClientService extends Service {
 
     public static UploadQueue uploadQueue = new UploadQueue();
 
-    private ArrayList<Long> reconnections = new ArrayList<>();
+    private final ArrayList<Long> reconnections = new ArrayList<>();
     private int WATCHDOG_INTERVAL_MINUTES = 2;
     private int WATCHDOG_RECONNECT_IN = 15;
     private int WATCHDOG_MAXCONNECTIONS = 5;
 
     public NSClientService() {
+        super();
         if (handler == null) {
             HandlerThread handlerThread = new HandlerThread(NSClientService.class.getSimpleName() + "Handler");
             handlerThread.start();
             handler = new Handler(handlerThread.getLooper());
         }
-
-        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
-        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService");
-        initialize();
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
+        PowerManager powerManager = (PowerManager) mainApp.getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService");
         mWakeLock.acquire();
-        disposable.add(RxBus.INSTANCE
+
+        initialize();
+
+        disposable.add(rxBus
                 .toObservable(EventConfigBuilderChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (nsEnabled != NSClientPlugin.getPlugin().isEnabled(PluginType.GENERAL)) {
+                    if (nsEnabled != nsClientPlugin.isEnabled(PluginType.GENERAL)) {
                         latestDateInReceivedData = 0;
                         destroy();
                         initialize();
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (event.isChanged(R.string.key_nsclientinternal_url) ||
-                            event.isChanged(R.string.key_nsclientinternal_api_secret) ||
-                            event.isChanged(R.string.key_nsclientinternal_paused)
+                    if (event.isChanged(resourceHelper, R.string.key_nsclientinternal_url) ||
+                            event.isChanged(resourceHelper, R.string.key_nsclientinternal_api_secret) ||
+                            event.isChanged(resourceHelper, R.string.key_nsclientinternal_paused)
                     ) {
                         latestDateInReceivedData = 0;
                         destroy();
                         initialize();
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
@@ -163,30 +182,30 @@ public class NSClientService extends Service {
                         log.debug("EventAppExit received");
                     destroy();
                     stopSelf();
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNSClientRestart.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     latestDateInReceivedData = 0;
                     restart();
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(NSAuthAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> processAuthAck(event), FabricPrivacy::logException)
+                .subscribe(this::processAuthAck, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(NSUpdateAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> processUpdateAck(event), FabricPrivacy::logException)
+                .subscribe(this::processUpdateAck, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(NSAddAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> processAddAck(event), FabricPrivacy::logException)
+                .subscribe(this::processAddAck, exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
@@ -200,18 +219,18 @@ public class NSClientService extends Service {
     public void processAddAck(NSAddAck ack) {
         if (ack.nsClientID != null) {
             uploadQueue.removeID(ack.json);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBADD", "Acked " + ack.nsClientID));
+            rxBus.send(new EventNSClientNewLog("DBADD", "Acked " + ack.nsClientID));
         } else {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "DBADD Unknown response"));
+            rxBus.send(new EventNSClientNewLog("ERROR", "DBADD Unknown response"));
         }
     }
 
     public void processUpdateAck(NSUpdateAck ack) {
         if (ack.result) {
             uploadQueue.removeID(ack.action, ack._id);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBUPDATE/DBREMOVE", "Acked " + ack._id));
+            rxBus.send(new EventNSClientNewLog("DBUPDATE/DBREMOVE", "Acked " + ack._id));
         } else {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "DBUPDATE/DBREMOVE Unknown response"));
+            rxBus.send(new EventNSClientNewLog("ERROR", "DBUPDATE/DBREMOVE Unknown response"));
         }
     }
 
@@ -223,19 +242,19 @@ public class NSClientService extends Service {
         connectionStatus += ')';
         isConnected = true;
         hasWriteAuth = ack.write && ack.write_treatment;
-        RxBus.INSTANCE.send(new EventNSClientStatus(connectionStatus));
-        RxBus.INSTANCE.send(new EventNSClientNewLog("AUTH", connectionStatus));
+        rxBus.send(new EventNSClientStatus(connectionStatus));
+        rxBus.send(new EventNSClientNewLog("AUTH", connectionStatus));
         if (!ack.write) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "Write permission not granted !!!!"));
+            rxBus.send(new EventNSClientNewLog("ERROR", "Write permission not granted !!!!"));
         }
         if (!ack.write_treatment) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "Write treatment permission not granted !!!!"));
+            rxBus.send(new EventNSClientNewLog("ERROR", "Write treatment permission not granted !!!!"));
         }
         if (!hasWriteAuth) {
-            Notification noperm = new Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, MainApp.gs(R.string.nowritepermission), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(noperm));
+            Notification noperm = new Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, resourceHelper.gs(R.string.nowritepermission), Notification.URGENT);
+            rxBus.send(new EventNewNotification(noperm));
         } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.NSCLIENT_NO_WRITE_PERMISSION));
+            rxBus.send(new EventDismissNotification(Notification.NSCLIENT_NO_WRITE_PERMISSION));
         }
     }
 
@@ -264,27 +283,30 @@ public class NSClientService extends Service {
         if (!nsAPISecret.equals(""))
             nsAPIhashCode = Hashing.sha1().hashString(nsAPISecret, Charsets.UTF_8).toString();
 
-        RxBus.INSTANCE.send(new EventNSClientStatus("Initializing"));
-        if (!NSClientPlugin.getPlugin().isAllowed()) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "not allowed"));
-            RxBus.INSTANCE.send(new EventNSClientStatus("Not allowed"));
-        } else if (NSClientPlugin.getPlugin().paused) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "paused"));
-            RxBus.INSTANCE.send(new EventNSClientStatus("Paused"));
+        rxBus.send(new EventNSClientStatus("Initializing"));
+        if (!nsClientPlugin.isAllowed()) {
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "not allowed"));
+            rxBus.send(new EventNSClientStatus("Not allowed"));
+        } else if (nsClientPlugin.paused) {
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "paused"));
+            rxBus.send(new EventNSClientStatus("Paused"));
         } else if (!nsEnabled) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "disabled"));
-            RxBus.INSTANCE.send(new EventNSClientStatus("Disabled"));
-        } else if (!nsURL.equals("")) {
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "disabled"));
+            rxBus.send(new EventNSClientStatus("Disabled"));
+        } else if (!nsURL.equals("") && (buildHelper.isEngineeringMode() || nsURL.toLowerCase().startsWith("https://"))) {
             try {
-                RxBus.INSTANCE.send(new EventNSClientStatus("Connecting ..."));
+                rxBus.send(new EventNSClientStatus("Connecting ..."));
                 IO.Options opt = new IO.Options();
                 opt.forceNew = true;
                 opt.reconnection = true;
                 mSocket = IO.socket(nsURL, opt);
                 mSocket.on(Socket.EVENT_CONNECT, onConnect);
                 mSocket.on(Socket.EVENT_DISCONNECT, onDisconnect);
+                mSocket.on(Socket.EVENT_ERROR, onError);
+                mSocket.on(Socket.EVENT_CONNECT_ERROR, onError);
+                mSocket.on(Socket.EVENT_CONNECT_TIMEOUT, onError);
                 mSocket.on(Socket.EVENT_PING, onPing);
-                RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "do connect"));
+                rxBus.send(new EventNSClientNewLog("NSCLIENT", "do connect"));
                 mSocket.connect();
                 mSocket.on("dataUpdate", onDataUpdate);
                 mSocket.on("announcement", onAnnouncement);
@@ -292,12 +314,15 @@ public class NSClientService extends Service {
                 mSocket.on("urgent_alarm", onUrgentAlarm);
                 mSocket.on("clear_alarm", onClearAlarm);
             } catch (URISyntaxException | RuntimeException e) {
-                RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"));
-                RxBus.INSTANCE.send(new EventNSClientStatus("Wrong URL syntax"));
+                rxBus.send(new EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"));
+                rxBus.send(new EventNSClientStatus("Wrong URL syntax"));
             }
+        } else if (nsURL.toLowerCase().startsWith("http://")) {
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "NS URL not encrypted"));
+            rxBus.send(new EventNSClientStatus("Not encrypted"));
         } else {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "No NS URL specified"));
-            RxBus.INSTANCE.send(new EventNSClientStatus("Not configured"));
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "No NS URL specified"));
+            rxBus.send(new EventNSClientStatus("Not configured"));
         }
     }
 
@@ -306,7 +331,7 @@ public class NSClientService extends Service {
         public void call(Object... args) {
             connectCounter++;
             String socketId = mSocket != null ? mSocket.id() : "NULL";
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "connect #" + connectCounter + " event. ID: " + socketId));
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "connect #" + connectCounter + " event. ID: " + socketId));
             if (mSocket != null)
                 sendAuthMessage(new NSAuthAck());
             watchdog();
@@ -323,17 +348,17 @@ public class NSClientService extends Service {
                     reconnections.remove(r);
                 }
             }
-            RxBus.INSTANCE.send(new EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " mins: " + reconnections.size() + "/" + WATCHDOG_MAXCONNECTIONS));
+            rxBus.send(new EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " mins: " + reconnections.size() + "/" + WATCHDOG_MAXCONNECTIONS));
             if (reconnections.size() >= WATCHDOG_MAXCONNECTIONS) {
-                Notification n = new Notification(Notification.NSMALFUNCTION, MainApp.gs(R.string.nsmalfunction), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(n));
-                RxBus.INSTANCE.send(new EventNSClientNewLog("WATCHDOG", "pausing for " + WATCHDOG_RECONNECT_IN + " mins"));
-                NSClientPlugin.getPlugin().pause(true);
-                RxBus.INSTANCE.send(new EventNSClientUpdateGUI());
+                Notification n = new Notification(Notification.NSMALFUNCTION, resourceHelper.gs(R.string.nsmalfunction), Notification.URGENT);
+                rxBus.send(new EventNewNotification(n));
+                rxBus.send(new EventNSClientNewLog("WATCHDOG", "pausing for " + WATCHDOG_RECONNECT_IN + " mins"));
+                nsClientPlugin.pause(true);
+                rxBus.send(new EventNSClientUpdateGUI());
                 new Thread(() -> {
                     SystemClock.sleep(T.mins(WATCHDOG_RECONNECT_IN).msecs());
-                    RxBus.INSTANCE.send(new EventNSClientNewLog("WATCHDOG", "reenabling NSClient"));
-                    NSClientPlugin.getPlugin().pause(false);
+                    rxBus.send(new EventNSClientNewLog("WATCHDOG", "reenabling NSClient"));
+                    nsClientPlugin.pause(false);
                 }).start();
             }
         }
@@ -344,7 +369,7 @@ public class NSClientService extends Service {
         public void call(Object... args) {
             if (L.isEnabled(L.NSCLIENT))
                 log.debug("disconnect reason: {}", args);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "disconnect event"));
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "disconnect event"));
         }
     };
 
@@ -359,7 +384,7 @@ public class NSClientService extends Service {
             mSocket.off("urgent_alarm");
             mSocket.off("clear_alarm");
 
-            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "destroy"));
+            rxBus.send(new EventNSClientNewLog("NSCLIENT", "destroy"));
             isConnected = false;
             hasWriteAuth = false;
             mSocket.disconnect();
@@ -380,22 +405,33 @@ public class NSClientService extends Service {
             log.error("Unhandled exception", e);
             return;
         }
-        RxBus.INSTANCE.send(new EventNSClientNewLog("AUTH", "requesting auth"));
+        rxBus.send(new EventNSClientNewLog("AUTH", "requesting auth"));
         if (mSocket != null)
             mSocket.emit("authorize", authMessage, ack);
     }
 
     public void readPreferences() {
-        nsEnabled = NSClientPlugin.getPlugin().isEnabled(PluginType.GENERAL);
-        nsURL = SP.getString(R.string.key_nsclientinternal_url, "");
-        nsAPISecret = SP.getString(R.string.key_nsclientinternal_api_secret, "");
-        nsDevice = SP.getString("careportal_enteredby", "");
+        nsEnabled = nsClientPlugin.isEnabled(PluginType.GENERAL);
+        nsURL = sp.getString(R.string.key_nsclientinternal_url, "");
+        nsAPISecret = sp.getString(R.string.key_nsclientinternal_api_secret, "");
+        nsDevice = sp.getString("careportal_enteredby", "");
     }
 
+    private Emitter.Listener onError = new Emitter.Listener() {
+        @Override
+        public void call(final Object... args) {
+            String msg = "Unknown Error";
+            if (args.length > 0 && args[0] != null) {
+                msg = args[0].toString();
+            }
+            rxBus.send(new EventNSClientNewLog("ERROR", msg));
+        }
+    };
+
     private Emitter.Listener onPing = new Emitter.Listener() {
         @Override
         public void call(final Object... args) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("PING", "received"));
+            rxBus.send(new EventNSClientNewLog("PING", "received"));
             // send data if there is something waiting
             resend("Ping received");
         }
@@ -418,20 +454,11 @@ public class NSClientService extends Service {
             JSONObject data;
             try {
                 data = (JSONObject) args[0];
+                handleAnnouncement(data);
             } catch (Exception e) {
-                FabricPrivacy.log("Wrong Announcement from NS: " + args[0]);
                 log.error("Unhandled exception", e);
                 return;
             }
-            try {
-                RxBus.INSTANCE.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(data, "message", "received")));
-            } catch (Exception e) {
-                FabricPrivacy.logException(e);
-                log.error("Unhandled exception", e);
-            }
-            BroadcastAnnouncement.handleAnnouncement(data, getApplicationContext());
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug(data.toString());
         }
     };
 
@@ -451,49 +478,24 @@ public class NSClientService extends Service {
          */
         @Override
         public void call(final Object... args) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ALARM", "received"));
             JSONObject data;
             try {
                 data = (JSONObject) args[0];
+                handleAlarm(data);
             } catch (Exception e) {
-                FabricPrivacy.log("Wrong alarm from NS: " + args[0]);
                 log.error("Unhandled exception", e);
                 return;
             }
-            BroadcastAlarm.handleAlarm(data, getApplicationContext());
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug(data.toString());
         }
     };
 
-    private Emitter.Listener onUrgentAlarm = new Emitter.Listener() {
-        /*
-        {
-        "level":2,
-        "title":"Urgent HIGH",
-        "message":"BG Now: 5.2 -0.1 → mmol\/L\nRaw BG: 5 mmol\/L Čistý\nBG 15m: 5 mmol\/L\nIOB: 0.00U\nCOB: 0g",
-        "eventName":"high",
-        "plugin":{"name":"simplealarms","label":"Simple Alarms","pluginType":"notification","enabled":true},
-        "pushoverSound":"persistent",
-        "debug":{"lastSGV":5.2,"thresholds":{"bgHigh":80,"bgTargetTop":75,"bgTargetBottom":72,"bgLow":70}},
-        "group":"default",
-        "key":"simplealarms_2"
-        }
-         */
-        @Override
-        public void call(final Object... args) {
-            JSONObject data;
-            try {
-                data = (JSONObject) args[0];
-            } catch (Exception e) {
-                FabricPrivacy.log("Wrong Urgent alarm from NS: " + args[0]);
-                log.error("Unhandled exception", e);
-                return;
-            }
-            RxBus.INSTANCE.send(new EventNSClientNewLog("URGENTALARM", "received"));
-            BroadcastUrgentAlarm.handleUrgentAlarm(data, getApplicationContext());
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug(data.toString());
+    private Emitter.Listener onUrgentAlarm = args -> {
+        JSONObject data;
+        try {
+            data = (JSONObject) args[0];
+            handleUrgentAlarm(data);
+        } catch (Exception e) {
+            log.error("Unhandled exception", e);
         }
     };
 
@@ -511,227 +513,223 @@ public class NSClientService extends Service {
             JSONObject data;
             try {
                 data = (JSONObject) args[0];
+                rxBus.send(new EventNSClientNewLog("CLEARALARM", "received"));
+                rxBus.send(new EventDismissNotification(Notification.NSALARM));
+                rxBus.send(new EventDismissNotification(Notification.NSURGENTALARM));
+                aapsLogger.debug(LTag.NSCLIENT, data.toString());
             } catch (Exception e) {
-                FabricPrivacy.log("Wrong Urgent alarm from NS: " + args[0]);
                 log.error("Unhandled exception", e);
                 return;
             }
-            RxBus.INSTANCE.send(new EventNSClientNewLog("CLEARALARM", "received"));
-            BroadcastClearAlarm.handleClearAlarm(data, getApplicationContext());
-            if (L.isEnabled(L.NSCLIENT))
-                log.debug(data.toString());
         }
     };
 
     private Emitter.Listener onDataUpdate = new Emitter.Listener() {
         @Override
         public void call(final Object... args) {
-            NSClientService.handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
-                    PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                            "AndroidAPS:NSClientService_onDataUpdate");
-                    wakeLock.acquire();
+            NSClientService.handler.post(() -> {
+                PowerManager powerManager = (PowerManager) mainApp.getApplicationContext().getSystemService(Context.POWER_SERVICE);
+                PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                        "AndroidAPS:NSClientService_onDataUpdate");
+                wakeLock.acquire();
+                try {
+
+                    JSONObject data = (JSONObject) args[0];
+                    boolean broadcastProfile = false;
                     try {
+                        // delta means only increment/changes are comming
+                        boolean isDelta = data.has("delta");
+                        boolean isFull = !isDelta;
+                        rxBus.send(new EventNSClientNewLog("DATA", "Data packet #" + dataCounter++ + (isDelta ? " delta" : " full")));
 
-                        JSONObject data = (JSONObject) args[0];
-                        boolean broadcastProfile = false;
-                        try {
-                            // delta means only increment/changes are comming
-                            boolean isDelta = data.has("delta");
-                            boolean isFull = !isDelta;
-                            RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "Data packet #" + dataCounter++ + (isDelta ? " delta" : " full")));
-
-                            if (data.has("profiles")) {
-                                JSONArray profiles = data.getJSONArray("profiles");
-                                if (profiles.length() > 0) {
-                                    JSONObject profile = (JSONObject) profiles.get(profiles.length() - 1);
-                                    profileStore = new ProfileStore(profile);
-                                    broadcastProfile = true;
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("PROFILE", "profile received"));
-                                }
+                        if (data.has("profiles")) {
+                            JSONArray profiles = data.getJSONArray("profiles");
+                            if (profiles.length() > 0) {
+                                JSONObject profile = (JSONObject) profiles.get(profiles.length() - 1);
+                                profileStore = new ProfileStore(injector, profile);
+                                broadcastProfile = true;
+                                rxBus.send(new EventNSClientNewLog("PROFILE", "profile received"));
                             }
-
-                            if (data.has("status")) {
-                                JSONObject status = data.getJSONObject("status");
-                                NSSettingsStatus nsSettingsStatus = NSSettingsStatus.getInstance().setData(status);
-
-                                if (!status.has("versionNum")) {
-                                    if (status.getInt("versionNum") < Config.SUPPORTEDNSVERSION) {
-                                        RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
-                                    }
-                                } else {
-                                    nightscoutVersionName = nsSettingsStatus.getVersion();
-                                    nightscoutVersionCode = nsSettingsStatus.getVersionNum();
-                                }
-                                BroadcastStatus.handleNewStatus(nsSettingsStatus, MainApp.instance().getApplicationContext(), isDelta);
-
-                    /*  Other received data to 2016/02/10
-                        {
-                          status: 'ok'
-                          , name: env.name
-                          , version: env.version
-                          , versionNum: versionNum (for ver 1.2.3 contains 10203)
-                          , serverTime: new Date().toISOString()
-                          , apiEnabled: apiEnabled
-                          , careportalEnabled: apiEnabled && env.settings.enable.indexOf('careportal') > -1
-                          , boluscalcEnabled: apiEnabled && env.settings.enable.indexOf('boluscalc') > -1
-                          , head: env.head
-                          , settings: env.settings
-                          , extendedSettings: ctx.plugins && ctx.plugins.extendedClientSettings ? ctx.plugins.extendedClientSettings(env.extendedSettings) : {}
-                          , activeProfile ..... calculated from treatments or missing
                         }
-                     */
-                            } else if (!isDelta) {
-                                RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
-                            }
 
-                            // If new profile received or change detected broadcast it
-                            if (broadcastProfile && profileStore != null) {
-                                BroadcastProfile.handleNewTreatment(profileStore, MainApp.instance().getApplicationContext(), isDelta);
-                                RxBus.INSTANCE.send(new EventNSClientNewLog("PROFILE", "broadcasting"));
-                            }
+                        if (data.has("status")) {
+                            JSONObject status = data.getJSONObject("status");
+                            nsSettingsStatus.setData(status);
 
-                            if (data.has("treatments")) {
-                                JSONArray treatments = data.getJSONArray("treatments");
-                                JSONArray removedTreatments = new JSONArray();
-                                JSONArray updatedTreatments = new JSONArray();
-                                JSONArray addedTreatments = new JSONArray();
-                                if (treatments.length() > 0)
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"));
-                                for (Integer index = 0; index < treatments.length(); index++) {
-                                    JSONObject jsonTreatment = treatments.getJSONObject(index);
-                                    NSTreatment treatment = new NSTreatment(jsonTreatment);
+                            if (!status.has("versionNum")) {
+                                if (status.getInt("versionNum") < Config.SUPPORTEDNSVERSION) {
+                                    rxBus.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
+                                }
+                            } else {
+                                nightscoutVersionName = nsSettingsStatus.getVersion();
+                                nightscoutVersionCode = nsSettingsStatus.getVersionNum();
+                            }
+                            nsSettingsStatus.handleNewData(nightscoutVersionName, nightscoutVersionCode, status);
 
-                                    // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(jsonTreatment);
-                                    //Find latest date in treatment
-                                    if (treatment.getMills() != null && treatment.getMills() < System.currentTimeMillis())
-                                        if (treatment.getMills() > latestDateInReceivedData)
-                                            latestDateInReceivedData = treatment.getMills();
-
-                                    if (treatment.getAction() == null) {
-                                        addedTreatments.put(jsonTreatment);
-                                    } else if (treatment.getAction().equals("update")) {
-                                        updatedTreatments.put(jsonTreatment);
-                                    } else if (treatment.getAction().equals("remove")) {
-                                        if (treatment.getMills() != null && treatment.getMills() > System.currentTimeMillis() - 24 * 60 * 60 * 1000L) // handle 1 day old deletions only
-                                            removedTreatments.put(jsonTreatment);
-                                    }
-                                }
-                                if (removedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleRemovedTreatment(removedTreatments, isDelta);
-                                }
-                                if (updatedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleChangedTreatment(updatedTreatments, isDelta);
-                                }
-                                if (addedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleNewTreatment(addedTreatments, isDelta);
-                                }
-                            }
-                            if (data.has("devicestatus")) {
-                                JSONArray devicestatuses = data.getJSONArray("devicestatus");
-                                if (devicestatuses.length() > 0) {
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + devicestatuses.length() + " devicestatuses"));
-                                    for (Integer index = 0; index < devicestatuses.length(); index++) {
-                                        JSONObject jsonStatus = devicestatuses.getJSONObject(index);
-                                        // remove from upload queue if Ack is failing
-                                        UploadQueue.removeID(jsonStatus);
-                                    }
-                                    BroadcastDeviceStatus.handleNewDeviceStatus(devicestatuses, MainApp.instance().getApplicationContext(), isDelta);
-                                }
-                            }
-                            if (data.has("food")) {
-                                JSONArray foods = data.getJSONArray("food");
-                                JSONArray removedFoods = new JSONArray();
-                                JSONArray updatedFoods = new JSONArray();
-                                JSONArray addedFoods = new JSONArray();
-                                if (foods.length() > 0)
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + foods.length() + " foods"));
-                                for (Integer index = 0; index < foods.length(); index++) {
-                                    JSONObject jsonFood = foods.getJSONObject(index);
-
-                                    // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(jsonFood);
-
-                                    String action = JsonHelper.safeGetString(jsonFood, "action");
-
-                                    if (action == null) {
-                                        addedFoods.put(jsonFood);
-                                    } else if (action.equals("update")) {
-                                        updatedFoods.put(jsonFood);
-                                    } else if (action.equals("remove")) {
-                                        removedFoods.put(jsonFood);
-                                    }
-                                }
-                                if (removedFoods.length() > 0) {
-                                    BroadcastFood.handleRemovedFood(removedFoods, MainApp.instance().getApplicationContext(), isDelta);
-                                }
-                                if (updatedFoods.length() > 0) {
-                                    BroadcastFood.handleChangedFood(updatedFoods, MainApp.instance().getApplicationContext(), isDelta);
-                                }
-                                if (addedFoods.length() > 0) {
-                                    BroadcastFood.handleNewFood(addedFoods, MainApp.instance().getApplicationContext(), isDelta);
-                                }
-                            }
-                            if (data.has("mbgs")) {
-                                JSONArray mbgs = data.getJSONArray("mbgs");
-                                if (mbgs.length() > 0)
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + mbgs.length() + " mbgs"));
-                                for (Integer index = 0; index < mbgs.length(); index++) {
-                                    JSONObject jsonMbg = mbgs.getJSONObject(index);
-                                    // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(jsonMbg);
-                                }
-                                BroadcastMbgs.handleNewMbg(mbgs, MainApp.instance().getApplicationContext(), isDelta);
-                            }
-                            if (data.has("cals")) {
-                                JSONArray cals = data.getJSONArray("cals");
-                                if (cals.length() > 0)
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + cals.length() + " cals"));
-                                // Retreive actual calibration
-                                for (Integer index = 0; index < cals.length(); index++) {
-                                    // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(cals.optJSONObject(index));
-                                }
-                                BroadcastCals.handleNewCal(cals, MainApp.instance().getApplicationContext(), isDelta);
-                            }
-                            if (data.has("sgvs")) {
-                                JSONArray sgvs = data.getJSONArray("sgvs");
-                                if (sgvs.length() > 0)
-                                    RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "received " + sgvs.length() + " sgvs"));
-                                for (Integer index = 0; index < sgvs.length(); index++) {
-                                    JSONObject jsonSgv = sgvs.getJSONObject(index);
-                                    // RxBus.INSTANCE.send(new EventNSClientNewLog("DATA", "svg " + sgvs.getJSONObject(index).toString());
-                                    NSSgv sgv = new NSSgv(jsonSgv);
-                                    // Handle new sgv here
-                                    // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(jsonSgv);
-                                    //Find latest date in sgv
-                                    if (sgv.getMills() != null && sgv.getMills() < System.currentTimeMillis())
-                                        if (sgv.getMills() > latestDateInReceivedData)
-                                            latestDateInReceivedData = sgv.getMills();
-                                }
-                                // Was that sgv more less 15 mins ago ?
-                                boolean lessThan15MinAgo = false;
-                                if ((System.currentTimeMillis() - latestDateInReceivedData) / (60 * 1000L) < 15L)
-                                    lessThan15MinAgo = true;
-                                if (Notification.isAlarmForStaleData() && lessThan15MinAgo) {
-                                    RxBus.INSTANCE.send(new EventDismissNotification(Notification.NSALARM));
-                                }
-                                BroadcastSgvs.handleNewSgv(sgvs, MainApp.instance().getApplicationContext(), isDelta);
-                            }
-                            RxBus.INSTANCE.send(new EventNSClientNewLog("LAST", DateUtil.dateAndTimeString(latestDateInReceivedData)));
-                        } catch (JSONException e) {
-                            log.error("Unhandled exception", e);
-                        }
-                        //RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
-                    } finally {
-                        if (wakeLock.isHeld()) wakeLock.release();
+                /*  Other received data to 2016/02/10
+                    {
+                      status: 'ok'
+                      , name: env.name
+                      , version: env.version
+                      , versionNum: versionNum (for ver 1.2.3 contains 10203)
+                      , serverTime: new Date().toISOString()
+                      , apiEnabled: apiEnabled
+                      , careportalEnabled: apiEnabled && env.settings.enable.indexOf('careportal') > -1
+                      , boluscalcEnabled: apiEnabled && env.settings.enable.indexOf('boluscalc') > -1
+                      , head: env.head
+                      , settings: env.settings
+                      , extendedSettings: ctx.plugins && ctx.plugins.extendedClientSettings ? ctx.plugins.extendedClientSettings(env.extendedSettings) : {}
+                      , activeProfile ..... calculated from treatments or missing
                     }
-                }
+                 */
+                        } else if (!isDelta) {
+                            rxBus.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
+                        }
 
+                        // If new profile received or change detected broadcast it
+                        if (broadcastProfile && profileStore != null) {
+                            handleNewProfile(profileStore, isDelta);
+                            rxBus.send(new EventNSClientNewLog("PROFILE", "broadcasting"));
+                        }
+
+                        if (data.has("treatments")) {
+                            JSONArray treatments = data.getJSONArray("treatments");
+                            JSONArray removedTreatments = new JSONArray();
+                            JSONArray updatedTreatments = new JSONArray();
+                            JSONArray addedTreatments = new JSONArray();
+                            if (treatments.length() > 0)
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"));
+                            for (Integer index = 0; index < treatments.length(); index++) {
+                                JSONObject jsonTreatment = treatments.getJSONObject(index);
+                                NSTreatment treatment = new NSTreatment(jsonTreatment);
+
+                                // remove from upload queue if Ack is failing
+                                UploadQueue.removeID(jsonTreatment);
+                                //Find latest date in treatment
+                                if (treatment.getMills() != null && treatment.getMills() < System.currentTimeMillis())
+                                    if (treatment.getMills() > latestDateInReceivedData)
+                                        latestDateInReceivedData = treatment.getMills();
+
+                                if (treatment.getAction() == null) {
+                                    addedTreatments.put(jsonTreatment);
+                                } else if (treatment.getAction().equals("update")) {
+                                    updatedTreatments.put(jsonTreatment);
+                                } else if (treatment.getAction().equals("remove")) {
+                                    if (treatment.getMills() != null && treatment.getMills() > System.currentTimeMillis() - 24 * 60 * 60 * 1000L) // handle 1 day old deletions only
+                                        removedTreatments.put(jsonTreatment);
+                                }
+                            }
+                            if (removedTreatments.length() > 0) {
+                                handleRemovedTreatment(removedTreatments, isDelta);
+                            }
+                            if (updatedTreatments.length() > 0) {
+                                handleChangedTreatment(updatedTreatments, isDelta);
+                            }
+                            if (addedTreatments.length() > 0) {
+                                handleNewTreatment(addedTreatments, isDelta);
+                            }
+                        }
+                        if (data.has("devicestatus")) {
+                            JSONArray devicestatuses = data.getJSONArray("devicestatus");
+                            if (devicestatuses.length() > 0) {
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + devicestatuses.length() + " devicestatuses"));
+                                for (Integer index = 0; index < devicestatuses.length(); index++) {
+                                    JSONObject jsonStatus = devicestatuses.getJSONObject(index);
+                                    // remove from upload queue if Ack is failing
+                                    UploadQueue.removeID(jsonStatus);
+                                }
+                                nsDeviceStatus.handleNewData(devicestatuses);
+                            }
+                        }
+                        if (data.has("food")) {
+                            JSONArray foods = data.getJSONArray("food");
+                            JSONArray removedFoods = new JSONArray();
+                            JSONArray updatedFoods = new JSONArray();
+                            JSONArray addedFoods = new JSONArray();
+                            if (foods.length() > 0)
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + foods.length() + " foods"));
+                            for (Integer index = 0; index < foods.length(); index++) {
+                                JSONObject jsonFood = foods.getJSONObject(index);
+
+                                // remove from upload queue if Ack is failing
+                                UploadQueue.removeID(jsonFood);
+
+                                String action = JsonHelper.safeGetString(jsonFood, "action");
+
+                                if (action == null) {
+                                    addedFoods.put(jsonFood);
+                                } else if (action.equals("update")) {
+                                    updatedFoods.put(jsonFood);
+                                } else if (action.equals("remove")) {
+                                    removedFoods.put(jsonFood);
+                                }
+                            }
+                            if (removedFoods.length() > 0) {
+                                EventNsFood evt = new EventNsFood(EventNsFood.Companion.getREMOVE(), removedFoods);
+                                rxBus.send(evt);
+                            }
+                            if (updatedFoods.length() > 0) {
+                                EventNsFood evt = new EventNsFood(EventNsFood.Companion.getUPDATE(), updatedFoods);
+                                rxBus.send(evt);
+                            }
+                            if (addedFoods.length() > 0) {
+                                EventNsFood evt = new EventNsFood(EventNsFood.Companion.getADD(), addedFoods);
+                                rxBus.send(evt);
+                            }
+                        }
+                        if (data.has("mbgs")) {
+                            JSONArray mbgs = data.getJSONArray("mbgs");
+                            if (mbgs.length() > 0)
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + mbgs.length() + " mbgs"));
+                            for (Integer index = 0; index < mbgs.length(); index++) {
+                                JSONObject jsonMbg = mbgs.getJSONObject(index);
+                                // remove from upload queue if Ack is failing
+                                UploadQueue.removeID(jsonMbg);
+                            }
+                            handleNewMbg(mbgs, isDelta);
+                        }
+                        if (data.has("cals")) {
+                            JSONArray cals = data.getJSONArray("cals");
+                            if (cals.length() > 0)
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + cals.length() + " cals"));
+                            // Retreive actual calibration
+                            for (Integer index = 0; index < cals.length(); index++) {
+                                // remove from upload queue if Ack is failing
+                                UploadQueue.removeID(cals.optJSONObject(index));
+                            }
+                            handleNewCal(cals, isDelta);
+                        }
+                        if (data.has("sgvs")) {
+                            JSONArray sgvs = data.getJSONArray("sgvs");
+                            if (sgvs.length() > 0)
+                                rxBus.send(new EventNSClientNewLog("DATA", "received " + sgvs.length() + " sgvs"));
+                            for (int index = 0; index < sgvs.length(); index++) {
+                                JSONObject jsonSgv = sgvs.getJSONObject(index);
+                                // rxBus.send(new EventNSClientNewLog("DATA", "svg " + sgvs.getJSONObject(index).toString());
+                                NSSgv sgv = new NSSgv(jsonSgv);
+                                // Handle new sgv here
+                                // remove from upload queue if Ack is failing
+                                UploadQueue.removeID(jsonSgv);
+                                //Find latest date in sgv
+                                if (sgv.getMills() != null && sgv.getMills() < System.currentTimeMillis())
+                                    if (sgv.getMills() > latestDateInReceivedData)
+                                        latestDateInReceivedData = sgv.getMills();
+                            }
+                            // Was that sgv more less 5 mins ago ?
+                            if ((System.currentTimeMillis() - latestDateInReceivedData) / (60 * 1000L) < 5L) {
+                                rxBus.send(new EventDismissNotification(Notification.NSALARM));
+                                rxBus.send(new EventDismissNotification(Notification.NSURGENTALARM));
+                            }
+                            handleNewSgv(sgvs, isDelta);
+                        }
+                        rxBus.send(new EventNSClientNewLog("LAST", DateUtil.dateAndTimeString(latestDateInReceivedData)));
+                    } catch (JSONException e) {
+                        log.error("Unhandled exception", e);
+                    }
+                    //rxBus.send(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
+                } finally {
+                    if (wakeLock.isHeld()) wakeLock.release();
+                }
             });
         }
     };
@@ -744,7 +742,7 @@ public class NSClientService extends Service {
             message.put("_id", dbr._id);
             message.put("data", new JSONObject(dbr.data));
             mSocket.emit("dbUpdate", message, ack);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
+            rxBus.send(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
@@ -758,7 +756,7 @@ public class NSClientService extends Service {
             message.put("_id", dbr._id);
             message.put("data", new JSONObject(dbr.data));
             mSocket.emit("dbUpdateUnset", message, ack);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBUPDATEUNSET " + dbr.collection, "Sent " + dbr._id));
+            rxBus.send(new EventNSClientNewLog("DBUPDATEUNSET " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
@@ -771,7 +769,7 @@ public class NSClientService extends Service {
             message.put("collection", dbr.collection);
             message.put("_id", dbr._id);
             mSocket.emit("dbRemove", message, ack);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
+            rxBus.send(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
@@ -784,7 +782,7 @@ public class NSClientService extends Service {
             message.put("collection", dbr.collection);
             message.put("data", new JSONObject(dbr.data));
             mSocket.emit("dbAdd", message, ack);
-            RxBus.INSTANCE.send(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
+            rxBus.send(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
@@ -793,7 +791,7 @@ public class NSClientService extends Service {
     public void sendAlarmAck(AlarmAck alarmAck) {
         if (!isConnected || !hasWriteAuth) return;
         mSocket.emit("ack", alarmAck.level, alarmAck.group, alarmAck.silenceTime);
-        RxBus.INSTANCE.send(new EventNSClientNewLog("ALARMACK ", alarmAck.level + " " + alarmAck.group + " " + alarmAck.silenceTime));
+        rxBus.send(new EventNSClientNewLog("ALARMACK ", alarmAck.level + " " + alarmAck.group + " " + alarmAck.silenceTime));
     }
 
     public void resend(final String reason) {
@@ -802,51 +800,48 @@ public class NSClientService extends Service {
 
         if (!isConnected || !hasWriteAuth) return;
 
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (mSocket == null || !mSocket.connected()) return;
+        handler.post(() -> {
+            if (mSocket == null || !mSocket.connected()) return;
 
-                if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
-                    if (L.isEnabled(L.NSCLIENT))
-                        log.debug("Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
-                    return;
-                }
-                lastResendTime = System.currentTimeMillis();
-
-                RxBus.INSTANCE.send(new EventNSClientNewLog("QUEUE", "Resend started: " + reason));
-
-                CloseableIterator<DbRequest> iterator = null;
-                int maxcount = 30;
-                try {
-                    iterator = MainApp.getDbHelper().getDbRequestInterator();
-                    try {
-                        while (iterator.hasNext() && maxcount > 0) {
-                            DbRequest dbr = iterator.next();
-                            if (dbr.action.equals("dbAdd")) {
-                                NSAddAck addAck = new NSAddAck();
-                                dbAdd(dbr, addAck);
-                            } else if (dbr.action.equals("dbRemove")) {
-                                NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id);
-                                dbRemove(dbr, removeAck);
-                            } else if (dbr.action.equals("dbUpdate")) {
-                                NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id);
-                                dbUpdate(dbr, updateAck);
-                            } else if (dbr.action.equals("dbUpdateUnset")) {
-                                NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id);
-                                dbUpdateUnset(dbr, updateUnsetAck);
-                            }
-                            maxcount--;
-                        }
-                    } finally {
-                        iterator.close();
-                    }
-                } catch (SQLException e) {
-                    log.error("Unhandled exception", e);
-                }
-
-                RxBus.INSTANCE.send(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
+            if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
+                if (L.isEnabled(L.NSCLIENT))
+                    log.debug("Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
+                return;
             }
+            lastResendTime = System.currentTimeMillis();
+
+            rxBus.send(new EventNSClientNewLog("QUEUE", "Resend started: " + reason));
+
+            CloseableIterator<DbRequest> iterator;
+            int maxcount = 30;
+            try {
+                iterator = mainApp.getDbHelper().getDbRequestInterator();
+                try {
+                    while (iterator.hasNext() && maxcount > 0) {
+                        DbRequest dbr = iterator.next();
+                        if (dbr.action.equals("dbAdd")) {
+                            NSAddAck addAck = new NSAddAck();
+                            dbAdd(dbr, addAck);
+                        } else if (dbr.action.equals("dbRemove")) {
+                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id);
+                            dbRemove(dbr, removeAck);
+                        } else if (dbr.action.equals("dbUpdate")) {
+                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id);
+                            dbUpdate(dbr, updateAck);
+                        } else if (dbr.action.equals("dbUpdateUnset")) {
+                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id);
+                            dbUpdateUnset(dbr, updateUnsetAck);
+                        }
+                        maxcount--;
+                    }
+                } finally {
+                    iterator.close();
+                }
+            } catch (SQLException e) {
+                log.error("Unhandled exception", e);
+            }
+
+            rxBus.send(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
         });
     }
 
@@ -854,4 +849,201 @@ public class NSClientService extends Service {
         destroy();
         initialize();
     }
-}
+
+    private void handleAnnouncement(JSONObject announcement) {
+        NSAlarm nsAlarm = new NSAlarm(announcement);
+        Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+        rxBus.send(new EventNewNotification(notification));
+        rxBus.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(announcement, "message", "received")));
+        aapsLogger.debug(LTag.NSCLIENT, announcement.toString());
+    }
+
+    private void handleAlarm(JSONObject alarm) {
+        long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
+        if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+            NSAlarm nsAlarm = new NSAlarm(alarm);
+            Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+            rxBus.send(new EventNewNotification(notification));
+        }
+        rxBus.send(new EventNSClientNewLog("ALARM", JsonHelper.safeGetString(alarm, "message", "received")));
+        aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
+    }
+
+    private void handleUrgentAlarm(JSONObject alarm) {
+        long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
+        if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+            NSAlarm nsAlarm = new NSAlarm(alarm);
+            Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+            rxBus.send(new EventNewNotification(notification));
+        }
+        rxBus.send(new EventNSClientNewLog("URGENTALARM", JsonHelper.safeGetString(alarm, "message", "received")));
+        aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
+    }
+
+    public void handleNewCal(JSONArray cals, boolean isDelta) {
+        Bundle bundle = new Bundle();
+        bundle.putString("cals", cals.toString());
+        bundle.putBoolean("delta", isDelta);
+        Intent intent = new Intent(Intents.ACTION_NEW_CAL);
+        intent.putExtras(bundle);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+    }
+
+    public void handleNewMbg(JSONArray mbgs, boolean isDelta) {
+        Bundle bundle = new Bundle();
+        bundle.putString("mbgs", mbgs.toString());
+        bundle.putBoolean("delta", isDelta);
+        Intent intent = new Intent(Intents.ACTION_NEW_MBG);
+        intent.putExtras(bundle);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+    }
+
+    public void handleNewProfile(ProfileStore profile, boolean isDelta) {
+        Bundle bundle = new Bundle();
+        bundle.putString("profile", profile.getData().toString());
+        bundle.putBoolean("delta", isDelta);
+        Intent intent = new Intent(Intents.ACTION_NEW_PROFILE);
+        intent.putExtras(bundle);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+            bundle = new Bundle();
+            bundle.putString("profile", profile.getData().toString());
+            bundle.putBoolean("delta", isDelta);
+            intent = new Intent(Intents.ACTION_NEW_PROFILE);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            mainApp.sendBroadcast(intent);
+        }
+    }
+
+    public void handleNewSgv(JSONArray sgvs, boolean isDelta) {
+        List<JSONArray> splitted = splitArray(sgvs);
+        for (JSONArray part : splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("sgvs", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_NEW_SGV);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        }
+
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("sgvs", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_NEW_SGV);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                mainApp.sendBroadcast(intent);
+            }
+        }
+    }
+
+    public void handleNewTreatment(JSONArray treatments, boolean isDelta) {
+        List<JSONArray> splitted = splitArray(treatments);
+        for (JSONArray part : splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("treatments", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        }
+
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+            splitted = splitArray(treatments);
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("treatments", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                mainApp.getApplicationContext().sendBroadcast(intent);
+            }
+        }
+    }
+
+    public void handleChangedTreatment(JSONArray treatments, boolean isDelta) {
+        List<JSONArray> splitted = splitArray(treatments);
+        for (JSONArray part : splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("treatments", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        }
+
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+            splitted = splitArray(treatments);
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("treatments", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                mainApp.getApplicationContext().sendBroadcast(intent);
+            }
+        }
+    }
+
+    public void handleRemovedTreatment(JSONArray treatments, boolean isDelta) {
+        Bundle bundle = new Bundle();
+        bundle.putString("treatments", treatments.toString());
+        bundle.putBoolean("delta", isDelta);
+        Intent intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
+        intent.putExtras(bundle);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+
+
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
+            bundle = new Bundle();
+            bundle.putString("treatments", treatments.toString());
+            bundle.putBoolean("delta", isDelta);
+            intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            mainApp.getApplicationContext().sendBroadcast(intent);
+        }
+    }
+
+
+    public List<JSONArray> splitArray(JSONArray array) {
+        List<JSONArray> ret = new ArrayList<>();
+        try {
+            int size = array.length();
+            int count = 0;
+            JSONArray newarr = null;
+            for (int i = 0; i < size; i++) {
+                if (count == 0) {
+                    if (newarr != null) {
+                        ret.add(newarr);
+                    }
+                    newarr = new JSONArray();
+                    count = 20;
+                }
+                newarr.put(array.get(i));
+                --count;
+            }
+            if (newarr != null && newarr.length() > 0) {
+                ret.add(newarr);
+            }
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+            ret = new ArrayList<>();
+            ret.add(array);
+        }
+        return ret;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index add3474652..a3d86716bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -24,9 +24,10 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -34,9 +35,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.jjoe64.graphview.GraphView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -45,16 +43,17 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import dagger.android.support.DaggerFragment;
 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.IobTotal;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.QuickWizard;
-import info.nightscout.androidaps.data.QuickWizardEntry;
 import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
@@ -78,22 +77,24 @@ import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.events.EventTreatmentChange;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 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.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;
@@ -101,28 +102,58 @@ 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.SourceDexcomPlugin;
-import info.nightscout.androidaps.plugins.source.SourceXdripPlugin;
+import info.nightscout.androidaps.plugins.source.DexcomPlugin;
+import info.nightscout.androidaps.plugins.source.XdripPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.BolusWizard;
+import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.OKDialog;
 import info.nightscout.androidaps.utils.Profiler;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.SingleClickButton;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.protection.ProtectionCheck;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+import info.nightscout.androidaps.utils.wizard.BolusWizard;
+import info.nightscout.androidaps.utils.wizard.QuickWizard;
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 
 import static info.nightscout.androidaps.utils.DateUtil.now;
 
-public class OverviewFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener {
-    private static Logger log = LoggerFactory.getLogger(L.OVERVIEW);
+public class OverviewFragment extends DaggerFragment implements View.OnClickListener, View.OnLongClickListener {
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject MainApp mainApp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject DefaultValueHelper defaultValueHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject StatusLightHandler statusLightHandler;
+    @Inject NSDeviceStatus nsDeviceStatus;
+    @Inject LoopPlugin loopPlugin;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject DexcomPlugin dexcomPlugin;
+    @Inject XdripPlugin xdripPlugin;
+    @Inject NotificationStore notificationStore;
+    @Inject ActionStringHandler actionStringHandler;
+    @Inject QuickWizard quickWizard;
+    @Inject BuildHelper buildHelper;
+    @Inject CommandQueue commandQueue;
+    @Inject ProtectionCheck protectionCheck;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -147,7 +178,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     TextView openapsDeviceStatusView;
     TextView uploaderDeviceStatusView;
     TextView iobCalculationProgressView;
-    LinearLayout loopStatusLayout;
+    ConstraintLayout loopStatusLayout;
     LinearLayout pumpStatusLayout;
     GraphView bgGraph;
     GraphView iobGraph;
@@ -168,7 +199,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     RecyclerView notificationsView;
     LinearLayoutManager llm;
 
-    LinearLayout acceptTempLayout;
     SingleClickButton acceptTempButton;
 
     SingleClickButton treatmentButton;
@@ -201,7 +231,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         //check screen width
@@ -215,13 +245,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         View view;
 
-        if (MainApp.sResources.getBoolean(R.bool.isTablet) && (Config.NSCLIENT)) {
+        if (resourceHelper.gb(R.bool.isTablet) && (Config.NSCLIENT)) {
             view = inflater.inflate(R.layout.overview_fragment_nsclient_tablet, container, false);
         } else if (Config.NSCLIENT) {
             view = inflater.inflate(R.layout.overview_fragment_nsclient, container, false);
             shorttextmode = true;
         } else if (smallHeight || landscape) {
-            view = inflater.inflate(R.layout.overview_fragment_smallheight, container, false);
+            view = inflater.inflate(R.layout.overview_fragment_landscape, container, false);
         } else {
             view = inflater.inflate(R.layout.overview_fragment, container, false);
         }
@@ -246,10 +276,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         openapsDeviceStatusView = (TextView) view.findViewById(R.id.overview_openaps);
         uploaderDeviceStatusView = (TextView) view.findViewById(R.id.overview_uploader);
         iobCalculationProgressView = (TextView) view.findViewById(R.id.overview_iobcalculationprogess);
-        loopStatusLayout = (LinearLayout) view.findViewById(R.id.overview_looplayout);
+        loopStatusLayout = view.findViewById(R.id.overview_looplayout);
         pumpStatusLayout = (LinearLayout) view.findViewById(R.id.overview_pumpstatuslayout);
 
-        pumpStatusView.setBackgroundColor(MainApp.gc(R.color.colorInitializingBorder));
+        pumpStatusView.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder));
 
         iobView = (TextView) view.findViewById(R.id.overview_iob);
         cobView = (TextView) view.findViewById(R.id.overview_cob);
@@ -294,8 +324,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         if (cgmButton != null)
             cgmButton.setOnClickListener(this);
 
-        acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
-
         notificationsView = (RecyclerView) view.findViewById(R.id.overview_notifications);
         notificationsView.setHasFixedSize(false);
         llm = new LinearLayoutManager(view.getContext());
@@ -316,23 +344,23 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         else
             axisWidth = 80;
 
-        bgGraph.getGridLabelRenderer().setGridColor(MainApp.gc(R.color.graphgrid));
+        bgGraph.getGridLabelRenderer().setGridColor(resourceHelper.gc(R.color.graphgrid));
         bgGraph.getGridLabelRenderer().reloadStyles();
-        iobGraph.getGridLabelRenderer().setGridColor(MainApp.gc(R.color.graphgrid));
+        iobGraph.getGridLabelRenderer().setGridColor(resourceHelper.gc(R.color.graphgrid));
         iobGraph.getGridLabelRenderer().reloadStyles();
         iobGraph.getGridLabelRenderer().setHorizontalLabelsVisible(false);
         bgGraph.getGridLabelRenderer().setLabelVerticalWidth(axisWidth);
         iobGraph.getGridLabelRenderer().setLabelVerticalWidth(axisWidth);
         iobGraph.getGridLabelRenderer().setNumVerticalLabels(3);
 
-        rangeToDisplay = SP.getInt(R.string.key_rangetodisplay, 6);
+        rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6);
 
         bgGraph.setOnLongClickListener(v -> {
             rangeToDisplay += 6;
             rangeToDisplay = rangeToDisplay > 24 ? 6 : rangeToDisplay;
-            SP.putInt(R.string.key_rangetodisplay, rangeToDisplay);
+            sp.putInt(R.string.key_rangetodisplay, rangeToDisplay);
             updateGUI("rangeChange");
-            SP.putBoolean(R.string.key_objectiveusescale, true);
+            sp.putBoolean(R.string.key_objectiveusescale, true);
             return false;
         });
 
@@ -354,92 +382,92 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     @Override
     public void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventRefreshOverview.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(eventOpenAPSUpdateGui -> scheduleUpdateGUI(eventOpenAPSUpdateGui.getFrom()),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventExtendedBolusChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventExtendedBolusChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTempBasalChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventTempBasalChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTreatmentChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventTreatmentChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTempTargetChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventTempTargetChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAcceptOpenLoopChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventAcceptOpenLoopChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventCareportalEventChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventCareportalEventChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventInitializationChanged.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventInitializationChanged"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventAutosensCalculationFinished"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventProfileNeedsUpdate.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventProfileNeedsUpdate"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventPreferenceChange"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNewOpenLoopNotification.class)
-                .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
                 .subscribe(event -> scheduleUpdateGUI("EventNewOpenLoopNotification"),
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPumpStatusChanged.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updatePumpStatus(event.getStatus()),
-                        FabricPrivacy::logException
+                .subscribe(event -> updatePumpStatus(event),
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventIobCalculationProgress.class)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(event -> {
                             if (iobCalculationProgressView != null)
                                 iobCalculationProgressView.setText(event.getProgress());
                         },
-                        FabricPrivacy::logException
+                        exception -> FabricPrivacy.getInstance().logException(exception)
                 ));
         sRefreshLoop = () -> {
             scheduleUpdateGUI("refreshLoop");
@@ -455,10 +483,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     private void setupChartMenu(View view) {
         chartButton = (ImageButton) view.findViewById(R.id.overview_chartMenuButton);
         chartButton.setOnClickListener(v -> {
-            final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
             boolean predictionsAvailable;
             if (Config.APS)
-                predictionsAvailable = finalLastRun != null && finalLastRun.request.hasPredictions;
+                predictionsAvailable = loopPlugin.lastRun != null && loopPlugin.lastRun.request.hasPredictions;
             else if (Config.NSCLIENT)
                 predictionsAvailable = true;
             else
@@ -477,76 +504,76 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.prediction, null)), 0, s.length(), 0);
                 item.setTitle(s);
                 item.setCheckable(true);
-                item.setChecked(SP.getBoolean("showprediction", true));
+                item.setChecked(sp.getBoolean("showprediction", true));
             }
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.BAS.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_basals));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.BAS.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_basals));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.basal, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showbasals", true));
+            item.setChecked(sp.getBoolean("showbasals", true));
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_activity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showactivityprimary", true));
+            item.setChecked(sp.getBoolean("showactivityprimary", true));
 
             dividerItem = popup.getMenu().add("");
             dividerItem.setEnabled(false);
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.IOB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_iob));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.IOB.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_iob));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.iob, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showiob", true));
+            item.setChecked(sp.getBoolean("showiob", true));
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.COB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_cob));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.COB.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_cob));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.cob, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showcob", true));
+            item.setChecked(sp.getBoolean("showcob", true));
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.DEV.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_deviations));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.DEV.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_deviations));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.deviations, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showdeviations", false));
+            item.setChecked(sp.getBoolean("showdeviations", false));
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.SEN.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_sensitivity));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.SEN.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_sensitivity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.ratio, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showratios", false));
+            item.setChecked(sp.getBoolean("showratios", false));
 
-            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, resourceHelper.gs(R.string.overview_show_activity));
             title = item.getTitle();
             if (titleMaxChars < title.length()) titleMaxChars = title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
-            item.setChecked(SP.getBoolean("showactivitysecondary", true));
+            item.setChecked(sp.getBoolean("showactivitysecondary", true));
 
-            if (MainApp.devBranch) {
+            if (buildHelper.isDev()) {
                 item = popup.getMenu().add(Menu.NONE, CHARTTYPE.DEVSLOPE.ordinal(), Menu.NONE, "Deviation slope");
                 title = item.getTitle();
                 if (titleMaxChars < title.length()) titleMaxChars = title.length();
@@ -554,7 +581,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.devslopepos, null)), 0, s.length(), 0);
                 item.setTitle(s);
                 item.setCheckable(true);
-                item.setChecked(SP.getBoolean("showdevslope", false));
+                item.setChecked(sp.getBoolean("showdevslope", false));
             }
 
             // Fairly good guestimate for required divider text size...
@@ -565,23 +592,23 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 @Override
                 public boolean onMenuItemClick(MenuItem item) {
                     if (item.getItemId() == CHARTTYPE.PRE.ordinal()) {
-                        SP.putBoolean("showprediction", !item.isChecked());
+                        sp.putBoolean("showprediction", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.BAS.ordinal()) {
-                        SP.putBoolean("showbasals", !item.isChecked());
+                        sp.putBoolean("showbasals", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.IOB.ordinal()) {
-                        SP.putBoolean("showiob", !item.isChecked());
+                        sp.putBoolean("showiob", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.COB.ordinal()) {
-                        SP.putBoolean("showcob", !item.isChecked());
+                        sp.putBoolean("showcob", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.DEV.ordinal()) {
-                        SP.putBoolean("showdeviations", !item.isChecked());
+                        sp.putBoolean("showdeviations", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.SEN.ordinal()) {
-                        SP.putBoolean("showratios", !item.isChecked());
+                        sp.putBoolean("showratios", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.ACTPRIM.ordinal()) {
-                        SP.putBoolean("showactivityprimary", !item.isChecked());
+                        sp.putBoolean("showactivityprimary", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.ACTSEC.ordinal()) {
-                        SP.putBoolean("showactivitysecondary", !item.isChecked());
+                        sp.putBoolean("showactivitysecondary", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.DEVSLOPE.ordinal()) {
-                        SP.putBoolean("showdevslope", !item.isChecked());
+                        sp.putBoolean("showdevslope", !item.isChecked());
                     }
                     scheduleUpdateGUI("onGraphCheckboxesCheckedChanged");
                     return true;
@@ -603,149 +630,160 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         if (v == apsModeView) {
-            final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
             final PumpDescription pumpDescription =
-                    ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
-            if (!ProfileFunctions.getInstance().isProfileValid("ContexMenuCreation"))
+                    activePlugin.getActivePump().getPumpDescription();
+            if (!profileFunction.isProfileValid("ContexMenuCreation"))
                 return;
-            menu.setHeaderTitle(MainApp.gs(R.string.loop));
+            menu.setHeaderTitle(resourceHelper.gs(R.string.loop));
             if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                menu.add(MainApp.gs(R.string.disableloop));
+                menu.add(resourceHelper.gs(R.string.disableloop));
                 if (!loopPlugin.isSuspended()) {
-                    menu.add(MainApp.gs(R.string.suspendloopfor1h));
-                    menu.add(MainApp.gs(R.string.suspendloopfor2h));
-                    menu.add(MainApp.gs(R.string.suspendloopfor3h));
-                    menu.add(MainApp.gs(R.string.suspendloopfor10h));
+                    menu.add(resourceHelper.gs(R.string.suspendloopfor1h));
+                    menu.add(resourceHelper.gs(R.string.suspendloopfor2h));
+                    menu.add(resourceHelper.gs(R.string.suspendloopfor3h));
+                    menu.add(resourceHelper.gs(R.string.suspendloopfor10h));
                 } else {
                     if (!loopPlugin.isDisconnected()) {
-                        menu.add(MainApp.gs(R.string.resume));
+                        menu.add(resourceHelper.gs(R.string.resume));
                     }
                 }
             }
 
             if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-                menu.add(MainApp.gs(R.string.enableloop));
+                menu.add(resourceHelper.gs(R.string.enableloop));
             }
 
             if (!loopPlugin.isDisconnected()) {
                 showSuspendtPump(menu, pumpDescription);
             } else {
-                menu.add(MainApp.gs(R.string.reconnect));
+                menu.add(resourceHelper.gs(R.string.reconnect));
             }
 
         } else if (v == activeProfileView) {
-            menu.setHeaderTitle(MainApp.gs(R.string.profile));
-            menu.add(MainApp.gs(R.string.danar_viewprofile));
-            if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() != null) {
-                menu.add(MainApp.gs(R.string.careportal_profileswitch));
+            menu.setHeaderTitle(resourceHelper.gs(R.string.profile));
+            menu.add(resourceHelper.gs(R.string.danar_viewprofile));
+            activePlugin.getActiveProfileInterface();
+            if (activePlugin.getActiveProfileInterface().getProfile() != null) {
+                menu.add(resourceHelper.gs(R.string.careportal_profileswitch));
             }
         } else if (v == tempTargetView) {
-            menu.setHeaderTitle(MainApp.gs(R.string.careportal_temporarytarget));
-            menu.add(MainApp.gs(R.string.custom));
-            menu.add(MainApp.gs(R.string.eatingsoon));
-            menu.add(MainApp.gs(R.string.activity));
-            menu.add(MainApp.gs(R.string.hypo));
-            if (TreatmentsPlugin.getPlugin().getTempTargetFromHistory() != null) {
-                menu.add(MainApp.gs(R.string.cancel));
+            menu.setHeaderTitle(resourceHelper.gs(R.string.careportal_temporarytarget));
+            menu.add(resourceHelper.gs(R.string.custom));
+            menu.add(resourceHelper.gs(R.string.eatingsoon));
+            menu.add(resourceHelper.gs(R.string.activity));
+            menu.add(resourceHelper.gs(R.string.hypo));
+            if (treatmentsPlugin.getTempTargetFromHistory() != null) {
+                menu.add(resourceHelper.gs(R.string.cancel));
             }
         }
     }
 
     private void showSuspendtPump(ContextMenu menu, PumpDescription pumpDescription) {
         if (pumpDescription.tempDurationStep15mAllowed)
-            menu.add(MainApp.gs(R.string.disconnectpumpfor15m));
+            menu.add(resourceHelper.gs(R.string.disconnectpumpfor15m));
         if (pumpDescription.tempDurationStep30mAllowed)
-            menu.add(MainApp.gs(R.string.disconnectpumpfor30m));
-        menu.add(MainApp.gs(R.string.disconnectpumpfor1h));
-        menu.add(MainApp.gs(R.string.disconnectpumpfor2h));
-        menu.add(MainApp.gs(R.string.disconnectpumpfor3h));
+            menu.add(resourceHelper.gs(R.string.disconnectpumpfor30m));
+        menu.add(resourceHelper.gs(R.string.disconnectpumpfor1h));
+        menu.add(resourceHelper.gs(R.string.disconnectpumpfor2h));
+        menu.add(resourceHelper.gs(R.string.disconnectpumpfor3h));
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
+    public boolean onContextItemSelected(@NonNull MenuItem item) {
+        final Profile profile = profileFunction.getProfile();
         if (profile == null)
             return true;
-        final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-        if (item.getTitle().equals(MainApp.gs(R.string.disableloop))) {
+        if (item.getTitle().equals(resourceHelper.gs(R.string.disableloop))) {
+            aapsLogger.debug("USER ENTRY: LOOP DISABLED");
             loopPlugin.setPluginEnabled(PluginType.LOOP, false);
             loopPlugin.setFragmentVisible(PluginType.LOOP, false);
-            ConfigBuilderPlugin.getPlugin().storeSettings("DisablingLoop");
+            configBuilderPlugin.storeSettings("DisablingLoop");
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+            commandQueue.cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
-                        ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.tempbasaldeliveryerror));
+                        ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
-            NSUpload.uploadOpenAPSOffline(24 * 60); // upload 24h, we don't know real duration
+            loopPlugin.createOfflineEvent(24 * 60); // upload 24h, we don't know real duration
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.enableloop))) {
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.enableloop))) {
+            aapsLogger.debug("USER ENTRY: LOOP ENABLED");
             loopPlugin.setPluginEnabled(PluginType.LOOP, true);
             loopPlugin.setFragmentVisible(PluginType.LOOP, true);
-            ConfigBuilderPlugin.getPlugin().storeSettings("EnablingLoop");
+            configBuilderPlugin.storeSettings("EnablingLoop");
             updateGUI("suspendmenu");
-            NSUpload.uploadOpenAPSOffline(0);
+            loopPlugin.createOfflineEvent(0);
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.resume)) ||
-                item.getTitle().equals(MainApp.gs(R.string.reconnect))) {
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.resume)) ||
+                item.getTitle().equals(resourceHelper.gs(R.string.reconnect))) {
+            aapsLogger.debug("USER ENTRY: RESUME");
             loopPlugin.suspendTo(0L);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
+            commandQueue.cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
-                        ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.tempbasaldeliveryerror));
+                        ToastUtils.showToastInUiThread(mainApp, resourceHelper.gs(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
-            SP.putBoolean(R.string.key_objectiveusereconnect, true);
-            NSUpload.uploadOpenAPSOffline(0);
+            sp.putBoolean(R.string.key_objectiveusereconnect, true);
+            loopPlugin.createOfflineEvent(0);
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor1h))) {
-            LoopPlugin.getPlugin().suspendLoop(60);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.suspendloopfor1h))) {
+            aapsLogger.debug("USER ENTRY: SUSPEND 1h");
+            loopPlugin.suspendLoop(60);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor2h))) {
-            LoopPlugin.getPlugin().suspendLoop(120);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.suspendloopfor2h))) {
+            aapsLogger.debug("USER ENTRY: SUSPEND 2h");
+            loopPlugin.suspendLoop(120);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor3h))) {
-            LoopPlugin.getPlugin().suspendLoop(180);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.suspendloopfor3h))) {
+            aapsLogger.debug("USER ENTRY: SUSPEND 3h");
+            loopPlugin.suspendLoop(180);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor10h))) {
-            LoopPlugin.getPlugin().suspendLoop(600);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.suspendloopfor10h))) {
+            aapsLogger.debug("USER ENTRY: SUSPEND 10h");
+            loopPlugin.suspendLoop(600);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor15m))) {
-            LoopPlugin.getPlugin().disconnectPump(15, profile);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.disconnectpumpfor15m))) {
+            aapsLogger.debug("USER ENTRY: DISCONNECT 15m");
+            loopPlugin.disconnectPump(15, profile);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor30m))) {
-            LoopPlugin.getPlugin().disconnectPump(30, profile);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.disconnectpumpfor30m))) {
+            aapsLogger.debug("USER ENTRY: DISCONNECT 30m");
+            loopPlugin.disconnectPump(30, profile);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor1h))) {
-            LoopPlugin.getPlugin().disconnectPump(60, profile);
-            SP.putBoolean(R.string.key_objectiveusedisconnect, true);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.disconnectpumpfor1h))) {
+            aapsLogger.debug("USER ENTRY: DISCONNECT 1h");
+            loopPlugin.disconnectPump(60, profile);
+            sp.putBoolean(R.string.key_objectiveusedisconnect, true);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor2h))) {
-            LoopPlugin.getPlugin().disconnectPump(120, profile);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.disconnectpumpfor2h))) {
+            aapsLogger.debug("USER ENTRY: DISCONNECT 2h");
+            loopPlugin.disconnectPump(120, profile);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor3h))) {
-            LoopPlugin.getPlugin().disconnectPump(180, profile);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.disconnectpumpfor3h))) {
+            aapsLogger.debug("USER ENTRY: DISCONNECT 3h");
+            loopPlugin.disconnectPump(180, profile);
             updateGUI("suspendmenu");
             return true;
-        } else if (item.getTitle().equals(MainApp.gs(R.string.careportal_profileswitch))) {
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.careportal_profileswitch))) {
             FragmentManager manager = getFragmentManager();
             if (manager != null)
                 new ProfileSwitchDialog().show(manager, "Overview");
-        } else if (item.getTitle().equals(MainApp.gs(R.string.danar_viewprofile))) {
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.danar_viewprofile))) {
             Bundle args = new Bundle();
             args.putLong("time", DateUtil.now());
             args.putInt("mode", ProfileViewerDialog.Mode.RUNNING_PROFILE.ordinal());
@@ -754,48 +792,52 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             FragmentManager manager = getFragmentManager();
             if (manager != null)
                 pvd.show(manager, "ProfileViewDialog");
-        } else if (item.getTitle().equals(MainApp.gs(R.string.eatingsoon))) {
-            double target = Profile.toMgdl(DefaultValueHelper.determineEatingSoonTT(), ProfileFunctions.getSystemUnits());
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.eatingsoon))) {
+            aapsLogger.debug("USER ENTRY: TEMP TARGET EATING SOON");
+            double target = Profile.toMgdl(defaultValueHelper.determineEatingSoonTT(), profileFunction.getUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(System.currentTimeMillis())
-                    .duration(DefaultValueHelper.determineEatingSoonTTDuration())
-                    .reason(MainApp.gs(R.string.eatingsoon))
+                    .duration(defaultValueHelper.determineEatingSoonTTDuration())
+                    .reason(resourceHelper.gs(R.string.eatingsoon))
                     .source(Source.USER)
                     .low(target)
                     .high(target);
-            TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-        } else if (item.getTitle().equals(MainApp.gs(R.string.activity))) {
-            double target = Profile.toMgdl(DefaultValueHelper.determineActivityTT(), ProfileFunctions.getSystemUnits());
+            treatmentsPlugin.addToHistoryTempTarget(tempTarget);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.activity))) {
+            aapsLogger.debug("USER ENTRY: TEMP TARGET ACTIVITY");
+            double target = Profile.toMgdl(defaultValueHelper.determineActivityTT(), profileFunction.getUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(now())
-                    .duration(DefaultValueHelper.determineActivityTTDuration())
-                    .reason(MainApp.gs(R.string.activity))
+                    .duration(defaultValueHelper.determineActivityTTDuration())
+                    .reason(resourceHelper.gs(R.string.activity))
                     .source(Source.USER)
                     .low(target)
                     .high(target);
-            TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-        } else if (item.getTitle().equals(MainApp.gs(R.string.hypo))) {
-            double target = Profile.toMgdl(DefaultValueHelper.determineHypoTT(), ProfileFunctions.getSystemUnits());
+            treatmentsPlugin.addToHistoryTempTarget(tempTarget);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.hypo))) {
+            aapsLogger.debug("USER ENTRY: TEMP TARGET HYPO");
+            double target = Profile.toMgdl(defaultValueHelper.determineHypoTT(), profileFunction.getUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(now())
-                    .duration(DefaultValueHelper.determineHypoTTDuration())
-                    .reason(MainApp.gs(R.string.hypo))
+                    .duration(defaultValueHelper.determineHypoTTDuration())
+                    .reason(resourceHelper.gs(R.string.hypo))
                     .source(Source.USER)
                     .low(target)
                     .high(target);
-            TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-        } else if (item.getTitle().equals(MainApp.gs(R.string.custom))) {
+            treatmentsPlugin.addToHistoryTempTarget(tempTarget);
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.custom))) {
             FragmentManager manager = getFragmentManager();
             if (manager != null)
                 new TempTargetDialog().show(manager, "Overview");
-        } else if (item.getTitle().equals(MainApp.gs(R.string.cancel))) {
+        } else if (item.getTitle().equals(resourceHelper.gs(R.string.cancel))) {
+            aapsLogger.debug("USER ENTRY: TEMP TARGET CANCEL");
             TempTarget tempTarget = new TempTarget()
                     .source(Source.USER)
                     .date(now())
                     .duration(0)
                     .low(0)
                     .high(0);
-            TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
+            treatmentsPlugin.addToHistoryTempTarget(tempTarget);
         }
 
         return super.onContextItemSelected(item);
@@ -803,8 +845,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
     @Override
     public void onClick(View v) {
-        boolean xdrip = SourceXdripPlugin.getPlugin().isEnabled(PluginType.BGSOURCE);
-        boolean dexcom = SourceDexcomPlugin.INSTANCE.isEnabled(PluginType.BGSOURCE);
+        boolean xdrip = xdripPlugin.isEnabled(PluginType.BGSOURCE);
+        boolean dexcom = dexcomPlugin.isEnabled(PluginType.BGSOURCE);
 
         FragmentManager manager = getFragmentManager();
         // try to fix  https://fabric.io/nightscout3/android/apps/info.nightscout.androidaps/issues/5aca7a1536c7b23527eb4be7?time=last-seven-days
@@ -816,11 +858,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 onClickAcceptTemp();
                 break;
             case R.id.overview_quickwizardbutton:
-                onClickQuickwizard();
+                protectionCheck.queryProtection(getActivity(), ProtectionCheck.Protection.BOLUS, this::onClickQuickwizard);
                 break;
             case R.id.overview_wizardbutton:
-                WizardDialog wizardDialog = new WizardDialog();
-                wizardDialog.show(manager, "WizardDialog");
+                protectionCheck.queryProtection(getActivity(), ProtectionCheck.Protection.BOLUS, () -> new WizardDialog().show(manager, "WizardDialog"));
                 break;
             case R.id.overview_calibrationbutton:
                 if (xdrip) {
@@ -828,16 +869,16 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     calibrationDialog.show(manager, "CalibrationDialog");
                 } else if (dexcom) {
                     try {
-                        String packageName = SourceDexcomPlugin.INSTANCE.findDexcomPackageName();
+                        String packageName = dexcomPlugin.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));
+                            ToastUtils.showToastInUiThread(getActivity(), resourceHelper.gs(R.string.dexcom_app_not_installed));
                         }
                     } catch (ActivityNotFoundException e) {
-                        ToastUtils.showToastInUiThread(getActivity(), MainApp.gs(R.string.g5appnotdetected));
+                        ToastUtils.showToastInUiThread(getActivity(), resourceHelper.gs(R.string.g5appnotdetected));
                     }
                 }
                 break;
@@ -845,32 +886,32 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 if (xdrip)
                     openCgmApp("com.eveningoutpost.dexdrip");
                 else if (dexcom) {
-                    String packageName = SourceDexcomPlugin.INSTANCE.findDexcomPackageName();
+                    String packageName = dexcomPlugin.findDexcomPackageName();
                     if (packageName != null) {
                         openCgmApp(packageName);
                     } else {
-                        ToastUtils.showToastInUiThread(getActivity(), MainApp.gs(R.string.dexcom_app_not_installed));
+                        ToastUtils.showToastInUiThread(getActivity(), resourceHelper.gs(R.string.dexcom_app_not_installed));
                     }
                 }
                 break;
             case R.id.overview_treatmentbutton:
-                new TreatmentDialog().show(manager, "Overview");
+                protectionCheck.queryProtection(getActivity(), ProtectionCheck.Protection.BOLUS, () -> new TreatmentDialog().show(manager, "Overview"));
                 break;
             case R.id.overview_insulinbutton:
-                new InsulinDialog().show(manager, "Overview");
+                protectionCheck.queryProtection(getActivity(), ProtectionCheck.Protection.BOLUS, () -> new InsulinDialog().show(manager, "Overview"));
                 break;
             case R.id.overview_carbsbutton:
-                new CarbsDialog().show(manager, "Overview");
+                protectionCheck.queryProtection(getActivity(), ProtectionCheck.Protection.BOLUS, () -> new CarbsDialog().show(manager, "Overview"));
                 break;
             case R.id.overview_pumpstatus:
-                if (ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended() || !ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized())
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("RefreshClicked", null);
+                if (activePlugin.getActivePump().isSuspended() || !activePlugin.getActivePump().isInitialized())
+                    commandQueue.readStatus("RefreshClicked", null);
                 break;
         }
 
     }
 
-    public boolean openCgmApp(String packageName) {
+    private void openCgmApp(String packageName) {
         PackageManager packageManager = getContext().getPackageManager();
         try {
             Intent intent = packageManager.getLaunchIntentForPackage(packageName);
@@ -879,10 +920,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             }
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
             getContext().startActivity(intent);
-            return true;
         } catch (ActivityNotFoundException e) {
-            OKDialog.show(getContext(), "", MainApp.gs(R.string.error_starting_cgm));
-            return false;
+            OKDialog.show(getContext(), "", resourceHelper.gs(R.string.error_starting_cgm));
         }
     }
 
@@ -898,40 +937,40 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     }
 
     private void onClickAcceptTemp() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
         Context context = getContext();
 
         if (context == null) return;
 
-        if (LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && profile != null) {
-            LoopPlugin.getPlugin().invoke("Accept temp button", false);
-            final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
-            if (finalLastRun != null && finalLastRun.lastAPSRun != null && finalLastRun.constraintsProcessed.isChangeRequested()) {
-                OKDialog.showConfirmation(context, MainApp.gs(R.string.pump_tempbasal_label), finalLastRun.constraintsProcessed.toSpanned(), () -> {
+        if (loopPlugin.isEnabled(PluginType.LOOP) && profile != null) {
+            loopPlugin.invoke("Accept temp button", false);
+            if (loopPlugin.lastRun != null && loopPlugin.lastRun.lastAPSRun != null && loopPlugin.lastRun.constraintsProcessed.isChangeRequested()) {
+                OKDialog.showConfirmation(context, resourceHelper.gs(R.string.pump_tempbasal_label), loopPlugin.lastRun.constraintsProcessed.toSpanned(), () -> {
+                    aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL");
                     hideTempRecommendation();
                     clearNotification();
-                    LoopPlugin.getPlugin().acceptChangeRequest();
+                    loopPlugin.acceptChangeRequest();
                 });
             }
         }
     }
 
-    void onClickQuickwizard() {
-        final BgReading actualBg = DatabaseHelper.actualBg();
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
-        final String profileName = ProfileFunctions.getInstance().getProfileName();
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+    private void onClickQuickwizard() {
+        final BgReading actualBg = iobCobCalculatorPlugin.actualBg();
+        final Profile profile = profileFunction.getProfile();
+        final String profileName = profileFunction.getProfileName();
+        final PumpInterface pump = activePlugin.getActivePump();
 
-        final QuickWizardEntry quickWizardEntry = QuickWizard.INSTANCE.getActive();
-        if (quickWizardEntry != null && actualBg != null && profile != null && pump != null) {
+        final QuickWizardEntry quickWizardEntry = quickWizard.getActive();
+        if (quickWizardEntry != null && actualBg != null && profile != null) {
             quickWizardButton.setVisibility(View.VISIBLE);
             final BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, actualBg, true);
 
             if (wizard.getCalculatedTotalInsulin() > 0d && quickWizardEntry.carbs() > 0d) {
-                Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(quickWizardEntry.carbs())).value();
+                Integer carbsAfterConstraints = constraintChecker.applyCarbsConstraints(new Constraint<>(quickWizardEntry.carbs())).value();
 
                 if (Math.abs(wizard.getInsulinAfterConstraints() - wizard.getCalculatedTotalInsulin()) >= pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(wizard.getInsulinAfterConstraints()) || !carbsAfterConstraints.equals(quickWizardEntry.carbs())) {
-                    OKDialog.show(getContext(), MainApp.gs(R.string.treatmentdeliveryerror), MainApp.gs(R.string.constraints_violation) + "\n" + MainApp.gs(R.string.changeyourinput));
+                    OKDialog.show(getContext(), resourceHelper.gs(R.string.treatmentdeliveryerror), resourceHelper.gs(R.string.constraints_violation) + "\n" + resourceHelper.gs(R.string.changeyourinput));
                     return;
                 }
 
@@ -944,20 +983,21 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         Activity activity = getActivity();
         if (activity != null)
             activity.runOnUiThread(() -> {
-                if (acceptTempLayout != null)
-                    acceptTempLayout.setVisibility(View.GONE);
+                if (acceptTempButton != null)
+                    acceptTempButton.setVisibility(View.GONE);
             });
     }
 
     private void clearNotification() {
         NotificationManager notificationManager =
-                (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
+                (NotificationManager) mainApp.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.cancel(Constants.notificationID);
 
-        ActionStringHandler.handleInitiate("cancelChangeRequest");
+        actionStringHandler.handleInitiate("cancelChangeRequest");
     }
 
-    private void updatePumpStatus(String status) {
+    private void updatePumpStatus(EventPumpStatusChanged event) {
+        String status = event.getStatus(resourceHelper);
         if (!status.equals("")) {
             pumpStatusView.setText(status);
             pumpStatusLayout.setVisibility(View.VISIBLE);
@@ -968,7 +1008,64 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         }
     }
 
-    public void scheduleUpdateGUI(final String from) {
+    private void processInsulinCarbsButtonsVisibility() {
+        BgReading lastBG = iobCobCalculatorPlugin.lastBg();
+
+        final PumpInterface pump = activePlugin.getActivePump();
+
+        final Profile profile = profileFunction.getProfile();
+        final String profileName = profileFunction.getProfileName();
+
+        // QuickWizard button
+        QuickWizardEntry quickWizardEntry = quickWizard.getActive();
+        if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended()) {
+            quickWizardButton.setVisibility(View.VISIBLE);
+            String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
+            BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false);
+            text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin(), pump) + "U";
+            quickWizardButton.setText(text);
+            if (wizard.getCalculatedTotalInsulin() <= 0)
+                quickWizardButton.setVisibility(View.GONE);
+        } else
+            quickWizardButton.setVisibility(View.GONE);
+
+        // **** Various treatment buttons ****
+        if (carbsButton != null) {
+            if ((!activePlugin.getActivePump().getPumpDescription().storesCarbInfo || (pump.isInitialized() && !pump.isSuspended())) &&
+                    profile != null &&
+                    sp.getBoolean(R.string.key_show_carbs_button, true))
+                carbsButton.setVisibility(View.VISIBLE);
+            else
+                carbsButton.setVisibility(View.GONE);
+        }
+
+        if (treatmentButton != null) {
+            if (pump.isInitialized() && !pump.isSuspended() &&
+                    profile != null &&
+                    sp.getBoolean(R.string.key_show_treatment_button, false))
+                treatmentButton.setVisibility(View.VISIBLE);
+            else
+                treatmentButton.setVisibility(View.GONE);
+        }
+        if (wizardButton != null) {
+            if (pump.isInitialized() && !pump.isSuspended() &&
+                    profile != null &&
+                    sp.getBoolean(R.string.key_show_wizard_button, true))
+                wizardButton.setVisibility(View.VISIBLE);
+            else
+                wizardButton.setVisibility(View.GONE);
+        }
+        if (insulinButton != null) {
+            if (pump.isInitialized() && !pump.isSuspended() &&
+                    profile != null &&
+                    sp.getBoolean(R.string.key_show_insulin_button, true))
+                insulinButton.setVisibility(View.VISIBLE);
+            else
+                insulinButton.setVisibility(View.GONE);
+        }
+    }
+
+    private void scheduleUpdateGUI(final String from) {
         class UpdateRunnable implements Runnable {
             public void run() {
                 Activity activity = getActivity();
@@ -990,8 +1087,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
     @SuppressLint("SetTextI18n")
     public void updateGUI(final String from) {
-        if (L.isEnabled(L.OVERVIEW))
-            log.debug("updateGUI entered from: " + from);
+        aapsLogger.debug(LTag.OVERVIEW, "updateGUI entered from: " + from);
         final long updateGUIStart = System.currentTimeMillis();
 
         if (getActivity() == null)
@@ -1001,55 +1097,55 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             timeView.setText(DateUtil.timeString(new Date()));
         }
 
-        OverviewPlugin.INSTANCE.getNotificationStore().updateNotifications(notificationsView);
+        notificationStore.updateNotifications(notificationsView);
 
         pumpStatusLayout.setVisibility(View.GONE);
         loopStatusLayout.setVisibility(View.GONE);
 
-        if (!ProfileFunctions.getInstance().isProfileValid("Overview")) {
+        if (!profileFunction.isProfileValid("Overview")) {
             pumpStatusView.setText(R.string.noprofileset);
             pumpStatusLayout.setVisibility(View.VISIBLE);
             return;
         }
         loopStatusLayout.setVisibility(View.VISIBLE);
 
-        CareportalFragment.updateAge(getActivity(), sage, iage, cage, pbage);
-        BgReading actualBG = DatabaseHelper.actualBg();
-        BgReading lastBG = DatabaseHelper.lastBg();
+        statusLightHandler.updateAge(sage, iage, cage, pbage);
+        BgReading actualBG = iobCobCalculatorPlugin.actualBg();
+        BgReading lastBG = iobCobCalculatorPlugin.lastBg();
 
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
+        final PumpInterface pump = activePlugin.getActivePump();
 
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
-        final String profileName = ProfileFunctions.getInstance().getProfileName();
+        final Profile profile = profileFunction.getProfile();
+        if (profile == null) return;
 
-        final String units = ProfileFunctions.getSystemUnits();
-        final double lowLine = OverviewPlugin.INSTANCE.determineLowLine();
-        final double highLine = OverviewPlugin.INSTANCE.determineHighLine();
+        final String units = profileFunction.getUnits();
+        final double lowLine = defaultValueHelper.determineLowLine();
+        final double highLine = defaultValueHelper.determineHighLine();
 
         //Start with updating the BG as it is unaffected by loop.
         // **** BG value ****
         if (lastBG != null) {
-            int color = MainApp.gc(R.color.inrange);
+            int color = resourceHelper.gc(R.color.inrange);
             if (lastBG.valueToUnits(units) < lowLine)
-                color = MainApp.gc(R.color.low);
+                color = resourceHelper.gc(R.color.low);
             else if (lastBG.valueToUnits(units) > highLine)
-                color = MainApp.gc(R.color.high);
+                color = resourceHelper.gc(R.color.high);
             bgView.setText(lastBG.valueToUnitsToString(units));
             arrowView.setText(lastBG.directionToSymbol());
             bgView.setTextColor(color);
             arrowView.setTextColor(color);
-            GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+            GlucoseStatus glucoseStatus = new GlucoseStatus(injector).getGlucoseStatusData();
             if (glucoseStatus != null) {
                 if (deltaView != null)
                     deltaView.setText("Δ " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units);
                 if (deltaShortView != null)
                     deltaShortView.setText(Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units));
                 if (avgdeltaView != null)
-                    avgdeltaView.setText("øΔ15m: " + Profile.toUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units) +
-                            "  øΔ40m: " + Profile.toUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units));
+                    avgdeltaView.setText("øΔ15m: " + Profile.toUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units) + "\n" +
+                            "øΔ40m: " + Profile.toUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units));
             } else {
                 if (deltaView != null)
-                    deltaView.setText("Δ " + MainApp.gs(R.string.notavailable));
+                    deltaView.setText("Δ " + resourceHelper.gs(R.string.notavailable));
                 if (deltaShortView != null)
                     deltaShortView.setText("---");
                 if (avgdeltaView != null)
@@ -1057,211 +1153,150 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             }
         }
 
-        Constraint<Boolean> closedLoopEnabled = MainApp.getConstraintChecker().isClosedLoopAllowed();
+        Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
 
         // open loop mode
-        final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
         if (Config.APS && pump.getPumpDescription().isTempBasalCapable) {
             apsModeView.setVisibility(View.VISIBLE);
-            apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonDefault));
-            apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextDefault));
-            final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
+            apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault));
+            apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault));
             if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isSuperBolus()) {
-                apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
-                apsModeView.setText(String.format(MainApp.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend()));
-                apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
+                apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning));
+                apsModeView.setText(String.format(resourceHelper.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend()));
+                apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning));
             } else if (loopPlugin.isDisconnected()) {
-                apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonCritical));
-                apsModeView.setText(String.format(MainApp.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend()));
-                apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextCritical));
+                apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical));
+                apsModeView.setText(String.format(resourceHelper.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend()));
+                apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextCritical));
             } else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isSuspended()) {
-                apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
-                apsModeView.setText(String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend()));
-                apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
+                apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning));
+                apsModeView.setText(String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend()));
+                apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning));
             } else if (pump.isSuspended()) {
-                apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
-                apsModeView.setText(MainApp.gs(R.string.pumpsuspended));
-                apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
+                apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning));
+                apsModeView.setText(resourceHelper.gs(R.string.pumpsuspended));
+                apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning));
             } else if (loopPlugin.isEnabled(PluginType.LOOP)) {
                 if (closedLoopEnabled.value()) {
-                    apsModeView.setText(MainApp.gs(R.string.closedloop));
+                    apsModeView.setText(resourceHelper.gs(R.string.closedloop));
                 } else {
-                    apsModeView.setText(MainApp.gs(R.string.openloop));
+                    apsModeView.setText(resourceHelper.gs(R.string.openloop));
                 }
             } else {
-                apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonCritical));
-                apsModeView.setText(MainApp.gs(R.string.disabledloop));
-                apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextCritical));
+                apsModeView.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical));
+                apsModeView.setText(resourceHelper.gs(R.string.disabledloop));
+                apsModeView.setTextColor(resourceHelper.gc(R.color.ribbonTextCritical));
             }
         } else {
             apsModeView.setVisibility(View.GONE);
         }
 
         // temp target
-        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
+        TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory();
         if (tempTarget != null) {
-            tempTargetView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
-            tempTargetView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
-            tempTargetView.setVisibility(View.VISIBLE);
-            tempTargetView.setText(Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units) + " " + DateUtil.untilString(tempTarget.end()));
+            tempTargetView.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning));
+            tempTargetView.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning));
+            tempTargetView.setText(Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units) + " " + DateUtil.untilString(tempTarget.end(), resourceHelper));
         } else {
-            tempTargetView.setTextColor(MainApp.gc(R.color.ribbonTextDefault));
-            tempTargetView.setBackgroundColor(MainApp.gc(R.color.ribbonDefault));
+            tempTargetView.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault));
+            tempTargetView.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault));
             tempTargetView.setText(Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), Constants.MGDL, units));
-            tempTargetView.setVisibility(View.VISIBLE);
         }
 
         // **** Temp button ****
-        if (acceptTempLayout != null) {
+        if (acceptTempButton != null) {
             boolean showAcceptButton = !closedLoopEnabled.value(); // Open mode needed
-            showAcceptButton = showAcceptButton && finalLastRun != null && finalLastRun.lastAPSRun != null; // aps result must exist
-            showAcceptButton = showAcceptButton && (finalLastRun.lastOpenModeAccept == null || finalLastRun.lastOpenModeAccept.getTime() < finalLastRun.lastAPSRun.getTime()); // never accepted or before last result
-            showAcceptButton = showAcceptButton && finalLastRun.constraintsProcessed.isChangeRequested(); // change is requested
+            showAcceptButton = showAcceptButton && loopPlugin.lastRun != null && loopPlugin.lastRun.lastAPSRun != null; // aps result must exist
+            showAcceptButton = showAcceptButton && (loopPlugin.lastRun.lastOpenModeAccept == 0 || loopPlugin.lastRun.lastOpenModeAccept < loopPlugin.lastRun.lastAPSRun.getTime()); // never accepted or before last result
+            showAcceptButton = showAcceptButton && loopPlugin.lastRun.constraintsProcessed.isChangeRequested(); // change is requested
 
-            if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) {
-                acceptTempLayout.setVisibility(View.VISIBLE);
-                acceptTempButton.setText(MainApp.gs(R.string.setbasalquestion) + "\n" + finalLastRun.constraintsProcessed);
+            if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && loopPlugin.isEnabled(PluginType.LOOP)) {
+                acceptTempButton.setVisibility(View.VISIBLE);
+                acceptTempButton.setText(resourceHelper.gs(R.string.setbasalquestion) + "\n" + loopPlugin.lastRun.constraintsProcessed);
             } else {
-                acceptTempLayout.setVisibility(View.GONE);
+                acceptTempButton.setVisibility(View.GONE);
             }
         }
 
         // **** Calibration & CGM buttons ****
-        boolean xDripIsBgSource = SourceXdripPlugin.getPlugin().isEnabled(PluginType.BGSOURCE);
-        boolean dexcomIsSource = SourceDexcomPlugin.INSTANCE.isEnabled(PluginType.BGSOURCE);
-        boolean bgAvailable = DatabaseHelper.actualBg() != null;
+        boolean xDripIsBgSource = xdripPlugin.isEnabled(PluginType.BGSOURCE);
+        boolean dexcomIsSource = dexcomPlugin.isEnabled(PluginType.BGSOURCE);
         if (calibrationButton != null) {
-            if ((xDripIsBgSource || dexcomIsSource) && bgAvailable && SP.getBoolean(R.string.key_show_calibration_button, true)) {
+            if ((xDripIsBgSource || dexcomIsSource) && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)) {
                 calibrationButton.setVisibility(View.VISIBLE);
             } else {
                 calibrationButton.setVisibility(View.GONE);
             }
         }
         if (cgmButton != null) {
-            if (xDripIsBgSource && SP.getBoolean(R.string.key_show_cgm_button, false)) {
+            if (xDripIsBgSource && sp.getBoolean(R.string.key_show_cgm_button, false)) {
                 cgmButton.setVisibility(View.VISIBLE);
-            } else if (dexcomIsSource && 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);
             }
         }
 
-        final TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        final TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         String basalText = "";
         if (shorttextmode) {
             if (activeTemp != null) {
                 basalText = "T: " + activeTemp.toStringVeryShort();
             } else {
-                basalText = MainApp.gs(R.string.pump_basebasalrate,profile.getBasal());
+                basalText = resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal());
             }
-            baseBasalView.setOnClickListener(v -> {
-                String fullText = MainApp.gs(R.string.pump_basebasalrate_label) + ": " + MainApp.gs(R.string.pump_basebasalrate,profile.getBasal()) + "\n";
-                if (activeTemp != null) {
-                    fullText += MainApp.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
-                }
-                OKDialog.show(getActivity(), MainApp.gs(R.string.basal), fullText);
-            });
-
         } else {
             if (activeTemp != null) {
                 basalText = activeTemp.toStringFull();
             } else {
-                basalText = MainApp.gs(R.string.pump_basebasalrate,profile.getBasal());
+                basalText = resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal());
             }
         }
         baseBasalView.setText(basalText);
+        baseBasalView.setOnClickListener(v -> {
+            String fullText = resourceHelper.gs(R.string.pump_basebasalrate_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal()) + "\n";
+            if (activeTemp != null) {
+                fullText += resourceHelper.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
+            }
+            OKDialog.show(getActivity(), resourceHelper.gs(R.string.basal), fullText);
+        });
+
         if (activeTemp != null) {
-            baseBasalView.setTextColor(MainApp.gc(R.color.basal));
+            baseBasalView.setTextColor(resourceHelper.gc(R.color.basal));
         } else {
-           baseBasalView.setTextColor(MainApp.gc(R.color.defaulttextcolor));
+            baseBasalView.setTextColor(resourceHelper.gc(R.color.defaulttextcolor));
         }
 
 
-        final ExtendedBolus extendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        final ExtendedBolus extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         String extendedBolusText = "";
         if (extendedBolusView != null) { // must not exists in all layouts
-            if (shorttextmode) {
-                if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses()) {
-                    extendedBolusText = DecimalFormatter.to2Decimal(extendedBolus.absoluteRate()) + "U/h";
-                }
-            } else {
-                if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses()) {
-                    extendedBolusText = extendedBolus.toString();
-                }
-            }
+            if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses())
+                extendedBolusText = shorttextmode ? DecimalFormatter.to2Decimal(extendedBolus.absoluteRate()) + "U/h" : extendedBolus.toStringMedium();
             extendedBolusView.setText(extendedBolusText);
-            if (Config.NSCLIENT) {
-                extendedBolusView.setOnClickListener(v -> OKDialog.show(getActivity(), MainApp.gs(R.string.extended_bolus), extendedBolus.toString()));
-            }
-            if (extendedBolusText.equals(""))
-                extendedBolusView.setVisibility(Config.NSCLIENT ? View.INVISIBLE : View.GONE);
-            else
-                extendedBolusView.setVisibility(View.VISIBLE);
+            extendedBolusView.setOnClickListener(v -> {
+                if (extendedBolus != null)
+                    OKDialog.show(getActivity(), resourceHelper.gs(R.string.extended_bolus), extendedBolus.toString());
+            });
         }
 
-        activeProfileView.setText(ProfileFunctions.getInstance().getProfileNameWithDuration());
+        activeProfileView.setText(profileFunction.getProfileNameWithDuration());
         if (profile.getPercentage() != 100 || profile.getTimeshift() != 0) {
-            activeProfileView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
-            activeProfileView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
+            activeProfileView.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning));
+            activeProfileView.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning));
         } else {
-            activeProfileView.setBackgroundColor(MainApp.gc(R.color.ribbonDefault));
-            activeProfileView.setTextColor(MainApp.gc(R.color.ribbonTextDefault));
+            activeProfileView.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault));
+            activeProfileView.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault));
         }
 
-        // QuickWizard button
-        QuickWizardEntry quickWizardEntry = QuickWizard.INSTANCE.getActive();
-        if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) {
-            quickWizardButton.setVisibility(View.VISIBLE);
-            String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
-            BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false);
-            text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin()) + "U";
-            quickWizardButton.setText(text);
-            if (wizard.getCalculatedTotalInsulin() <= 0)
-                quickWizardButton.setVisibility(View.GONE);
-        } else
-            quickWizardButton.setVisibility(View.GONE);
-
-        // **** Various treatment buttons ****
-        if (carbsButton != null) {
-            if (SP.getBoolean(R.string.key_show_carbs_button, true)
-                    && (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo ||
-                    (pump.isInitialized() && !pump.isSuspended()))) {
-                carbsButton.setVisibility(View.VISIBLE);
-            } else {
-                carbsButton.setVisibility(View.GONE);
-            }
-        }
-
-        if (pump.isInitialized() && !pump.isSuspended()) {
-            if (treatmentButton != null) {
-                if (SP.getBoolean(R.string.key_show_treatment_button, false)) {
-                    treatmentButton.setVisibility(View.VISIBLE);
-                } else {
-                    treatmentButton.setVisibility(View.GONE);
-                }
-            }
-            if (pump.isInitialized() && !pump.isSuspended() && wizardButton != null) {
-                if (SP.getBoolean(R.string.key_show_wizard_button, true)) {
-                    wizardButton.setVisibility(View.VISIBLE);
-                } else {
-                    wizardButton.setVisibility(View.GONE);
-                }
-            }
-            if (pump.isInitialized() && !pump.isSuspended() && insulinButton != null) {
-                if (SP.getBoolean(R.string.key_show_insulin_button, true)) {
-                    insulinButton.setVisibility(View.VISIBLE);
-                } else {
-                    insulinButton.setVisibility(View.GONE);
-                }
-            }
-        }
+        processInsulinCarbsButtonsVisibility();
 
         // **** BG value ****
         if (lastBG == null) { //left this here as it seems you want to exit at this point if it is null...
             return;
         }
-        Integer flag = bgView.getPaintFlags();
+        int flag = bgView.getPaintFlags();
         if (actualBG == null) {
             flag |= Paint.STRIKE_THRU_TEXT_FLAG;
         } else
@@ -1269,29 +1304,29 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         bgView.setPaintFlags(flag);
 
         if (timeAgoView != null)
-            timeAgoView.setText(DateUtil.minAgo(lastBG.date));
+            timeAgoView.setText(DateUtil.minAgo(resourceHelper, lastBG.date));
         if (timeAgoShortView != null)
             timeAgoShortView.setText("(" + DateUtil.minAgoShort(lastBG.date) + ")");
 
         // iob
-        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
-        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
-        final IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
-        final IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
+        treatmentsPlugin.updateTotalIOBTreatments();
+        treatmentsPlugin.updateTotalIOBTempBasals();
+        final IobTotal bolusIob = treatmentsPlugin.getLastCalculationTreatments().round();
+        final IobTotal basalIob = treatmentsPlugin.getLastCalculationTempBasals().round();
 
         if (shorttextmode) {
             String iobtext = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U";
             iobView.setText(iobtext);
             iobView.setOnClickListener(v -> {
                 String iobtext1 = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U\n"
-                        + MainApp.gs(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U\n"
-                        + MainApp.gs(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U\n";
-                OKDialog.show(getActivity(), MainApp.gs(R.string.iob), iobtext1);
+                        + resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U\n"
+                        + resourceHelper.gs(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U\n";
+                OKDialog.show(getActivity(), resourceHelper.gs(R.string.iob), iobtext1);
             });
-        } else if (MainApp.sResources.getBoolean(R.bool.isTablet)) {
+        } else if (resourceHelper.gb(R.bool.isTablet)) {
             String iobtext = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
-                    + MainApp.gs(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
-                    + MainApp.gs(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
+                    + resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+                    + resourceHelper.gs(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
             iobView.setText(iobtext);
         } else {
             String iobtext = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
@@ -1302,8 +1337,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // cob
         if (cobView != null) { // view must not exists
-            String cobText = MainApp.gs(R.string.value_unavailable_short);
-            CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "Overview COB");
+            String cobText = resourceHelper.gs(R.string.value_unavailable_short);
+            CobInfo cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "Overview COB");
             if (cobInfo.displayCob != null) {
                 cobText = DecimalFormatter.to0Decimal(cobInfo.displayCob);
                 if (cobInfo.futureCarbs > 0)
@@ -1313,13 +1348,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         }
 
         if (statuslightsLayout != null)
-            if (SP.getBoolean(R.string.key_show_statuslights, false)) {
-                StatuslightHandler handler = new StatuslightHandler();
-                if (SP.getBoolean(R.string.key_show_statuslights_extended, false)) {
-                    handler.extendedStatuslight(cageView, iageView, reservoirView, sageView, batteryView);
+            if (sp.getBoolean(R.string.key_show_statuslights, false)) {
+                if (sp.getBoolean(R.string.key_show_statuslights_extended, false)) {
+                    statusLightHandler.extendedStatusLight(cageView, iageView, reservoirView, sageView, batteryView);
                     statuslightsLayout.setVisibility(View.VISIBLE);
                 } else {
-                    handler.statuslight(cageView, iageView, reservoirView, sageView, batteryView);
+                    statusLightHandler.statusLight(cageView, iageView, reservoirView, sageView, batteryView);
                     statuslightsLayout.setVisibility(View.VISIBLE);
                 }
             } else {
@@ -1328,7 +1362,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         boolean predictionsAvailable;
         if (Config.APS)
-            predictionsAvailable = finalLastRun != null && finalLastRun.request.hasPredictions;
+            predictionsAvailable = loopPlugin.lastRun != null && loopPlugin.lastRun.request.hasPredictions;
         else if (Config.NSCLIENT)
             predictionsAvailable = true;
         else
@@ -1337,25 +1371,25 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // pump status from ns
         if (pumpDeviceStatusView != null) {
-            pumpDeviceStatusView.setText(NSDeviceStatus.getInstance().getPumpStatus());
-            pumpDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), MainApp.gs(R.string.pump), NSDeviceStatus.getInstance().getExtendedPumpStatus()));
+            pumpDeviceStatusView.setText(nsDeviceStatus.getPumpStatus());
+            pumpDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), resourceHelper.gs(R.string.pump), nsDeviceStatus.getExtendedPumpStatus()));
         }
 
         // OpenAPS status from ns
         if (openapsDeviceStatusView != null) {
-            openapsDeviceStatusView.setText(NSDeviceStatus.getInstance().getOpenApsStatus());
-            openapsDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), MainApp.gs(R.string.openaps), NSDeviceStatus.getInstance().getExtendedOpenApsStatus()));
+            openapsDeviceStatusView.setText(nsDeviceStatus.getOpenApsStatus());
+            openapsDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), resourceHelper.gs(R.string.openaps), nsDeviceStatus.getExtendedOpenApsStatus()));
         }
 
         // Uploader status from ns
         if (uploaderDeviceStatusView != null) {
-            uploaderDeviceStatusView.setText(NSDeviceStatus.getInstance().getUploaderStatusSpanned());
-            uploaderDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), MainApp.gs(R.string.uploader), NSDeviceStatus.getInstance().getExtendedUploaderStatus()));
+            uploaderDeviceStatusView.setText(nsDeviceStatus.getUploaderStatusSpanned());
+            uploaderDeviceStatusView.setOnClickListener(v -> OKDialog.show(getActivity(), resourceHelper.gs(R.string.uploader), nsDeviceStatus.getExtendedUploaderStatus()));
         }
 
         // Sensitivity
         if (sensitivityView != null) {
-            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Overview");
+            AutosensData autosensData = iobCobCalculatorPlugin.getLastAutosensData("Overview");
             if (autosensData != null)
                 sensitivityView.setText(String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100));
             else
@@ -1380,11 +1414,11 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             APSResult apsResult = null;
 
-            if (finalPredictionsAvailable && SP.getBoolean("showprediction", false)) {
+            if (finalPredictionsAvailable && sp.getBoolean("showprediction", false)) {
                 if (Config.APS)
-                    apsResult = finalLastRun.constraintsProcessed;
+                    apsResult = loopPlugin.lastRun.constraintsProcessed;
                 else
-                    apsResult = NSDeviceStatus.getAPSResult();
+                    apsResult = NSDeviceStatus.getAPSResult(injector);
                 int predHours = (int) (Math.ceil(apsResult.getLatestPredictionsTime() - System.currentTimeMillis()) / (60 * 60 * 1000));
                 predHours = Math.min(2, predHours);
                 predHours = Math.max(0, predHours);
@@ -1403,16 +1437,15 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             final long now = System.currentTimeMillis();
 
             //  ------------------ 1st graph
-            if (L.isEnabled(L.OVERVIEW))
-                Profiler.log(log, from + " - 1st graph - START", updateGUIStart);
+            Profiler.log(aapsLogger, LTag.OVERVIEW, from + " - 1st graph - START", updateGUIStart);
 
-            final GraphData graphData = new GraphData(bgGraph, IobCobCalculatorPlugin.getPlugin());
+            final GraphData graphData = new GraphData(injector, bgGraph, iobCobCalculatorPlugin);
 
             // **** In range Area ****
             graphData.addInRangeArea(fromTime, endTime, lowLine, highLine);
 
             // **** BG ****
-            if (finalPredictionsAvailable && SP.getBoolean("showprediction", false))
+            if (finalPredictionsAvailable && sp.getBoolean("showprediction", false))
                 graphData.addBgReadings(fromTime, toTime, lowLine, highLine,
                         apsResult.getPredictions());
             else
@@ -1424,26 +1457,25 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             // Treatments
             graphData.addTreatments(fromTime, endTime);
 
-            if (SP.getBoolean("showactivityprimary", true)) {
+            if (sp.getBoolean("showactivityprimary", true)) {
                 graphData.addActivity(fromTime, endTime, false, 0.8d);
             }
 
             // add basal data
-            if (pump.getPumpDescription().isTempBasalCapable && SP.getBoolean("showbasals", true)) {
-                graphData.addBasals(fromTime, now, lowLine / graphData.maxY / 1.2d);
+            if (pump.getPumpDescription().isTempBasalCapable && sp.getBoolean("showbasals", true)) {
+                graphData.addBasals(fromTime, now, lowLine / graphData.getMaxY() / 1.2d);
             }
 
             // add target line
-            graphData.addTargetLine(fromTime, toTime, profile);
+            graphData.addTargetLine(fromTime, toTime, profile, loopPlugin.lastRun);
 
             // **** NOW line ****
             graphData.addNowLine(now);
 
             // ------------------ 2nd graph
-            if (L.isEnabled(L.OVERVIEW))
-                Profiler.log(log, from + " - 2nd graph - START", updateGUIStart);
+            Profiler.log(aapsLogger, LTag.OVERVIEW, from + " - 2nd graph - START", updateGUIStart);
 
-            final GraphData secondGraphData = new GraphData(iobGraph, IobCobCalculatorPlugin.getPlugin());
+            final GraphData secondGraphData = new GraphData(injector, iobGraph, iobCobCalculatorPlugin);
 
             boolean useIobForScale = false;
             boolean useCobForScale = false;
@@ -1452,31 +1484,31 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             boolean useDSForScale = false;
             boolean useIAForScale = false;
 
-            if (SP.getBoolean("showiob", true)) {
+            if (sp.getBoolean("showiob", true)) {
                 useIobForScale = true;
-            } else if (SP.getBoolean("showcob", true)) {
+            } else if (sp.getBoolean("showcob", true)) {
                 useCobForScale = true;
-            } else if (SP.getBoolean("showdeviations", false)) {
+            } else if (sp.getBoolean("showdeviations", false)) {
                 useDevForScale = true;
-            } else if (SP.getBoolean("showratios", false)) {
+            } else if (sp.getBoolean("showratios", false)) {
                 useRatioForScale = true;
-            } else if (SP.getBoolean("showactivitysecondary", false)) {
+            } else if (sp.getBoolean("showactivitysecondary", false)) {
                 useIAForScale = true;
-            } else if (SP.getBoolean("showdevslope", false)) {
+            } else if (sp.getBoolean("showdevslope", false)) {
                 useDSForScale = true;
             }
 
-            if (SP.getBoolean("showiob", true))
-                secondGraphData.addIob(fromTime, now, useIobForScale, 1d, SP.getBoolean("showprediction", false));
-            if (SP.getBoolean("showcob", true))
+            if (sp.getBoolean("showiob", true))
+                secondGraphData.addIob(fromTime, now, useIobForScale, 1d, sp.getBoolean("showprediction", false));
+            if (sp.getBoolean("showcob", true))
                 secondGraphData.addCob(fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
-            if (SP.getBoolean("showdeviations", false))
+            if (sp.getBoolean("showdeviations", false))
                 secondGraphData.addDeviations(fromTime, now, useDevForScale, 1d);
-            if (SP.getBoolean("showratios", false))
+            if (sp.getBoolean("showratios", false))
                 secondGraphData.addRatio(fromTime, now, useRatioForScale, 1d);
-            if (SP.getBoolean("showactivitysecondary", true))
+            if (sp.getBoolean("showactivitysecondary", true))
                 secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8d);
-            if (SP.getBoolean("showdevslope", false) && MainApp.devBranch)
+            if (sp.getBoolean("showdevslope", false) && buildHelper.isDev())
                 secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1d);
 
             // **** NOW line ****
@@ -1488,12 +1520,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             FragmentActivity activity = getActivity();
             if (activity != null) {
                 activity.runOnUiThread(() -> {
-                    if (SP.getBoolean("showiob", true)
-                            || SP.getBoolean("showcob", true)
-                            || SP.getBoolean("showdeviations", false)
-                            || SP.getBoolean("showratios", false)
-                            || SP.getBoolean("showactivitysecondary", false)
-                            || SP.getBoolean("showdevslope", false)) {
+                    if (sp.getBoolean("showiob", true)
+                            || sp.getBoolean("showcob", true)
+                            || sp.getBoolean("showdeviations", false)
+                            || sp.getBoolean("showratios", false)
+                            || sp.getBoolean("showactivitysecondary", false)
+                            || sp.getBoolean("showdevslope", false)) {
                         iobGraph.setVisibility(View.VISIBLE);
                     } else {
                         iobGraph.setVisibility(View.GONE);
@@ -1501,14 +1533,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     // finally enforce drawing of graphs
                     graphData.performUpdate();
                     secondGraphData.performUpdate();
-                    if (L.isEnabled(L.OVERVIEW))
-                        Profiler.log(log, from + " - onDataChanged", updateGUIStart);
+                    Profiler.log(aapsLogger, LTag.OVERVIEW, from + " - onDataChanged", updateGUIStart);
                 });
             }
         }).start();
 
-        if (L.isEnabled(L.OVERVIEW))
-            Profiler.log(log, from, updateGUIStart);
+        Profiler.log(aapsLogger, LTag.OVERVIEW, from, updateGUIStart);
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
index 8e4a9581b8..219b56d025 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@@ -1,80 +1,67 @@
 package info.nightscout.androidaps.plugins.general.overview
 
-import info.nightscout.androidaps.Constants
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.SP
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object OverviewPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .fragmentClass(OverviewFragment::class.qualifiedName)
-        .alwaysVisible(true)
-        .alwaysEnabled(true)
-        .pluginName(R.string.overview)
-        .shortName(R.string.overview_shortname)
-        .preferencesId(R.xml.pref_overview)
-        .description(R.string.description_overview)) {
+@Singleton
+class OverviewPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val notificationStore: NotificationStore,
+    private val fabricPrivacy: FabricPrivacy,
+    private val rxBus: RxBusWrapper,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(OverviewFragment::class.qualifiedName)
+    .alwaysVisible(true)
+    .alwaysEnabled(true)
+    .pluginName(R.string.overview)
+    .shortName(R.string.overview_shortname)
+    .preferencesId(R.xml.pref_overview)
+    .description(R.string.description_overview),
+    aapsLogger, resourceHelper, injector
+) {
 
-    private val log = LoggerFactory.getLogger(L.OVERVIEW)
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    var bgTargetLow = 80.0
-    var bgTargetHigh = 180.0
-
-    var notificationStore = NotificationStore()
-
     override fun onStart() {
         super.onStart()
-        disposable += RxBus
-                .toObservable(EventNewNotification::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ n ->
-                    if (notificationStore.add(n.notification))
-                        RxBus.send(EventRefreshOverview("EventNewNotification"))
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventDismissNotification::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ n ->
-                    if (notificationStore.remove(n.id))
-                        RxBus.send(EventRefreshOverview("EventDismissNotification"))
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        notificationStore.createNotificationChannel()
+        disposable += rxBus
+            .toObservable(EventNewNotification::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ n ->
+                if (notificationStore.add(n.notification))
+                    rxBus.send(EventRefreshOverview("EventNewNotification"))
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventDismissNotification::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ n ->
+                if (notificationStore.remove(n.id))
+                    rxBus.send(EventRefreshOverview("EventDismissNotification"))
+            }, { fabricPrivacy.logException(it) })
     }
 
     override fun onStop() {
         disposable.clear()
         super.onStop()
     }
-
-    fun determineHighLine(): Double {
-        var highLineSetting = SP.getDouble(R.string.key_high_mark, bgTargetHigh)
-        if (highLineSetting < 1) highLineSetting = Constants.HIGHMARK
-        highLineSetting = Profile.toCurrentUnits(highLineSetting)
-        return highLineSetting
-    }
-
-    fun determineLowLine(): Double {
-        var lowLineSetting = SP.getDouble(R.string.key_low_mark, bgTargetLow)
-        if (lowLineSetting < 1) lowLineSetting = Constants.LOWMARK
-        lowLineSetting = Profile.toCurrentUnits(lowLineSetting)
-        return lowLineSetting
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
new file mode 100644
index 0000000000..6900614a96
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
@@ -0,0 +1,172 @@
+package info.nightscout.androidaps.plugins.general.overview
+
+import android.graphics.Color
+import android.view.View
+import android.widget.TextView
+import androidx.arch.core.util.Function
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.SetWarnColor
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StatusLightHandler @Inject constructor(
+    private val nsSettingsStatus: NSSettingsStatus,
+    private val resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val activePlugin: ActivePluginProvider
+) {
+
+    /**
+     * applies the statusLight subview on the overview fragment
+     */
+    fun statusLight(cageView: TextView?, iAgeView: TextView?, reservoirView: TextView?,
+                    sageView: TextView?, batteryView: TextView?) {
+        val pump = activePlugin.activePump
+        applyStatusLight("cage", CareportalEvent.SITECHANGE, cageView, "CAN", 48, 72)
+        applyStatusLight("iage", CareportalEvent.INSULINCHANGE, iAgeView, "INS", 72, 96)
+        val reservoirLevel = if (pump.isInitialized) pump.reservoirLevel else (-1).toDouble()
+        applyStatusLightLevel(R.string.key_statuslights_res_critical, 10.0,
+            R.string.key_statuslights_res_warning, 80.0, reservoirView, "RES", reservoirLevel)
+        applyStatusLight("sage", CareportalEvent.SENSORCHANGE, sageView, "SEN", 164, 166)
+        if (pump.model() != PumpType.AccuChekCombo) {
+            val batteryLevel = if (pump.isInitialized) pump.batteryLevel.toDouble() else -1.0
+            applyStatusLightLevel(R.string.key_statuslights_bat_critical, 5.0,
+                R.string.key_statuslights_bat_warning, 22.0,
+                batteryView, "BAT", batteryLevel)
+        } else {
+            applyStatusLight("bage", CareportalEvent.PUMPBATTERYCHANGE, batteryView, "BAT", 224, 336)
+        }
+    }
+
+    private fun applyStatusLight(nsSettingPlugin: String?, eventName: String?, view: TextView?, text: String?,
+                                 defaultWarnThreshold: Int, defaultUrgentThreshold: Int) {
+        if (view != null) {
+            val urgent = nsSettingsStatus.getExtendedWarnValue(nsSettingPlugin!!, "urgent", defaultUrgentThreshold.toDouble())
+            val warn = nsSettingsStatus.getExtendedWarnValue(nsSettingPlugin, "warn", defaultWarnThreshold.toDouble())
+            val event = MainApp.getDbHelper().getLastCareportalEvent(eventName)
+            val age = event?.hoursFromStart ?: Double.MAX_VALUE
+            applyStatusLight(view, text, age, warn, urgent, Double.MAX_VALUE, true)
+        }
+    }
+
+    private fun applyStatusLightLevel(criticalSetting: Int, criticalDefaultValue: Double,
+                                      warnSetting: Int, warnDefaultValue: Double,
+                                      view: TextView?, text: String?, level: Double) {
+        if (view != null) {
+            val resUrgent = sp.getDouble(criticalSetting, criticalDefaultValue)
+            val resWarn = sp.getDouble(warnSetting, warnDefaultValue)
+            applyStatusLight(view, text, level, resWarn, resUrgent, -1.0, false)
+        }
+    }
+
+    private fun applyStatusLight(view: TextView, text: String?, value: Double, warnThreshold: Double,
+                                 urgentThreshold: Double, invalid: Double, checkAscending: Boolean) {
+        val check =
+            if (checkAscending) Function { threshold: Double -> value >= threshold }
+            else Function { threshold: Double -> value <= threshold }
+        if (value != invalid) {
+            view.text = text
+            when {
+                check.apply(urgentThreshold) -> view.setTextColor(resourceHelper.gc(R.color.ribbonCritical))
+                check.apply(warnThreshold)   -> view.setTextColor(resourceHelper.gc(R.color.ribbonWarning))
+                else                         -> view.setTextColor(resourceHelper.gc(R.color.ribbonDefault))
+            }
+            view.visibility = View.VISIBLE
+        } else {
+            view.visibility = View.GONE
+        }
+    }
+
+    /**
+     * applies the extended statusLight subview on the overview fragment
+     */
+    fun extendedStatusLight(cageView: TextView, iAgeView: TextView,
+                            reservoirView: TextView, sageView: TextView,
+                            batteryView: TextView) {
+        val pump = activePlugin.activePump
+        handleAge("cage", CareportalEvent.SITECHANGE, cageView, "CAN ",
+            48, 72)
+        handleAge("iage", CareportalEvent.INSULINCHANGE, iAgeView, "INS ",
+            72, 96)
+        handleLevel(R.string.key_statuslights_res_critical, 10.0,
+            R.string.key_statuslights_res_warning, 80.0,
+            reservoirView, "RES ", pump.reservoirLevel)
+        handleAge("sage", CareportalEvent.SENSORCHANGE, sageView, "SEN ",
+            164, 166)
+        if (pump.model() != PumpType.AccuChekCombo) {
+            handleLevel(R.string.key_statuslights_bat_critical, 26.0,
+                R.string.key_statuslights_bat_warning, 51.0,
+                batteryView, "BAT ", pump.batteryLevel.toDouble())
+        } else {
+            handleAge("bage", CareportalEvent.PUMPBATTERYCHANGE, batteryView, "BAT ",
+                224, 336)
+        }
+    }
+
+    private fun handleAge(nsSettingPlugin: String, eventName: String, view: TextView, text: String,
+                          defaultWarnThreshold: Int, defaultUrgentThreshold: Int) {
+        val urgent = nsSettingsStatus.getExtendedWarnValue(nsSettingPlugin, "urgent", defaultUrgentThreshold.toDouble())
+        val warn = nsSettingsStatus.getExtendedWarnValue(nsSettingPlugin, "warn", defaultWarnThreshold.toDouble())
+        handleAge(view, text, eventName, warn, urgent, true)
+    }
+
+    private fun handleLevel(criticalSetting: Int, criticalDefaultValue: Double,
+                            warnSetting: Int, warnDefaultValue: Double,
+                            view: TextView?, text: String, level: Double) {
+        if (view != null) {
+            val resUrgent = sp.getDouble(criticalSetting, criticalDefaultValue)
+            val resWarn = sp.getDouble(warnSetting, warnDefaultValue)
+            @Suppress("SetTextI18n")
+            view.text = text + DecimalFormatter.to0Decimal(level)
+            SetWarnColor.setColorInverse(view, level, resWarn, resUrgent)
+        }
+    }
+
+    private fun handleAge(age: TextView?, eventType: String, warnThreshold: Double, urgentThreshold: Double) =
+        handleAge(age, "", eventType, warnThreshold, urgentThreshold, OverviewFragment.shorttextmode)
+
+    fun handleAge(age: TextView?, prefix: String, eventType: String, warnThreshold: Double, urgentThreshold: Double, useShortText: Boolean) {
+        val notavailable = if (useShortText) "-" else resourceHelper.gs(R.string.notavailable)
+        val careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(eventType)
+        if (careportalEvent != null) {
+            age?.setTextColor(determineTextColor(careportalEvent, warnThreshold, urgentThreshold))
+            age?.text = prefix + careportalEvent.age(useShortText)
+        } else {
+            age?.text = notavailable
+        }
+    }
+
+    fun updateAge(sage: TextView?, iage: TextView?, cage: TextView?, pbage: TextView?) {
+        val iageUrgent = nsSettingsStatus.getExtendedWarnValue("iage", "urgent", 96.0)
+        val iageWarn = nsSettingsStatus.getExtendedWarnValue("iage", "warn", 72.0)
+        handleAge(iage, CareportalEvent.INSULINCHANGE, iageWarn, iageUrgent)
+        val cageUrgent = nsSettingsStatus.getExtendedWarnValue("cage", "urgent", 72.0)
+        val cageWarn = nsSettingsStatus.getExtendedWarnValue("cage", "warn", 48.0)
+        handleAge(cage, CareportalEvent.SITECHANGE, cageWarn, cageUrgent)
+        val sageUrgent = nsSettingsStatus.getExtendedWarnValue("sage", "urgent", 166.0)
+        val sageWarn = nsSettingsStatus.getExtendedWarnValue("sage", "warn", 164.0)
+        handleAge(sage, CareportalEvent.SENSORCHANGE, sageWarn, sageUrgent)
+        val pbageUrgent = nsSettingsStatus.getExtendedWarnValue("bage", "urgent", 360.0)
+        val pbageWarn = nsSettingsStatus.getExtendedWarnValue("bage", "warn", 240.0)
+        handleAge(pbage, CareportalEvent.PUMPBATTERYCHANGE, pbageWarn, pbageUrgent)
+    }
+
+    fun determineTextColor(careportalEvent: CareportalEvent, warnThreshold: Double, urgentThreshold: Double): Int {
+        return if (careportalEvent.isOlderThan(urgentThreshold)) {
+            resourceHelper.gc(R.color.low)
+        } else if (careportalEvent.isOlderThan(warnThreshold)) {
+            resourceHelper.gc(R.color.high)
+        } else {
+            Color.WHITE
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatuslightHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatuslightHandler.java
deleted file mode 100644
index 15d9f11a2b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatuslightHandler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview;
-
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.arch.core.util.Function;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SetWarnColor;
-
-class StatuslightHandler {
-
-    /**
-     * applies the statuslight subview on the overview fragement
-     */
-    void statuslight(TextView cageView, TextView iageView, TextView reservoirView,
-                     TextView sageView, TextView batteryView) {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-        applyStatuslight("cage", CareportalEvent.SITECHANGE, cageView, "CAN", 48, 72);
-        applyStatuslight("iage", CareportalEvent.INSULINCHANGE, iageView, "INS", 72, 96);
-
-        double reservoirLevel = pump.isInitialized() ? pump.getReservoirLevel() : -1;
-        applyStatuslightLevel(R.string.key_statuslights_res_critical, 10.0,
-                R.string.key_statuslights_res_warning, 80.0, reservoirView, "RES", reservoirLevel);
-
-        applyStatuslight("sage", CareportalEvent.SENSORCHANGE, sageView, "SEN", 164, 166);
-
-        if (pump.model() != PumpType.AccuChekCombo) {
-            double batteryLevel = pump.isInitialized() ? pump.getBatteryLevel() : -1;
-            applyStatuslightLevel(R.string.key_statuslights_bat_critical, 5.0,
-                    R.string.key_statuslights_bat_warning, 22.0,
-                    batteryView, "BAT", batteryLevel);
-        } else {
-            applyStatuslight("bage", CareportalEvent.PUMPBATTERYCHANGE, batteryView, "BAT", 504, 240);
-        }
-
-    }
-
-    void applyStatuslight(String nsSettingPlugin, String eventName, TextView view, String text,
-                          int defaultWarnThreshold, int defaultUrgentThreshold) {
-        NSSettingsStatus nsSettings = NSSettingsStatus.getInstance();
-
-        if (view != null) {
-            double urgent = nsSettings.getExtendedWarnValue(nsSettingPlugin, "urgent", defaultUrgentThreshold);
-            double warn = nsSettings.getExtendedWarnValue(nsSettingPlugin, "warn", defaultWarnThreshold);
-            CareportalEvent event = MainApp.getDbHelper().getLastCareportalEvent(eventName);
-            double age = event != null ? event.getHoursFromStart() : Double.MAX_VALUE;
-            applyStatuslight(view, text, age, warn, urgent, Double.MAX_VALUE, true);
-        }
-    }
-
-    void applyStatuslightLevel(int criticalSetting, double criticalDefaultValue,
-                               int warnSetting, double warnDefaultValue,
-                               TextView view, String text, double level) {
-        if (view != null) {
-            double resUrgent = SP.getDouble(criticalSetting, criticalDefaultValue);
-            double resWarn = SP.getDouble(warnSetting, warnDefaultValue);
-            applyStatuslight(view, text, level, resWarn, resUrgent, -1, false);
-        }
-    }
-
-    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) {
-            view.setText(text);
-            if (check.apply(urgentThreshold)) {
-                view.setTextColor(MainApp.gc(R.color.ribbonCritical));
-            } else if (check.apply(warnThreshold)) {
-                view.setTextColor(MainApp.gc(R.color.ribbonWarning));
-            } else {
-                view.setTextColor(MainApp.gc(R.color.ribbonDefault));
-            }
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.GONE);
-        }
-
-    }
-
-    /**
-     * applies the extended statuslight subview on the overview fragement
-     */
-    void extendedStatuslight(TextView cageView, TextView iageView,
-                             TextView reservoirView, TextView sageView,
-                             TextView batteryView) {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-        handleAge("cage", CareportalEvent.SITECHANGE, cageView, "CAN ",
-                48, 72);
-
-        handleAge("iage", CareportalEvent.INSULINCHANGE, iageView, "INS ",
-                72, 96);
-
-        handleLevel(R.string.key_statuslights_res_critical, 10.0,
-                R.string.key_statuslights_res_warning, 80.0,
-                reservoirView, "RES ", pump.getReservoirLevel());
-
-        handleAge("sage", CareportalEvent.SENSORCHANGE, sageView, "SEN ",
-                164, 166);
-
-        if (pump.model() != PumpType.AccuChekCombo) {
-            handleLevel(R.string.key_statuslights_bat_critical, 26.0,
-                    R.string.key_statuslights_bat_warning, 51.0,
-                    batteryView, "BAT ", pump.getBatteryLevel());
-        } else {
-            handleAge("bage", CareportalEvent.PUMPBATTERYCHANGE, batteryView, "BAT ",
-                    336, 240);
-        }
-    }
-
-    void handleAge(String nsSettingPlugin, String eventName, TextView view, String text,
-                   int defaultUrgentThreshold, int defaultWarnThreshold) {
-        NSSettingsStatus nsSettings = new NSSettingsStatus().getInstance();
-
-        if (view != null) {
-            double urgent = nsSettings.getExtendedWarnValue(nsSettingPlugin, "urgent", defaultUrgentThreshold);
-            double warn = nsSettings.getExtendedWarnValue(nsSettingPlugin, "warn", defaultWarnThreshold);
-            CareportalFragment.handleAge(view, text, eventName, warn, urgent, true);
-        }
-    }
-
-    void handleLevel(int criticalSetting, double criticalDefaultValue,
-                     int warnSetting, double warnDefaultValue,
-                     TextView view, String text, double level) {
-        if (view != null) {
-            double resUrgent = SP.getDouble(criticalSetting, criticalDefaultValue);
-            double resWarn = SP.getDouble(warnSetting, warnDefaultValue);
-            view.setText(text + DecimalFormatter.to0Decimal(level));
-            SetWarnColor.setColorInverse(view, level, resWarn, resUrgent);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
index 9aa1e29978..505ec3e943 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@@ -11,19 +11,24 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.data.QuickWizard
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.wizard.QuickWizard
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.overview_quickwizardlist_activity.*
+import javax.inject.Inject
 
 class QuickWizardListActivity : NoSplashAppCompatActivity() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var quickWizard: QuickWizard
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -34,13 +39,13 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
         }
 
         override fun onBindViewHolder(holder: QuickWizardEntryViewHolder, position: Int) {
-            holder.from.text = DateUtil.timeString(QuickWizard[position].validFromDate())
-            holder.to.text = DateUtil.timeString(QuickWizard[position].validToDate())
-            holder.buttonText.text = QuickWizard[position].buttonText()
-            holder.carbs.text = DecimalFormatter.to0Decimal(QuickWizard[position].carbs().toDouble()) + " g"
+            holder.from.text = DateUtil.timeString(quickWizard[position].validFromDate())
+            holder.to.text = DateUtil.timeString(quickWizard[position].validToDate())
+            holder.buttonText.text = quickWizard[position].buttonText()
+            holder.carbs.text = resourceHelper.gs(R.string.format_carbs, quickWizard[position].carbs())
         }
 
-        override fun getItemCount(): Int = QuickWizard.size()
+        override fun getItemCount(): Int = quickWizard.size()
 
         private inner class QuickWizardEntryViewHolder internal constructor(itemView: View, internal var fragmentManager: FragmentManager) : RecyclerView.ViewHolder(itemView) {
             val buttonText: TextView = itemView.findViewById(R.id.overview_quickwizard_item_buttonText)
@@ -54,12 +59,14 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
                 editButton.setOnClickListener {
                     val manager = fragmentManager
                     val editQuickWizardDialog = EditQuickWizardDialog()
-                    editQuickWizardDialog.entry = QuickWizard[adapterPosition]
+                    val bundle = Bundle()
+                    bundle.putInt("position", adapterPosition)
+                    editQuickWizardDialog.arguments = bundle
                     editQuickWizardDialog.show(manager, "EditQuickWizardDialog")
                 }
                 removeButton.setOnClickListener {
-                    QuickWizard.remove(adapterPosition)
-                    RxBus.send(EventQuickWizardChange())
+                    quickWizard.remove(adapterPosition)
+                    rxBus.send(EventQuickWizardChange())
                 }
             }
         }
@@ -82,15 +89,13 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        disposable += RxBus
-                .toObservable(EventQuickWizardChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    val adapter = RecyclerViewAdapter(supportFragmentManager)
-                    overview_quickwizardactivity_recyclerview?.swapAdapter(adapter, false)
-                }, {
-                    FabricPrivacy.logException(it)
-                })
+        disposable += rxBus
+            .toObservable(EventQuickWizardChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                val adapter = RecyclerViewAdapter(supportFragmentManager)
+                overview_quickwizardactivity_recyclerview?.swapAdapter(adapter, false)
+            }, { fabricPrivacy.logException(it) })
     }
 
     override fun onPause() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
index 8b70c637fa..d2531c77c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
@@ -1,28 +1,34 @@
 package info.nightscout.androidaps.plugins.general.overview.dialogs
 
-
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.fragment.app.DialogFragment
+import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.QuickWizard
-import info.nightscout.androidaps.data.QuickWizardEntry
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.utils.wizard.QuickWizard
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.SafeParse
 import kotlinx.android.synthetic.main.okcancel.*
 import kotlinx.android.synthetic.main.overview_editquickwizard_dialog.*
 import org.json.JSONException
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
 
+class EditQuickWizardDialog : DaggerDialogFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var quickWizard: QuickWizard
 
-class EditQuickWizardDialog : DialogFragment() {
-    private val log = LoggerFactory.getLogger(EditQuickWizardDialog::class.java)
-    internal var entry = QuickWizard.newEmptyItem()
+    var position = -1
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -34,6 +40,10 @@ class EditQuickWizardDialog : DialogFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        (arguments ?: savedInstanceState)?.let { bundle ->
+            position = bundle.getInt("position", -1)
+        }
+        val entry = if (position ==-1) quickWizard.newEmptyItem() else quickWizard[position]
         ok.setOnClickListener {
             if (overview_editquickwizard_from_spinner.selectedItem == null) return@setOnClickListener
             if (overview_editquickwizard_to_spinner.selectedItem == null) return@setOnClickListener
@@ -52,11 +62,11 @@ class EditQuickWizardDialog : DialogFragment() {
                 entry.storage.put("useSuperBolus", overview_editquickwizard_usesuperbolus_spinner.selectedItemPosition)
                 entry.storage.put("useTempTarget", overview_editquickwizard_usetemptarget_spinner.selectedItemPosition)
             } catch (e: JSONException) {
-                log.error("Unhandled exception", e)
+                aapsLogger.error("Unhandled exception", e)
             }
 
-            QuickWizard.addOrUpdate(entry)
-            RxBus.send(EventQuickWizardChange())
+            quickWizard.addOrUpdate(entry)
+            rxBus.send(EventQuickWizardChange())
             dismiss()
         }
         cancel.setOnClickListener { dismiss() }
@@ -104,6 +114,11 @@ class EditQuickWizardDialog : DialogFragment() {
         dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt("position", position)
+    }
+
     private fun processCob() {
         if (overview_editquickwizard_usecob_spinner.selectedItemPosition == QuickWizardEntry.YES) {
             overview_editquickwizard_usebolusiob_spinner.isEnabled = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
deleted file mode 100644
index a3dc3c4212..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
+++ /dev/null
@@ -1,725 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.graphData;
-
-import android.graphics.Color;
-import android.graphics.DashPathEffect;
-import android.graphics.Paint;
-
-import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.ValueDependentColor;
-import com.jjoe64.graphview.series.BarGraphSeries;
-import com.jjoe64.graphview.series.DataPoint;
-import com.jjoe64.graphview.series.LineGraphSeries;
-import com.jjoe64.graphview.series.Series;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.loop.APSResult;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.AreaGraphSeries;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DoubleDataPoint;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.FixedLineGraphSeries;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.TimeAsXAxisLabelFormatter;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.BasalData;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 18.10.2017.
- */
-
-public class GraphData {
-    private static Logger log = LoggerFactory.getLogger(L.OVERVIEW);
-
-    private GraphView graph;
-    public double maxY = Double.MIN_VALUE;
-    public double minY = Double.MAX_VALUE;
-    private List<BgReading> bgReadingsArray;
-    private String units;
-    private List<Series> series = new ArrayList<>();
-
-    private IobCobCalculatorPlugin iobCobCalculatorPlugin;
-
-    public GraphData(GraphView graph, IobCobCalculatorPlugin iobCobCalculatorPlugin) {
-        units = ProfileFunctions.getSystemUnits();
-        this.graph = graph;
-        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
-    }
-
-    public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, List<BgReading> predictions) {
-        double maxBgValue = Double.MIN_VALUE;
-        //bgReadingsArray = MainApp.getDbHelper().getBgreadingsDataFromTime(fromTime, true);
-        bgReadingsArray = iobCobCalculatorPlugin.getBgReadings();
-        List<DataPointWithLabelInterface> bgListArray = new ArrayList<>();
-
-        if (bgReadingsArray == null || bgReadingsArray.size() == 0) {
-            if (L.isEnabled(L.OVERVIEW))
-                log.debug("No BG data.");
-            maxY = 10;
-            minY = 0;
-            return;
-        }
-
-        for (BgReading bg : bgReadingsArray) {
-            if (bg.date < fromTime || bg.date > toTime) continue;
-            if (bg.value > maxBgValue) maxBgValue = bg.value;
-            bgListArray.add(bg);
-        }
-        if (predictions != null) {
-            Collections.sort(predictions, (o1, o2) -> Double.compare(o1.getX(), o2.getX()));
-            for (BgReading prediction : predictions) {
-                if (prediction.value >= 40)
-                    bgListArray.add(prediction);
-            }
-        }
-
-        maxBgValue = Profile.fromMgdlToUnits(maxBgValue, units);
-        maxBgValue = units.equals(Constants.MGDL) ? Round.roundTo(maxBgValue, 40d) + 80 : Round.roundTo(maxBgValue, 2d) + 4;
-        if (highLine > maxBgValue) maxBgValue = highLine;
-        int numOfVertLines = units.equals(Constants.MGDL) ? (int) (maxBgValue / 40 + 1) : (int) (maxBgValue / 2 + 1);
-
-        DataPointWithLabelInterface[] bg = new DataPointWithLabelInterface[bgListArray.size()];
-        bg = bgListArray.toArray(bg);
-
-
-        maxY = maxBgValue;
-        minY = 0;
-        // set manual y bounds to have nice steps
-        graph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
-
-        addSeries(new PointsWithLabelGraphSeries<>(bg));
-    }
-
-    public void addInRangeArea(long fromTime, long toTime, double lowLine, double highLine) {
-        AreaGraphSeries<DoubleDataPoint> inRangeAreaSeries;
-
-        DoubleDataPoint[] inRangeAreaDataPoints = new DoubleDataPoint[]{
-                new DoubleDataPoint(fromTime, lowLine, highLine),
-                new DoubleDataPoint(toTime, lowLine, highLine)
-        };
-        inRangeAreaSeries = new AreaGraphSeries<>(inRangeAreaDataPoints);
-        inRangeAreaSeries.setColor(0);
-        inRangeAreaSeries.setDrawBackground(true);
-        inRangeAreaSeries.setBackgroundColor(MainApp.gc(R.color.inrangebackground));
-
-        addSeries(inRangeAreaSeries);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addBasals(long fromTime, long toTime, double scale) {
-        LineGraphSeries<ScaledDataPoint> basalsLineSeries;
-        LineGraphSeries<ScaledDataPoint> absoluteBasalsLineSeries;
-        LineGraphSeries<ScaledDataPoint> baseBasalsSeries;
-        LineGraphSeries<ScaledDataPoint> tempBasalsSeries;
-
-        double maxBasalValueFound = 0d;
-        Scale basalScale = new Scale();
-
-        List<ScaledDataPoint> baseBasalArray = new ArrayList<>();
-        List<ScaledDataPoint> tempBasalArray = new ArrayList<>();
-        List<ScaledDataPoint> basalLineArray = new ArrayList<>();
-        List<ScaledDataPoint> absoluteBasalLineArray = new ArrayList<>();
-        double lastLineBasal = 0;
-        double lastAbsoluteLineBasal = -1;
-        double lastBaseBasal = 0;
-        double lastTempBasal = 0;
-        for (long time = fromTime; time < toTime; time += 60 * 1000L) {
-            Profile profile = ProfileFunctions.getInstance().getProfile(time);
-            if (profile == null) continue;
-            BasalData basalData = iobCobCalculatorPlugin.getBasalData(profile, time);
-            double baseBasalValue = basalData.basal;
-            double absoluteLineValue = baseBasalValue;
-            double tempBasalValue = 0;
-            double basal = 0d;
-            if (basalData.isTempBasalRunning) {
-                absoluteLineValue = tempBasalValue = basalData.tempBasalAbsolute;
-                if (tempBasalValue != lastTempBasal) {
-                    tempBasalArray.add(new ScaledDataPoint(time, lastTempBasal, basalScale));
-                    tempBasalArray.add(new ScaledDataPoint(time, basal = tempBasalValue, basalScale));
-                }
-                if (lastBaseBasal != 0d) {
-                    baseBasalArray.add(new ScaledDataPoint(time, lastBaseBasal, basalScale));
-                    baseBasalArray.add(new ScaledDataPoint(time, 0d, basalScale));
-                    lastBaseBasal = 0d;
-                }
-            } else {
-                if (baseBasalValue != lastBaseBasal) {
-                    baseBasalArray.add(new ScaledDataPoint(time, lastBaseBasal, basalScale));
-                    baseBasalArray.add(new ScaledDataPoint(time, basal = baseBasalValue, basalScale));
-                    lastBaseBasal = baseBasalValue;
-                }
-                if (lastTempBasal != 0) {
-                    tempBasalArray.add(new ScaledDataPoint(time, lastTempBasal, basalScale));
-                    tempBasalArray.add(new ScaledDataPoint(time, 0d, basalScale));
-                }
-            }
-
-            if (baseBasalValue != lastLineBasal) {
-                basalLineArray.add(new ScaledDataPoint(time, lastLineBasal, basalScale));
-                basalLineArray.add(new ScaledDataPoint(time, baseBasalValue, basalScale));
-            }
-            if (absoluteLineValue != lastAbsoluteLineBasal) {
-                absoluteBasalLineArray.add(new ScaledDataPoint(time, lastAbsoluteLineBasal, basalScale));
-                absoluteBasalLineArray.add(new ScaledDataPoint(time, basal, basalScale));
-            }
-
-            lastAbsoluteLineBasal = absoluteLineValue;
-            lastLineBasal = baseBasalValue;
-            lastTempBasal = tempBasalValue;
-            maxBasalValueFound = Math.max(maxBasalValueFound, Math.max(tempBasalValue, baseBasalValue));
-        }
-
-        basalLineArray.add(new ScaledDataPoint(toTime, lastLineBasal, basalScale));
-        baseBasalArray.add(new ScaledDataPoint(toTime, lastBaseBasal, basalScale));
-        tempBasalArray.add(new ScaledDataPoint(toTime, lastTempBasal, basalScale));
-        absoluteBasalLineArray.add(new ScaledDataPoint(toTime, lastAbsoluteLineBasal, basalScale));
-
-        ScaledDataPoint[] baseBasal = new ScaledDataPoint[baseBasalArray.size()];
-        baseBasal = baseBasalArray.toArray(baseBasal);
-        baseBasalsSeries = new LineGraphSeries<>(baseBasal);
-        baseBasalsSeries.setDrawBackground(true);
-        baseBasalsSeries.setBackgroundColor(MainApp.gc(R.color.basebasal));
-        baseBasalsSeries.setThickness(0);
-
-        ScaledDataPoint[] tempBasal = new ScaledDataPoint[tempBasalArray.size()];
-        tempBasal = tempBasalArray.toArray(tempBasal);
-        tempBasalsSeries = new LineGraphSeries<>(tempBasal);
-        tempBasalsSeries.setDrawBackground(true);
-        tempBasalsSeries.setBackgroundColor(MainApp.gc(R.color.tempbasal));
-        tempBasalsSeries.setThickness(0);
-
-        ScaledDataPoint[] basalLine = new ScaledDataPoint[basalLineArray.size()];
-        basalLine = basalLineArray.toArray(basalLine);
-        basalsLineSeries = new LineGraphSeries<>(basalLine);
-        Paint paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(MainApp.instance().getApplicationContext().getResources().getDisplayMetrics().scaledDensity * 2);
-        paint.setPathEffect(new DashPathEffect(new float[]{2, 4}, 0));
-        paint.setColor(MainApp.gc(R.color.basal));
-        basalsLineSeries.setCustomPaint(paint);
-
-        ScaledDataPoint[] absoluteBasalLine = new ScaledDataPoint[absoluteBasalLineArray.size()];
-        absoluteBasalLine = absoluteBasalLineArray.toArray(absoluteBasalLine);
-        absoluteBasalsLineSeries = new LineGraphSeries<>(absoluteBasalLine);
-        Paint absolutePaint = new Paint();
-        absolutePaint.setStyle(Paint.Style.STROKE);
-        absolutePaint.setStrokeWidth(MainApp.instance().getApplicationContext().getResources().getDisplayMetrics().scaledDensity * 2);
-        absolutePaint.setColor(MainApp.gc(R.color.basal));
-        absoluteBasalsLineSeries.setCustomPaint(absolutePaint);
-
-        basalScale.setMultiplier(maxY * scale / maxBasalValueFound);
-
-        addSeries(baseBasalsSeries);
-        addSeries(tempBasalsSeries);
-        addSeries(basalsLineSeries);
-        addSeries(absoluteBasalsLineSeries);
-    }
-
-    public void addTargetLine(long fromTime, long toTime, Profile profile) {
-        LineGraphSeries<DataPoint> targetsSeries;
-
-        Scale targetsScale = new Scale();
-        targetsScale.setMultiplier(1);
-
-        List<DataPoint> targetsSeriesArray = new ArrayList<>();
-        double lastTarget = -1;
-
-        if (LoopPlugin.lastRun != null && LoopPlugin.lastRun.constraintsProcessed != null) {
-            APSResult apsResult = LoopPlugin.lastRun.constraintsProcessed;
-            long latestPredictionsTime = apsResult.getLatestPredictionsTime();
-            if (latestPredictionsTime > toTime) {
-                toTime = latestPredictionsTime;
-            }
-        }
-
-        for (long time = fromTime; time < toTime; time += 5 * 60 * 1000L) {
-            TempTarget tt = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(time);
-            double value;
-            if (tt == null) {
-                value = Profile.fromMgdlToUnits((profile.getTargetLowMgdl(time) + profile.getTargetHighMgdl(time)) / 2, ProfileFunctions.getSystemUnits());
-            } else {
-                value = Profile.fromMgdlToUnits(tt.target(), ProfileFunctions.getSystemUnits());
-            }
-            if (lastTarget != value) {
-                if (lastTarget != -1)
-                    targetsSeriesArray.add(new DataPoint(time, lastTarget));
-                targetsSeriesArray.add(new DataPoint(time, value));
-            }
-            lastTarget = value;
-        }
-        targetsSeriesArray.add(new DataPoint(toTime, lastTarget));
-
-        DataPoint[] targets = new DataPoint[targetsSeriesArray.size()];
-        targets = targetsSeriesArray.toArray(targets);
-        targetsSeries = new LineGraphSeries<>(targets);
-        targetsSeries.setDrawBackground(false);
-        targetsSeries.setColor(MainApp.gc(R.color.tempTargetBackground));
-        targetsSeries.setThickness(2);
-
-        addSeries(targetsSeries);
-    }
-
-    public void addTreatments(long fromTime, long endTime) {
-        List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>();
-
-        List<Treatment> treatments = TreatmentsPlugin.getPlugin().getTreatmentsFromHistory();
-
-        for (int tx = 0; tx < treatments.size(); tx++) {
-            Treatment t = treatments.get(tx);
-            if (t.getX() < fromTime || t.getX() > endTime) continue;
-            if (t.isSMB && !t.isValid) continue;
-            t.setY(getNearestBg((long) t.getX()));
-            filteredTreatments.add(t);
-        }
-
-        // ProfileSwitch
-        List<ProfileSwitch> profileSwitches = TreatmentsPlugin.getPlugin().getProfileSwitchesFromHistory().getList();
-
-        for (int tx = 0; tx < profileSwitches.size(); tx++) {
-            DataPointWithLabelInterface t = profileSwitches.get(tx);
-            if (t.getX() < fromTime || t.getX() > endTime) continue;
-            filteredTreatments.add(t);
-        }
-
-        // Extended bolus
-        if (!ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
-            List<ExtendedBolus> extendedBoluses = TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory().getList();
-
-            for (int tx = 0; tx < extendedBoluses.size(); tx++) {
-                DataPointWithLabelInterface t = extendedBoluses.get(tx);
-                if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
-                if (t.getDuration() == 0) continue;
-                t.setY(getNearestBg((long) t.getX()));
-                filteredTreatments.add(t);
-            }
-        }
-
-        // Careportal
-        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true);
-
-        for (int tx = 0; tx < careportalEvents.size(); tx++) {
-            DataPointWithLabelInterface t = careportalEvents.get(tx);
-            if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
-            t.setY(getNearestBg((long) t.getX()));
-            filteredTreatments.add(t);
-        }
-
-        DataPointWithLabelInterface[] treatmentsArray = new DataPointWithLabelInterface[filteredTreatments.size()];
-        treatmentsArray = filteredTreatments.toArray(treatmentsArray);
-        addSeries(new PointsWithLabelGraphSeries<>(treatmentsArray));
-    }
-
-    private double getNearestBg(long date) {
-        if (bgReadingsArray == null)
-            return Profile.fromMgdlToUnits(100, units);
-        for (int r = 0; r < bgReadingsArray.size(); r++) {
-            BgReading reading = bgReadingsArray.get(r);
-            if (reading.date > date) continue;
-            return Profile.fromMgdlToUnits(reading.value, units);
-        }
-        return bgReadingsArray.size() > 0
-                ? Profile.fromMgdlToUnits(bgReadingsArray.get(0).value, units) : Profile.fromMgdlToUnits(100, units);
-    }
-
-    public void addActivity(long fromTime, long toTime, boolean useForScale, double scale) {
-        FixedLineGraphSeries<ScaledDataPoint> actSeriesHist;
-        List<ScaledDataPoint> actArrayHist = new ArrayList<>();
-        FixedLineGraphSeries<ScaledDataPoint> actSeriesPred;
-        List<ScaledDataPoint> actArrayPred = new ArrayList<>();
-
-        double now = System.currentTimeMillis();
-        Scale actScale = new Scale();
-        IobTotal total;
-        double maxIAValue = 0;
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            Profile profile = ProfileFunctions.getInstance().getProfile(time);
-            double act = 0d;
-            if (profile == null) continue;
-            total = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time, profile);
-            act = total.activity;
-
-            if (time <= now)
-                actArrayHist.add(new ScaledDataPoint(time, act, actScale));
-            else
-                actArrayPred.add(new ScaledDataPoint(time, act, actScale));
-            if (act > maxIAValue) maxIAValue = act;
-        }
-
-        ScaledDataPoint[] actData = new ScaledDataPoint[actArrayHist.size()];
-        actData = actArrayHist.toArray(actData);
-        actSeriesHist = new FixedLineGraphSeries<>(actData);
-        actSeriesHist.setDrawBackground(false);
-        actSeriesHist.setColor(MainApp.gc(R.color.activity));
-        actSeriesHist.setThickness(3);
-
-        addSeries(actSeriesHist);
-
-        actData = new ScaledDataPoint[actArrayPred.size()];
-        actData = actArrayPred.toArray(actData);
-        actSeriesPred = new FixedLineGraphSeries<>(actData);
-
-        Paint paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(3);
-        paint.setPathEffect(new DashPathEffect(new float[]{4, 4}, 0));
-        paint.setColor(MainApp.gc(R.color.activity));
-        actSeriesPred.setCustomPaint(paint);
-
-        if (useForScale) {
-            maxY = maxIAValue;
-            minY = -maxIAValue;
-        }
-        actScale.setMultiplier(maxY * scale / maxIAValue);
-
-        addSeries(actSeriesPred);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addIob(long fromTime, long toTime, boolean useForScale, double scale, boolean showPrediction) {
-        FixedLineGraphSeries<ScaledDataPoint> iobSeries;
-        List<ScaledDataPoint> iobArray = new ArrayList<>();
-        Double maxIobValueFound = Double.MIN_VALUE;
-        double lastIob = 0;
-        Scale iobScale = new Scale();
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            Profile profile = ProfileFunctions.getInstance().getProfile(time);
-            double iob = 0d;
-            if (profile != null)
-                iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time, profile).iob;
-            if (Math.abs(lastIob - iob) > 0.02) {
-                if (Math.abs(lastIob - iob) > 0.2)
-                    iobArray.add(new ScaledDataPoint(time, lastIob, iobScale));
-                iobArray.add(new ScaledDataPoint(time, iob, iobScale));
-                maxIobValueFound = Math.max(maxIobValueFound, Math.abs(iob));
-                lastIob = iob;
-            }
-        }
-
-        ScaledDataPoint[] iobData = new ScaledDataPoint[iobArray.size()];
-        iobData = iobArray.toArray(iobData);
-        iobSeries = new FixedLineGraphSeries<>(iobData);
-        iobSeries.setDrawBackground(true);
-        iobSeries.setBackgroundColor(0x80FFFFFF & MainApp.gc(R.color.iob)); //50%
-        iobSeries.setColor(MainApp.gc(R.color.iob));
-        iobSeries.setThickness(3);
-
-        if (showPrediction) {
-            AutosensResult lastAutosensResult;
-            AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("GraphData");
-            if (autosensData == null)
-                lastAutosensResult = new AutosensResult();
-            else
-                lastAutosensResult = autosensData.autosensResult;
-            boolean isTempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(System.currentTimeMillis()) != null;
-
-            List<DataPointWithLabelInterface> iobPred = new ArrayList<>();
-            IobTotal[] iobPredArray = IobCobCalculatorPlugin.getPlugin().calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget);
-            for (IobTotal i : iobPredArray) {
-                iobPred.add(i.setColor(MainApp.gc(R.color.iobPredAS)));
-                maxIobValueFound = Math.max(maxIobValueFound, Math.abs(i.iob));
-            }
-            DataPointWithLabelInterface[] iobp = new DataPointWithLabelInterface[iobPred.size()];
-            iobp = iobPred.toArray(iobp);
-            addSeries(new PointsWithLabelGraphSeries<>(iobp));
-
-
-            List<DataPointWithLabelInterface> iobPred2 = new ArrayList<>();
-            IobTotal[] iobPredArray2 = IobCobCalculatorPlugin.getPlugin().calculateIobArrayForSMB(new AutosensResult(), SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget);
-            for (IobTotal i : iobPredArray2) {
-                iobPred2.add(i.setColor(MainApp.gc(R.color.iobPred)));
-                maxIobValueFound = Math.max(maxIobValueFound, Math.abs(i.iob));
-            }
-            DataPointWithLabelInterface[] iobp2 = new DataPointWithLabelInterface[iobPred2.size()];
-            iobp2 = iobPred2.toArray(iobp2);
-            addSeries(new PointsWithLabelGraphSeries<>(iobp2));
-
-            if (L.isEnabled(L.AUTOSENS)) {
-                log.debug("IOB pred for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + IobCobCalculatorPlugin.getPlugin().iobArrayToString(iobPredArray));
-                log.debug("IOB pred for AS=" + DecimalFormatter.to2Decimal(1) + ": " + IobCobCalculatorPlugin.getPlugin().iobArrayToString(iobPredArray2));
-            }
-        }
-
-        if (useForScale) {
-            maxY = maxIobValueFound;
-            minY = -maxIobValueFound;
-        }
-
-        iobScale.setMultiplier(maxY * scale / maxIobValueFound);
-
-        addSeries(iobSeries);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addCob(long fromTime, long toTime, boolean useForScale, double scale) {
-        List<DataPointWithLabelInterface> minFailoverActiveList = new ArrayList<>();
-        FixedLineGraphSeries<ScaledDataPoint> cobSeries;
-        List<ScaledDataPoint> cobArray = new ArrayList<>();
-        Double maxCobValueFound = 0d;
-        int lastCob = 0;
-        Scale cobScale = new Scale();
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            AutosensData autosensData = iobCobCalculatorPlugin.getAutosensData(time);
-            if (autosensData != null) {
-                int cob = (int) autosensData.cob;
-                if (cob != lastCob) {
-                    if (autosensData.carbsFromBolus > 0)
-                        cobArray.add(new ScaledDataPoint(time, lastCob, cobScale));
-                    cobArray.add(new ScaledDataPoint(time, cob, cobScale));
-                    maxCobValueFound = Math.max(maxCobValueFound, cob);
-                    lastCob = cob;
-                }
-                if (autosensData.failoverToMinAbsorbtionRate) {
-                    autosensData.setScale(cobScale);
-                    autosensData.setChartTime(time);
-                    minFailoverActiveList.add(autosensData);
-                }
-            }
-        }
-
-        // COB
-        ScaledDataPoint[] cobData = new ScaledDataPoint[cobArray.size()];
-        cobData = cobArray.toArray(cobData);
-        cobSeries = new FixedLineGraphSeries<>(cobData);
-        cobSeries.setDrawBackground(true);
-        cobSeries.setBackgroundColor(0x80FFFFFF & MainApp.gc(R.color.cob)); //50%
-        cobSeries.setColor(MainApp.gc(R.color.cob));
-        cobSeries.setThickness(3);
-
-        if (useForScale) {
-            maxY = maxCobValueFound;
-            minY = 0;
-        }
-
-        cobScale.setMultiplier(maxY * scale / maxCobValueFound);
-
-        addSeries(cobSeries);
-
-        DataPointWithLabelInterface[] minFailover = new DataPointWithLabelInterface[minFailoverActiveList.size()];
-        minFailover = minFailoverActiveList.toArray(minFailover);
-        addSeries(new PointsWithLabelGraphSeries<>(minFailover));
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addDeviations(long fromTime, long toTime, boolean useForScale, double scale) {
-        class DeviationDataPoint extends ScaledDataPoint {
-            public int color;
-
-            public DeviationDataPoint(double x, double y, int color, Scale scale) {
-                super(x, y, scale);
-                this.color = color;
-            }
-        }
-
-        BarGraphSeries<DeviationDataPoint> devSeries;
-        List<DeviationDataPoint> devArray = new ArrayList<>();
-        Double maxDevValueFound = 0d;
-        Scale devScale = new Scale();
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            AutosensData autosensData = iobCobCalculatorPlugin.getAutosensData(time);
-            if (autosensData != null) {
-                int color = MainApp.gc(R.color.deviationblack); // "="
-                if (autosensData.type.equals("") || autosensData.type.equals("non-meal")) {
-                    if (autosensData.pastSensitivity.equals("C"))
-                        color = MainApp.gc(R.color.deviationgrey);
-                    if (autosensData.pastSensitivity.equals("+"))
-                        color = MainApp.gc(R.color.deviationgreen);
-                    if (autosensData.pastSensitivity.equals("-"))
-                        color = MainApp.gc(R.color.deviationred);
-                } else if (autosensData.type.equals("uam")) {
-                    color = MainApp.gc(R.color.uam);
-                } else if (autosensData.type.equals("csf")) {
-                    color = MainApp.gc(R.color.deviationgrey);
-                }
-                devArray.add(new DeviationDataPoint(time, autosensData.deviation, color, devScale));
-                maxDevValueFound = Math.max(maxDevValueFound, Math.abs(autosensData.deviation));
-            }
-        }
-
-        // DEVIATIONS
-        DeviationDataPoint[] devData = new DeviationDataPoint[devArray.size()];
-        devData = devArray.toArray(devData);
-        devSeries = new BarGraphSeries<>(devData);
-        devSeries.setValueDependentColor(new ValueDependentColor<DeviationDataPoint>() {
-            @Override
-            public int get(DeviationDataPoint data) {
-                return data.color;
-            }
-        });
-
-        if (useForScale) {
-            maxY = maxDevValueFound;
-            minY = -maxY;
-        }
-
-        devScale.setMultiplier(maxY * scale / maxDevValueFound);
-
-        addSeries(devSeries);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addRatio(long fromTime, long toTime, boolean useForScale, double scale) {
-        LineGraphSeries<ScaledDataPoint> ratioSeries;
-        List<ScaledDataPoint> ratioArray = new ArrayList<>();
-        Double maxRatioValueFound = Double.MIN_VALUE;
-        Double minRatioValueFound = Double.MAX_VALUE;
-        Scale ratioScale = new Scale();
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            AutosensData autosensData = iobCobCalculatorPlugin.getAutosensData(time);
-            if (autosensData != null) {
-                ratioArray.add(new ScaledDataPoint(time, autosensData.autosensResult.ratio - 1, ratioScale));
-                maxRatioValueFound = Math.max(maxRatioValueFound, autosensData.autosensResult.ratio - 1);
-                minRatioValueFound = Math.min(minRatioValueFound, autosensData.autosensResult.ratio - 1);
-            }
-        }
-
-        // RATIOS
-        ScaledDataPoint[] ratioData = new ScaledDataPoint[ratioArray.size()];
-        ratioData = ratioArray.toArray(ratioData);
-        ratioSeries = new LineGraphSeries<>(ratioData);
-        ratioSeries.setColor(MainApp.gc(R.color.ratio));
-        ratioSeries.setThickness(3);
-
-        if (useForScale) {
-            maxY = Math.max(maxRatioValueFound, Math.abs(minRatioValueFound));
-            minY = -maxY;
-        }
-
-        ratioScale.setMultiplier(maxY * scale / Math.max(maxRatioValueFound, Math.abs(minRatioValueFound)));
-
-        addSeries(ratioSeries);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addDeviationSlope(long fromTime, long toTime, boolean useForScale, double scale) {
-        LineGraphSeries<ScaledDataPoint> dsMaxSeries;
-        LineGraphSeries<ScaledDataPoint> dsMinSeries;
-        List<ScaledDataPoint> dsMaxArray = new ArrayList<>();
-        List<ScaledDataPoint> dsMinArray = new ArrayList<>();
-        Double maxFromMaxValueFound = 0d;
-        Double maxFromMinValueFound = 0d;
-        Scale dsMaxScale = new Scale();
-        Scale dsMinScale = new Scale();
-
-        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
-            AutosensData autosensData = iobCobCalculatorPlugin.getAutosensData(time);
-            if (autosensData != null) {
-                dsMaxArray.add(new ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale));
-                dsMinArray.add(new ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale));
-                maxFromMaxValueFound = Math.max(maxFromMaxValueFound, Math.abs(autosensData.slopeFromMaxDeviation));
-                maxFromMinValueFound = Math.max(maxFromMinValueFound, Math.abs(autosensData.slopeFromMinDeviation));
-            }
-        }
-
-        // Slopes
-        ScaledDataPoint[] ratioMaxData = new ScaledDataPoint[dsMaxArray.size()];
-        ratioMaxData = dsMaxArray.toArray(ratioMaxData);
-        dsMaxSeries = new LineGraphSeries<>(ratioMaxData);
-        dsMaxSeries.setColor(MainApp.gc(R.color.devslopepos));
-        dsMaxSeries.setThickness(3);
-
-        ScaledDataPoint[] ratioMinData = new ScaledDataPoint[dsMinArray.size()];
-        ratioMinData = dsMinArray.toArray(ratioMinData);
-        dsMinSeries = new LineGraphSeries<>(ratioMinData);
-        dsMinSeries.setColor(MainApp.gc(R.color.devslopeneg));
-        dsMinSeries.setThickness(3);
-
-        if (useForScale) {
-            maxY = Math.max(maxFromMaxValueFound, maxFromMinValueFound);
-            minY = -maxY;
-        }
-
-        dsMaxScale.setMultiplier(maxY * scale / maxFromMaxValueFound);
-        dsMinScale.setMultiplier(maxY * scale / maxFromMinValueFound);
-
-        addSeries(dsMaxSeries);
-        addSeries(dsMinSeries);
-    }
-
-    // scale in % of vertical size (like 0.3)
-    public void addNowLine(long now) {
-        LineGraphSeries<DataPoint> seriesNow;
-        DataPoint[] nowPoints = new DataPoint[]{
-                new DataPoint(now, 0),
-                new DataPoint(now, maxY)
-        };
-
-        seriesNow = new LineGraphSeries<>(nowPoints);
-        seriesNow.setDrawDataPoints(false);
-        // custom paint to make a dotted line
-        Paint paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(2);
-        paint.setPathEffect(new DashPathEffect(new float[]{10, 20}, 0));
-        paint.setColor(Color.WHITE);
-        seriesNow.setCustomPaint(paint);
-
-        addSeries(seriesNow);
-    }
-
-    public void formatAxis(long fromTime, long endTime) {
-        graph.getViewport().setMaxX(endTime);
-        graph.getViewport().setMinX(fromTime);
-        graph.getViewport().setXAxisBoundsManual(true);
-        graph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter("HH"));
-        graph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
-    }
-
-    private void addSeries(Series s) {
-        series.add(s);
-    }
-
-    public void performUpdate() {
-        // clear old data
-        graph.getSeries().clear();
-
-        // add precalculated series
-        for (Series s : series) {
-            if (!s.isEmpty()) {
-                s.onGraphViewAttached(graph);
-                graph.getSeries().add(s);
-            }
-        }
-
-        double step = 1d;
-        if (maxY < 1) step = 0.1d;
-        graph.getViewport().setMaxY(Round.ceilTo(maxY, step));
-        graph.getViewport().setMinY(Round.floorTo(minY, step));
-        graph.getViewport().setYAxisBoundsManual(true);
-
-        // draw it
-        graph.onDataChanged(false, false);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
new file mode 100644
index 0000000000..fc7d1eb2a1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -0,0 +1,569 @@
+package info.nightscout.androidaps.plugins.general.overview.graphData
+
+import android.graphics.Color
+import android.graphics.DashPathEffect
+import android.graphics.Paint
+import com.jjoe64.graphview.GraphView
+import com.jjoe64.graphview.series.BarGraphSeries
+import com.jjoe64.graphview.series.DataPoint
+import com.jjoe64.graphview.series.LineGraphSeries
+import com.jjoe64.graphview.series.Series
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.TreatmentsInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin.LastRun
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.Round
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+
+class GraphData(injector: HasAndroidInjector, private val graph: GraphView, private val iobCobCalculatorPlugin: IobCobCalculatorPlugin) {
+
+    // IobCobCalculatorPlugin  Cannot be injected: HistoryBrowser
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    private val treatmentsPlugin: TreatmentsInterface
+
+    var maxY = Double.MIN_VALUE
+    private var minY = Double.MAX_VALUE
+    private var bgReadingsArray: List<BgReading>? = null
+    private val units: String
+    private val series: MutableList<Series<*>> = ArrayList()
+
+    init {
+        injector.androidInjector().inject(this)
+        units = profileFunction.getUnits()
+        treatmentsPlugin = activePlugin.activeTreatments
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun addBgReadings(fromTime: Long, toTime: Long, lowLine: Double, highLine: Double, predictions: MutableList<BgReading>?) {
+        var maxBgValue = Double.MIN_VALUE
+        bgReadingsArray = iobCobCalculatorPlugin.bgReadings
+        if (bgReadingsArray?.isEmpty() != false) {
+            aapsLogger.debug(LTag.OVERVIEW, "No BG data.")
+            maxY = 10.0
+            minY = 0.0
+            return
+        }
+        val bgListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
+        for (bg in bgReadingsArray!!) {
+            if (bg.date < fromTime || bg.date > toTime) continue
+            if (bg.value > maxBgValue) maxBgValue = bg.value
+            bgListArray.add(bg)
+        }
+        if (predictions != null) {
+            predictions.sortWith(Comparator { o1: BgReading, o2: BgReading -> o1.x.compareTo(o2.x) })
+            for (prediction in predictions) if (prediction.value >= 40) bgListArray.add(prediction)
+        }
+        maxBgValue = Profile.fromMgdlToUnits(maxBgValue, units)
+        maxBgValue = if (units == Constants.MGDL) Round.roundTo(maxBgValue, 40.0) + 80 else Round.roundTo(maxBgValue, 2.0) + 4
+        if (highLine > maxBgValue) maxBgValue = highLine
+        val numOfVerticalLines = if (units == Constants.MGDL) (maxBgValue / 40 + 1).toInt() else (maxBgValue / 2 + 1).toInt()
+        maxY = maxBgValue
+        minY = 0.0
+        // set manual y bounds to have nice steps
+        graph.gridLabelRenderer.numVerticalLabels = numOfVerticalLines
+        addSeries(PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] }))
+    }
+
+    fun addInRangeArea(fromTime: Long, toTime: Long, lowLine: Double, highLine: Double) {
+        val inRangeAreaSeries: AreaGraphSeries<DoubleDataPoint>
+        val inRangeAreaDataPoints = arrayOf(
+            DoubleDataPoint(fromTime.toDouble(), lowLine, highLine),
+            DoubleDataPoint(toTime.toDouble(), lowLine, highLine)
+        )
+        inRangeAreaSeries = AreaGraphSeries(inRangeAreaDataPoints)
+        inRangeAreaSeries.color = 0
+        inRangeAreaSeries.isDrawBackground = true
+        inRangeAreaSeries.backgroundColor = resourceHelper.gc(R.color.inrangebackground)
+        addSeries(inRangeAreaSeries)
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addBasals(fromTime: Long, toTime: Long, scale: Double) {
+        var maxBasalValueFound = 0.0
+        val basalScale = Scale()
+        val baseBasalArray: MutableList<ScaledDataPoint> = ArrayList()
+        val tempBasalArray: MutableList<ScaledDataPoint> = ArrayList()
+        val basalLineArray: MutableList<ScaledDataPoint> = ArrayList()
+        val absoluteBasalLineArray: MutableList<ScaledDataPoint> = ArrayList()
+        var lastLineBasal = 0.0
+        var lastAbsoluteLineBasal = -1.0
+        var lastBaseBasal = 0.0
+        var lastTempBasal = 0.0
+        var time = fromTime
+        while (time < toTime) {
+            val profile = profileFunction.getProfile(time)
+            if (profile == null) {
+                time += 60 * 1000L
+                continue
+            }
+            val basalData = iobCobCalculatorPlugin.getBasalData(profile, time)
+            val baseBasalValue = basalData.basal
+            var absoluteLineValue = baseBasalValue
+            var tempBasalValue = 0.0
+            var basal = 0.0
+            if (basalData.isTempBasalRunning) {
+                tempBasalValue = basalData.tempBasalAbsolute
+                absoluteLineValue = tempBasalValue
+                if (tempBasalValue != lastTempBasal) {
+                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, basalScale))
+                    tempBasalArray.add(ScaledDataPoint(time, tempBasalValue.also { basal = it }, basalScale))
+                }
+                if (lastBaseBasal != 0.0) {
+                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, basalScale))
+                    baseBasalArray.add(ScaledDataPoint(time, 0.0, basalScale))
+                    lastBaseBasal = 0.0
+                }
+            } else {
+                if (baseBasalValue != lastBaseBasal) {
+                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, basalScale))
+                    baseBasalArray.add(ScaledDataPoint(time, baseBasalValue.also { basal = it }, basalScale))
+                    lastBaseBasal = baseBasalValue
+                }
+                if (lastTempBasal != 0.0) {
+                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, basalScale))
+                    tempBasalArray.add(ScaledDataPoint(time, 0.0, basalScale))
+                }
+            }
+            if (baseBasalValue != lastLineBasal) {
+                basalLineArray.add(ScaledDataPoint(time, lastLineBasal, basalScale))
+                basalLineArray.add(ScaledDataPoint(time, baseBasalValue, basalScale))
+            }
+            if (absoluteLineValue != lastAbsoluteLineBasal) {
+                absoluteBasalLineArray.add(ScaledDataPoint(time, lastAbsoluteLineBasal, basalScale))
+                absoluteBasalLineArray.add(ScaledDataPoint(time, basal, basalScale))
+            }
+            lastAbsoluteLineBasal = absoluteLineValue
+            lastLineBasal = baseBasalValue
+            lastTempBasal = tempBasalValue
+            maxBasalValueFound = max(maxBasalValueFound, max(tempBasalValue, baseBasalValue))
+            time += 60 * 1000L
+        }
+
+        // final points
+        basalLineArray.add(ScaledDataPoint(toTime, lastLineBasal, basalScale))
+        baseBasalArray.add(ScaledDataPoint(toTime, lastBaseBasal, basalScale))
+        tempBasalArray.add(ScaledDataPoint(toTime, lastTempBasal, basalScale))
+        absoluteBasalLineArray.add(ScaledDataPoint(toTime, lastAbsoluteLineBasal, basalScale))
+
+        // create series
+        addSeries(LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = resourceHelper.gc(R.color.basebasal)
+            it.thickness = 0
+        })
+        addSeries(LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = resourceHelper.gc(R.color.tempbasal)
+            it.thickness = 0
+        })
+        addSeries(LineGraphSeries(Array(basalLineArray.size) { i -> basalLineArray[i] }).also {
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
+                paint.pathEffect = DashPathEffect(floatArrayOf(2f, 4f), 0f)
+                paint.color = resourceHelper.gc(R.color.basal)
+            })
+        })
+        addSeries(LineGraphSeries(Array(absoluteBasalLineArray.size) { i -> absoluteBasalLineArray[i] }).also {
+            it.setCustomPaint(Paint().also { absolutePaint ->
+                absolutePaint.style = Paint.Style.STROKE
+                absolutePaint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
+                absolutePaint.color = resourceHelper.gc(R.color.basal)
+            })
+        })
+        basalScale.setMultiplier(maxY * scale / maxBasalValueFound)
+    }
+
+    fun addTargetLine(fromTime: Long, toTimeParam: Long, profile: Profile, lastRun: LastRun?) {
+        var toTime = toTimeParam
+        val targetsSeriesArray: MutableList<DataPoint> = ArrayList()
+        var lastTarget = -1.0
+        lastRun?.constraintsProcessed?.let { toTime = max(it.latestPredictionsTime, toTime) }
+        var time = fromTime
+        while (time < toTime) {
+            val tt = treatmentsPlugin.getTempTargetFromHistory(time)
+            var value: Double
+            value = if (tt == null) {
+                Profile.fromMgdlToUnits((profile.getTargetLowMgdl(time) + profile.getTargetHighMgdl(time)) / 2, units)
+            } else {
+                Profile.fromMgdlToUnits(tt.target(), units)
+            }
+            if (lastTarget != value) {
+                if (lastTarget != -1.0) targetsSeriesArray.add(DataPoint(time.toDouble(), lastTarget))
+                targetsSeriesArray.add(DataPoint(time.toDouble(), value))
+            }
+            lastTarget = value
+            time += 5 * 60 * 1000L
+        }
+        // final point
+        targetsSeriesArray.add(DataPoint(toTime.toDouble(), lastTarget))
+        // create series
+        addSeries(LineGraphSeries(Array(targetsSeriesArray.size) { i -> targetsSeriesArray[i] }).also {
+            it.isDrawBackground = false
+            it.color = resourceHelper.gc(R.color.tempTargetBackground)
+            it.thickness = 2
+        })
+    }
+
+    fun addTreatments(fromTime: Long, endTime: Long) {
+        val filteredTreatments: MutableList<DataPointWithLabelInterface> = ArrayList()
+        val treatments = treatmentsPlugin.treatmentsFromHistory
+        for (tx in treatments.indices) {
+            val t = treatments[tx]
+            if (t.x < fromTime || t.x > endTime) continue
+            if (t.isSMB && !t.isValid) continue
+            t.y = getNearestBg(t.x.toLong())
+            filteredTreatments.add(t)
+        }
+
+        // ProfileSwitch
+        val profileSwitches = treatmentsPlugin.profileSwitchesFromHistory.list
+        for (tx in profileSwitches.indices) {
+            val t: DataPointWithLabelInterface = profileSwitches[tx]
+            if (t.x < fromTime || t.x > endTime) continue
+            filteredTreatments.add(t)
+        }
+
+        // Extended bolus
+        if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) {
+            val extendedBoluses = treatmentsPlugin.extendedBolusesFromHistory.list
+            for (tx in extendedBoluses.indices) {
+                val t: DataPointWithLabelInterface = extendedBoluses[tx]
+                if (t.x + t.duration < fromTime || t.x > endTime) continue
+                if (t.duration == 0L) continue
+                t.y = getNearestBg(t.x.toLong())
+                filteredTreatments.add(t)
+            }
+        }
+
+        // Careportal
+        val careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true)
+        for (tx in careportalEvents.indices) {
+            val t: DataPointWithLabelInterface = careportalEvents[tx]
+            if (t.x + t.duration < fromTime || t.x > endTime) continue
+            t.y = getNearestBg(t.x.toLong())
+            filteredTreatments.add(t)
+        }
+        addSeries(PointsWithLabelGraphSeries(Array(filteredTreatments.size) { i -> filteredTreatments[i] }))
+    }
+
+    private fun getNearestBg(date: Long): Double {
+        bgReadingsArray?.let { bgReadingsArray ->
+            for (r in bgReadingsArray.indices) {
+                val reading = bgReadingsArray[r]
+                if (reading.date > date) continue
+                return Profile.fromMgdlToUnits(reading.value, units)
+            }
+            return if (bgReadingsArray.isNotEmpty()) Profile.fromMgdlToUnits(bgReadingsArray[0].value, units) else Profile.fromMgdlToUnits(100.0, units)
+        } ?: return Profile.fromMgdlToUnits(100.0, units)
+    }
+
+    fun addActivity(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double) {
+        val actArrayHist: MutableList<ScaledDataPoint> = ArrayList()
+        val actArrayPred: MutableList<ScaledDataPoint> = ArrayList()
+        val now = System.currentTimeMillis().toDouble()
+        val actScale = Scale()
+        var total: IobTotal
+        var maxIAValue = 0.0
+        var time = fromTime
+        while (time <= toTime) {
+            val profile = profileFunction.getProfile(time)
+            if (profile == null) {
+                time += 5 * 60 * 1000L
+                continue
+            }
+            total = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time, profile)
+            val act: Double = total.activity
+            if (time <= now) actArrayHist.add(ScaledDataPoint(time, act, actScale)) else actArrayPred.add(ScaledDataPoint(time, act, actScale))
+            maxIAValue = max(maxIAValue, abs(act))
+            time += 5 * 60 * 1000L
+        }
+        addSeries(FixedLineGraphSeries(Array(actArrayHist.size) { i -> actArrayHist[i] }).also {
+            it.isDrawBackground = false
+            it.color = resourceHelper.gc(R.color.activity)
+            it.thickness = 3
+        })
+        addSeries(FixedLineGraphSeries(Array(actArrayPred.size) { i -> actArrayPred[i] }).also {
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = 3f
+                paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
+                paint.color = resourceHelper.gc(R.color.activity)
+            })
+        })
+        if (useForScale) {
+            maxY = maxIAValue
+            minY = -maxIAValue
+        }
+        actScale.setMultiplier(maxY * scale / maxIAValue)
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addIob(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double, showPrediction: Boolean) {
+        val iobSeries: FixedLineGraphSeries<ScaledDataPoint?>
+        val iobArray: MutableList<ScaledDataPoint> = ArrayList()
+        var maxIobValueFound = Double.MIN_VALUE
+        var lastIob = 0.0
+        val iobScale = Scale()
+        var time = fromTime
+        while (time <= toTime) {
+            val profile = profileFunction.getProfile(time)
+            var iob = 0.0
+            if (profile != null) iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time, profile).iob
+            if (abs(lastIob - iob) > 0.02) {
+                if (abs(lastIob - iob) > 0.2) iobArray.add(ScaledDataPoint(time, lastIob, iobScale))
+                iobArray.add(ScaledDataPoint(time, iob, iobScale))
+                maxIobValueFound = max(maxIobValueFound, abs(iob))
+                lastIob = iob
+            }
+            time += 5 * 60 * 1000L
+        }
+        iobSeries = FixedLineGraphSeries(Array(iobArray.size) { i -> iobArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
+            it.color = resourceHelper.gc(R.color.iob)
+            it.thickness = 3
+        }
+        if (showPrediction) {
+            val autosensData = iobCobCalculatorPlugin.getLastAutosensDataSynchronized("GraphData")
+            val lastAutosensResult = autosensData?.autosensResult ?: AutosensResult()
+            val isTempTarget = treatmentsPlugin.getTempTargetFromHistory(System.currentTimeMillis()) != null
+            val iobPred: MutableList<DataPointWithLabelInterface> = ArrayList()
+            val iobPredArray = iobCobCalculatorPlugin.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
+            for (i in iobPredArray) {
+                iobPred.add(i.setColor(resourceHelper.gc(R.color.iobPredAS)))
+                maxIobValueFound = max(maxIobValueFound, abs(i.iob))
+            }
+            addSeries(PointsWithLabelGraphSeries(Array(iobPred.size) { i -> iobPred[i] }))
+            val iobPred2: MutableList<DataPointWithLabelInterface> = ArrayList()
+            val iobPredArray2 = iobCobCalculatorPlugin.calculateIobArrayForSMB(AutosensResult(), SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
+            for (i in iobPredArray2) {
+                iobPred2.add(i.setColor(resourceHelper.gc(R.color.iobPred)))
+                maxIobValueFound = max(maxIobValueFound, abs(i.iob))
+            }
+            addSeries(PointsWithLabelGraphSeries(Array(iobPred2.size) { i -> iobPred2[i] }))
+            aapsLogger.debug(LTag.AUTOSENS, "IOB pred for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + iobCobCalculatorPlugin.iobArrayToString(iobPredArray))
+            aapsLogger.debug(LTag.AUTOSENS, "IOB pred for AS=" + DecimalFormatter.to2Decimal(1.0) + ": " + iobCobCalculatorPlugin.iobArrayToString(iobPredArray2))
+        }
+        if (useForScale) {
+            maxY = maxIobValueFound
+            minY = -maxIobValueFound
+        }
+        iobScale.setMultiplier(maxY * scale / maxIobValueFound)
+        addSeries(iobSeries)
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addCob(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double) {
+        val minFailOverActiveList: MutableList<DataPointWithLabelInterface> = ArrayList()
+        val cobArray: MutableList<ScaledDataPoint> = ArrayList()
+        var maxCobValueFound = 0.0
+        var lastCob = 0
+        val cobScale = Scale()
+        var time = fromTime
+        while (time <= toTime) {
+            iobCobCalculatorPlugin.getAutosensData(time)?.let { autosensData ->
+                val cob = autosensData.cob.toInt()
+                if (cob != lastCob) {
+                    if (autosensData.carbsFromBolus > 0) cobArray.add(ScaledDataPoint(time, lastCob.toDouble(), cobScale))
+                    cobArray.add(ScaledDataPoint(time, cob.toDouble(), cobScale))
+                    maxCobValueFound = max(maxCobValueFound, cob.toDouble())
+                    lastCob = cob
+                }
+                if (autosensData.failoverToMinAbsorbtionRate) {
+                    autosensData.setScale(cobScale)
+                    autosensData.setChartTime(time)
+                    minFailOverActiveList.add(autosensData)
+                }
+            }
+            time += 5 * 60 * 1000L
+        }
+
+        // COB
+        addSeries(FixedLineGraphSeries(Array(cobArray.size) { i -> cobArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.cob) //50%
+            it.color = resourceHelper.gc(R.color.cob)
+            it.thickness = 3
+        })
+        if (useForScale) {
+            maxY = maxCobValueFound
+            minY = 0.0
+        }
+        cobScale.setMultiplier(maxY * scale / maxCobValueFound)
+        addSeries(PointsWithLabelGraphSeries(Array(minFailOverActiveList.size) { i -> minFailOverActiveList[i] }))
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addDeviations(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double) {
+        class DeviationDataPoint(x: Double, y: Double, var color: Int, scale: Scale) : ScaledDataPoint(x, y, scale)
+
+        val devArray: MutableList<DeviationDataPoint> = ArrayList()
+        var maxDevValueFound = 0.0
+        val devScale = Scale()
+        var time = fromTime
+        while (time <= toTime) {
+            iobCobCalculatorPlugin.getAutosensData(time)?.let { autosensData ->
+                var color = resourceHelper.gc(R.color.deviationblack) // "="
+                if (autosensData.type == "" || autosensData.type == "non-meal") {
+                    if (autosensData.pastSensitivity == "C") color = resourceHelper.gc(R.color.deviationgrey)
+                    if (autosensData.pastSensitivity == "+") color = resourceHelper.gc(R.color.deviationgreen)
+                    if (autosensData.pastSensitivity == "-") color = resourceHelper.gc(R.color.deviationred)
+                } else if (autosensData.type == "uam") {
+                    color = resourceHelper.gc(R.color.uam)
+                } else if (autosensData.type == "csf") {
+                    color = resourceHelper.gc(R.color.deviationgrey)
+                }
+                devArray.add(DeviationDataPoint(time.toDouble(), autosensData.deviation, color, devScale))
+                maxDevValueFound = max(maxDevValueFound, abs(autosensData.deviation))
+            }
+            time += 5 * 60 * 1000L
+        }
+
+        // DEVIATIONS
+        addSeries(BarGraphSeries(Array(devArray.size) { i -> devArray[i] }).also {
+            it.setValueDependentColor { data: DeviationDataPoint -> data.color }
+        })
+        if (useForScale) {
+            maxY = maxDevValueFound
+            minY = -maxY
+        }
+        devScale.setMultiplier(maxY * scale / maxDevValueFound)
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addRatio(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double) {
+        val ratioArray: MutableList<ScaledDataPoint> = ArrayList()
+        var maxRatioValueFound = Double.MIN_VALUE
+        var minRatioValueFound = Double.MAX_VALUE
+        val ratioScale = Scale()
+        var time = fromTime
+        while (time <= toTime) {
+            iobCobCalculatorPlugin.getAutosensData(time)?.let { autosensData ->
+                ratioArray.add(ScaledDataPoint(time, autosensData.autosensResult.ratio - 1, ratioScale))
+                maxRatioValueFound = max(maxRatioValueFound, autosensData.autosensResult.ratio - 1)
+                minRatioValueFound = min(minRatioValueFound, autosensData.autosensResult.ratio - 1)
+            }
+            time += 5 * 60 * 1000L
+        }
+
+        // RATIOS
+        addSeries(LineGraphSeries(Array(ratioArray.size) { i -> ratioArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.ratio)
+            it.thickness = 3
+        })
+        if (useForScale) {
+            maxY = max(maxRatioValueFound, abs(minRatioValueFound))
+            minY = -maxY
+        }
+        ratioScale.setMultiplier(maxY * scale / max(maxRatioValueFound, abs(minRatioValueFound)))
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addDeviationSlope(fromTime: Long, toTime: Long, useForScale: Boolean, scale: Double) {
+        val dsMaxArray: MutableList<ScaledDataPoint> = ArrayList()
+        val dsMinArray: MutableList<ScaledDataPoint> = ArrayList()
+        var maxFromMaxValueFound = 0.0
+        var maxFromMinValueFound = 0.0
+        val dsMaxScale = Scale()
+        val dsMinScale = Scale()
+        var time = fromTime
+        while (time <= toTime) {
+            iobCobCalculatorPlugin.getAutosensData(time)?.let { autosensData ->
+                dsMaxArray.add(ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale))
+                dsMinArray.add(ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale))
+                maxFromMaxValueFound = max(maxFromMaxValueFound, abs(autosensData.slopeFromMaxDeviation))
+                maxFromMinValueFound = max(maxFromMinValueFound, abs(autosensData.slopeFromMinDeviation))
+            }
+            time += 5 * 60 * 1000L
+        }
+
+        // Slopes
+        addSeries(LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.devslopepos)
+            it.thickness = 3
+        })
+        addSeries(LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.devslopeneg)
+            it.thickness = 3
+        })
+        if (useForScale) {
+            maxY = max(maxFromMaxValueFound, maxFromMinValueFound)
+            minY = -maxY
+        }
+        dsMaxScale.setMultiplier(maxY * scale / maxFromMaxValueFound)
+        dsMinScale.setMultiplier(maxY * scale / maxFromMinValueFound)
+    }
+
+    // scale in % of vertical size (like 0.3)
+    fun addNowLine(now: Long) {
+        val nowPoints = arrayOf(
+            DataPoint(now.toDouble(), 0.0),
+            DataPoint(now.toDouble(), maxY)
+        )
+        addSeries(LineGraphSeries(nowPoints).also {
+            it.isDrawDataPoints = false
+            // custom paint to make a dotted line
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = 2f
+                paint.pathEffect = DashPathEffect(floatArrayOf(10f, 20f), 0f)
+                paint.color = Color.WHITE
+            })
+        })
+    }
+
+    fun formatAxis(fromTime: Long, endTime: Long) {
+        graph.viewport.setMaxX(endTime.toDouble())
+        graph.viewport.setMinX(fromTime.toDouble())
+        graph.viewport.isXAxisBoundsManual = true
+        graph.gridLabelRenderer.labelFormatter = TimeAsXAxisLabelFormatter("HH")
+        graph.gridLabelRenderer.numHorizontalLabels = 7 // only 7 because of the space
+    }
+
+    private fun addSeries(s: Series<*>) = series.add(s)
+
+    fun performUpdate() {
+        // clear old data
+        graph.series.clear()
+
+        // add pre calculated series
+        for (s in series) {
+            if (!s.isEmpty) {
+                s.onGraphViewAttached(graph)
+                graph.series.add(s)
+            }
+        }
+        var step = 1.0
+        if (maxY < 1) step = 0.1
+        graph.viewport.setMaxY(Round.ceilTo(maxY, step))
+        graph.viewport.setMinY(Round.floorTo(minY, step))
+        graph.viewport.isYAxisBoundsManual = true
+
+        // draw it
+        graph.onDataChanged(false, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java
index ac63790a71..8a00446092 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java
@@ -23,6 +23,12 @@ public class ScaledDataPoint implements DataPointInterface, Serializable {
         this.scale = scale;
     }
 
+    public ScaledDataPoint(long x, double y, Scale scale) {
+        this.x=x;
+        this.y=y;
+        this.scale = scale;
+    }
+
     public ScaledDataPoint(Date x, double y, Scale scale) {
         this.x = x.getTime();
         this.y = y;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
deleted file mode 100644
index 3d1189de2b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.notifications;
-
-import android.app.IntentService;
-import android.app.PendingIntent;
-import android.content.Intent;
-
-import androidx.annotation.Nullable;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-
-public class DismissNotificationService extends IntentService {
-
-    /**
-     * Creates an IntentService.  Invoked by your subclass's constructor.
-     *
-     * @param name Used to name the worker thread, important only for debugging.
-     */
-    public DismissNotificationService(String name) {
-        super(name);
-    }
-
-    public DismissNotificationService() {
-        super("DismissNotificationService");
-    }
-
-    @Override
-    protected void onHandleIntent(@Nullable Intent intent) {
-        RxBus.INSTANCE.send(new EventDismissNotification(intent.getIntExtra("alertID", -1)));
-    }
-
-    public static PendingIntent deleteIntent(int id) {
-        Intent intent = new Intent(MainApp.instance(), DismissNotificationService.class);
-        intent.putExtra("alertID", id);
-        return PendingIntent.getService(MainApp.instance(), id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt
new file mode 100644
index 0000000000..3d4e2d0600
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.general.overview.notifications
+
+import android.content.Intent
+import dagger.android.DaggerIntentService
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import javax.inject.Inject
+
+class DismissNotificationService : DaggerIntentService(DismissNotificationService::class.simpleName) {
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    override fun onHandleIntent(intent: Intent) {
+        rxBus.send(EventDismissNotification(intent.getIntExtra("alertID", -1)))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
index 28b0abd33d..3089ca1a7c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
@@ -1,21 +1,11 @@
 package info.nightscout.androidaps.plugins.general.overview.notifications;
 
-import java.util.Date;
+import androidx.annotation.NonNull;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
-import info.nightscout.androidaps.utils.SP;
-
-// Added by Rumen for debugging
-
-/**
- * Created by mike on 03.12.2016.
- */
+import info.nightscout.androidaps.utils.T;
 
 public class Notification {
+    // TODO join with NotificationWithAction after change to enums
     public static final int URGENT = 0;
     public static final int NORMAL = 1;
     public static final int LOW = 2;
@@ -30,7 +20,6 @@ public class Notification {
     public static final int PROFILE_NOT_SET_NOT_INITIALIZED = 5;
     public static final int FAILED_UDPATE_PROFILE = 6;
     public static final int BASAL_VALUE_BELOW_MINIMUM = 7;
-    public static final int OLD_NSCLIENT = 8;
     public static final int OLD_NS = 9;
     public static final int INVALID_PHONE_NUMBER = 10;
     public static final int INVALID_MESSAGE_BODY = 11;
@@ -75,24 +64,27 @@ public class Notification {
     public static final int DST_IN_24H = 50;
     public static final int DISKFULL = 51;
     public static final int OLDVERSION = 52;
-    public static final int USERMESSAGE = 53;
     public static final int OVER_24H_TIME_CHANGE_REQUESTED = 54;
     public static final int INVALID_VERSION = 55;
+    public static final int PERMISSION_SYSTEM_WINDOW = 56;
 
+    public static final int USERMESSAGE = 1000;
 
     public int id;
-    public Date date;
+    public long date;
     public String text;
     public int level;
-    public Date validTo = new Date(0);
+    public long validTo = 0;
 
-    public NSAlarm nsAlarm = null;
     public Integer soundId = null;
 
+    protected Runnable action = null;
+    protected int buttonText = 0;
+
     public Notification() {
     }
 
-    public Notification(int id, Date date, String text, int level, Date validTo) {
+    public Notification(int id, long date, String text, int level, long validTo) {
         this.id = id;
         this.date = date;
         this.text = text;
@@ -102,24 +94,22 @@ public class Notification {
 
     public Notification(int id, String text, int level, int validMinutes) {
         this.id = id;
-        this.date = new Date();
+        this.date = System.currentTimeMillis();
         this.text = text;
         this.level = level;
-        this.validTo = new Date(System.currentTimeMillis() + validMinutes * 60 * 1000L);
+        this.validTo = System.currentTimeMillis() + T.mins(validMinutes).msecs();
     }
 
-    public Notification(int id, String text, int level) {
+    public Notification(int id, @NonNull String text, int level) {
         this.id = id;
-        this.date = new Date();
+        this.date = System.currentTimeMillis();
         this.text = text;
         this.level = level;
-        this.validTo = new Date(0);
     }
 
     public Notification(int id) {
         this.id = id;
-        this.date = new Date();
-        this.validTo = new Date(0);
+        this.date = System.currentTimeMillis();
     }
 
     public Notification text(String text) {
@@ -136,102 +126,4 @@ public class Notification {
         this.soundId = soundId;
         return this;
     }
-
-    public Notification(NSAlarm nsAlarm) {
-        this.date = new Date();
-        this.validTo = new Date(0);
-        this.nsAlarm = nsAlarm;
-        switch (nsAlarm.getLevel()) {
-            case 0:
-                this.id = NSANNOUNCEMENT;
-                this.level = ANNOUNCEMENT;
-                this.text = nsAlarm.getMessage();
-                this.validTo = new Date(System.currentTimeMillis() + 60 * 60 * 1000L);
-                break;
-            case 1:
-                this.id = NSALARM;
-                this.level = NORMAL;
-                this.text = nsAlarm.getTile();
-                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false))
-                    this.soundId = R.raw.alarm;
-                break;
-            case 2:
-                this.id = NSURGENTALARM;
-                this.level = URGENT;
-                this.text = nsAlarm.getTile();
-                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false))
-                    this.soundId = R.raw.urgentalarm;
-                break;
-        }
-    }
-
-    public boolean isEnabled() {
-        if (nsAlarm == null)
-            return true;
-        if (level == ANNOUNCEMENT)
-            return true;
-        if (level == NORMAL && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false)) {
-            return true;
-        }
-        if (level == URGENT && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_urgent_staledata, false))
-            return true;
-        return false;
-    }
-
-    boolean isAlarmForLow() {
-        BgReading bgReading = MainApp.getDbHelper().lastBg();
-        if (bgReading == null)
-            return false;
-        Double threshold = NSSettingsStatus.getInstance().getThreshold("bgTargetTop");
-        if (threshold == null)
-            return false;
-        if (bgReading.value <= threshold)
-            return true;
-        return false;
-    }
-
-    boolean isAlarmForHigh() {
-        BgReading bgReading = MainApp.getDbHelper().lastBg();
-        if (bgReading == null)
-            return false;
-        Double threshold = NSSettingsStatus.getInstance().getThreshold("bgTargetBottom");
-        if (threshold == null)
-            return false;
-        if (bgReading.value >= threshold)
-            return true;
-        return false;
-    }
-
-    public static boolean isAlarmForStaleData() {
-        long snoozedTo = SP.getLong("snoozedTo", 0L);
-        if (snoozedTo != 0L) {
-            if (System.currentTimeMillis() < SP.getLong("snoozedTo", 0L)) {
-                //log.debug("Alarm is snoozed for next "+(SP.getLong("snoozedTo", 0L)-System.currentTimeMillis())/1000+" seconds");
-                return false;
-            }
-        }
-        BgReading bgReading = MainApp.getDbHelper().lastBg();
-        if (bgReading == null)
-            return false;
-        long bgReadingAgo = System.currentTimeMillis() - bgReading.date;
-        int bgReadingAgoMin = (int) (bgReadingAgo / (1000 * 60));
-        // Added for testing
-        // bgReadingAgoMin = 20;
-        boolean openAPSEnabledAlerts = NSSettingsStatus.getInstance().openAPSEnabledAlerts();
-        //log.debug("bgReadingAgoMin value is:"+bgReadingAgoMin);
-        //log.debug("Stale alarm snoozed to: "+(System.currentTimeMillis() - snoozedTo)/60000L);
-        Double threshold = NSSettingsStatus.getInstance().getThreshold("alarmTimeagoWarnMins");
-        //log.debug("OpenAPS Alerts enabled: "+openAPSEnabledAlerts);
-        // if no thresshold from Ns get it loccally
-        if (threshold == null) threshold = SP.getDouble(R.string.key_nsalarm_staledatavalue, 15D);
-        // No threshold of OpenAPS Alarm so using the one for BG
-        // Added OpenAPSEnabledAlerts to alarm check
-        if ((bgReadingAgoMin > threshold && SP.getBoolean(R.string.key_nsalarm_staledata, false)) || (bgReadingAgoMin > threshold && openAPSEnabledAlerts)) {
-            return true;
-        }
-        //snoozing for threshold
-        SP.putLong("snoozedTo", (long) (bgReading.date + (threshold * 1000 * 60L)));
-        //log.debug("New bg data is available Alarm is snoozed for next "+threshold*1000*60+" seconds");
-        return false;
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
deleted file mode 100644
index 8d1664c7e4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.notifications;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Objects;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-public class NotificationRecyclerViewAdapter extends RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder> {
-    private static Logger log = LoggerFactory.getLogger(L.NOTIFICATION);
-
-    private List<Notification> notificationsList;
-
-    NotificationRecyclerViewAdapter(List<Notification> notificationsList) {
-        this.notificationsList = notificationsList;
-    }
-
-    @NonNull
-    @Override
-    public NotificationsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-        View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.overview_notification_item, viewGroup, false);
-        return new NotificationsViewHolder(v);
-    }
-
-    @Override
-    public void onBindViewHolder(NotificationsViewHolder holder, int position) {
-        Notification notification = notificationsList.get(position);
-        holder.dismiss.setTag(notification);
-        if (notification instanceof NotificationWithAction)
-            holder.dismiss.setText(((NotificationWithAction) notification).buttonText);
-        else if (Objects.equals(notification.text, MainApp.gs(R.string.nsalarm_staledata)))
-            holder.dismiss.setText(R.string.snooze);
-
-        holder.text.setText(DateUtil.timeString(notification.date) + " " + notification.text);
-        if (notification.level == Notification.URGENT)
-            holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationUrgent));
-        else if (notification.level == Notification.NORMAL)
-            holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationNormal));
-        else if (notification.level == Notification.LOW)
-            holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationLow));
-        else if (notification.level == Notification.INFO)
-            holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationInfo));
-        else if (notification.level == Notification.ANNOUNCEMENT)
-            holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationAnnouncement));
-    }
-
-    @Override
-    public int getItemCount() {
-        return notificationsList.size();
-    }
-
-    @Override
-    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-    }
-
-    static class NotificationsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        CardView cv;
-        TextView text;
-        Button dismiss;
-
-        NotificationsViewHolder(View itemView) {
-            super(itemView);
-            cv = itemView.findViewById(R.id.notification_cardview);
-            text = itemView.findViewById(R.id.notification_text);
-            dismiss = itemView.findViewById(R.id.notification_dismiss);
-            dismiss.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View v) {
-            Notification notification = (Notification) v.getTag();
-            RxBus.INSTANCE.send(new EventDismissNotification(notification.id));
-            if (notification.nsAlarm != null) {
-                NSClientPlugin.getPlugin().handleClearAlarm(notification.nsAlarm, 60 * 60 * 1000L);
-            }
-            // Adding current time to snooze if we got staleData
-            if (L.isEnabled(L.NOTIFICATION))
-                log.debug("Notification text is: " + notification.text);
-            if (notification.text.equals(MainApp.gs(R.string.nsalarm_staledata))) {
-                NotificationStore nstore = OverviewPlugin.INSTANCE.getNotificationStore();
-                long msToSnooze = SP.getInt("nsalarm_staledatavalue", 15) * 60 * 1000L;
-                if (L.isEnabled(L.NOTIFICATION))
-                    log.debug("snooze nsalarm_staledatavalue in minutes is " + SP.getInt("nsalarm_staledatavalue", 15) + "\n in ms is: " + msToSnooze + " currentTimeMillis is: " + System.currentTimeMillis());
-                nstore.snoozeTo(System.currentTimeMillis() + (SP.getInt("nsalarm_staledatavalue", 15) * 60 * 1000L));
-            }
-            if (notification instanceof NotificationWithAction) {
-                ((NotificationWithAction) notification).action.run();
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
deleted file mode 100644
index 9685445ce0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.notifications;
-
-import android.annotation.SuppressLint;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.AudioManager;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Build;
-import android.view.View;
-
-import androidx.core.app.NotificationCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.services.AlarmSoundService;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 03.12.2016.
- */
-
-public class NotificationStore {
-
-    private static final String CHANNEL_ID = "AndroidAPS-Overview";
-
-    private static Logger log = LoggerFactory.getLogger(L.NOTIFICATION);
-    public List<Notification> store = new ArrayList<>();
-    private boolean usesChannels;
-
-    public NotificationStore() {
-        createNotificationChannel();
-    }
-
-    public class NotificationComparator implements Comparator<Notification> {
-        @Override
-        public int compare(Notification o1, Notification o2) {
-            return o1.level - o2.level;
-        }
-    }
-
-    public synchronized boolean add(Notification n) {
-        if (L.isEnabled(L.NOTIFICATION))
-            log.debug("Notification received: " + n.text);
-        for (Notification storeNotification : store) {
-            if (storeNotification.id == n.id) {
-                storeNotification.date = n.date;
-                storeNotification.validTo = n.validTo;
-                return false;
-            }
-        }
-        store.add(n);
-
-        if (SP.getBoolean(MainApp.gs(R.string.key_raise_notifications_as_android_notifications), false) && !(n instanceof NotificationWithAction)) {
-            raiseSystemNotification(n);
-            if (usesChannels && n.soundId != null && n.soundId != 0) {
-                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);
-            }
-
-        } else {
-            if (n.soundId != null && n.soundId != 0) {
-                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);
-            }
-        }
-
-        Collections.sort(store, new NotificationComparator());
-        return true;
-    }
-
-    public synchronized boolean remove(int id) {
-        for (int i = 0; i < store.size(); i++) {
-            if (store.get(i).id == id) {
-                if (store.get(i).soundId != null) {
-                    Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
-                    MainApp.instance().stopService(alarm);
-                }
-                store.remove(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    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()) {
-                store.remove(i);
-                i--;
-            }
-        }
-    }
-
-    void snoozeTo(long timeToSnooze) {
-        if (L.isEnabled(L.NOTIFICATION))
-            log.debug("Snoozing alarm until: " + timeToSnooze);
-        SP.putLong("snoozedTo", timeToSnooze);
-    }
-
-    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());
-            add(notification);
-            if (L.isEnabled(L.NOTIFICATION))
-                log.debug("Snoozed to current time and added back notification!");
-        }
-    }
-
-    private void raiseSystemNotification(Notification n) {
-        Context context = MainApp.instance().getApplicationContext();
-        NotificationManager mgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        Bitmap largeIcon = BitmapFactory.decodeResource(context.getResources(), MainApp.getIcon());
-        int smallIcon = MainApp.getNotificationIcon();
-        Uri sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
-        NotificationCompat.Builder notificationBuilder =
-                new NotificationCompat.Builder(context, CHANNEL_ID)
-                        .setSmallIcon(smallIcon)
-                        .setLargeIcon(largeIcon)
-                        .setContentText(n.text)
-                        .setPriority(NotificationCompat.PRIORITY_MAX)
-                        .setDeleteIntent(DismissNotificationService.deleteIntent(n.id));
-        if (n.level == Notification.URGENT) {
-            notificationBuilder.setVibrate(new long[]{1000, 1000, 1000, 1000})
-                    .setContentTitle(MainApp.gs(R.string.urgent_alarm))
-                    .setSound(sound, AudioManager.STREAM_ALARM);
-        } else {
-            notificationBuilder.setVibrate(new long[]{0, 100, 50, 100, 50})
-                    .setContentTitle(MainApp.gs(R.string.info))
-            ;
-        }
-        mgr.notify(n.id, notificationBuilder.build());
-    }
-
-    private void createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            usesChannels = true;
-            NotificationManager mNotificationManager =
-                    (NotificationManager) MainApp.instance().getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
-            @SuppressLint("WrongConstant") NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
-                    CHANNEL_ID,
-                    NotificationManager.IMPORTANCE_HIGH);
-            mNotificationManager.createNotificationChannel(channel);
-        }
-    }
-
-    public synchronized void updateNotifications(RecyclerView notificationsView) {
-        removeExpired();
-        unSnooze();
-        if (store.size() > 0) {
-            NotificationRecyclerViewAdapter adapter = new NotificationRecyclerViewAdapter(cloneStore());
-            notificationsView.setAdapter(adapter);
-            notificationsView.setVisibility(View.VISIBLE);
-        } else {
-            notificationsView.setVisibility(View.GONE);
-        }
-    }
-
-    private synchronized List<Notification> cloneStore() {
-        List<Notification> clone = new ArrayList<>(store.size());
-        clone.addAll(store);
-        return clone;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
new file mode 100644
index 0000000000..a14f33e33c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
@@ -0,0 +1,220 @@
+package info.nightscout.androidaps.plugins.general.overview.notifications
+
+import android.annotation.SuppressLint
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.media.AudioManager
+import android.media.RingtoneManager
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.core.app.NotificationCompat
+import androidx.recyclerview.widget.RecyclerView
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationStore @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context
+) {
+
+    var store: MutableList<Notification> = ArrayList()
+    private var usesChannels = false
+
+    companion object {
+        private const val CHANNEL_ID = "AndroidAPS-Overview"
+    }
+
+    inner class NotificationComparator : Comparator<Notification> {
+        override fun compare(o1: Notification, o2: Notification): Int {
+            return o1.level - o2.level
+        }
+    }
+
+    @Synchronized
+    fun add(n: Notification): Boolean {
+        aapsLogger.debug(LTag.NOTIFICATION, "Notification received: " + n.text)
+        for (storeNotification in store) {
+            if (storeNotification.id == n.id) {
+                storeNotification.date = n.date
+                storeNotification.validTo = n.validTo
+                return false
+            }
+        }
+        store.add(n)
+        if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false) && n !is NotificationWithAction) {
+            raiseSystemNotification(n)
+            if (usesChannels && n.soundId != null && n.soundId != 0) {
+                val alarm = Intent(context, AlarmSoundService::class.java)
+                alarm.putExtra("soundid", n.soundId)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm)
+            }
+        } else {
+            if (n.soundId != null && n.soundId != 0) {
+                val alarm = Intent(context, AlarmSoundService::class.java)
+                alarm.putExtra("soundid", n.soundId)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm)
+            }
+        }
+        Collections.sort(store, NotificationComparator())
+        return true
+    }
+
+    @Synchronized fun remove(id: Int): Boolean {
+        for (i in store.indices) {
+            if (store[i].id == id) {
+                if (store[i].soundId != null) {
+                    val alarm = Intent(context, AlarmSoundService::class.java)
+                    context.stopService(alarm)
+                }
+                store.removeAt(i)
+                return true
+            }
+        }
+        return false
+    }
+
+    @Synchronized private fun removeExpired() {
+        var i = 0
+        while (i < store.size) {
+            val n = store[i]
+            if (n.validTo != 0L && n.validTo < System.currentTimeMillis()) {
+                store.removeAt(i)
+                i--
+            }
+            i++
+        }
+    }
+
+    private fun raiseSystemNotification(n: Notification) {
+        val mgr = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val largeIcon = resourceHelper.decodeResource(resourceHelper.getIcon())
+        val smallIcon = resourceHelper.getNotificationIcon()
+        val sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
+        val notificationBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(smallIcon)
+            .setLargeIcon(largeIcon)
+            .setContentText(n.text)
+            .setPriority(NotificationCompat.PRIORITY_MAX)
+            .setDeleteIntent(deleteIntent(n.id))
+        if (n.level == Notification.URGENT) {
+            notificationBuilder.setVibrate(longArrayOf(1000, 1000, 1000, 1000))
+                .setContentTitle(resourceHelper.gs(R.string.urgent_alarm))
+                .setSound(sound, AudioManager.STREAM_ALARM)
+        } else {
+            notificationBuilder.setVibrate(longArrayOf(0, 100, 50, 100, 50))
+                .setContentTitle(resourceHelper.gs(R.string.info))
+        }
+        mgr.notify(n.id, notificationBuilder.build())
+    }
+
+    private fun deleteIntent(id: Int): PendingIntent {
+        val intent = Intent(context, DismissNotificationService::class.java)
+        intent.putExtra("alertID", id)
+        return PendingIntent.getService(context, id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+
+    fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            usesChannels = true
+            val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            @SuppressLint("WrongConstant") val channel = NotificationChannel(CHANNEL_ID,
+                CHANNEL_ID,
+                NotificationManager.IMPORTANCE_HIGH)
+            mNotificationManager.createNotificationChannel(channel)
+        }
+    }
+
+    @Synchronized
+    fun updateNotifications(notificationsView: RecyclerView) {
+        removeExpired()
+//        unSnooze()
+        if (store.size > 0) {
+            val adapter = NotificationRecyclerViewAdapter(cloneStore())
+            notificationsView.adapter = adapter
+            notificationsView.visibility = View.VISIBLE
+        } else {
+            notificationsView.visibility = View.GONE
+        }
+    }
+
+    @Synchronized
+    private fun cloneStore(): List<Notification> {
+        val clone: MutableList<Notification> = ArrayList(store.size)
+        clone.addAll(store)
+        return clone
+    }
+
+    /*
+        private fun unSnooze() {
+            if (sp.getBoolean(R.string.key_nsalarm_staledata, false)) {
+                val notification = Notification(Notification.NSALARM, resourceHelper.gs(R.string.nsalarm_staledata), Notification.URGENT)
+                sp.putLong(R.string.key_snoozedTo, System.currentTimeMillis())
+                add(notification)
+                aapsLogger.debug(LTag.NOTIFICATION, "Snoozed to current time and added back notification!")
+            }
+        }
+    */
+    inner class NotificationRecyclerViewAdapter internal constructor(private val notificationsList: List<Notification>) : RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder>() {
+
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NotificationsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.overview_notification_item, viewGroup, false)
+            return NotificationsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: NotificationsViewHolder, position: Int) {
+            val notification = notificationsList[position]
+            holder.dismiss.tag = notification
+            if (notification.buttonText != 0) holder.dismiss.setText(notification.buttonText)
+            else holder.dismiss.setText(R.string.snooze)
+            @Suppress("SetTextI18n")
+            holder.text.text = DateUtil.timeString(notification.date) + " " + notification.text
+            when (notification.level) {
+                Notification.URGENT       -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationUrgent))
+                Notification.NORMAL       -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationNormal))
+                Notification.LOW          -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationLow))
+                Notification.INFO         -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationInfo))
+                Notification.ANNOUNCEMENT -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationAnnouncement))
+            }
+        }
+
+        override fun getItemCount(): Int {
+            return notificationsList.size
+        }
+
+        inner class NotificationsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var cv: CardView = itemView.findViewById(R.id.notification_cardview)
+            var text: TextView = itemView.findViewById(R.id.notification_text)
+            var dismiss: Button = itemView.findViewById(R.id.notification_dismiss)
+
+            init {
+                dismiss.setOnClickListener {
+                    val notification = it.tag as Notification
+                    rxBus.send(EventDismissNotification(notification.id))
+                    notification.action?.run()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt
new file mode 100644
index 0000000000..3d198dfc0b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.general.overview.notifications
+
+class NotificationUserMessage  (text :String): Notification() {
+
+    init {
+        var hash = text.hashCode()
+        if (hash < USERMESSAGE) hash += USERMESSAGE
+        id = hash
+        this.text = text
+        level = URGENT
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.java
deleted file mode 100644
index c117559a61..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.notifications;
-
-import androidx.annotation.IntegerRes;
-
-public class NotificationWithAction extends Notification {
-
-    Runnable action;
-    int buttonText;
-
-    public NotificationWithAction(int id, String text, int level) {
-        super(id, text, level);
-    }
-
-    public void action(int buttonText, Runnable action) {
-        this.buttonText = buttonText;
-        this.action = action;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
new file mode 100644
index 0000000000..c5670699c9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.general.overview.notifications
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+class NotificationWithAction constructor(
+    injector: HasAndroidInjector
+) : Notification() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
+    @Inject lateinit var nsSettingsStatus: NSSettingsStatus
+    @Inject lateinit var nsClientPlugin: NSClientPlugin
+
+    private var nsAlarm: NSAlarm? = null
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    constructor(injector: HasAndroidInjector, id: Int, text: String, level: Int) : this(injector) {
+        this.id = id
+        date = System.currentTimeMillis()
+        this.text = text
+        this.level = level
+    }
+
+    constructor (injector: HasAndroidInjector, nsAlarm: NSAlarm) : this(injector) {
+        this.nsAlarm = nsAlarm
+        date = System.currentTimeMillis()
+        when (nsAlarm.level()) {
+            0 -> {
+                id = NSANNOUNCEMENT
+                level = ANNOUNCEMENT
+                text = nsAlarm.message()
+                validTo = System.currentTimeMillis() + T.mins(60).msecs()
+            }
+
+            1 -> {
+                id = NSALARM
+                level = NORMAL
+                text = nsAlarm.title()
+                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.alarm
+            }
+
+            2 -> {
+                id = NSURGENTALARM
+                level = URGENT
+                text = nsAlarm.title()
+                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.urgentalarm
+            }
+        }
+        buttonText = R.string.snooze
+        action = Runnable {
+            nsClientPlugin.handleClearAlarm(nsAlarm, 60 * 60 * 1000L)
+            // Adding current time to snooze if we got staleData
+            aapsLogger.debug(LTag.NOTIFICATION, "Notification text is: $text")
+            val msToSnooze = sp.getInt(R.string.key_nsalarm_staledatavalue, 15) * 60 * 1000L
+            aapsLogger.debug(LTag.NOTIFICATION, "snooze nsalarm_staledatavalue in minutes is ${T.msecs(msToSnooze).mins()} currentTimeMillis is: ${System.currentTimeMillis()}")
+            sp.putLong(R.string.key_snoozedTo, System.currentTimeMillis() + msToSnooze)
+        }
+    }
+
+    fun action(buttonText: Int, action: Runnable) {
+        this.buttonText = buttonText
+        this.action = action
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
deleted file mode 100644
index 007298ac76..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.general.persistentNotification;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-import androidx.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Keeps AndroidAPS in foreground state, so it won't be terminated by Android nor get restricted by the background execution limits
- */
-public class DummyService extends Service {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @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().
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().getLastNotification());
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.PUMP)) log.debug("EventAppExit received");
-                    stopSelf();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        if (L.isEnabled(L.CORE)) log.debug("onDestroy");
-        disposable.clear();
-        super.onDestroy();
-        stopForeground(true);
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().getLastNotification());
-        return START_STICKY;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
new file mode 100644
index 0000000000..e83b31a1e2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.general.persistentNotification
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+import dagger.android.DaggerService
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+
+/**
+ * Keeps AndroidAPS in foreground state, so it won't be terminated by Android nor get restricted by the background execution limits
+ */
+class DummyService : DaggerService() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
+    private val disposable = CompositeDisposable()
+
+    override fun onBind(intent: Intent): IBinder? = null
+
+    override fun 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().
+        startForeground(mainApp.notificationId(), mainApp.notification)
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                aapsLogger.debug(LTag.CORE, "EventAppExit received")
+                stopSelf()
+            }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    override fun onDestroy() {
+        aapsLogger.debug(LTag.CORE, "onDestroy")
+        disposable.clear()
+        super.onDestroy()
+        stopForeground(true)
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        startForeground(mainApp.notificationId(), mainApp.notification)
+        return Service.START_STICKY
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
deleted file mode 100644
index 1cc2b1426a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package info.nightscout.androidaps.plugins.general.persistentNotification;
-
-import android.annotation.SuppressLint;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Build;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.RemoteInput;
-import androidx.core.app.TaskStackBuilder;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainActivity;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventNewBasalProfile;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.events.EventTreatmentChange;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-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;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Created by adrian on 23/12/16.
- */
-
-public class PersistentNotificationPlugin extends PluginBase {
-
-    private CompositeDisposable disposable  = new CompositeDisposable();
-
-    private static PersistentNotificationPlugin plugin;
-    private Notification notification;
-
-    public static PersistentNotificationPlugin getPlugin() {
-        if (plugin == null) plugin = new PersistentNotificationPlugin();
-        return plugin;
-    }
-
-    public static final String CHANNEL_ID = "AndroidAPS-Ongoing";
-
-    public static final int ONGOING_NOTIFICATION_ID = 4711;
-
-    /// For Android Auto
-    /// Intents are not declared in manifest and not consumed, this is intentionally because actually we can't do anything with
-    private static final String PACKAGE = "info.nightscout";
-    private static final String READ_ACTION =
-            "info.nightscout.androidaps.ACTION_MESSAGE_READ";
-    private static final String REPLY_ACTION =
-            "info.nightscout.androidaps.ACTION_MESSAGE_REPLY";
-    private static final String CONVERSATION_ID = "conversation_id";
-    private static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
-    /// End Android Auto
-
-
-    private PersistentNotificationPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .neverVisible(true)
-                .pluginName(R.string.ongoingnotificaction)
-                .enableByDefault(true)
-                .alwaysEnabled(true)
-                .showInList(false)
-                .description(R.string.description_persistent_notification)
-        );
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        createNotificationChannel(); // make sure channels exist before triggering updates through the bus
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventRefreshOverview.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventExtendedBolusChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTempBasalChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTreatmentChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventInitializationChanged.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventNewBasalProfile.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> triggerNotificationUpdate(false),
-                        FabricPrivacy::logException
-                ));
-        triggerNotificationUpdate(true);
-    }
-
-    private void createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
-            NotificationManager mNotificationManager =
-                    (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
-            @SuppressLint("WrongConstant") NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
-                    CHANNEL_ID,
-                    NotificationManager.IMPORTANCE_HIGH);
-            mNotificationManager.createNotificationChannel(channel);
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        disposable.clear();
-        MainApp.instance().stopService(new Intent(MainApp.instance(), DummyService.class));
-        super.onStop();
-    }
-
-    private void triggerNotificationUpdate(boolean boot) {
-        updateNotification(boot);
-        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));
-    }
-
-    private void updateNotification(boolean boot) {
-        String line1;
-        String line2 = null;
-        String line3 = null;
-        NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder = null;
-
-        if (boot) {
-            line1 = MainApp.gs(R.string.loading);
-        } else if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ProfileFunctions.getInstance().isProfileValid("Notification")) {
-            String line1_aa;
-            String units = ProfileFunctions.getSystemUnits();
-
-
-            BgReading lastBG = DatabaseHelper.lastBg();
-            GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
-            if (lastBG != null) {
-                line1 = line1_aa = lastBG.valueToUnitsToString(units);
-                if (glucoseStatus != null) {
-                    line1 += "  Δ" + deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                            + " avgΔ" + deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units);
-                    line1_aa += "  " + lastBG.directionToSymbol();
-                } else {
-                    line1 += " " +
-                            MainApp.gs(R.string.old_data) +
-                            " ";
-                    line1_aa += line1 + ".";
-                }
-            } else {
-                line1 = line1_aa = MainApp.gs(R.string.missed_bg_readings);
-            }
-
-            TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
-            if (activeTemp != null) {
-                line1 += "  " + activeTemp.toStringShort();
-                line1_aa += "  " + activeTemp.toStringShort() + ".";
-            }
-
-            //IOB
-            TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
-            TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
-            IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
-            IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
-
-
-            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() + ".";
-
-
-            line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
-            String line3_aa = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h.";
-
-
-            line3 += " - " + ProfileFunctions.getInstance().getProfileName();
-            line3_aa += " - " + ProfileFunctions.getInstance().getProfileName() + ".";
-
-            /// For Android Auto
-            Intent msgReadIntent = new Intent()
-                    .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                    .setAction(READ_ACTION)
-                    .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
-                    .setPackage(PACKAGE);
-
-            PendingIntent msgReadPendingIntent =
-                    PendingIntent.getBroadcast(MainApp.instance(),
-                            ONGOING_NOTIFICATION_ID,
-                            msgReadIntent,
-                            PendingIntent.FLAG_UPDATE_CURRENT);
-
-            Intent msgReplyIntent = new Intent()
-                    .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                    .setAction(REPLY_ACTION)
-                    .putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
-                    .setPackage(PACKAGE);
-
-            PendingIntent msgReplyPendingIntent = PendingIntent.getBroadcast(
-                    MainApp.instance(),
-                    ONGOING_NOTIFICATION_ID,
-                    msgReplyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-
-            // Build a RemoteInput for receiving voice input from devices
-            RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY).build();
-
-            // Create the UnreadConversation
-            unreadConversationBuilder =
-                    new NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
-                            .setLatestTimestamp(System.currentTimeMillis())
-                            .setReadPendingIntent(msgReadPendingIntent)
-                            .setReplyAction(msgReplyPendingIntent, remoteInput);
-
-            /// Add dot to produce a "more natural sounding result"
-            unreadConversationBuilder.addMessage(line3_aa);
-            /// End Android Auto
-        } else {
-            line1 = MainApp.gs(R.string.noprofileset);
-        }
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(MainApp.instance(), CHANNEL_ID);
-        builder.setOngoing(true);
-        builder.setOnlyAlertOnce(true);
-        builder.setCategory(NotificationCompat.CATEGORY_STATUS);
-        builder.setSmallIcon(MainApp.getNotificationIcon());
-        Bitmap largeIcon = BitmapFactory.decodeResource(MainApp.instance().getResources(), MainApp.getIcon());
-        builder.setLargeIcon(largeIcon);
-        if (line1 != null) builder.setContentTitle(line1);
-        if (line2 != null) builder.setContentText(line2);
-        if (line3 != null) builder.setSubText(line3);
-        /// Android Auto
-        if (unreadConversationBuilder != null) {
-            builder.extend(new NotificationCompat.CarExtender()
-                    .setUnreadConversation(unreadConversationBuilder.build()));
-        }
-        /// End Android Auto
-
-
-        Intent resultIntent = new Intent(MainApp.instance(), MainActivity.class);
-
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(MainApp.instance());
-        stackBuilder.addParentStack(MainActivity.class);
-        stackBuilder.addNextIntent(resultIntent);
-        PendingIntent resultPendingIntent =
-                stackBuilder.getPendingIntent(
-                        0,
-                        PendingIntent.FLAG_UPDATE_CURRENT
-                );
-        builder.setContentIntent(resultPendingIntent);
-        NotificationManager mNotificationManager =
-                (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
-
-        android.app.Notification notification = builder.build();
-        mNotificationManager.notify(ONGOING_NOTIFICATION_ID, notification);
-        this.notification = notification;
-    }
-
-    private String deltastring(double deltaMGDL, double deltaMMOL, String units) {
-        String deltastring = "";
-        if (deltaMGDL >= 0) {
-            deltastring += "+";
-        } else {
-            deltastring += "-";
-
-        }
-        if (units.equals(Constants.MGDL)) {
-            deltastring += DecimalFormatter.to1Decimal(Math.abs(deltaMGDL));
-        } else {
-            deltastring += DecimalFormatter.to1Decimal(Math.abs(deltaMMOL));
-        }
-        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 {
-            throw new IllegalStateException("Notification is null");
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
new file mode 100644
index 0000000000..991599ae46
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -0,0 +1,237 @@
+package info.nightscout.androidaps.plugins.general.persistentNotification
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.RemoteInput
+import androidx.core.app.TaskStackBuilder
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainActivity
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+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.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PersistentNotificationPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private var profileFunction: ProfileFunction,
+    private var fabricPrivacy: FabricPrivacy,
+    private var activePlugins: ActivePluginProvider,
+    private var iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private var rxBus: RxBusWrapper,
+    private var context: Context,
+    private var mainApp: MainApp
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .neverVisible(true)
+    .pluginName(R.string.ongoingnotificaction)
+    .enableByDefault(true)
+    .alwaysEnabled(true)
+    .showInList(false)
+    .description(R.string.description_persistent_notification),
+    aapsLogger, resourceHelper, injector
+) {
+
+    // For Android Auto
+    // Intents are not declared in manifest and not consumed, this is intentionally because actually we can't do anything with
+    private val PACKAGE = "info.nightscout"
+    private val READ_ACTION = "info.nightscout.androidaps.ACTION_MESSAGE_READ"
+    private val REPLY_ACTION = "info.nightscout.androidaps.ACTION_MESSAGE_REPLY"
+    private val CONVERSATION_ID = "conversation_id"
+    private val EXTRA_VOICE_REPLY = "extra_voice_reply"
+    // End Android auto
+
+    private val disposable = CompositeDisposable()
+
+    override fun onStart() {
+        super.onStart()
+        createNotificationChannel() // make sure channels exist before triggering updates through the bus
+        disposable.add(rxBus
+            .toObservable(EventRefreshOverview::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTreatmentChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventInitializationChanged::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventNewBasalProfile::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ triggerNotificationUpdate() }) { fabricPrivacy.logException(it) })
+        triggerNotificationUpdate()
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val channel = NotificationChannel(mainApp.channelId(), mainApp.channelId() as CharSequence, NotificationManager.IMPORTANCE_HIGH)
+            mNotificationManager.createNotificationChannel(channel)
+        }
+    }
+
+    override fun onStop() {
+        disposable.clear()
+        context.stopService(Intent(context, DummyService::class.java))
+        super.onStop()
+    }
+
+    private fun triggerNotificationUpdate() {
+        updateNotification()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            context.startForegroundService(Intent(context, DummyService::class.java))
+        else
+            context.startService(Intent(context, DummyService::class.java))
+    }
+
+    private fun updateNotification() {
+        val pump = activePlugins.activePump
+        var line1: String?
+        var line2: String? = null
+        var line3: String? = null
+        var unreadConversationBuilder: NotificationCompat.CarExtender.UnreadConversation.Builder? = null
+        if (profileFunction.isProfileValid("Notification")) {
+            var line1_aa: String
+            val units = profileFunction.getUnits()
+            val lastBG = iobCobCalculatorPlugin.lastBg()
+            val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+            if (lastBG != null) {
+                line1_aa = lastBG.valueToUnitsToString(units)
+                line1 = line1_aa
+                if (glucoseStatus != null) {
+                    line1 += ("  Δ" + Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+                        + " avgΔ" + Profile.toSignedUnitsString(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units))
+                    line1_aa += "  " + lastBG.directionToSymbol()
+                } else {
+                    line1 += " " +
+                        resourceHelper.gs(R.string.old_data) +
+                        " "
+                    line1_aa += "$line1."
+                }
+            } else {
+                line1_aa = resourceHelper.gs(R.string.missed_bg_readings)
+                line1 = line1_aa
+            }
+            val activeTemp = activePlugins.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
+            if (activeTemp != null) {
+                line1 += "  " + activeTemp.toStringShort()
+                line1_aa += "  " + activeTemp.toStringShort() + "."
+            }
+            //IOB
+            activePlugins.activeTreatments.updateTotalIOBTreatments()
+            activePlugins.activeTreatments.updateTotalIOBTempBasals()
+            val bolusIob = activePlugins.activeTreatments.lastCalculationTreatments.round()
+            val basalIob = activePlugins.activeTreatments.lastCalculationTempBasals.round()
+            line2 = resourceHelper.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + resourceHelper.gs(R.string.cob) + ": " + iobCobCalculatorPlugin.getCobInfo(false, "PersistentNotificationPlugin").generateCOBString()
+            val line2_aa = resourceHelper.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + resourceHelper.gs(R.string.cob) + ": " + iobCobCalculatorPlugin.getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + "."
+            line3 = DecimalFormatter.to2Decimal(pump.baseBasalRate) + " U/h"
+            var line3_aa = DecimalFormatter.to2Decimal(pump.baseBasalRate) + " U/h."
+            line3 += " - " + profileFunction.getProfileName()
+            line3_aa += " - " + profileFunction.getProfileName() + "."
+            /// For Android Auto
+            val msgReadIntent = Intent()
+                .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                .setAction(READ_ACTION)
+                .putExtra(CONVERSATION_ID, mainApp.notificationId())
+                .setPackage(PACKAGE)
+            val msgReadPendingIntent = PendingIntent.getBroadcast(context,
+                mainApp.notificationId(),
+                msgReadIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+            val msgReplyIntent = Intent()
+                .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                .setAction(REPLY_ACTION)
+                .putExtra(CONVERSATION_ID, mainApp.notificationId())
+                .setPackage(PACKAGE)
+            val msgReplyPendingIntent = PendingIntent.getBroadcast(
+                context,
+                mainApp.notificationId(),
+                msgReplyIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+            // Build a RemoteInput for receiving voice input from devices
+            val remoteInput = RemoteInput.Builder(EXTRA_VOICE_REPLY).build()
+            // Create the UnreadConversation
+            unreadConversationBuilder = NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
+                .setLatestTimestamp(System.currentTimeMillis())
+                .setReadPendingIntent(msgReadPendingIntent)
+                .setReplyAction(msgReplyPendingIntent, remoteInput)
+            /// Add dot to produce a "more natural sounding result"
+            unreadConversationBuilder.addMessage(line3_aa)
+            /// End Android Auto
+        } else {
+            line1 = resourceHelper.gs(R.string.noprofileset)
+        }
+        val builder = NotificationCompat.Builder(context, mainApp.channelId())
+        builder.setOngoing(true)
+        builder.setOnlyAlertOnce(true)
+        builder.setCategory(NotificationCompat.CATEGORY_STATUS)
+        builder.setSmallIcon(resourceHelper.getNotificationIcon())
+        builder.setLargeIcon(resourceHelper.decodeResource(resourceHelper.getIcon()))
+        if (line1 != null) builder.setContentTitle(line1)
+        if (line2 != null) builder.setContentText(line2)
+        if (line3 != null) builder.setSubText(line3)
+        /// Android Auto
+        if (unreadConversationBuilder != null) {
+            builder.extend(NotificationCompat.CarExtender()
+                .setUnreadConversation(unreadConversationBuilder.build()))
+        }
+        /// End Android Auto
+        val resultIntent = Intent(context, MainActivity::class.java)
+        val stackBuilder = TaskStackBuilder.create(context)
+        stackBuilder.addParentStack(MainActivity::class.java)
+        stackBuilder.addNextIntent(resultIntent)
+        val resultPendingIntent = stackBuilder.getPendingIntent(
+            0,
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
+        builder.setContentIntent(resultPendingIntent)
+        val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val notification = builder.build()
+        mNotificationManager.notify(mainApp.notificationId(), notification)
+        mainApp.notification = notification
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
index 48e816928f..942613c872 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
@@ -1,38 +1,61 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.DateUtil
-import org.slf4j.LoggerFactory
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 
-class AuthRequest internal constructor(val plugin: SmsCommunicatorPlugin, var requester: Sms, requestText: String, var confirmCode: String, val action: SmsAction) {
-    private val log = LoggerFactory.getLogger(L.SMS)
+class AuthRequest internal constructor(
+    injector: HasAndroidInjector,
+    var requester: Sms,
+    requestText: String,
+    var confirmCode: String,
+    val action: SmsAction) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var otp : OneTimePassword
 
     private val date = DateUtil.now()
     private var processed = false
 
     init {
-        plugin.sendSMS(Sms(requester.phoneNumber, requestText))
+        injector.androidInjector().inject(this)
+        smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, requestText))
+    }
+
+    private fun codeIsValid(toValidate: String) : Boolean {
+        return if (otp.isEnabled()) {
+            otp.checkOTP(toValidate) == OneTimePasswordValidationResult.OK
+        } else {
+            confirmCode == toValidate
+        }
     }
 
     fun action(codeReceived: String) {
         if (processed) {
-            if (L.isEnabled(L.SMS)) log.debug("Already processed")
+            aapsLogger.debug(LTag.SMS, "Already processed")
             return
         }
-        if (confirmCode != codeReceived) {
+        if (!codeIsValid(codeReceived)) {
             processed = true
-            if (L.isEnabled(L.SMS)) log.debug("Wrong code")
-            plugin.sendSMS(Sms(requester.phoneNumber, R.string.sms_wrongcode))
+            aapsLogger.debug(LTag.SMS, "Wrong code")
+            smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, resourceHelper.gs(R.string.sms_wrongcode)))
             return
         }
         if (DateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
             processed = true
-            if (L.isEnabled(L.SMS)) log.debug("Processing confirmed SMS: " + requester.text)
+            aapsLogger.debug(LTag.SMS, "Processing confirmed SMS: " + requester.text)
             action.run()
             return
         }
-        if (L.isEnabled(L.SMS)) log.debug("Timed out SMS: " + requester.text)
+        aapsLogger.debug(LTag.SMS, "Timed out SMS: " + requester.text)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt
index 868620be2e..bab25dfe3e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt
@@ -27,13 +27,6 @@ class Sms {
         sent = true
     }
 
-    internal constructor(phoneNumber: String, textId: Int) {
-        this.phoneNumber = phoneNumber
-        text = MainApp.gs(textId)
-        date = DateUtil.now()
-        sent = true
-    }
-
     override fun toString(): String {
         return "SMS from $phoneNumber: $text"
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
index 90ec078931..94dd9965f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@@ -4,20 +4,26 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.extensions.plusAssign
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.smscommunicator_fragment.*
 import java.util.*
+import javax.inject.Inject
 import kotlin.math.max
 
-class SmsCommunicatorFragment : Fragment() {
+class SmsCommunicatorFragment : DaggerFragment() {
+    @Inject lateinit var fabricPrivacy : FabricPrivacy
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+
     private val disposable = CompositeDisposable()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -28,10 +34,10 @@ class SmsCommunicatorFragment : Fragment() {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(toObservable(EventSmsCommunicatorUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }) { FabricPrivacy.logException(it) }
-        )
+        disposable += rxBus
+            .toObservable(EventSmsCommunicatorUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
         updateGui()
     }
 
@@ -47,20 +53,22 @@ class SmsCommunicatorFragment : Fragment() {
                 return (object1.date - object2.date).toInt()
             }
         }
-        Collections.sort(SmsCommunicatorPlugin.messages, CustomComparator())
+        Collections.sort(smsCommunicatorPlugin.messages, CustomComparator())
         val messagesToShow = 40
-        val start = max(0, SmsCommunicatorPlugin.messages.size - messagesToShow)
+        val start = max(0, smsCommunicatorPlugin.messages.size - messagesToShow)
         var logText = ""
-        for (x in start until SmsCommunicatorPlugin.messages.size) {
-            val sms = SmsCommunicatorPlugin.messages[x]
+        for (x in start until smsCommunicatorPlugin.messages.size) {
+            val sms = smsCommunicatorPlugin.messages[x]
             when {
-                sms.ignored -> {
+                sms.ignored  -> {
                     logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + "░ " + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
+
                 sms.received -> {
                     logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
-                sms.sent -> {
+
+                sms.sent     -> {
                     logText += DateUtil.timeString(sms.date) + " &gt;&gt;&gt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 87f7d832da..350e5f08db 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -1,60 +1,77 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
 import android.content.Intent
-import android.preference.EditTextPreference
-import android.preference.Preference
-import android.preference.Preference.OnPreferenceChangeListener
-import android.preference.PreferenceFragment
 import android.telephony.SmsManager
 import android.telephony.SmsMessage
 import android.text.TextUtils
-import com.andreabaccega.widget.ValidatingEditTextPreference
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TempTarget
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBus.send
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import org.apache.commons.lang3.StringUtils
-import org.slf4j.LoggerFactory
 import java.text.Normalizer
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object SmsCommunicatorPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .fragmentClass(SmsCommunicatorFragment::class.java.name)
-        .pluginName(R.string.smscommunicator)
-        .shortName(R.string.smscommunicator_shortname)
-        .preferencesId(R.xml.pref_smscommunicator)
-        .description(R.string.description_sms_communicator)
+@Singleton
+class SmsCommunicatorPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val constraintChecker: ConstraintChecker,
+    private val rxBus: RxBusWrapper,
+    private val profileFunction: ProfileFunction,
+    private val fabricPrivacy: FabricPrivacy,
+    private val activePlugin: ActivePluginProvider,
+    private val commandQueue: CommandQueueProvider,
+    private val loopPlugin: LoopPlugin,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val xdripCalibrations: XdripCalibrations,
+    private var otp: OneTimePassword
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(SmsCommunicatorFragment::class.java.name)
+    .pluginName(R.string.smscommunicator)
+    .shortName(R.string.smscommunicator_shortname)
+    .preferencesId(R.xml.pref_smscommunicator)
+    .description(R.string.description_sms_communicator),
+    aapsLogger, resourceHelper, injector
 ) {
-    private val log = LoggerFactory.getLogger(L.SMS)
+
     private val disposable = CompositeDisposable()
     var allowedNumbers: MutableList<String> = ArrayList()
     var messageToConfirm: AuthRequest? = null
@@ -62,32 +79,29 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     var messages = ArrayList<Sms>()
 
     val commands = mapOf(
-            "BG" to "BG",
-            "LOOP" to "LOOP STOP/DISABLE/START/ENABLE/RESUME/STATUS\nLOOP SUSPEND 20",
-            "TREATMENTS" to "TREATMENTS REFRESH",
-            "NSCLIENT" to "NSCLIENT RESTART",
-            "PUMP" to "PUMP",
-            "BASAL" to "BASAL STOP/CANCEL\nBASAL 0.3\nBASAL 0.3 20\nBASAL 30%\nBASAL 30% 20\n",
-            "BOLUS" to "BOLUS 1.2\nBOLUS 1.2 MEAL",
-            "EXTENDED" to "EXTENDED STOP/CANCEL\nEXTENDED 2 120",
-            "CAL" to "CAL 5.6",
-            "PROFILE" to "PROFILE STATUS/LIST\nPROFILE 1\nPROFILE 2 30",
-            "TARGET" to "TARGET MEAL/ACTIVITY/HYPO/STOP",
-            "SMS" to "SMS DISABLE/STOP",
-            "CARBS" to "CARBS 12\nCARBS 12 23:05\nCARBS 12 11:05PM",
-            "HELP" to "HELP\nHELP command"
+        "BG" to "BG",
+        "LOOP" to "LOOP STOP/DISABLE/START/ENABLE/RESUME/STATUS\nLOOP SUSPEND 20",
+        "TREATMENTS" to "TREATMENTS REFRESH",
+        "NSCLIENT" to "NSCLIENT RESTART",
+        "PUMP" to "PUMP",
+        "BASAL" to "BASAL STOP/CANCEL\nBASAL 0.3\nBASAL 0.3 20\nBASAL 30%\nBASAL 30% 20\n",
+        "BOLUS" to "BOLUS 1.2\nBOLUS 1.2 MEAL",
+        "EXTENDED" to "EXTENDED STOP/CANCEL\nEXTENDED 2 120",
+        "CAL" to "CAL 5.6",
+        "PROFILE" to "PROFILE STATUS/LIST\nPROFILE 1\nPROFILE 2 30",
+        "TARGET" to "TARGET MEAL/ACTIVITY/HYPO/STOP",
+        "SMS" to "SMS DISABLE/STOP",
+        "CARBS" to "CARBS 12\nCARBS 12 23:05\nCARBS 12 11:05PM",
+        "HELP" to "HELP\nHELP command"
     )
 
-    init {
-        processSettings(null)
-    }
-
     override fun onStart() {
+        processSettings(null)
         super.onStart()
-        disposable.add(toObservable(EventPreferenceChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ event: EventPreferenceChange? -> processSettings(event) }) { throwable: Throwable? -> FabricPrivacy.logException(throwable) }
-        )
+        disposable += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event: EventPreferenceChange? -> processSettings(event) }) { fabricPrivacy.logException(it) }
     }
 
     override fun onStop() {
@@ -95,30 +109,30 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
         super.onStop()
     }
 
-    override fun preprocessPreferences(preferenceFragment: PreferenceFragment) {
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
-        val distance = preferenceFragment.findPreference(MainApp.gs(R.string.key_smscommunicator_remotebolusmindistance)) as ValidatingEditTextPreference?
-                ?: return
-        val allowedNumbers = preferenceFragment.findPreference(MainApp.gs(R.string.key_smscommunicator_allowednumbers)) as EditTextPreference?
-                ?: return
+        val distance = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_smscommunicator_remotebolusmindistance)) as ValidatingEditTextPreference?
+            ?: return
+        val allowedNumbers = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_smscommunicator_allowednumbers)) as EditTextPreference?
+            ?: return
         if (!areMoreNumbers(allowedNumbers.text)) {
-            distance.title = (MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
-                    + ".\n"
-                    + MainApp.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+            distance.title = (resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+                + ".\n"
+                + resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
             distance.isEnabled = false
         } else {
-            distance.title = MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+            distance.title = resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
             distance.isEnabled = true
         }
-        allowedNumbers.onPreferenceChangeListener = OnPreferenceChangeListener { _: Preference?, newValue: Any ->
+        allowedNumbers.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any ->
             if (!areMoreNumbers(newValue as String)) {
                 distance.text = (Constants.remoteBolusMinDistance / (60 * 1000L)).toString()
-                distance.title = (MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
-                        + ".\n"
-                        + MainApp.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+                distance.title = (resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+                    + ".\n"
+                    + resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
                 distance.isEnabled = false
             } else {
-                distance.title = MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+                distance.title = resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
                 distance.isEnabled = true
             }
             true
@@ -130,20 +144,20 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
         if (pref is EditTextPreference) {
             val editTextPref = pref
             if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.text == null || TextUtils.isEmpty(editTextPref.text.trim { it <= ' ' }))) {
-                pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary))
+                pref.setSummary(resourceHelper.gs(R.string.smscommunicator_allowednumbers_summary))
             }
         }
     }
 
     private fun processSettings(ev: EventPreferenceChange?) {
-        if (ev == null || ev.isChanged(R.string.key_smscommunicator_allowednumbers)) {
-            val settings = SP.getString(R.string.key_smscommunicator_allowednumbers, "")
+        if (ev == null || ev.isChanged(resourceHelper, R.string.key_smscommunicator_allowednumbers)) {
+            val settings = sp.getString(R.string.key_smscommunicator_allowednumbers, "")
             allowedNumbers.clear()
             val substrings = settings.split(";").toTypedArray()
             for (number in substrings) {
                 val cleaned = number.replace("\\s+".toRegex(), "")
                 allowedNumbers.add(cleaned)
-                log.debug("Found allowed number: $cleaned")
+                aapsLogger.debug(LTag.SMS, "Found allowed number: $cleaned")
             }
         }
     }
@@ -175,109 +189,115 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
 
     fun processSms(receivedSms: Sms) {
         if (!isEnabled(PluginType.GENERAL)) {
-            log.debug("Ignoring SMS. Plugin disabled.")
+            aapsLogger.debug(LTag.SMS, "Ignoring SMS. Plugin disabled.")
             return
         }
         if (!isAllowedNumber(receivedSms.phoneNumber)) {
-            log.debug("Ignoring SMS from: " + receivedSms.phoneNumber + ". Sender not allowed")
+            aapsLogger.debug(LTag.SMS, "Ignoring SMS from: " + receivedSms.phoneNumber + ". Sender not allowed")
             receivedSms.ignored = true
             messages.add(receivedSms)
-            send(EventSmsCommunicatorUpdateGui())
+            rxBus.send(EventSmsCommunicatorUpdateGui())
             return
         }
-        val pump = ConfigBuilderPlugin.getPlugin().activePump ?: return
+        val pump = activePlugin.activePump
         messages.add(receivedSms)
-        log.debug(receivedSms.toString())
+        aapsLogger.debug(LTag.SMS, receivedSms.toString())
         val splitted = receivedSms.text.split(Regex("\\s+")).toTypedArray()
-        val remoteCommandsAllowed = SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
+        val remoteCommandsAllowed = sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
+
+        val minDistance =
+            if (areMoreNumbers(sp.getString(R.string.key_smscommunicator_allowednumbers, "")))
+                T.mins(sp.getLong(R.string.key_smscommunicator_remotebolusmindistance, T.msecs(Constants.remoteBolusMinDistance).mins())).msecs()
+            else Constants.remoteBolusMinDistance
+
         if (splitted.isNotEmpty() && isCommand(splitted[0].toUpperCase(Locale.getDefault()), receivedSms.phoneNumber)) {
             when (splitted[0].toUpperCase(Locale.getDefault())) {
-                "BG" ->
+                "BG"         ->
                     if (splitted.size == 1) processBG(receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "LOOP" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "LOOP"       ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2 || splitted.size == 3) processLOOP(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 "TREATMENTS" ->
                     if (splitted.size == 2) processTREATMENTS(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "NSCLIENT" ->
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "NSCLIENT"   ->
                     if (splitted.size == 2) processNSCLIENT(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "PUMP" ->
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "PUMP"       ->
                     if (splitted.size == 1) processPUMP(receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "PROFILE" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "PROFILE"    ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2 || splitted.size == 3) processPROFILE(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "BASAL" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "BASAL"      ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2 || splitted.size == 3) processBASAL(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "EXTENDED" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "EXTENDED"   ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2 || splitted.size == 3) processEXTENDED(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "BOLUS" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
-                    else if (splitted.size == 2 && DateUtil.now() - lastRemoteBolusTime < Constants.remoteBolusMinDistance) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotebolusnotallowed))
-                    else if (splitted.size == 2 && pump.isSuspended) sendSMS(Sms(receivedSms.phoneNumber, R.string.pumpsuspended))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "BOLUS"      ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    else if (splitted.size == 2 && DateUtil.now() - lastRemoteBolusTime < minDistance) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotebolusnotallowed)))
+                    else if (splitted.size == 2 && pump.isSuspended) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.pumpsuspended)))
                     else if (splitted.size == 2 || splitted.size == 3) processBOLUS(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "CARBS" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "CARBS"      ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2 || splitted.size == 3) processCARBS(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "CAL" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "CAL"        ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2) processCAL(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "TARGET" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "TARGET"     ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2) processTARGET(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "SMS" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "SMS"        ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (splitted.size == 2) processSMS(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                "HELP" ->
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                "HELP"       ->
                     if (splitted.size == 1 || splitted.size == 2) processHELP(splitted, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-                else ->
+                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                else         ->
                     if (messageToConfirm?.requester?.phoneNumber == receivedSms.phoneNumber) {
                         messageToConfirm?.action(splitted[0])
                         messageToConfirm = null
-                    } else sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand))
+                    } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_unknowncommand)))
             }
         }
-        send(EventSmsCommunicatorUpdateGui())
+        rxBus.send(EventSmsCommunicatorUpdateGui())
     }
 
     private fun processBG(receivedSms: Sms) {
-        val actualBG = DatabaseHelper.actualBg()
-        val lastBG = DatabaseHelper.lastBg()
+        val actualBG = iobCobCalculatorPlugin.actualBg()
+        val lastBG = iobCobCalculatorPlugin.lastBg()
         var reply = ""
-        val units = ProfileFunctions.getSystemUnits()
+        val units = profileFunction.getUnits()
         if (actualBG != null) {
-            reply = MainApp.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "
+            reply = resourceHelper.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "
         } else if (lastBG != null) {
             val agoMsec = System.currentTimeMillis() - lastBG.date
             val agoMin = (agoMsec / 60.0 / 1000.0).toInt()
-            reply = MainApp.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.gs(R.string.sms_minago), agoMin) + ", "
+            reply = resourceHelper.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(resourceHelper.gs(R.string.sms_minago), agoMin) + ", "
         }
-        val glucoseStatus = GlucoseStatus.getGlucoseStatusData()
-        if (glucoseStatus != null) reply += MainApp.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
-        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments()
-        val bolusIob = TreatmentsPlugin.getPlugin().lastCalculationTreatments.round()
-        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals()
-        val basalIob = TreatmentsPlugin.getPlugin().lastCalculationTempBasals.round()
-        val cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB")
-        reply += (MainApp.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
-                + MainApp.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
-                + MainApp.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
-                + MainApp.gs(R.string.cob) + ": " + cobInfo.generateCOBString())
+        val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+        if (glucoseStatus != null) reply += resourceHelper.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
+        activePlugin.activeTreatments.updateTotalIOBTreatments()
+        val bolusIob = activePlugin.activeTreatments.lastCalculationTreatments.round()
+        activePlugin.activeTreatments.updateTotalIOBTempBasals()
+        val basalIob = activePlugin.activeTreatments.lastCalculationTempBasals.round()
+        val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "SMS COB")
+        reply += (resourceHelper.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+            + resourceHelper.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+            + resourceHelper.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
+            + resourceHelper.gs(R.string.cob) + ": " + cobInfo.generateCOBString())
         sendSMS(Sms(receivedSms.phoneNumber, reply))
         receivedSms.processed = true
     }
@@ -285,74 +305,74 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     private fun processLOOP(splitted: Array<String>, receivedSms: Sms) {
         when (splitted[1].toUpperCase(Locale.getDefault())) {
             "DISABLE", "STOP" -> {
-                val loopPlugin = LoopPlugin.getPlugin()
                 if (loopPlugin.isEnabled(PluginType.LOOP)) {
                     loopPlugin.setPluginEnabled(PluginType.LOOP, false)
-                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                    commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
-                            send(EventRefreshOverview("SMS_LOOP_STOP"))
-                            val replyText = MainApp.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
-                                    MainApp.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                            rxBus.send(EventRefreshOverview("SMS_LOOP_STOP"))
+                            val replyText = resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
+                                resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
                             sendSMS(Sms(receivedSms.phoneNumber, replyText))
                         }
                     })
                 } else
-                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisdisabled))
+                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopisdisabled)))
                 receivedSms.processed = true
             }
+
             "ENABLE", "START" -> {
-                val loopPlugin = LoopPlugin.getPlugin()
                 if (!loopPlugin.isEnabled(PluginType.LOOP)) {
                     loopPlugin.setPluginEnabled(PluginType.LOOP, true)
-                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loophasbeenenabled))
-                    send(EventRefreshOverview("SMS_LOOP_START"))
+                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)))
+                    rxBus.send(EventRefreshOverview("SMS_LOOP_START"))
                 } else
-                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisenabled))
+                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopisenabled)))
                 receivedSms.processed = true
             }
-            "STATUS" -> {
-                val loopPlugin = LoopPlugin.getPlugin()
+
+            "STATUS"          -> {
                 val reply = if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    if (loopPlugin.isSuspended()) String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
-                    else MainApp.gs(R.string.smscommunicator_loopisenabled)
+                    if (loopPlugin.isSuspended()) String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
+                    else resourceHelper.gs(R.string.smscommunicator_loopisenabled)
                 } else
-                    MainApp.gs(R.string.smscommunicator_loopisdisabled)
+                    resourceHelper.gs(R.string.smscommunicator_loopisdisabled)
                 sendSMS(Sms(receivedSms.phoneNumber, reply))
                 receivedSms.processed = true
             }
-            "RESUME" -> {
-                LoopPlugin.getPlugin().suspendTo(0)
-                send(EventRefreshOverview("SMS_LOOP_RESUME"))
-                NSUpload.uploadOpenAPSOffline(0.0)
-                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopresumed))
+
+            "RESUME"          -> {
+                rxBus.send(EventRefreshOverview("SMS_LOOP_RESUME"))
+                loopPlugin.createOfflineEvent(0)
+                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopresumed)))
             }
-            "SUSPEND" -> {
+
+            "SUSPEND"         -> {
                 var duration = 0
                 if (splitted.size == 3) duration = SafeParse.stringToInt(splitted[2])
                 duration = Math.max(0, duration)
                 duration = Math.min(180, duration)
                 if (duration == 0) {
                     receivedSms.processed = true
-                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_wrongduration))
+                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
                     return
                 } else {
                     val passCode = generatePasscode()
-                    val reply = String.format(MainApp.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
+                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
                     receivedSms.processed = true
-                    messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(duration) {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(duration) {
                         override fun run() {
-                            ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                            commandQueue.cancelTempBasal(true, object : Callback() {
                                 override fun run() {
                                     if (result.success) {
-                                        LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + anInteger() * 60L * 1000)
-                                        NSUpload.uploadOpenAPSOffline(anInteger() * 60.toDouble())
-                                        send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
-                                        val replyText = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
-                                                MainApp.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                                        loopPlugin.suspendTo(System.currentTimeMillis() + anInteger() * 60L * 1000)
+                                        loopPlugin.createOfflineEvent(anInteger() * 60)
+                                        rxBus.send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
+                                        val replyText = resourceHelper.gs(R.string.smscommunicator_loopsuspended) + " " +
+                                            resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
                                         sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     } else {
-                                        var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed)
-                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                        var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                        replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                     }
                                 }
@@ -361,27 +381,28 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                     })
                 }
             }
-            else -> sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+
+            else              -> sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         }
     }
 
     private fun processTREATMENTS(splitted: Array<String>, receivedSms: Sms) {
         if (splitted[1].toUpperCase(Locale.getDefault()) == "REFRESH") {
-            TreatmentsPlugin.getPlugin().service.resetTreatments()
-            send(EventNSClientRestart())
+            (activePlugin.activeTreatments as TreatmentsPlugin).service.resetTreatments()
+            rxBus.send(EventNSClientRestart())
             sendSMS(Sms(receivedSms.phoneNumber, "TREATMENTS REFRESH SENT"))
             receivedSms.processed = true
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processNSCLIENT(splitted: Array<String>, receivedSms: Sms) {
         if (splitted[1].toUpperCase(Locale.getDefault()) == "RESTART") {
-            send(EventNSClientRestart())
+            rxBus.send(EventNSClientRestart())
             sendSMS(Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"))
             receivedSms.processed = true
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processHELP(splitted: Array<String>, receivedSms: Sms) {
@@ -394,20 +415,18 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                 receivedSms.processed = true
             }
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processPUMP(receivedSms: Sms) {
-        ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("SMS", object : Callback() {
+        commandQueue.readStatus("SMS", object : Callback() {
             override fun run() {
-                val pump = ConfigBuilderPlugin.getPlugin().activePump
+                val pump = activePlugin.activePump
                 if (result.success) {
-                    if (pump != null) {
-                        val reply = pump.shortStatus(true)
-                        sendSMS(Sms(receivedSms.phoneNumber, reply))
-                    }
+                    val reply = pump.shortStatus(true)
+                    sendSMS(Sms(receivedSms.phoneNumber, reply))
                 } else {
-                    val reply = MainApp.gs(R.string.readstatusfailed)
+                    val reply = resourceHelper.gs(R.string.readstatusfailed)
                     sendSMS(Sms(receivedSms.phoneNumber, reply))
                 }
             }
@@ -416,23 +435,19 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     }
 
     private fun processPROFILE(splitted: Array<String>, receivedSms: Sms) { // load profiles
-        val anInterface = ConfigBuilderPlugin.getPlugin().activeProfileInterface
-        if (anInterface == null) {
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.notconfigured))
-            receivedSms.processed = true
-            return
-        }
+        val anInterface = activePlugin.activeProfileInterface
         val store = anInterface.profile
         if (store == null) {
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.notconfigured))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.notconfigured)))
             receivedSms.processed = true
             return
         }
+        val profileName = profileFunction.getProfileName()
         val list = store.getProfileList()
         if (splitted[1].toUpperCase(Locale.getDefault()) == "STATUS") {
-            sendSMS(Sms(receivedSms.phoneNumber, ProfileFunctions.getInstance().profileName))
+            sendSMS(Sms(receivedSms.phoneNumber, profileName))
         } else if (splitted[1].toUpperCase(Locale.getDefault()) == "LIST") {
-            if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, R.string.invalidprofile))
+            if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.invalidprofile)))
             else {
                 var reply = ""
                 for (i in list.indices) {
@@ -446,21 +461,21 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
             val pindex = SafeParse.stringToInt(splitted[1])
             var percentage = 100
             if (splitted.size > 2) percentage = SafeParse.stringToInt(splitted[2])
-            if (pindex > list.size) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-            else if (percentage == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-            else if (pindex == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            if (pindex > list.size) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else if (percentage == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else if (pindex == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
             else {
                 val profile = store.getSpecificProfile(list[pindex - 1] as String)
-                if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
+                if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
                 else {
                     val passCode = generatePasscode()
-                    val reply = String.format(MainApp.gs(R.string.smscommunicator_profilereplywithcode), list[pindex - 1], percentage, passCode)
+                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_profilereplywithcode), list[pindex - 1], percentage, passCode)
                     receivedSms.processed = true
                     val finalPercentage = percentage
-                    messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(list[pindex - 1] as String, finalPercentage) {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(list[pindex - 1] as String, finalPercentage) {
                         override fun run() {
-                            ProfileFunctions.doProfileSwitch(store, list[pindex - 1] as String, 0, finalPercentage, 0, DateUtil.now())
-                            sendSMS(Sms(receivedSms.phoneNumber, R.string.profileswitchcreated))
+                            activePlugin.activeTreatments.doProfileSwitch(store, list[pindex - 1] as String, 0, finalPercentage, 0, DateUtil.now())
+                            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.profileswitchcreated)))
                         }
                     })
                 }
@@ -472,19 +487,19 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     private fun processBASAL(splitted: Array<String>, receivedSms: Sms) {
         if (splitted[1].toUpperCase(Locale.getDefault()) == "CANCEL" || splitted[1].toUpperCase(Locale.getDefault()) == "STOP") {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
-                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                    commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcanceled)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcanceled)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                             } else {
-                                var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
                             }
                         }
@@ -495,27 +510,27 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
             var tempBasalPct = SafeParse.stringToInt(StringUtils.removeEnd(splitted[1], "%"))
             var duration = 30
             if (splitted.size > 2) duration = SafeParse.stringToInt(splitted[2])
-            val profile = ProfileFunctions.getInstance().profile
-            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
-            else if (tempBasalPct == 0 && splitted[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            val profile = profileFunction.getProfile()
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
+            else if (tempBasalPct == 0 && splitted[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
             else {
-                tempBasalPct = MainApp.getConstraintChecker().applyBasalPercentConstraints(Constraint(tempBasalPct), profile).value()
+                tempBasalPct = constraintChecker.applyBasalPercentConstraints(Constraint(tempBasalPct), profile).value()
                 val passCode = generatePasscode()
-                val reply = String.format(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(tempBasalPct, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(tempBasalPct, duration) {
                     override fun run() {
-                        ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(anInteger(), secondInteger(), true, profile, object : Callback() {
+                        commandQueue.tempBasalPercent(anInteger(), secondInteger(), true, profile, object : Callback() {
                             override fun run() {
                                 if (result.success) {
                                     var replyText: String
-                                    replyText = if (result.isPercent) String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration) else String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    replyText = if (result.isPercent) String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration) else String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                 } else {
-                                    var replyText = MainApp.gs(R.string.smscommunicator_tempbasalfailed)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalfailed)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                 }
                             }
@@ -527,27 +542,27 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
             var tempBasal = SafeParse.stringToDouble(splitted[1])
             var duration = 30
             if (splitted.size > 2) duration = SafeParse.stringToInt(splitted[2])
-            val profile = ProfileFunctions.getInstance().profile
-            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
-            else if (tempBasal == 0.0 && splitted[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
-            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            val profile = profileFunction.getProfile()
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
+            else if (tempBasal == 0.0 && splitted[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
             else {
-                tempBasal = MainApp.getConstraintChecker().applyBasalConstraints(Constraint(tempBasal), profile).value()
+                tempBasal = constraintChecker.applyBasalConstraints(Constraint(tempBasal), profile).value()
                 val passCode = generatePasscode()
-                val reply = String.format(MainApp.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(tempBasal, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(tempBasal, duration) {
                     override fun run() {
-                        ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(aDouble(), secondInteger(), true, profile, object : Callback() {
+                        commandQueue.tempBasalAbsolute(aDouble(), secondInteger(), true, profile, object : Callback() {
                             override fun run() {
                                 if (result.success) {
-                                    var replyText = if (result.isPercent) String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration)
-                                    else String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    var replyText = if (result.isPercent) String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration)
+                                    else String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                 } else {
-                                    var replyText = MainApp.gs(R.string.smscommunicator_tempbasalfailed)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalfailed)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                 }
                             }
@@ -561,19 +576,19 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     private fun processEXTENDED(splitted: Array<String>, receivedSms: Sms) {
         if (splitted[1].toUpperCase(Locale.getDefault()) == "CANCEL" || splitted[1].toUpperCase(Locale.getDefault()) == "STOP") {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
-                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelExtended(object : Callback() {
+                    commandQueue.cancelExtended(object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = MainApp.gs(R.string.smscommunicator_extendedcanceled)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = resourceHelper.gs(R.string.smscommunicator_extendedcanceled)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                             } else {
-                                var replyText = MainApp.gs(R.string.smscommunicator_extendedcancelfailed)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = resourceHelper.gs(R.string.smscommunicator_extendedcancelfailed)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
                             }
                         }
@@ -581,27 +596,28 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                 }
             })
         } else if (splitted.size != 3) {
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         } else {
             var extended = SafeParse.stringToDouble(splitted[1])
             val duration = SafeParse.stringToInt(splitted[2])
-            extended = MainApp.getConstraintChecker().applyExtendedBolusConstraints(Constraint(extended)).value()
-            if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            extended = constraintChecker.applyExtendedBolusConstraints(Constraint(extended)).value()
+            if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
             else {
                 val passCode = generatePasscode()
-                val reply = String.format(MainApp.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(extended, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(extended, duration) {
                     override fun run() {
-                        ConfigBuilderPlugin.getPlugin().commandQueue.extendedBolus(aDouble(), secondInteger(), object : Callback() {
+                        commandQueue.extendedBolus(aDouble(), secondInteger(), object : Callback() {
                             override fun run() {
                                 if (result.success) {
-                                    var replyText = String.format(MainApp.gs(R.string.smscommunicator_extendedset), aDouble, duration)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    var replyText = String.format(resourceHelper.gs(R.string.smscommunicator_extendedset), aDouble, duration)
+                                    if (Config.APS) replyText += "\n" + resourceHelper.gs(R.string.loopsuspended)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                 } else {
-                                    var replyText = MainApp.gs(R.string.smscommunicator_extendedfailed)
-                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    var replyText = resourceHelper.gs(R.string.smscommunicator_extendedfailed)
+                                    replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                 }
                             }
@@ -615,63 +631,63 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
     private fun processBOLUS(splitted: Array<String>, receivedSms: Sms) {
         var bolus = SafeParse.stringToDouble(splitted[1])
         val isMeal = splitted.size > 2 && splitted[2].equals("MEAL", ignoreCase = true)
-        bolus = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(bolus)).value()
+        bolus = constraintChecker.applyBolusConstraints(Constraint(bolus)).value()
         if (splitted.size == 3 && !isMeal) {
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         } else if (bolus > 0.0) {
             val passCode = generatePasscode()
             val reply = if (isMeal)
-                String.format(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode), bolus, passCode)
+                String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusreplywithcode), bolus, passCode)
             else
-                String.format(MainApp.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
+                String.format(resourceHelper.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(bolus) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(bolus) {
                 override fun run() {
                     val detailedBolusInfo = DetailedBolusInfo()
                     detailedBolusInfo.insulin = aDouble()
                     detailedBolusInfo.source = Source.USER
-                    ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                    commandQueue.bolus(detailedBolusInfo, object : Callback() {
                         override fun run() {
                             val resultSuccess = result.success
                             val resultBolusDelivered = result.bolusDelivered
-                            ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("SMS", object : Callback() {
+                            commandQueue.readStatus("SMS", object : Callback() {
                                 override fun run() {
                                     if (resultSuccess) {
                                         var replyText = if (isMeal)
-                                            String.format(MainApp.gs(R.string.smscommunicator_mealbolusdelivered), resultBolusDelivered)
+                                            String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered), resultBolusDelivered)
                                         else
-                                            String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered)
-                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                            String.format(resourceHelper.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered)
+                                        replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         lastRemoteBolusTime = DateUtil.now()
                                         if (isMeal) {
-                                            ProfileFunctions.getInstance().profile?.let { currentProfile ->
-                                                var eatingSoonTTDuration = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration)
+                                            profileFunction.getProfile()?.let { currentProfile ->
+                                                var eatingSoonTTDuration = sp.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration)
                                                 eatingSoonTTDuration =
-                                                        if (eatingSoonTTDuration > 0) eatingSoonTTDuration
-                                                        else Constants.defaultEatingSoonTTDuration
-                                                var eatingSoonTT = SP.getDouble(R.string.key_eatingsoon_target, if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol else Constants.defaultEatingSoonTTmgdl)
+                                                    if (eatingSoonTTDuration > 0) eatingSoonTTDuration
+                                                    else Constants.defaultEatingSoonTTDuration
+                                                var eatingSoonTT = sp.getDouble(R.string.key_eatingsoon_target, if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol else Constants.defaultEatingSoonTTmgdl)
                                                 eatingSoonTT =
-                                                        if (eatingSoonTT > 0) eatingSoonTT
-                                                        else if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol
-                                                        else Constants.defaultEatingSoonTTmgdl
+                                                    if (eatingSoonTT > 0) eatingSoonTT
+                                                    else if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol
+                                                    else Constants.defaultEatingSoonTTmgdl
                                                 val tempTarget = TempTarget()
-                                                        .date(System.currentTimeMillis())
-                                                        .duration(eatingSoonTTDuration)
-                                                        .reason(MainApp.gs(R.string.eatingsoon))
-                                                        .source(Source.USER)
-                                                        .low(Profile.toMgdl(eatingSoonTT, currentProfile.units))
-                                                        .high(Profile.toMgdl(eatingSoonTT, currentProfile.units))
-                                                TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                                                    .date(System.currentTimeMillis())
+                                                    .duration(eatingSoonTTDuration)
+                                                    .reason(resourceHelper.gs(R.string.eatingsoon))
+                                                    .source(Source.USER)
+                                                    .low(Profile.toMgdl(eatingSoonTT, currentProfile.units))
+                                                    .high(Profile.toMgdl(eatingSoonTT, currentProfile.units))
+                                                activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
                                                 val tt = if (currentProfile.units == Constants.MMOL) {
                                                     DecimalFormatter.to1Decimal(eatingSoonTT)
                                                 } else DecimalFormatter.to0Decimal(eatingSoonTT)
-                                                replyText += "\n" + String.format(MainApp.gs(R.string.smscommunicator_mealbolusdelivered_tt), tt, eatingSoonTTDuration)
+                                                replyText += "\n" + String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered_tt), tt, eatingSoonTTDuration)
                                             }
                                         }
                                         sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     } else {
-                                        var replyText = MainApp.gs(R.string.smscommunicator_bolusfailed)
-                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                        var replyText = resourceHelper.gs(R.string.smscommunicator_bolusfailed)
+                                        replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                     }
                                 }
@@ -680,41 +696,39 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                     })
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processCARBS(splitted: Array<String>, receivedSms: Sms) {
         var grams = SafeParse.stringToInt(splitted[1])
         var time = DateUtil.now()
         if (splitted.size > 2) {
-            val seconds = DateUtil.toSeconds(splitted[2].toUpperCase(Locale.getDefault()))
-            val midnight = MidnightTime.calc()
-            if (seconds == 0 && (!splitted[2].startsWith("00:00") || !splitted[2].startsWith("12:00"))) {
-                sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            time = DateUtil.toTodayTime(splitted[2].toUpperCase(Locale.getDefault()))
+            if (time == 0L) {
+                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 return
             }
-            time = midnight + T.secs(seconds.toLong()).msecs()
         }
-        grams = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(grams)).value()
-        if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        grams = constraintChecker.applyCarbsConstraints(Constraint(grams)).value()
+        if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         else {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_carbsreplywithcode), grams, DateUtil.timeString(time), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode), grams, DateUtil.timeString(time), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(grams, time) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(grams, time) {
                 override fun run() {
                     val detailedBolusInfo = DetailedBolusInfo()
                     detailedBolusInfo.carbs = anInteger().toDouble()
                     detailedBolusInfo.date = secondLong()
-                    ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                    commandQueue.bolus(detailedBolusInfo, object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = String.format(MainApp.gs(R.string.smscommunicator_carbsset), anInteger)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = String.format(resourceHelper.gs(R.string.smscommunicator_carbsset), anInteger)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                             } else {
-                                var replyText = MainApp.gs(R.string.smscommunicator_carbsfailed)
-                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                var replyText = resourceHelper.gs(R.string.smscommunicator_carbsfailed)
+                                replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
                             }
                         }
@@ -731,104 +745,110 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
         val isStop = splitted[1].equals("STOP", ignoreCase = true) || splitted[1].equals("CANCEL", ignoreCase = true)
         if (isMeal || isActivity || isHypo) {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_temptargetwithcode), splitted[1].toUpperCase(Locale.getDefault()), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetwithcode), splitted[1].toUpperCase(Locale.getDefault()), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
-                    val units = ProfileFunctions.getSystemUnits()
+                    val units = profileFunction.getUnits()
                     var keyDuration = 0
                     var defaultTargetDuration = 0
                     var keyTarget = 0
                     var defaultTargetMMOL = 0.0
                     var defaultTargetMGDL = 0.0
-                    if (isMeal) {
-                        keyDuration = R.string.key_eatingsoon_duration
-                        defaultTargetDuration = Constants.defaultEatingSoonTTDuration
-                        keyTarget = R.string.key_eatingsoon_target
-                        defaultTargetMMOL = Constants.defaultEatingSoonTTmmol
-                        defaultTargetMGDL = Constants.defaultEatingSoonTTmgdl
-                    } else if (isActivity) {
-                        keyDuration = R.string.key_activity_duration
-                        defaultTargetDuration = Constants.defaultActivityTTDuration
-                        keyTarget = R.string.key_activity_target
-                        defaultTargetMMOL = Constants.defaultActivityTTmmol
-                        defaultTargetMGDL = Constants.defaultActivityTTmgdl
-                    } else if (isHypo) {
-                        keyDuration = R.string.key_hypo_duration
-                        defaultTargetDuration = Constants.defaultHypoTTDuration
-                        keyTarget = R.string.key_hypo_target
-                        defaultTargetMMOL = Constants.defaultHypoTTmmol
-                        defaultTargetMGDL = Constants.defaultHypoTTmgdl
+                    when {
+                        isMeal     -> {
+                            keyDuration = R.string.key_eatingsoon_duration
+                            defaultTargetDuration = Constants.defaultEatingSoonTTDuration
+                            keyTarget = R.string.key_eatingsoon_target
+                            defaultTargetMMOL = Constants.defaultEatingSoonTTmmol
+                            defaultTargetMGDL = Constants.defaultEatingSoonTTmgdl
+                        }
+
+                        isActivity -> {
+                            keyDuration = R.string.key_activity_duration
+                            defaultTargetDuration = Constants.defaultActivityTTDuration
+                            keyTarget = R.string.key_activity_target
+                            defaultTargetMMOL = Constants.defaultActivityTTmmol
+                            defaultTargetMGDL = Constants.defaultActivityTTmgdl
+                        }
+
+                        isHypo     -> {
+                            keyDuration = R.string.key_hypo_duration
+                            defaultTargetDuration = Constants.defaultHypoTTDuration
+                            keyTarget = R.string.key_hypo_target
+                            defaultTargetMMOL = Constants.defaultHypoTTmmol
+                            defaultTargetMGDL = Constants.defaultHypoTTmgdl
+                        }
                     }
-                    var ttDuration = SP.getInt(keyDuration, defaultTargetDuration)
+                    var ttDuration = sp.getInt(keyDuration, defaultTargetDuration)
                     ttDuration = if (ttDuration > 0) ttDuration else defaultTargetDuration
-                    var tt = SP.getDouble(keyTarget, if (units == Constants.MMOL) defaultTargetMMOL else defaultTargetMGDL)
-                    tt = Profile.toCurrentUnits(tt)
+                    var tt = sp.getDouble(keyTarget, if (units == Constants.MMOL) defaultTargetMMOL else defaultTargetMGDL)
+                    tt = Profile.toCurrentUnits(profileFunction, tt)
                     tt = if (tt > 0) tt else if (units == Constants.MMOL) defaultTargetMMOL else defaultTargetMGDL
                     val tempTarget = TempTarget()
-                            .date(System.currentTimeMillis())
-                            .duration(ttDuration)
-                            .reason(MainApp.gs(R.string.eatingsoon))
-                            .source(Source.USER)
-                            .low(Profile.toMgdl(tt, units))
-                            .high(Profile.toMgdl(tt, units))
-                    TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                        .date(System.currentTimeMillis())
+                        .duration(ttDuration)
+                        .reason(resourceHelper.gs(R.string.eatingsoon))
+                        .source(Source.USER)
+                        .low(Profile.toMgdl(tt, units))
+                        .high(Profile.toMgdl(tt, units))
+                    activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
                     val ttString = if (units == Constants.MMOL) DecimalFormatter.to1Decimal(tt) else DecimalFormatter.to0Decimal(tt)
-                    val replyText = String.format(MainApp.gs(R.string.smscommunicator_tt_set), ttString, ttDuration)
+                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_tt_set), ttString, ttDuration)
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                 }
             })
         } else if (isStop) {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_temptargetcancel), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetcancel), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
                     val tempTarget = TempTarget()
-                            .source(Source.USER)
-                            .date(DateUtil.now())
-                            .duration(0)
-                            .low(0.0)
-                            .high(0.0)
-                    TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
-                    val replyText = String.format(MainApp.gs(R.string.smscommunicator_tt_canceled))
+                        .source(Source.USER)
+                        .date(DateUtil.now())
+                        .duration(0)
+                        .low(0.0)
+                        .high(0.0)
+                    activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
+                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_tt_canceled))
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                 }
             })
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processSMS(splitted: Array<String>, receivedSms: Sms) {
         val isStop = (splitted[1].equals("STOP", ignoreCase = true)
-                || splitted[1].equals("DISABLE", ignoreCase = true))
+            || splitted[1].equals("DISABLE", ignoreCase = true))
         if (isStop) {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_stopsmswithcode), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_stopsmswithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
-                    SP.putBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
-                    val replyText = String.format(MainApp.gs(R.string.smscommunicator_stoppedsms))
+                    sp.putBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
+                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_stoppedsms))
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     private fun processCAL(splitted: Array<String>, receivedSms: Sms) {
         val cal = SafeParse.stringToDouble(splitted[1])
         if (cal > 0.0) {
             val passCode = generatePasscode()
-            val reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(cal) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(cal) {
                 override fun run() {
-                    val result = XdripCalibrations.sendIntent(aDouble)
-                    if (result) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationsent)) else sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationfailed))
+                    val result = xdripCalibrations.sendIntent(aDouble!!)
+                    if (result) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_calibrationsent))) else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_calibrationfailed)))
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
     fun sendNotificationToAllNumbers(text: String): Boolean {
@@ -851,34 +871,40 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
         val smsManager = SmsManager.getDefault()
         sms.text = stripAccents(sms.text)
         try {
-            if (L.isEnabled(L.SMS)) log.debug("Sending SMS to " + sms.phoneNumber + ": " + sms.text)
+            aapsLogger.debug(LTag.SMS, "Sending SMS to " + sms.phoneNumber + ": " + sms.text)
             if (sms.text.toByteArray().size <= 140) smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null)
             else {
                 val parts = smsManager.divideMessage(sms.text)
                 smsManager.sendMultipartTextMessage(sms.phoneNumber, null, parts,
-                        null, null)
+                    null, null)
             }
             messages.add(sms)
         } catch (e: IllegalArgumentException) {
             return if (e.message == "Invalid message body") {
-                val notification = Notification(Notification.INVALID_MESSAGE_BODY, MainApp.gs(R.string.smscommunicator_messagebody), Notification.NORMAL)
-                send(EventNewNotification(notification))
+                val notification = Notification(Notification.INVALID_MESSAGE_BODY, resourceHelper.gs(R.string.smscommunicator_messagebody), Notification.NORMAL)
+                rxBus.send(EventNewNotification(notification))
                 false
             } else {
-                val notification = Notification(Notification.INVALID_PHONE_NUMBER, MainApp.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL)
-                send(EventNewNotification(notification))
+                val notification = Notification(Notification.INVALID_PHONE_NUMBER, resourceHelper.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL)
+                rxBus.send(EventNewNotification(notification))
                 false
             }
         } catch (e: SecurityException) {
-            val notification = Notification(Notification.MISSING_SMS_PERMISSION, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL)
-            send(EventNewNotification(notification))
+            val notification = Notification(Notification.MISSING_SMS_PERMISSION, resourceHelper.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
             return false
         }
-        send(EventSmsCommunicatorUpdateGui())
+        rxBus.send(EventSmsCommunicatorUpdateGui())
         return true
     }
 
     private fun generatePasscode(): String {
+
+        if (otp.isEnabled()) {
+            // this not realy generate password - rather info to use Authenticator TOTP instead
+            return resourceHelper.gs(R.string.smscommunicator_code_from_authenticator_for, otp.name())
+        }
+
         val startChar1 = 'A'.toInt() // on iphone 1st char is uppercase :)
         var passCode = Character.toString((startChar1 + Math.random() * ('z' - 'a' + 1)).toChar())
         val startChar2: Int = if (Math.random() > 0.5) 'a'.toInt() else 'A'.toInt()
@@ -896,7 +922,7 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
         return s
     }
 
-    fun areMoreNumbers(allowednumbers: String?): Boolean {
+    private fun areMoreNumbers(allowednumbers: String?): Boolean {
         return allowednumbers?.let {
             var countNumbers = 0
             val substrings = it.split(";").toTypedArray()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
new file mode 100644
index 0000000000..bd4ed45cf6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@@ -0,0 +1,97 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator.activities
+
+import android.content.res.Resources
+import android.graphics.Color
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import com.google.common.primitives.Ints.min
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.activity_smscommunicator_otp.*
+import net.glxn.qrgen.android.QRCode
+import javax.inject.Inject
+
+class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var otp: OneTimePassword
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_smscommunicator_otp)
+
+        smscommunicator_otp_verify_edit.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable) {
+                val checkResult = otp.checkOTP(s.toString())
+
+                smscommunicator_otp_verify_label.text = when (checkResult) {
+                    OneTimePasswordValidationResult.OK                 -> "OK"
+                    OneTimePasswordValidationResult.ERROR_WRONG_LENGTH -> "INVALID SIZE!"
+                    OneTimePasswordValidationResult.ERROR_WRONG_PIN    -> "WRONG PIN"
+                    OneTimePasswordValidationResult.ERROR_WRONG_OTP    -> "WRONG OTP"
+                }
+
+                smscommunicator_otp_verify_label.setTextColor(when (checkResult) {
+                    OneTimePasswordValidationResult.OK                 -> Color.GREEN
+                    OneTimePasswordValidationResult.ERROR_WRONG_LENGTH -> Color.YELLOW
+                    OneTimePasswordValidationResult.ERROR_WRONG_PIN    -> Color.RED
+                    OneTimePasswordValidationResult.ERROR_WRONG_OTP    -> Color.RED
+                })
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        actions_smscommunicator_otp_reset.setOnClickListener {
+            OKDialog.showConfirmation(this,
+                resourceHelper.gs(R.string.smscommunicator_otp_reset_title),
+                resourceHelper.gs(R.string.smscommunicator_otp_reset_prompt),
+                Runnable {
+                    otp.ensureKey(true)
+                    updateGui()
+                    ToastUtils.showToastInUiThread(this, R.string.smscommunicator_otp_reset_successful)
+                })
+        }
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        updateGui()
+    }
+
+    fun updateGui() {
+        val displayMetrics = Resources.getSystem().displayMetrics
+        val width = displayMetrics.widthPixels
+        val height = displayMetrics.heightPixels
+
+        // ensure QRCode is big enough to fit on screen
+        val dim = (min(width, height) * 0.85).toInt()
+        val provURI = otp.provisioningURI()
+
+        if (provURI != null) {
+            val myBitmap = QRCode.from(provURI).withErrorCorrection(ErrorCorrectionLevel.H).withSize(dim, dim).bitmap()
+            smscommunicator_otp_provisioning.setImageBitmap(myBitmap)
+            smscommunicator_otp_provisioning.visibility = View.VISIBLE
+        } else {
+            smscommunicator_otp_provisioning.visibility = View.GONE
+        }
+
+        smscommunicator_otp_verify_edit.text = smscommunicator_otp_verify_edit.text
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
new file mode 100644
index 0000000000..a3e1e9a1f1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
@@ -0,0 +1,124 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator.otp
+
+import android.util.Base64
+import com.eatthepath.otp.TimeBasedOneTimePasswordGenerator
+import com.google.common.io.BaseEncoding
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.net.URLEncoder
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.SecretKeySpec
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OneTimePassword @Inject constructor(
+    private val sp: SP,
+    private val resourceHelper: ResourceHelper
+) {
+
+    private var key: SecretKey? = null
+    private var pin: String = ""
+    private val totp = TimeBasedOneTimePasswordGenerator()
+
+    init {
+        instance = this
+        configure()
+    }
+
+    companion object {
+        private lateinit var instance: OneTimePassword
+
+        @JvmStatic
+        fun getInstance(): OneTimePassword = instance
+    }
+
+    /**
+     * If OTP Authenticator support is enabled by user
+     */
+    fun isEnabled(): Boolean {
+        return sp.getBoolean(R.string.key_smscommunicator_otp_enabled, true)
+    }
+
+    /**
+     * Name of master device (target of OTP)
+     */
+    fun name(): String {
+        val defaultUserName = resourceHelper.gs(R.string.smscommunicator_default_user_display_name)
+        var userName = sp.getString(R.string.key_smscommunicator_otp_name, defaultUserName).replace(":", "").trim()
+        if (userName.isEmpty())
+            userName = defaultUserName
+        return userName
+    }
+
+    /**
+     * Make sure if private key for TOTP is generated, creating it when necessary or requested
+     */
+    fun ensureKey(forceNewKey: Boolean = false) {
+        val keyBytes: ByteArray
+        val strSecret = sp.getString(R.string.key_smscommunicator_otp_secret, "").trim()
+        if (strSecret.isEmpty() || forceNewKey) {
+            val keyGenerator = KeyGenerator.getInstance(totp.algorithm)
+            keyGenerator.init(Constants.OTP_GENERATED_KEY_LENGTH_BITS)
+            val generatedKey = keyGenerator.generateKey()
+            keyBytes = generatedKey.encoded
+            sp.putString(R.string.key_smscommunicator_otp_secret, Base64.encodeToString(keyBytes, Base64.NO_WRAP + Base64.NO_PADDING))
+        } else {
+            keyBytes = Base64.decode(strSecret, Base64.DEFAULT)
+        }
+        key = SecretKeySpec(keyBytes, 0, keyBytes.size, "SHA1")
+    }
+
+    private fun configure() {
+        ensureKey()
+        pin = sp.getString(R.string.key_smscommunicator_otp_password, "").trim()
+    }
+
+    private fun generateOneTimePassword(counter: Long): String =
+        key?.let { String.format("%06d", totp.generateOneTimePassword(key, counter)) } ?: ""
+
+    /**
+     * Check if given OTP+PIN is valid
+     */
+    fun checkOTP(otp: String): OneTimePasswordValidationResult {
+        configure()
+        val normalisedOtp = otp.replace(" ", "").replace("-", "").trim()
+
+        if (pin.length < 3) {
+            return OneTimePasswordValidationResult.ERROR_WRONG_PIN
+        }
+
+        if (normalisedOtp.length != (6 + pin.length)) {
+            return OneTimePasswordValidationResult.ERROR_WRONG_LENGTH
+        }
+
+        if (normalisedOtp.substring(6) != pin) {
+            return OneTimePasswordValidationResult.ERROR_WRONG_PIN
+        }
+
+        val counter: Long = DateUtil.now() / 30000L
+
+        val acceptableTokens: MutableList<String> = mutableListOf(generateOneTimePassword(counter))
+        for (i in 0 until Constants.OTP_ACCEPT_OLD_TOKENS_COUNT) {
+            acceptableTokens.add(generateOneTimePassword(counter - i - 1))
+        }
+        val candidateOtp = normalisedOtp.substring(0, 6)
+
+        if (acceptableTokens.any { candidate -> candidateOtp == candidate }) {
+            return OneTimePasswordValidationResult.OK
+        }
+
+        return OneTimePasswordValidationResult.ERROR_WRONG_OTP
+    }
+
+    /**
+     * Return URI used to provision Authenticator apps
+     */
+    fun provisioningURI(): String? =
+        key?.let { "otpauth://totp/AndroidAPS:" + URLEncoder.encode(name(), "utf-8") + "?secret=" + BaseEncoding.base32().encode(it.encoded).replace("=", "") + "&issuer=AndroidAPS" }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt
new file mode 100644
index 0000000000..f023849624
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator.otp
+
+enum class OneTimePasswordValidationResult {
+    OK,
+    ERROR_WRONG_LENGTH,
+    ERROR_WRONG_PIN,
+    ERROR_WRONG_OTP
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
index f83b9cc243..e11ee70a93 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
@@ -5,20 +5,27 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ScrollView
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolDoUpload
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolResetData
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolUpdateGUI
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.tidepool_fragment.*
+import javax.inject.Inject
 
-class TidepoolFragment : Fragment() {
+class TidepoolFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var tidepoolPlugin: TidepoolPlugin
+    @Inject lateinit var tidepoolUploader: TidepoolUploader
+    @Inject lateinit var sp: SP
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -28,28 +35,25 @@ class TidepoolFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        tidepool_login.setOnClickListener { TidepoolUploader.doLogin(false) }
-        tidepool_uploadnow.setOnClickListener { RxBus.send(EventTidepoolDoUpload()) }
-        tidepool_removeall.setOnClickListener { RxBus.send(EventTidepoolResetData()) }
-        tidepool_resertstart.setOnClickListener { SP.putLong(R.string.key_tidepool_last_end, 0) }
+        tidepool_login.setOnClickListener { tidepoolUploader.doLogin(false) }
+        tidepool_uploadnow.setOnClickListener { rxBus.send(EventTidepoolDoUpload()) }
+        tidepool_removeall.setOnClickListener { rxBus.send(EventTidepoolResetData()) }
+        tidepool_resertstart.setOnClickListener { sp.putLong(R.string.key_tidepool_last_end, 0) }
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
-                .toObservable(EventTidepoolUpdateGUI::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    TidepoolPlugin.updateLog()
-                    tidepool_log?.text = TidepoolPlugin.textLog
-                    tidepool_status?.text = TidepoolUploader.connectionStatus.name
-                    tidepool_log?.text = TidepoolPlugin.textLog
-                    tidepool_logscrollview?.fullScroll(ScrollView.FOCUS_DOWN)
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        )
+        disposable += rxBus
+            .toObservable(EventTidepoolUpdateGUI::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                tidepoolPlugin.updateLog()
+                tidepool_log?.text = tidepoolPlugin.textLog
+                tidepool_status?.text = tidepoolUploader.connectionStatus.name
+                tidepool_log?.text = tidepoolPlugin.textLog
+                tidepool_logscrollview?.fullScroll(ScrollView.FOCUS_DOWN)
+            }, { fabricPrivacy.logException(it) })
     }
 
     @Synchronized
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
index e8971ab9d5..701221e361 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.general.tidepool
 
-import android.preference.PreferenceFragment
+import android.content.Context
 import android.text.Spanned
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventNetworkChange
 import info.nightscout.androidaps.events.EventNewBG
@@ -11,31 +13,55 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader
+import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader.ConnectionStatus.CONNECTED
+import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader.ConnectionStatus.DISCONNECTED
+import info.nightscout.androidaps.plugins.general.tidepool.comm.UploadChunk
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolDoUpload
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolResetData
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolUpdateGUI
 import info.nightscout.androidaps.plugins.general.tidepool.utils.RateLimit
-import info.nightscout.androidaps.receivers.ChargingStateReceiver
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object TidepoolPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .pluginName(R.string.tidepool)
-        .shortName(R.string.tidepool_shortname)
-        .fragmentClass(TidepoolFragment::class.qualifiedName)
-        .preferencesId(R.xml.pref_tidepool)
-        .description(R.string.description_tidepool)
+@Singleton
+class TidepoolPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    private val fabricPrivacy: FabricPrivacy,
+    private val tidepoolUploader: TidepoolUploader,
+    private val uploadChunk: UploadChunk,
+    private val sp: SP,
+    private val rateLimit: RateLimit,
+    private val receiverStatusStore: ReceiverStatusStore
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .pluginName(R.string.tidepool)
+    .shortName(R.string.tidepool_shortname)
+    .fragmentClass(TidepoolFragment::class.qualifiedName)
+    .preferencesId(R.xml.pref_tidepool)
+    .description(R.string.description_tidepool),
+    aapsLogger, resourceHelper, injector
 ) {
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     private val listLog = ArrayList<EventTidepoolStatus>()
@@ -43,66 +69,64 @@ object TidepoolPlugin : PluginBase(PluginDescription()
 
     override fun onStart() {
         super.onStart()
-        disposable += RxBus
-                .toObservable(EventTidepoolDoUpload::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ doUpload() }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventTidepoolResetData::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({
-                    if (TidepoolUploader.connectionStatus != TidepoolUploader.ConnectionStatus.CONNECTED) {
-                        log.debug("Not connected for delete Dataset")
-                    } else {
-                        TidepoolUploader.deleteDataSet()
-                        SP.putLong(R.string.key_tidepool_last_end, 0)
-                        TidepoolUploader.doLogin()
-                    }
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventTidepoolStatus::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ event -> addToLog(event) }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventNewBG::class.java)
-                .observeOn(Schedulers.io())
-                .filter { it.bgReading != null } // better would be optional in API level >24
-                .map { it.bgReading }
-                .subscribe({ bgReading ->
-                    if (bgReading!!.date < TidepoolUploader.getLastEnd())
-                        TidepoolUploader.setLastEnd(bgReading.date)
-                    if (isEnabled(PluginType.GENERAL)
-                            && (!SP.getBoolean(R.string.key_tidepool_only_while_charging, false) || ChargingStateReceiver.isCharging())
-                            && (!SP.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || NetworkChangeReceiver.isWifiConnected())
-                            && RateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt()))
-                        doUpload()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventPreferenceChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({ event ->
-                    if (event.isChanged(R.string.key_tidepool_dev_servers)
-                            || event.isChanged(R.string.key_tidepool_username)
-                            || event.isChanged(R.string.key_tidepool_password)
-                    )
-                        TidepoolUploader.resetInstance()
-                }, {
-                    FabricPrivacy.logException(it)
-                })
-        disposable += RxBus
-                .toObservable(EventNetworkChange::class.java)
-                .observeOn(Schedulers.io())
-                .subscribe({}, {
-                    FabricPrivacy.logException(it)
-                }) // TODO start upload on wifi connect
+        disposable += rxBus
+            .toObservable(EventTidepoolDoUpload::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ doUpload() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventTidepoolResetData::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                if (tidepoolUploader.connectionStatus != CONNECTED) {
+                    aapsLogger.debug(LTag.TIDEPOOL, "Not connected for delete Dataset")
+                } else {
+                    tidepoolUploader.deleteDataSet()
+                    sp.putLong(R.string.key_tidepool_last_end, 0)
+                    tidepoolUploader.doLogin()
+                }
+            }, {
+                fabricPrivacy.logException(it)
+            })
+        disposable += rxBus
+            .toObservable(EventTidepoolStatus::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event -> addToLog(event) }, {
+                fabricPrivacy.logException(it)
+            })
+        disposable += rxBus
+            .toObservable(EventNewBG::class.java)
+            .observeOn(Schedulers.io())
+            .filter { it.bgReading != null } // better would be optional in API level >24
+            .map { it.bgReading }
+            .subscribe({ bgReading ->
+                if (bgReading!!.date < uploadChunk.getLastEnd())
+                    uploadChunk.setLastEnd(bgReading.date)
+                if (isEnabled(PluginType.GENERAL)
+                    && (!sp.getBoolean(R.string.key_tidepool_only_while_charging, false) || receiverStatusStore.isCharging)
+                    && (!sp.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || receiverStatusStore.isWifiConnected)
+                    && rateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt()))
+                    doUpload()
+            }, {
+                fabricPrivacy.logException(it)
+            })
+        disposable += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event ->
+                if (event.isChanged(resourceHelper, R.string.key_tidepool_dev_servers)
+                    || event.isChanged(resourceHelper, R.string.key_tidepool_username)
+                    || event.isChanged(resourceHelper, R.string.key_tidepool_password)
+                )
+                    tidepoolUploader.resetInstance()
+            }, {
+                fabricPrivacy.logException(it)
+            })
+        disposable += rxBus
+            .toObservable(EventNetworkChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({}, {
+                fabricPrivacy.logException(it)
+            }) // TODO start upload on wifi connect
 
     }
 
@@ -111,22 +135,25 @@ object TidepoolPlugin : PluginBase(PluginDescription()
         super.onStop()
     }
 
-    override fun preprocessPreferences(preferenceFragment: PreferenceFragment) {
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
 
-        val tidepoolTestLogin = preferenceFragment.findPreference(MainApp.gs(R.string.key_tidepool_test_login))
+        val tidepoolTestLogin: Preference? = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_tidepool_test_login))
         tidepoolTestLogin?.setOnPreferenceClickListener {
-            TidepoolUploader.testLogin(preferenceFragment.getActivity())
+            preferenceFragment.context?.let {
+                tidepoolUploader.testLogin(it)
+            }
             false
         }
     }
 
     private fun doUpload() =
-        when (TidepoolUploader.connectionStatus) {
-            TidepoolUploader.ConnectionStatus.FAILED -> {}
-            TidepoolUploader.ConnectionStatus.CONNECTING -> {}
-            TidepoolUploader.ConnectionStatus.DISCONNECTED -> TidepoolUploader.doLogin(true)
-            TidepoolUploader.ConnectionStatus.CONNECTED -> TidepoolUploader.doUpload()
+        when (tidepoolUploader.connectionStatus) {
+            DISCONNECTED -> tidepoolUploader.doLogin(true)
+            CONNECTED    -> tidepoolUploader.doUpload()
+
+            else         -> {
+            }
         }
 
     @Synchronized
@@ -138,7 +165,7 @@ object TidepoolPlugin : PluginBase(PluginDescription()
                 listLog.removeAt(0)
             }
         }
-        RxBus.send(EventTidepoolUpdateGUI())
+        rxBus.send(EventTidepoolUpdateGUI())
     }
 
     @Synchronized
@@ -152,7 +179,7 @@ object TidepoolPlugin : PluginBase(PluginDescription()
             }
             textLog = HtmlHelper.fromHtml(newTextLog.toString())
         } catch (e: OutOfMemoryError) {
-            ToastUtils.showToastInUiThread(MainApp.instance().applicationContext, "Out of memory!\nStop using this phone !!!", R.raw.error)
+            ToastUtils.showToastInUiThread(context, rxBus, "Out of memory!\nStop using this phone !!!", R.raw.error)
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
index 4acc0b5d67..59268f49b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
@@ -1,31 +1,22 @@
 package info.nightscout.androidaps.plugins.general.tidepool.comm
 
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import okhttp3.Interceptor
 import okhttp3.Response
 import okio.Buffer
-import org.slf4j.LoggerFactory
 import java.io.IOException
 
-class InfoInterceptor(tag: String) : Interceptor {
-
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
-    private var tag = "interceptor"
-
-    init {
-        this.tag = tag
-    }
+class InfoInterceptor(val tag: String = "interceptor", val aapsLogger: AAPSLogger) : Interceptor {
 
     @Throws(IOException::class)
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
         request.body?.let {
-            if (L.isEnabled(L.TIDEPOOL)) {
-                log.debug("Interceptor Body size: " + it.contentLength())
-                val requestBuffer = Buffer()
-                it.writeTo(requestBuffer)
-                log.debug("Interceptor Body: " + requestBuffer.readUtf8())
-            }
+            aapsLogger.debug(LTag.TIDEPOOL, "Interceptor Body size: " + it.contentLength())
+            val requestBuffer = Buffer()
+            it.writeTo(requestBuffer)
+            aapsLogger.debug(LTag.TIDEPOOL, "Interceptor Body: " + requestBuffer.readUtf8())
         }
         return chain.proceed(request)
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
index 58ba913e91..bbc7646011 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
@@ -1,34 +1,33 @@
 package info.nightscout.androidaps.plugins.general.tidepool.comm
 
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
-import org.slf4j.LoggerFactory
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-internal class TidepoolCallback<T>(private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) : Callback<T> {
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+internal class TidepoolCallback<T>(private val aapsLogger: AAPSLogger, private val rxBus: RxBusWrapper, private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) : Callback<T> {
 
     override fun onResponse(call: Call<T>, response: Response<T>) {
         if (response.isSuccessful && response.body() != null) {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("$name success")
+            aapsLogger.debug(LTag.TIDEPOOL, "$name success")
             session.populateBody(response.body())
             session.populateHeaders(response.headers())
             onSuccess()
         } else {
             val msg = name + " was not successful: " + response.code() + " " + response.message()
-            if (L.isEnabled(L.TIDEPOOL)) log.debug(msg)
-            RxBus.send(EventTidepoolStatus(msg))
+            aapsLogger.debug(LTag.TIDEPOOL, msg)
+            rxBus.send(EventTidepoolStatus(msg))
             onFail()
         }
     }
 
     override fun onFailure(call: Call<T>, t: Throwable) {
         val msg = "$name Failed: $t"
-        if (L.isEnabled(L.TIDEPOOL)) log.debug(msg)
-        RxBus.send(EventTidepoolStatus(msg))
+        aapsLogger.debug(LTag.TIDEPOOL, msg)
+        rxBus.send(EventTidepoolStatus(msg))
         onFail()
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
index 5a65206f83..51c16af342 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
@@ -6,32 +6,49 @@ import android.os.SystemClock
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
-import info.nightscout.androidaps.plugins.general.tidepool.messages.*
+import info.nightscout.androidaps.plugins.general.tidepool.messages.AuthReplyMessage
+import info.nightscout.androidaps.plugins.general.tidepool.messages.AuthRequestMessage
+import info.nightscout.androidaps.plugins.general.tidepool.messages.DatasetReplyMessage
+import info.nightscout.androidaps.plugins.general.tidepool.messages.OpenDatasetRequestMessage
+import info.nightscout.androidaps.plugins.general.tidepool.messages.UploadReplyMessage
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.SP
 import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.logging.HttpLoggingInterceptor
-import org.slf4j.LoggerFactory
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object TidepoolUploader {
-
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+@Singleton
+class TidepoolUploader @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val mainApp: MainApp,
+    private val resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val uploadChunk: UploadChunk,
+    private val activePlugin: ActivePluginProvider
+) {
 
     private var wl: PowerManager.WakeLock? = null
 
-    private const val INTEGRATION_BASE_URL = "https://int-api.tidepool.org"
-    private const val PRODUCTION_BASE_URL = "https://api.tidepool.org"
-
-    internal const val VERSION = "0.0.1"
+    companion object {
+        private const val INTEGRATION_BASE_URL = "https://int-api.tidepool.org"
+        private const val PRODUCTION_BASE_URL = "https://api.tidepool.org"
+        internal const val VERSION = "0.0.1"
+        const val PUMP_TYPE = "Tandem"
+    }
 
     private var retrofit: Retrofit? = null
 
@@ -41,48 +58,44 @@ object TidepoolUploader {
         DISCONNECTED, CONNECTING, CONNECTED, FAILED
     }
 
-    val PUMPTYPE = "Tandem"
-
     var connectionStatus: ConnectionStatus = ConnectionStatus.DISCONNECTED
 
-    fun getRetrofitInstance(): Retrofit? {
+    private fun getRetrofitInstance(): Retrofit? {
         if (retrofit == null) {
 
             val httpLoggingInterceptor = HttpLoggingInterceptor()
             httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
 
             val client = OkHttpClient.Builder()
-                    .addInterceptor(httpLoggingInterceptor)
-                    .addInterceptor(InfoInterceptor(TidepoolUploader::class.java.name))
-                    .build()
+                .addInterceptor(httpLoggingInterceptor)
+                .addInterceptor(InfoInterceptor(TidepoolUploader::class.java.name, aapsLogger))
+                .build()
 
             retrofit = Retrofit.Builder()
-                    .baseUrl(if (SP.getBoolean(R.string.key_tidepool_dev_servers, false)) INTEGRATION_BASE_URL else PRODUCTION_BASE_URL)
-                    .client(client)
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .build()
+                .baseUrl(if (sp.getBoolean(R.string.key_tidepool_dev_servers, false)) INTEGRATION_BASE_URL else PRODUCTION_BASE_URL)
+                .client(client)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
         }
         return retrofit
     }
 
-    fun createSession(): Session {
+    private fun createSession(): Session {
         val service = getRetrofitInstance()?.create(TidepoolApiService::class.java)
-        return Session(AuthRequestMessage.getAuthRequestHeader(), SESSION_TOKEN_HEADER, service)
+        return Session(AuthRequestMessage.getAuthRequestHeader(sp), SESSION_TOKEN_HEADER, service)
     }
 
     // TODO: call on preference change
     fun resetInstance() {
         retrofit = null
-        if (L.isEnabled(L.TIDEPOOL))
-            log.debug("Instance reset")
+        aapsLogger.debug(LTag.TIDEPOOL, "Instance reset")
         connectionStatus = ConnectionStatus.DISCONNECTED
     }
 
     @Synchronized
     fun doLogin(doUpload: Boolean = false) {
-        if (connectionStatus == TidepoolUploader.ConnectionStatus.CONNECTED || connectionStatus == TidepoolUploader.ConnectionStatus.CONNECTING) {
-            if (L.isEnabled(L.TIDEPOOL))
-                log.debug("Already connected")
+        if (connectionStatus == ConnectionStatus.CONNECTED || connectionStatus == ConnectionStatus.CONNECTING) {
+            aapsLogger.debug(LTag.TIDEPOOL, "Already connected")
             return
         }
         // TODO failure backoff
@@ -90,21 +103,21 @@ object TidepoolUploader {
         session = createSession()
         val authHeader = session?.authHeader
         if (authHeader != null) {
-            connectionStatus = TidepoolUploader.ConnectionStatus.CONNECTING
-            RxBus.send(EventTidepoolStatus(("Connecting")))
+            connectionStatus = ConnectionStatus.CONNECTING
+            rxBus.send(EventTidepoolStatus(("Connecting")))
             val call = session?.service?.getLogin(authHeader)
 
-            call?.enqueue(TidepoolCallback<AuthReplyMessage>(session!!, "Login", {
+            call?.enqueue(TidepoolCallback<AuthReplyMessage>(aapsLogger, rxBus, session!!, "Login", {
                 startSession(session!!, doUpload)
             }, {
-                connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
+                connectionStatus = ConnectionStatus.FAILED
                 releaseWakeLock()
             }))
             return
         } else {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("Cannot do login as user credentials have not been set correctly")
-            connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
-            RxBus.send(EventTidepoolStatus(("Invalid credentials")))
+            aapsLogger.debug(LTag.TIDEPOOL, "Cannot do login as user credentials have not been set correctly")
+            connectionStatus = ConnectionStatus.FAILED
+            rxBus.send(EventTidepoolStatus(("Invalid credentials")))
             releaseWakeLock()
             return
         }
@@ -115,14 +128,14 @@ object TidepoolUploader {
         session.authHeader?.let {
             val call = session.service?.getLogin(it)
 
-            call?.enqueue(TidepoolCallback<AuthReplyMessage>(session, "Login", {
-                OKDialog.show(rootContext, MainApp.gs(R.string.tidepool), "Successfully logged into Tidepool.")
+            call?.enqueue(TidepoolCallback<AuthReplyMessage>(aapsLogger, rxBus, session, "Login", {
+                OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Successfully logged into Tidepool.")
             }, {
-                OKDialog.show(rootContext, MainApp.gs(R.string.tidepool), "Failed to log into Tidepool.\nCheck that your user name and password are correct.")
+                OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Failed to log into Tidepool.\nCheck that your user name and password are correct.")
             }))
 
         }
-                ?: OKDialog.show(rootContext, MainApp.gs(R.string.tidepool), "Cannot do login as user credentials have not been set correctly")
+            ?: OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Cannot do login as user credentials have not been set correctly")
 
     }
 
@@ -131,43 +144,43 @@ object TidepoolUploader {
         if (session.authReply?.userid != null) {
             // See if we already have an open data set to write to
             val datasetCall = session.service!!.getOpenDataSets(session.token!!,
-                    session.authReply!!.userid!!, BuildConfig.APPLICATION_ID, 1)
+                session.authReply!!.userid!!, BuildConfig.APPLICATION_ID, 1)
 
-            datasetCall.enqueue(TidepoolCallback<List<DatasetReplyMessage>>(session, "Get Open Datasets", {
+            datasetCall.enqueue(TidepoolCallback<List<DatasetReplyMessage>>(aapsLogger, rxBus, session, "Get Open Datasets", {
                 if (session.datasetReply == null) {
-                    RxBus.send(EventTidepoolStatus(("Creating new dataset")))
-                    val call = session.service.openDataSet(session.token!!, session.authReply!!.userid!!, OpenDatasetRequestMessage().getBody())
-                    call.enqueue(TidepoolCallback<DatasetReplyMessage>(session, "Open New Dataset", {
-                        connectionStatus = TidepoolUploader.ConnectionStatus.CONNECTED
-                        RxBus.send(EventTidepoolStatus(("New dataset OK")))
+                    rxBus.send(EventTidepoolStatus(("Creating new dataset")))
+                    val call = session.service.openDataSet(session.token!!, session.authReply!!.userid!!,
+                        OpenDatasetRequestMessage(activePlugin.activePump.serialNumber()).getBody())
+                    call.enqueue(TidepoolCallback<DatasetReplyMessage>(aapsLogger, rxBus, session, "Open New Dataset", {
+                        connectionStatus = ConnectionStatus.CONNECTED
+                        rxBus.send(EventTidepoolStatus(("New dataset OK")))
                         if (doUpload) doUpload()
                         else
                             releaseWakeLock()
                     }, {
-                        RxBus.send(EventTidepoolStatus(("New dataset FAILED")))
-                        connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
+                        rxBus.send(EventTidepoolStatus(("New dataset FAILED")))
+                        connectionStatus = ConnectionStatus.FAILED
                         releaseWakeLock()
                     }))
                 } else {
-                    if (L.isEnabled(L.TIDEPOOL))
-                        log.debug("Existing Dataset: " + session.datasetReply!!.getUploadId())
+                    aapsLogger.debug(LTag.TIDEPOOL, "Existing Dataset: " + session.datasetReply!!.getUploadId())
                     // TODO: Wouldn't need to do this if we could block on the above `call.enqueue`.
                     // ie, do the openDataSet conditionally, and then do `doUpload` either way.
-                    connectionStatus = TidepoolUploader.ConnectionStatus.CONNECTED
-                    RxBus.send(EventTidepoolStatus(("Appending to existing dataset")))
+                    connectionStatus = ConnectionStatus.CONNECTED
+                    rxBus.send(EventTidepoolStatus(("Appending to existing dataset")))
                     if (doUpload) doUpload()
                     else
                         releaseWakeLock()
                 }
             }, {
-                connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
-                RxBus.send(EventTidepoolStatus(("Open dataset FAILED")))
+                connectionStatus = ConnectionStatus.FAILED
+                rxBus.send(EventTidepoolStatus(("Open dataset FAILED")))
                 releaseWakeLock()
             }))
         } else {
-            log.error("Got login response but cannot determine userId - cannot proceed")
-            connectionStatus = TidepoolUploader.ConnectionStatus.FAILED
-            RxBus.send(EventTidepoolStatus(("Error userId")))
+            aapsLogger.error("Got login response but cannot determine userId - cannot proceed")
+            connectionStatus = ConnectionStatus.FAILED
+            rxBus.send(EventTidepoolStatus(("Error userId")))
             releaseWakeLock()
         }
     }
@@ -176,39 +189,39 @@ object TidepoolUploader {
     fun doUpload() {
         session.let { session ->
             if (session == null) {
-                log.error("Session is null, cannot proceed")
+                aapsLogger.error("Session is null, cannot proceed")
                 releaseWakeLock()
                 return
             }
             extendWakeLock(60000)
             session.iterations++
-            val chunk = UploadChunk.getNext(session)
+            val chunk = uploadChunk.getNext(session)
             when {
-                chunk == null -> {
-                    log.error("Upload chunk is null, cannot proceed")
+                chunk == null     -> {
+                    aapsLogger.error("Upload chunk is null, cannot proceed")
                     releaseWakeLock()
                 }
 
                 chunk.length == 2 -> {
-                    if (L.isEnabled(L.TIDEPOOL)) log.debug("Empty dataset - marking as succeeded")
-                    RxBus.send(EventTidepoolStatus(("No data to upload")))
+                    aapsLogger.debug(LTag.TIDEPOOL, "Empty dataset - marking as succeeded")
+                    rxBus.send(EventTidepoolStatus(("No data to upload")))
                     releaseWakeLock()
-                    unploadNext()
+                    uploadNext()
                 }
 
-                else -> {
+                else              -> {
                     val body = chunk.toRequestBody("application/json".toMediaTypeOrNull())
 
-                    RxBus.send(EventTidepoolStatus(("Uploading")))
+                    rxBus.send(EventTidepoolStatus(("Uploading")))
                     if (session.service != null && session.token != null && session.datasetReply != null) {
                         val call = session.service.doUpload(session.token!!, session.datasetReply!!.getUploadId()!!, body)
-                        call.enqueue(TidepoolCallback<UploadReplyMessage>(session, "Data Upload", {
-                            setLastEnd(session.end)
-                            RxBus.send(EventTidepoolStatus(("Upload completed OK")))
+                        call.enqueue(TidepoolCallback<UploadReplyMessage>(aapsLogger, rxBus, session, "Data Upload", {
+                            uploadChunk.setLastEnd(session.end)
+                            rxBus.send(EventTidepoolStatus(("Upload completed OK")))
                             releaseWakeLock()
-                            unploadNext()
+                            uploadNext()
                         }, {
-                            RxBus.send(EventTidepoolStatus(("Upload FAILED")))
+                            rxBus.send(EventTidepoolStatus(("Upload FAILED")))
                             releaseWakeLock()
                         }))
                     }
@@ -217,11 +230,10 @@ object TidepoolUploader {
         }
     }
 
-    private fun unploadNext() {
-        if (getLastEnd() < DateUtil.now() - T.mins(1).msecs()) {
+    private fun uploadNext() {
+        if (uploadChunk.getLastEnd() < DateUtil.now() - T.mins(1).msecs()) {
             SystemClock.sleep(3000)
-            if (L.isEnabled(L.TIDEPOOL))
-                log.debug("Restarting doUpload. Last: " + DateUtil.dateAndTimeString(getLastEnd()))
+            aapsLogger.debug(LTag.TIDEPOOL, "Restarting doUpload. Last: " + DateUtil.dateAndTimeString(uploadChunk.getLastEnd()))
             doUpload()
         }
     }
@@ -230,64 +242,49 @@ object TidepoolUploader {
         if (session?.datasetReply?.id != null) {
             extendWakeLock(60000)
             val call = session!!.service?.deleteDataSet(session!!.token!!, session!!.datasetReply!!.id!!)
-            call?.enqueue(TidepoolCallback(session!!, "Delete Dataset", {
+            call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session!!, "Delete Dataset", {
                 connectionStatus = ConnectionStatus.DISCONNECTED
-                RxBus.send(EventTidepoolStatus(("Dataset removed OK")))
+                rxBus.send(EventTidepoolStatus(("Dataset removed OK")))
                 releaseWakeLock()
             }, {
                 connectionStatus = ConnectionStatus.DISCONNECTED
-                RxBus.send(EventTidepoolStatus(("Dataset remove FAILED")))
+                rxBus.send(EventTidepoolStatus(("Dataset remove FAILED")))
                 releaseWakeLock()
             }))
         } else {
-            log.error("Got login response but cannot determine datasetId - cannot proceed")
+            aapsLogger.error("Got login response but cannot determine datasetId - cannot proceed")
         }
     }
 
+    @Suppress("unused")
     fun deleteAllData() {
         val session = this.session
         val token = session?.token
-        val userid = session?.authReply?.userid
+        val userId = session?.authReply?.userid
         try {
             requireNotNull(session)
             requireNotNull(token)
-            requireNotNull(userid)
+            requireNotNull(userId)
             extendWakeLock(60000)
-            val call = session.service?.deleteAllData(token, userid)
-            call?.enqueue(TidepoolCallback(session, "Delete all data", {
+            val call = session.service?.deleteAllData(token, userId)
+            call?.enqueue(TidepoolCallback(aapsLogger, rxBus, session, "Delete all data", {
                 connectionStatus = ConnectionStatus.DISCONNECTED
-                RxBus.send(EventTidepoolStatus(("All data removed OK")))
+                rxBus.send(EventTidepoolStatus(("All data removed OK")))
                 releaseWakeLock()
             }, {
                 connectionStatus = ConnectionStatus.DISCONNECTED
-                RxBus.send(EventTidepoolStatus(("All data remove FAILED")))
+                rxBus.send(EventTidepoolStatus(("All data remove FAILED")))
                 releaseWakeLock()
             }))
         } catch (e: IllegalArgumentException) {
-            log.error("Got login response but cannot determine userId - cannot proceed")
-        }
-    }
-
-    fun getLastEnd(): Long {
-        val result = SP.getLong(R.string.key_tidepool_last_end, 0)
-        return Math.max(result, DateUtil.now() - T.months(2).msecs())
-    }
-
-    fun setLastEnd(time: Long) {
-        if (time > getLastEnd()) {
-            SP.putLong(R.string.key_tidepool_last_end, time)
-            val friendlyEnd = DateUtil.dateAndTimeString(time)
-            RxBus.send(EventTidepoolStatus(("Marking uploaded data up to $friendlyEnd")))
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("Updating last end to: " + DateUtil.dateAndTimeString(time))
-        } else {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("Cannot set last end to: " + DateUtil.dateAndTimeString(time) + " vs " + DateUtil.dateAndTimeString(getLastEnd()))
+            aapsLogger.error("Got login response but cannot determine userId - cannot proceed")
         }
     }
 
     @Synchronized
     private fun extendWakeLock(ms: Long) {
         if (wl == null) {
-            val pm = MainApp.instance().getSystemService(Context.POWER_SERVICE) as PowerManager
+            val pm = mainApp.getSystemService(Context.POWER_SERVICE) as PowerManager
             wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:TidepoolUploader")
             wl?.acquire(ms)
         } else {
@@ -303,7 +300,7 @@ object TidepoolUploader {
                 try {
                     it.release()
                 } catch (e: Exception) {
-                    log.error("Error releasing wakelock: $e")
+                    aapsLogger.error("Error releasing wakelock: $e")
                 }
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
index 40cab06f4c..9c5bfb9aad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
@@ -2,67 +2,97 @@ package info.nightscout.androidaps.plugins.general.tidepool.comm
 
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.data.Intervals
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.tidepool.elements.*
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import info.nightscout.androidaps.plugins.general.tidepool.utils.GsonInstance
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.SP
 import info.nightscout.androidaps.utils.T
-import org.slf4j.LoggerFactory
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.max
 
-object UploadChunk {
+@Singleton
+class UploadChunk @Inject constructor(
+    private val sp: SP,
+    private val rxBus: RxBusWrapper,
+    private val aapsLogger: AAPSLogger,
+    private val profileFunction: ProfileFunction,
+    private val treatmentsPlugin: TreatmentsPlugin,
+    private val activePlugin: ActivePluginProvider
+) {
 
     private val MAX_UPLOAD_SIZE = T.days(7).msecs() // don't change this
 
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
-
     fun getNext(session: Session?): String? {
         if (session == null)
             return null
 
-        session.start = TidepoolUploader.getLastEnd()
+        session.start = getLastEnd()
         session.end = Math.min(session.start + MAX_UPLOAD_SIZE, DateUtil.now())
 
         val result = get(session.start, session.end)
         if (result.length < 3) {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("No records in this time period, setting start to best end time")
-            TidepoolUploader.setLastEnd(Math.max(session.end, getOldestRecordTimeStamp()))
+            aapsLogger.debug(LTag.TIDEPOOL, "No records in this time period, setting start to best end time")
+            setLastEnd(Math.max(session.end, getOldestRecordTimeStamp()))
         }
         return result
     }
 
     operator fun get(start: Long, end: Long): String {
 
-        if (L.isEnabled(L.TIDEPOOL)) log.debug("Syncing data between: " + DateUtil.dateAndTimeString(start) + " -> " + DateUtil.dateAndTimeString(end))
+        aapsLogger.debug(LTag.TIDEPOOL, "Syncing data between: " + DateUtil.dateAndTimeString(start) + " -> " + DateUtil.dateAndTimeString(end))
         if (end <= start) {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("End is <= start: " + DateUtil.dateAndTimeString(start) + " " + DateUtil.dateAndTimeString(end))
+            aapsLogger.debug(LTag.TIDEPOOL, "End is <= start: " + DateUtil.dateAndTimeString(start) + " " + DateUtil.dateAndTimeString(end))
             return ""
         }
         if (end - start > MAX_UPLOAD_SIZE) {
-            if (L.isEnabled(L.TIDEPOOL)) log.debug("More than max range - rejecting")
+            aapsLogger.debug(LTag.TIDEPOOL, "More than max range - rejecting")
             return ""
         }
 
         val records = LinkedList<BaseElement>()
 
-        if (SP.getBoolean(R.string.key_tidepool_upload_bolus, true))
+        if (sp.getBoolean(R.string.key_tidepool_upload_bolus, true))
             records.addAll(getTreatments(start, end))
-        if (SP.getBoolean(R.string.key_tidepool_upload_bg, true))
+        if (sp.getBoolean(R.string.key_tidepool_upload_bg, true))
             records.addAll(getBloodTests(start, end))
-        if (SP.getBoolean(R.string.key_tidepool_upload_tbr, true))
+        if (sp.getBoolean(R.string.key_tidepool_upload_tbr, true))
             records.addAll(getBasals(start, end))
-        if (SP.getBoolean(R.string.key_tidepool_upload_cgm, true))
+        if (sp.getBoolean(R.string.key_tidepool_upload_cgm, true))
             records.addAll(getBgReadings(start, end))
-        if (SP.getBoolean(R.string.key_tidepool_upload_profile, true))
+        if (sp.getBoolean(R.string.key_tidepool_upload_profile, true))
             records.addAll(getProfiles(start, end))
 
         return GsonInstance.defaultGsonInstance().toJson(records)
     }
 
+    fun getLastEnd(): Long {
+        val result = sp.getLong(R.string.key_tidepool_last_end, 0)
+        return max(result, DateUtil.now() - T.months(2).msecs())
+    }
+
+    fun setLastEnd(time: Long) {
+        if (time > getLastEnd()) {
+            sp.putLong(R.string.key_tidepool_last_end, time)
+            val friendlyEnd = DateUtil.dateAndTimeString(time)
+            rxBus.send(EventTidepoolStatus(("Marking uploaded data up to $friendlyEnd")))
+            aapsLogger.debug(LTag.TIDEPOOL, "Updating last end to: " + DateUtil.dateAndTimeString(time))
+        } else {
+            aapsLogger.debug(LTag.TIDEPOOL, "Cannot set last end to: " + DateUtil.dateAndTimeString(time) + " vs " + DateUtil.dateAndTimeString(getLastEnd()))
+        }
+    }
+
     // numeric limits must match max time windows
 
     private fun getOldestRecordTimeStamp(): Long {
@@ -79,7 +109,7 @@ object UploadChunk {
 
     private fun getTreatments(start: Long, end: Long): List<BaseElement> {
         val result = LinkedList<BaseElement>()
-        val treatments = TreatmentsPlugin.getPlugin().service.getTreatmentDataFromTime(start, end, true)
+        val treatments = treatmentsPlugin.service.getTreatmentDataFromTime(start, end, true)
         for (treatment in treatments) {
             if (treatment.carbs > 0) {
                 result.add(WizardElement(treatment))
@@ -94,7 +124,7 @@ object UploadChunk {
         val readings = MainApp.getDbHelper().getCareportalEvents(start, end, true)
         val selection = BloodGlucoseElement.fromCareportalEvents(readings)
         if (selection.isNotEmpty())
-            RxBus.send(EventTidepoolStatus("${selection.size} BGs selected for upload"))
+            rxBus.send(EventTidepoolStatus("${selection.size} BGs selected for upload"))
         return selection
 
     }
@@ -103,27 +133,42 @@ object UploadChunk {
         val readings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, end, true)
         val selection = SensorGlucoseElement.fromBgReadings(readings)
         if (selection.isNotEmpty())
-            RxBus.send(EventTidepoolStatus("${selection.size} CGMs selected for upload"))
+            rxBus.send(EventTidepoolStatus("${selection.size} CGMs selected for upload"))
         return selection
     }
 
+    private fun fromTemporaryBasals(tbrList: Intervals<TemporaryBasal>, start: Long, end: Long): List<BasalElement> {
+        val results = LinkedList<BasalElement>()
+        for (tbr in tbrList.list) {
+            if (tbr.date >= start && tbr.date <= end && tbr.durationInMinutes != 0)
+                results.add(BasalElement(tbr, profileFunction))
+        }
+        return results
+    }
+
     private fun getBasals(start: Long, end: Long): List<BasalElement> {
-        val tbrs = TreatmentsPlugin.getPlugin().temporaryBasalsFromHistory
+        val tbrs = treatmentsPlugin.temporaryBasalsFromHistory
         tbrs.merge()
-        val selection = BasalElement.fromTemporaryBasals(tbrs, start, end) // TODO do not upload running TBR
+        val selection = fromTemporaryBasals(tbrs, start, end) // TODO do not upload running TBR
         if (selection.isNotEmpty())
-            RxBus.send(EventTidepoolStatus("${selection.size} TBRs selected for upload"))
+            rxBus.send(EventTidepoolStatus("${selection.size} TBRs selected for upload"))
         return selection
     }
 
+    fun newInstanceOrNull(ps: ProfileSwitch): ProfileElement? = try {
+        ProfileElement(ps, activePlugin.activePump.serialNumber())
+    } catch (e: Throwable) {
+        null
+    }
+
     private fun getProfiles(start: Long, end: Long): List<ProfileElement> {
         val pss = MainApp.getDbHelper().getProfileSwitchEventsFromTime(start, end, true)
         val selection = LinkedList<ProfileElement>()
         for (ps in pss) {
-            ProfileElement.newInstanceOrNull(ps)?.let { selection.add(it) }
+            newInstanceOrNull(ps)?.let { selection.add(it) }
         }
         if (selection.size > 0)
-            RxBus.send(EventTidepoolStatus("${selection.size} ProfileSwitches selected for upload"))
+            rxBus.send(EventTidepoolStatus("${selection.size} ProfileSwitches selected for upload"))
         return selection
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
index 11478afa66..4297e24420 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
@@ -1,12 +1,11 @@
 package info.nightscout.androidaps.plugins.general.tidepool.elements
 
 import com.google.gson.annotations.Expose
-import info.nightscout.androidaps.data.Intervals
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import java.util.*
 
-class BasalElement(tbr: TemporaryBasal)
+class BasalElement(tbr: TemporaryBasal, private val profileFunction: ProfileFunction)
     : BaseElement(tbr.date, UUID.nameUUIDFromBytes(("AAPS-basal" + tbr.date).toByteArray()).toString()) {
 
     internal var timestamp: Long = 0 // not exposed
@@ -27,18 +26,7 @@ class BasalElement(tbr: TemporaryBasal)
     init {
         type = "basal"
         timestamp = tbr.date
-        rate = tbr.tempBasalConvertedToAbsolute(tbr.date, ProfileFunctions.getInstance().getProfile(tbr.date))
+        rate = tbr.tempBasalConvertedToAbsolute(tbr.date, profileFunction.getProfile(tbr.date))
         duration = tbr.end() - tbr.start()
     }
-
-    companion object {
-        internal fun fromTemporaryBasals(tbrList: Intervals<TemporaryBasal>, start: Long, end: Long): List<BasalElement> {
-            val results = LinkedList<BasalElement>()
-            for (tbr in tbrList.list) {
-                if (tbr.date >= start && tbr.date <= end && tbr.durationInMinutes != 0)
-                    results.add(BasalElement(tbr))
-            }
-            return results
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt
index 82ae37cebc..cae2dd7b6a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.utils.InstanceId
 import java.util.*
 import kotlin.collections.ArrayList
 
-class ProfileElement private constructor(ps: ProfileSwitch)
+class ProfileElement(ps: ProfileSwitch, serialNumber: String)
     : BaseElement(ps.date, UUID.nameUUIDFromBytes(("AAPS-profile" + ps.date).toByteArray()).toString()) {
 
     @Expose
@@ -25,11 +25,9 @@ class ProfileElement private constructor(ps: ProfileSwitch)
     @Expose
     internal var insulinSensitivities: IsfProfile = IsfProfile()
     @Expose
-    internal var deviceId: String = TidepoolUploader.PUMPTYPE + ":" + (ConfigBuilderPlugin.getPlugin().activePump?.serialNumber()
-            ?: InstanceId.instanceId())
+    internal var deviceId: String = TidepoolUploader.PUMP_TYPE + ":" + serialNumber
     @Expose
-    internal var deviceSerialNumber: String = ConfigBuilderPlugin.getPlugin().activePump?.serialNumber()
-            ?: InstanceId.instanceId()
+    internal var deviceSerialNumber: String = serialNumber
     @Expose
     internal var clockDriftOffset: Long = 0
     @Expose
@@ -96,16 +94,6 @@ class ProfileElement private constructor(ps: ProfileSwitch)
             @field:Expose
             internal var amount: Double
     )
-
-    companion object {
-        @JvmStatic
-        fun newInstanceOrNull(ps: ProfileSwitch): ProfileElement? = try {
-            ProfileElement(ps)
-        } catch (e: Throwable) {
-            null
-        }
-    }
-
 }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
index f9e2b724cb..aff358ba08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
@@ -1,22 +1,13 @@
 package info.nightscout.androidaps.plugins.general.tidepool.events
 
 import info.nightscout.androidaps.events.Event
-import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.utils.DateUtil
-import org.slf4j.LoggerFactory
 import java.text.SimpleDateFormat
 import java.util.*
 
 class EventTidepoolStatus(val status: String) : Event() {
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
-
     var date: Long = DateUtil.now()
 
-    init {
-        if (L.isEnabled(L.TIDEPOOL))
-            log.debug("New status: $status")
-    }
-
     private var timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
 
     fun toPreparedHtml(): StringBuilder {
@@ -28,5 +19,4 @@ class EventTidepoolStatus(val status: String) : Event() {
         stringBuilder.append("<br>")
         return stringBuilder
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/AuthRequestMessage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/AuthRequestMessage.kt
index 33c230ea75..7b5d8a679d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/AuthRequestMessage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/AuthRequestMessage.kt
@@ -1,17 +1,17 @@
 package info.nightscout.androidaps.plugins.general.tidepool.messages
 
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.SP
 import info.nightscout.androidaps.utils.StringUtils
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import okhttp3.Credentials
 
 class AuthRequestMessage : BaseMessage() {
     companion object {
-        fun getAuthRequestHeader(): String? {
-            val username = SP.getString(R.string.key_tidepool_username, null)
-            val password = SP.getString(R.string.key_tidepool_password, null)
+        fun getAuthRequestHeader(sp: SP): String? {
+            val username = sp.getStringOrNull(R.string.key_tidepool_username, null)
+            val password = sp.getStringOrNull(R.string.key_tidepool_password, null)
 
-            return if (StringUtils.emptyString(username) || StringUtils.emptyString(password)) null else Credentials.basic(username.trim { it <= ' ' }, password)
+            return if (StringUtils.emptyString(username) || StringUtils.emptyString(password)) null else Credentials.basic(username!!.trim { it <= ' ' }, password!!)
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/OpenDatasetRequestMessage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/OpenDatasetRequestMessage.kt
index 38b93b2f7b..c0b0d3a92b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/OpenDatasetRequestMessage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/OpenDatasetRequestMessage.kt
@@ -9,11 +9,10 @@ import info.nightscout.androidaps.utils.InstanceId
 import info.nightscout.androidaps.utils.T
 import java.util.*
 
-class OpenDatasetRequestMessage : BaseMessage() {
+class OpenDatasetRequestMessage (val serialNumber : String): BaseMessage() {
 
     @Expose
-    var deviceId: String = TidepoolUploader.PUMPTYPE + ":" + (ConfigBuilderPlugin.getPlugin().activePump?.serialNumber()
-            ?: InstanceId.instanceId())
+    var deviceId: String = TidepoolUploader.PUMP_TYPE + ":" + serialNumber
     @Expose
     var time = DateUtil.toISOAsUTC(DateUtil.now())
     @Expose
@@ -28,9 +27,9 @@ class OpenDatasetRequestMessage : BaseMessage() {
     @Expose
     var dataSetType = "continuous"
     @Expose
-    var deviceManufacturers = arrayOf(TidepoolUploader.PUMPTYPE)
+    var deviceManufacturers = arrayOf(TidepoolUploader.PUMP_TYPE)
     @Expose
-    var deviceModel = TidepoolUploader.PUMPTYPE
+    var deviceModel = TidepoolUploader.PUMP_TYPE
     @Expose
     var deviceTags = arrayOf("bgm", "cgm", "insulin-pump")
     @Expose
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
index 88f09abdc2..9e48d0b90f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
@@ -1,25 +1,27 @@
 package info.nightscout.androidaps.plugins.general.tidepool.utils
 
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object RateLimit {
+@Singleton
+class RateLimit @Inject constructor(
+    val aapsLogger: AAPSLogger
+) {
 
     private val rateLimits = HashMap<String, Long>()
 
-    private val log = LoggerFactory.getLogger(L.TIDEPOOL)
-
     // return true if below rate limit
     @Synchronized
     fun rateLimit(name: String, seconds: Int): Boolean {
         // check if over limit
         rateLimits[name]?.let {
             if (DateUtil.now() - it < T.secs(seconds.toLong()).msecs()) {
-                if (L.isEnabled(L.TIDEPOOL))
-                    log.debug("$name rate limited: $seconds seconds")
+                aapsLogger.debug(LTag.TIDEPOOL, "$name rate limited: $seconds seconds")
                 return false
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
deleted file mode 100644
index cae9817a55..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
+++ /dev/null
@@ -1,758 +0,0 @@
-package info.nightscout.androidaps.plugins.general.wear;
-
-import android.app.NotificationManager;
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TDD;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.interfaces.APSInterface;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.aps.loop.APSResult;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.treatments.CarbsGenerator;
-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.HardLimits;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-/**
- * Created by adrian on 09/02/17.
- */
-
-public class ActionStringHandler {
-
-    public static final int TIMEOUT = 65 * 1000;
-
-    private static long lastSentTimestamp = 0;
-    private static String lastConfirmActionString = null;
-    private static BolusWizard lastBolusWizard = null;
-
-    public synchronized static void handleInitiate(String actionstring) {
-
-        if (!SP.getBoolean("wearcontrol", false)) return;
-
-        lastBolusWizard = null;
-
-        String rTitle = "CONFIRM"; //TODO: i18n
-        String rMessage = "";
-        String rAction = "";
-
-
-        // do the parsing and check constraints
-        String[] act = actionstring.split("\\s+");
-
-        if ("fillpreset".equals(act[0])) {
-            ///////////////////////////////////// PRIME/FILL
-            double amount = 0d;
-            if ("1".equals(act[1])) {
-                amount = SP.getDouble("fill_button1", 0.3);
-            } else if ("2".equals(act[1])) {
-                amount = SP.getDouble("fill_button2", 0d);
-            } else if ("3".equals(act[1])) {
-                amount = SP.getDouble("fill_button3", 0d);
-            } else {
-                return;
-            }
-            Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-            rMessage += MainApp.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U";
-            if (insulinAfterConstraints - amount != 0)
-                rMessage += "\n" + MainApp.gs(R.string.constraintapllied);
-
-            rAction += "fill " + insulinAfterConstraints;
-
-        } else if ("fill".equals(act[0])) {
-            ////////////////////////////////////////////// PRIME/FILL
-            double amount = SafeParse.stringToDouble(act[1]);
-
-            Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-            rMessage += MainApp.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U";
-            if (insulinAfterConstraints - amount != 0)
-                rMessage += "\n" + MainApp.gs(R.string.constraintapllied);
-
-            rAction += "fill " + insulinAfterConstraints;
-
-        } else if ("bolus".equals(act[0])) {
-            ////////////////////////////////////////////// BOLUS
-            double insulin = SafeParse.stringToDouble(act[1]);
-            int carbs = SafeParse.stringToInt(act[2]);
-            Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(insulin)).value();
-            Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(carbs)).value();
-            rMessage += MainApp.gs(R.string.bolus) + ": " + insulinAfterConstraints + "U\n";
-            rMessage += MainApp.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g";
-
-            if ((insulinAfterConstraints - insulin != 0) || (carbsAfterConstraints - carbs != 0)) {
-                rMessage += "\n" + MainApp.gs(R.string.constraintapllied);
-            }
-            rAction += "bolus " + insulinAfterConstraints + " " + carbsAfterConstraints;
-
-        } else if ("temptarget".equals(act[0])) {
-            ///////////////////////////////////////////////////////// TEMPTARGET
-            boolean isMGDL = Boolean.parseBoolean(act[1]);
-
-            if (ProfileFunctions.getSystemUnits().equals(Constants.MGDL) != isMGDL) {
-                sendError("Different units used on watch and phone!");
-                return;
-            }
-
-            int duration = SafeParse.stringToInt(act[2]);
-            if (duration == 0) {
-                rMessage += "Zero-Temp-Target - cancelling running Temp-Targets?";
-                rAction = "temptarget true 0 0 0";
-            } else {
-                double low = SafeParse.stringToDouble(act[3]);
-                double high = SafeParse.stringToDouble(act[4]);
-                if (!isMGDL) {
-                    low *= Constants.MMOLL_TO_MGDL;
-                    high *= Constants.MMOLL_TO_MGDL;
-                }
-                if (low < HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0] || low > HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1]) {
-                    sendError("Min-BG out of range!");
-                    return;
-                }
-                if (high < HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0] || high > HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1]) {
-                    sendError("Max-BG out of range!");
-                    return;
-                }
-                rMessage += "Temptarget:\nMin: " + act[3] + "\nMax: " + act[4] + "\nDuration: " + act[2];
-                rAction = actionstring;
-
-            }
-
-        } else if ("status".equals(act[0])) {
-            ////////////////////////////////////////////// STATUS
-            rTitle = "STATUS";
-            rAction = "statusmessage";
-            if ("pump".equals(act[1])) {
-                rTitle += " PUMP";
-                rMessage = getPumpStatus();
-            } else if ("loop".equals(act[1])) {
-                rTitle += " LOOP";
-                rMessage = "TARGETS:\n" + getTargetsStatus();
-                rMessage += "\n\n" + getLoopStatus();
-                rMessage += "\n\nOAPS RESULT:\n" + getOAPSResultStatus();
-            }
-
-        } else if ("wizard".equals(act[0])) {
-            sendError("Update APP on Watch!");
-            return;
-        } else if ("wizard2".equals(act[0])) {
-            ////////////////////////////////////////////// WIZARD
-            Integer carbsBeforeConstraints = SafeParse.stringToInt(act[1]);
-            Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(carbsBeforeConstraints)).value();
-
-            if (carbsAfterConstraints - carbsBeforeConstraints != 0) {
-                sendError("Carb constraint violation!");
-                return;
-            }
-
-            boolean useBG = SP.getBoolean(R.string.key_wearwizard_bg, true);
-            boolean useTT = SP.getBoolean(R.string.key_wearwizard_tt, false);
-            boolean useBolusIOB = SP.getBoolean(R.string.key_wearwizard_bolusiob, true);
-            boolean useBasalIOB = SP.getBoolean(R.string.key_wearwizard_basaliob, true);
-            boolean useCOB = SP.getBoolean(R.string.key_wearwizard_cob, true);
-            boolean useTrend = SP.getBoolean(R.string.key_wearwizard_trend, false);
-            int percentage = Integer.parseInt(act[2]);
-
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            String profileName = ProfileFunctions.getInstance().getProfileName();
-            if (profile == null) {
-                sendError("No profile found!");
-                return;
-            }
-
-            BgReading bgReading = DatabaseHelper.actualBg();
-            if (bgReading == null && useBG) {
-                sendError("No recent BG to base calculation on!");
-                return;
-            }
-
-            CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "Wizard wear");
-            if (useCOB && (cobInfo == null || cobInfo.displayCob == null)) {
-                sendError("Unknown COB! BG reading missing or recent app restart?");
-                return;
-            }
-
-            DecimalFormat format = new DecimalFormat("0.00");
-            DecimalFormat formatInt = new DecimalFormat("0");
-            BolusWizard bolusWizard = new BolusWizard(profile, profileName, TreatmentsPlugin.getPlugin().getTempTargetFromHistory(),
-                    carbsAfterConstraints, cobInfo.displayCob, bgReading.valueToUnits(ProfileFunctions.getSystemUnits()),
-                    0d, percentage, useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend);
-
-            if (Math.abs(bolusWizard.getInsulinAfterConstraints() - bolusWizard.getCalculatedTotalInsulin()) >= 0.01) {
-                sendError("Insulin constraint violation!" +
-                        "\nCannot deliver " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "!");
-                return;
-            }
-
-            if (bolusWizard.getCalculatedTotalInsulin() <= 0 && bolusWizard.getCarbs() <= 0) {
-                rAction = "info";
-                rTitle = "INFO";
-            } else {
-                rAction = actionstring;
-            }
-            rMessage += "Carbs: " + bolusWizard.getCarbs() + "g";
-            rMessage += "\nBolus: " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
-            rMessage += "\n_____________";
-            rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.getIc()) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.getSens()) + "): ";
-            rMessage += "\nFrom Carbs: " + format.format(bolusWizard.getInsulinFromCarbs()) + "U";
-            if (useCOB)
-                rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.getInsulinFromCOB()) + "U";
-            if (useBG)
-                rMessage += "\nFrom BG: " + format.format(bolusWizard.getInsulinFromBG()) + "U";
-            if (useBolusIOB)
-                rMessage += "\nBolus IOB: " + format.format(bolusWizard.getInsulinFromBolusIOB()) + "U";
-            if (useBasalIOB)
-                rMessage += "\nBasal IOB: " + format.format(bolusWizard.getInsulinFromBasalsIOB()) + "U";
-            if (useTrend)
-                rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.getInsulinFromTrend()) + "U";
-            if (percentage != 100) {
-                rMessage += "\nPercentage: " + format.format(bolusWizard.getTotalBeforePercentageAdjustment()) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
-            }
-
-            lastBolusWizard = bolusWizard;
-
-        } else if ("opencpp".equals(act[0])) {
-            ProfileSwitch activeProfileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
-            if (activeProfileSwitch == null) {
-                sendError("No active profile switch!");
-                return;
-            } else {
-                // read CPP values
-                rTitle = "opencpp";
-                rMessage = "opencpp";
-                rAction = "opencpp" + " " + activeProfileSwitch.percentage + " " + activeProfileSwitch.timeshift;
-            }
-
-        } else if ("cppset".equals(act[0])) {
-            ProfileSwitch activeProfileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
-            if (activeProfileSwitch == null) {
-                sendError("No active profile switch!");
-                return;
-            } else {
-                // read CPP values
-                rMessage = "CPP:" + "\n\n" +
-                        "Timeshift: " + act[1] + "\n" +
-                        "Percentage: " + act[2] + "%";
-                rAction = actionstring;
-            }
-
-        } else if ("tddstats".equals(act[0])) {
-            Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (activePump != null) {
-                // check if DB up to date
-                List<TDD> dummies = new LinkedList<TDD>();
-                List<TDD> historyList = getTDDList(dummies);
-
-                if (isOldData(historyList)) {
-                    rTitle = "TDD";
-                    rAction = "statusmessage";
-                    rMessage = "OLD DATA - ";
-
-                    //if pump is not busy: try to fetch data
-                    final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-                    if (pump.isBusy()) {
-                        rMessage += MainApp.gs(R.string.pumpbusy);
-                    } else {
-                        rMessage += "trying to fetch data from pump.";
-
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadTDDs(new Callback() {
-                            @Override
-                            public void run() {
-                                List<TDD> dummies = new LinkedList<TDD>();
-                                List<TDD> historyList = getTDDList(dummies);
-                                if (isOldData(historyList)) {
-                                    sendStatusmessage("TDD", "TDD: Still old data! Cannot load from pump.\n" + generateTDDMessage(historyList, dummies));
-                                } else {
-                                    sendStatusmessage("TDD", generateTDDMessage(historyList, dummies));
-                                }
-                            }
-                        });
-                    }
-                } else {
-                    // if up to date: prepare, send (check if CPP is activated -> add CPP stats)
-                    rTitle = "TDD";
-                    rAction = "statusmessage";
-                    rMessage = generateTDDMessage(historyList, dummies);
-                }
-            }
-
-        } else if ("ecarbs".equals(act[0])) {
-            ////////////////////////////////////////////// ECARBS
-            int carbs = SafeParse.stringToInt(act[1]);
-            int starttime = SafeParse.stringToInt(act[2]);
-            int duration = SafeParse.stringToInt(act[3]);
-            long starttimestamp = System.currentTimeMillis() + starttime * 60 * 1000;
-            Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(carbs)).value();
-            rMessage += MainApp.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g";
-            rMessage += "\n" + MainApp.gs(R.string.time) + ": " + DateUtil.timeString(starttimestamp);
-            rMessage += "\n" + MainApp.gs(R.string.duration) + ": " + duration + "h";
-
-
-            if ((carbsAfterConstraints - carbs != 0)) {
-                rMessage += "\n" + MainApp.gs(R.string.constraintapllied);
-            }
-            if (carbsAfterConstraints <= 0) {
-                sendError("Carbs = 0! No action taken!");
-                return;
-            }
-            rAction += "ecarbs " + carbsAfterConstraints + " " + starttimestamp + " " + duration;
-
-        } else if ("changeRequest".equals(act[0])) {
-            ////////////////////////////////////////////// CHANGE REQUEST
-            rTitle = MainApp.gs(R.string.openloop_newsuggestion);
-            rAction = "changeRequest";
-            final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
-            rMessage += finalLastRun.constraintsProcessed;
-
-            WearPlugin.getPlugin().requestChangeConfirmation(rTitle, rMessage, rAction);
-            lastSentTimestamp = System.currentTimeMillis();
-            lastConfirmActionString = rAction;
-            return;
-        } else if ("cancelChangeRequest".equals(act[0])) {
-            ////////////////////////////////////////////// CANCEL CHANGE REQUEST NOTIFICATION
-            rAction = "cancelChangeRequest";
-
-            WearPlugin.getPlugin().requestNotificationCancel(rAction);
-            return;
-        } else return;
-
-
-        // send result
-        WearPlugin.getPlugin().requestActionConfirmation(rTitle, rMessage, rAction);
-        lastSentTimestamp = System.currentTimeMillis();
-        lastConfirmActionString = rAction;
-    }
-
-    private static String generateTDDMessage(List<TDD> historyList, List<TDD> dummies) {
-
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-
-        if (profile == null) {
-            return "No profile loaded :(";
-        }
-
-        if (historyList.isEmpty()) {
-            return "No history data!";
-        }
-
-        DateFormat df = new SimpleDateFormat("dd.MM.");
-        String message = "";
-
-        double refTDD = profile.baseBasalSum() * 2;
-
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (df.format(new Date(historyList.get(0).date)).equals(df.format(new Date()))) {
-            double tdd = historyList.get(0).getTotal();
-            historyList.remove(0);
-            message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n";
-            message += "\n";
-        } else if (pump != null && pump instanceof DanaRPlugin) {
-            double tdd = DanaRPump.getInstance().dailyTotalUnits;
-            message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n";
-            message += "\n";
-        }
-
-        int i = 0;
-        double sum = 0d;
-        double weighted03 = 0d;
-        double weighted05 = 0d;
-        double weighted07 = 0d;
-
-        Collections.reverse(historyList);
-        for (TDD record : historyList) {
-            double tdd = record.getTotal();
-            if (i == 0) {
-                weighted03 = tdd;
-                weighted05 = tdd;
-                weighted07 = tdd;
-
-            } else {
-                weighted07 = (weighted07 * 0.3 + tdd * 0.7);
-                weighted05 = (weighted05 * 0.5 + tdd * 0.5);
-                weighted03 = (weighted03 * 0.7 + tdd * 0.3);
-            }
-            i++;
-        }
-        message += "weighted:\n";
-        message += "0.3: " + DecimalFormatter.to2Decimal(weighted03) + "U " + (DecimalFormatter.to0Decimal(100 * weighted03 / refTDD) + "%") + "\n";
-        message += "0.5: " + DecimalFormatter.to2Decimal(weighted05) + "U " + (DecimalFormatter.to0Decimal(100 * weighted05 / refTDD) + "%") + "\n";
-        message += "0.7: " + DecimalFormatter.to2Decimal(weighted07) + "U " + (DecimalFormatter.to0Decimal(100 * weighted07 / refTDD) + "%") + "\n";
-        message += "\n";
-        Collections.reverse(historyList);
-
-        //add TDDs:
-        for (TDD record : historyList) {
-            double tdd = record.getTotal();
-            message += df.format(new Date(record.date)) + " " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + (dummies.contains(record) ? "x" : "") + "\n";
-        }
-        return message;
-    }
-
-    public static boolean isOldData(List<TDD> historyList) {
-        Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        PumpInterface dana = DanaRPlugin.getPlugin();
-        PumpInterface danaRS = DanaRSPlugin.getPlugin();
-        PumpInterface danaV2 = DanaRv2Plugin.getPlugin();
-        PumpInterface danaKorean = DanaRKoreanPlugin.getPlugin();
-        PumpInterface insight = LocalInsightPlugin.getPlugin();
-
-        boolean startsYesterday = activePump == dana || activePump == danaRS || activePump == danaV2 || activePump == danaKorean || activePump == insight;
-
-        DateFormat df = new SimpleDateFormat("dd.MM.");
-        return (historyList.size() < 3 || !(df.format(new Date(historyList.get(0).date)).equals(df.format(new Date(System.currentTimeMillis() - (startsYesterday ? 1000 * 60 * 60 * 24 : 0))))));
-    }
-
-    @NonNull
-    public static List<TDD> getTDDList(List<TDD> returnDummies) {
-        List<TDD> historyList = MainApp.getDbHelper().getTDDs();
-
-        historyList = historyList.subList(0, Math.min(10, historyList.size()));
-
-        //fill single gaps - only needed for Dana*R data
-        List<TDD> dummies = (returnDummies != null) ? returnDummies : (new LinkedList());
-        DateFormat df = new SimpleDateFormat("dd.MM.");
-        for (int i = 0; i < historyList.size() - 1; i++) {
-            TDD elem1 = historyList.get(i);
-            TDD elem2 = historyList.get(i + 1);
-
-            if (!df.format(new Date(elem1.date)).equals(df.format(new Date(elem2.date + 25 * 60 * 60 * 1000)))) {
-                TDD dummy = new TDD();
-                dummy.date = elem1.date - 24 * 60 * 60 * 1000;
-                dummy.basal = elem1.basal / 2;
-                dummy.bolus = elem1.bolus / 2;
-                dummies.add(dummy);
-                elem1.basal /= 2;
-                elem1.bolus /= 2;
-
-
-            }
-        }
-        historyList.addAll(dummies);
-        Collections.sort(historyList, new Comparator<TDD>() {
-            @Override
-            public int compare(TDD lhs, TDD rhs) {
-                return (int) (rhs.date - lhs.date);
-            }
-        });
-
-        return historyList;
-    }
-
-    @NonNull
-    private static String getPumpStatus() {
-        return ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(false);
-    }
-
-    @NonNull
-    private static String getLoopStatus() {
-        String ret = "";
-        // decide if enabled/disabled closed/open; what Plugin as APS?
-        final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-        if (loopPlugin.isEnabled(loopPlugin.getType())) {
-            if (MainApp.getConstraintChecker().isClosedLoopAllowed().value()) {
-                ret += "CLOSED LOOP\n";
-            } else {
-                ret += "OPEN LOOP\n";
-            }
-            final APSInterface aps = ConfigBuilderPlugin.getPlugin().getActiveAPS();
-            ret += "APS: " + ((aps == null) ? "NO APS SELECTED!" : ((PluginBase) aps).getName());
-            if (LoopPlugin.lastRun != null) {
-                if (LoopPlugin.lastRun.lastAPSRun != null)
-                    ret += "\nLast Run: " + DateUtil.timeString(LoopPlugin.lastRun.lastAPSRun);
-
-                if (LoopPlugin.lastRun.lastEnact != null)
-                    ret += "\nLast Enact: " + DateUtil.timeString(LoopPlugin.lastRun.lastEnact);
-
-            }
-
-
-        } else {
-            ret += "LOOP DISABLED\n";
-        }
-        return ret;
-
-    }
-
-    @NonNull
-    private static String getTargetsStatus() {
-        String ret = "";
-        if (!Config.APS) {
-            return "Targets only apply in APS mode!";
-        }
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile == null) {
-            return "No profile set :(";
-        }
-
-        //Check for Temp-Target:
-        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
-        if (tempTarget != null) {
-            ret += "Temp Target: " + Profile.toTargetRangeString(tempTarget.low, tempTarget.low, Constants.MGDL, ProfileFunctions.getSystemUnits());
-            ret += "\nuntil: " + DateUtil.timeString(tempTarget.originalEnd());
-            ret += "\n\n";
-        }
-
-        ret += "DEFAULT RANGE: ";
-        ret += Profile.fromMgdlToUnits(profile.getTargetLowMgdl(), ProfileFunctions.getSystemUnits()) + " - " + Profile.fromMgdlToUnits(profile.getTargetHighMgdl(), ProfileFunctions.getSystemUnits());
-        ret += " target: " + Profile.fromMgdlToUnits(profile.getTargetMgdl(), ProfileFunctions.getSystemUnits());
-        return ret;
-    }
-
-    private static String getOAPSResultStatus() {
-        String ret = "";
-        if (!Config.APS) {
-            return "Only apply in APS mode!";
-        }
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile == null) {
-            return "No profile set :(";
-        }
-
-        APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
-        if (usedAPS == null) {
-            return "No active APS :(!";
-        }
-
-        APSResult result = usedAPS.getLastAPSResult();
-        if (result == null) {
-            return "Last result not available!";
-        }
-
-        if (!result.isChangeRequested()) {
-            ret += MainApp.gs(R.string.nochangerequested) + "\n";
-        } else if (result.rate == 0 && result.duration == 0) {
-            ret += MainApp.gs(R.string.canceltemp) + "\n";
-        } else {
-            ret += MainApp.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(result.rate) + " U/h " +
-                    "(" + DecimalFormatter.to2Decimal(result.rate / ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate() * 100) + "%)\n" +
-                    MainApp.gs(R.string.duration) + ": " + DecimalFormatter.to0Decimal(result.duration) + " min\n";
-        }
-        ret += "\n" + MainApp.gs(R.string.reason) + ": " + result.reason;
-
-        return ret;
-    }
-
-
-    public synchronized static void handleConfirmation(String actionString) {
-
-        if (!SP.getBoolean("wearcontrol", false)) return;
-
-
-        //Guard from old or duplicate confirmations
-        if (lastConfirmActionString == null) return;
-        if (!lastConfirmActionString.equals(actionString)) return;
-        if (System.currentTimeMillis() - lastSentTimestamp > TIMEOUT) return;
-        lastConfirmActionString = null;
-
-        // do the parsing, check constraints and enact!
-        String[] act = actionString.split("\\s+");
-
-        if ("fill".equals(act[0])) {
-            Double amount = SafeParse.stringToDouble(act[1]);
-            Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-            if (amount - insulinAfterConstraints != 0) {
-                ToastUtils.showToastInUiThread(MainApp.instance(), "aborting: previously applied constraint changed");
-                sendError("aborting: previously applied constraint changed");
-                return;
-            }
-            doFillBolus(amount);
-        } else if ("temptarget".equals(act[0])) {
-            int duration = SafeParse.stringToInt(act[2]);
-            double low = SafeParse.stringToDouble(act[3]);
-            double high = SafeParse.stringToDouble(act[4]);
-            boolean isMGDL = Boolean.parseBoolean(act[1]);
-            if (!isMGDL) {
-                low *= Constants.MMOLL_TO_MGDL;
-                high *= Constants.MMOLL_TO_MGDL;
-            }
-            generateTempTarget(duration, low, high);
-        } else if ("wizard2".equals(act[0])) {
-            if (lastBolusWizard != null) {
-                //use last calculation as confirmed string matches
-
-                doBolus(lastBolusWizard.getCalculatedTotalInsulin(), lastBolusWizard.getCarbs());
-                lastBolusWizard = null;
-            }
-        } else if ("bolus".equals(act[0])) {
-            double insulin = SafeParse.stringToDouble(act[1]);
-            int carbs = SafeParse.stringToInt(act[2]);
-            doBolus(insulin, carbs);
-        } else if ("cppset".equals(act[0])) {
-            int timeshift = SafeParse.stringToInt(act[1]);
-            int percentage = SafeParse.stringToInt(act[2]);
-            setCPP(timeshift, percentage);
-        } else if ("ecarbs".equals(act[0])) {
-            int carbs = SafeParse.stringToInt(act[1]);
-            long starttime = SafeParse.stringToLong(act[2]);
-            int duration = SafeParse.stringToInt(act[3]);
-
-            doECarbs(carbs, starttime, duration);
-        } else if ("dismissoverviewnotification".equals(act[0])) {
-            RxBus.INSTANCE.send(new EventDismissNotification(SafeParse.stringToInt(act[1])));
-        } else if ("changeRequest".equals(act[0])) {
-            LoopPlugin.getPlugin().acceptChangeRequest();
-            NotificationManager notificationManager =
-                    (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.cancel(Constants.notificationID);
-        }
-        lastBolusWizard = null;
-    }
-
-    private static void doECarbs(int carbs, long time, int duration) {
-        if (carbs > 0) {
-            if (duration == 0) {
-                CarbsGenerator.createCarb(carbs, time, CareportalEvent.CARBCORRECTION, "watch");
-            } else {
-                CarbsGenerator.generateCarbs(carbs, time, duration, "watch eCarbs");
-            }
-        }
-    }
-
-    private static void setCPP(int timeshift, int percentage) {
-
-        String msg = "";
-
-
-        //check for validity
-        if (percentage < Constants.CPP_MIN_PERCENTAGE || percentage > Constants.CPP_MAX_PERCENTAGE) {
-            msg += String.format(MainApp.gs(R.string.valueoutofrange), "Profile-Percentage") + "\n";
-        }
-        if (timeshift < 0 || timeshift > 23) {
-            msg += String.format(MainApp.gs(R.string.valueoutofrange), "Profile-Timeshift") + "\n";
-        }
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
-
-        if (profile == null) {
-            msg += MainApp.gs(R.string.notloadedplugins) + "\n";
-        }
-        if (!"".equals(msg)) {
-            msg += MainApp.gs(R.string.valuesnotstored);
-            String rTitle = "STATUS";
-            String rAction = "statusmessage";
-            WearPlugin.getPlugin().requestActionConfirmation(rTitle, msg, rAction);
-            lastSentTimestamp = System.currentTimeMillis();
-            lastConfirmActionString = rAction;
-            return;
-        }
-
-        //send profile to pumpe
-        new NewNSTreatmentDialog(); //init
-        ProfileFunctions.doProfileSwitch(0, percentage, timeshift);
-    }
-
-    private static void generateTempTarget(int duration, double low, double high) {
-        TempTarget tempTarget = new TempTarget()
-                .date(System.currentTimeMillis())
-                .duration(duration)
-                .reason("WearPlugin")
-                .source(Source.USER);
-        if (tempTarget.durationInMinutes != 0) {
-            tempTarget.low(low).high(high);
-        } else {
-            tempTarget.low(0).high(0);
-        }
-        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
-    }
-
-    private static void doFillBolus(final Double amount) {
-        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-        detailedBolusInfo.insulin = amount;
-        detailedBolusInfo.isValid = false;
-        detailedBolusInfo.source = Source.USER;
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-            @Override
-            public void run() {
-                if (!result.success) {
-                    sendError(MainApp.gs(R.string.treatmentdeliveryerror) +
-                            "\n" +
-                            result.comment);
-                }
-            }
-        });
-    }
-
-    private static void doBolus(final Double amount, final Integer carbs) {
-        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-        detailedBolusInfo.insulin = amount;
-        detailedBolusInfo.carbs = carbs;
-        detailedBolusInfo.source = Source.USER;
-        if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                @Override
-                public void run() {
-                    if (!result.success) {
-                        sendError(MainApp.gs(R.string.treatmentdeliveryerror) +
-                                "\n" +
-                                result.comment);
-                    }
-                }
-            });
-        } else {
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-        }
-    }
-
-    private synchronized static void sendError(String errormessage) {
-        WearPlugin.getPlugin().requestActionConfirmation("ERROR", errormessage, "error");
-        lastSentTimestamp = System.currentTimeMillis();
-        lastConfirmActionString = null;
-        lastBolusWizard = null;
-    }
-
-    private synchronized static void sendStatusmessage(String title, String message) {
-        WearPlugin.getPlugin().requestActionConfirmation(title, message, "statusmessage");
-        lastSentTimestamp = System.currentTimeMillis();
-        lastConfirmActionString = null;
-        lastBolusWizard = null;
-    }
-
-    public synchronized static void expectNotificationAction(String message, int id) {
-        String actionstring = "dismissoverviewnotification " + id;
-        WearPlugin.getPlugin().requestActionConfirmation("DISMISS", message, actionstring);
-        lastSentTimestamp = System.currentTimeMillis();
-        lastConfirmActionString = actionstring;
-        lastBolusWizard = null;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
new file mode 100644
index 0000000000..594c2f5c5b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -0,0 +1,626 @@
+package info.nightscout.androidaps.plugins.general.wear
+
+import android.app.NotificationManager
+import android.content.Context
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TDD
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.wizard.BolusWizard
+import java.text.DateFormat
+import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ActionStringHandler @Inject constructor(
+    private val sp: SP,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val injector: HasAndroidInjector,
+    private val context: Context,
+    private val constraintChecker: ConstraintChecker,
+    private val profileFunction: ProfileFunction,
+    private val loopPlugin: LoopPlugin,
+    private val wearPlugin: WearPlugin,
+    private val commandQueue: CommandQueueProvider,
+    private val activePlugin: ActivePluginProvider,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val localInsightPlugin: LocalInsightPlugin,
+    private val danaRPlugin: DanaRPlugin,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin,
+    private val danaRv2Plugin: DanaRv2Plugin,
+    private val danaRSPlugin: DanaRSPlugin,
+    private val danaRPump: DanaRPump,
+    private val hardLimits: HardLimits,
+    private val carbsGenerator: CarbsGenerator
+) {
+
+    private val TIMEOUT = 65 * 1000
+    private var lastSentTimestamp: Long = 0
+    private var lastConfirmActionString: String? = null
+    private var lastBolusWizard: BolusWizard? = null
+
+    // TODO Adrian use RxBus instead of Lazy + cross dependency
+    @Synchronized
+    fun handleInitiate(actionString: String) {
+        if (!sp.getBoolean("wearcontrol", false)) return
+        lastBolusWizard = null
+        var rTitle = "CONFIRM" //TODO: i18n
+        var rMessage = ""
+        var rAction = ""
+        // do the parsing and check constraints
+        val act = actionString.split("\\s+").toTypedArray()
+        if ("fillpreset" == act[0]) { ///////////////////////////////////// PRIME/FILL
+            val amount: Double = if ("1" == act[1]) {
+                sp.getDouble("fill_button1", 0.3)
+            } else if ("2" == act[1]) {
+                sp.getDouble("fill_button2", 0.0)
+            } else if ("3" == act[1]) {
+                sp.getDouble("fill_button3", 0.0)
+            } else {
+                return
+            }
+            val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+            rMessage += resourceHelper.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
+            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            rAction += "fill $insulinAfterConstraints"
+        } else if ("fill" == act[0]) { ////////////////////////////////////////////// PRIME/FILL
+            val amount = SafeParse.stringToDouble(act[1])
+            val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+            rMessage += resourceHelper.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
+            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            rAction += "fill $insulinAfterConstraints"
+        } else if ("bolus" == act[0]) { ////////////////////////////////////////////// BOLUS
+            val insulin = SafeParse.stringToDouble(act[1])
+            val carbs = SafeParse.stringToInt(act[2])
+            val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
+            val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+            rMessage += resourceHelper.gs(R.string.bolus) + ": " + insulinAfterConstraints + "U\n"
+            rMessage += resourceHelper.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
+            if (insulinAfterConstraints - insulin != 0.0 || carbsAfterConstraints - carbs != 0) {
+                rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            }
+            rAction += "bolus $insulinAfterConstraints $carbsAfterConstraints"
+        } else if ("temptarget" == act[0]) { ///////////////////////////////////////////////////////// TEMPTARGET
+            val isMGDL = java.lang.Boolean.parseBoolean(act[1])
+            if (profileFunction.getUnits() == Constants.MGDL != isMGDL) {
+                sendError("Different units used on watch and phone!")
+                return
+            }
+            val duration = SafeParse.stringToInt(act[2])
+            if (duration == 0) {
+                rMessage += "Zero-Temp-Target - cancelling running Temp-Targets?"
+                rAction = "temptarget true 0 0 0"
+            } else {
+                var low = SafeParse.stringToDouble(act[3])
+                var high = SafeParse.stringToDouble(act[4])
+                if (!isMGDL) {
+                    low *= Constants.MMOLL_TO_MGDL
+                    high *= Constants.MMOLL_TO_MGDL
+                }
+                if (low < hardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0] || low > hardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1]) {
+                    sendError("Min-BG out of range!")
+                    return
+                }
+                if (high < hardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0] || high > hardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1]) {
+                    sendError("Max-BG out of range!")
+                    return
+                }
+                rMessage += "Temptarget:\nMin: " + act[3] + "\nMax: " + act[4] + "\nDuration: " + act[2]
+                rAction = actionString
+            }
+        } else if ("status" == act[0]) { ////////////////////////////////////////////// STATUS
+            rTitle = "STATUS"
+            rAction = "statusmessage"
+            if ("pump" == act[1]) {
+                rTitle += " PUMP"
+                rMessage = pumpStatus
+            } else if ("loop" == act[1]) {
+                rTitle += " LOOP"
+                rMessage = "TARGETS:\n$targetsStatus"
+                rMessage += "\n\n" + loopStatus
+                rMessage += "\n\nOAPS RESULT:\n$oAPSResultStatus"
+            }
+        } else if ("wizard" == act[0]) {
+            sendError("Update APP on Watch!")
+            return
+        } else if ("wizard2" == act[0]) { ////////////////////////////////////////////// WIZARD
+            val carbsBeforeConstraints = SafeParse.stringToInt(act[1])
+            val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbsBeforeConstraints)).value()
+            if (carbsAfterConstraints - carbsBeforeConstraints != 0) {
+                sendError("Carb constraint violation!")
+                return
+            }
+            val useBG = sp.getBoolean(R.string.key_wearwizard_bg, true)
+            val useTT = sp.getBoolean(R.string.key_wearwizard_tt, false)
+            val useBolusIOB = sp.getBoolean(R.string.key_wearwizard_bolusiob, true)
+            val useBasalIOB = sp.getBoolean(R.string.key_wearwizard_basaliob, true)
+            val useCOB = sp.getBoolean(R.string.key_wearwizard_cob, true)
+            val useTrend = sp.getBoolean(R.string.key_wearwizard_trend, false)
+            val percentage = act[2].toInt()
+            val profile = profileFunction.getProfile()
+            val profileName = profileFunction.getProfileName()
+            if (profile == null) {
+                sendError("No profile found!")
+                return
+            }
+            val bgReading = iobCobCalculatorPlugin.actualBg()
+            if (bgReading == null && useBG) {
+                sendError("No recent BG to base calculation on!")
+                return
+            }
+            val cobInfo = iobCobCalculatorPlugin.getCobInfo(false, "Wizard wear")
+            if (useCOB && (cobInfo.displayCob == null)) {
+                sendError("Unknown COB! BG reading missing or recent app restart?")
+                return
+            }
+            val format = DecimalFormat("0.00")
+            val formatInt = DecimalFormat("0")
+            val bolusWizard = BolusWizard(injector).doCalc(profile, profileName, activePlugin.activeTreatments.tempTargetFromHistory,
+                carbsAfterConstraints, cobInfo.displayCob!!, bgReading!!.valueToUnits(profileFunction.getUnits()),
+                0.0, percentage.toDouble(), useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend)
+            if (Math.abs(bolusWizard.insulinAfterConstraints - bolusWizard.calculatedTotalInsulin) >= 0.01) {
+                sendError("Insulin constraint violation!" +
+                    "\nCannot deliver " + format.format(bolusWizard.calculatedTotalInsulin) + "!")
+                return
+            }
+            if (bolusWizard.calculatedTotalInsulin <= 0 && bolusWizard.carbs <= 0) {
+                rAction = "info"
+                rTitle = "INFO"
+            } else {
+                rAction = actionString
+            }
+            rMessage += "Carbs: " + bolusWizard.carbs + "g"
+            rMessage += "\nBolus: " + format.format(bolusWizard.calculatedTotalInsulin) + "U"
+            rMessage += "\n_____________"
+            rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.ic) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.sens) + "): "
+            rMessage += "\nFrom Carbs: " + format.format(bolusWizard.insulinFromCarbs) + "U"
+            if (useCOB) rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.insulinFromCOB) + "U"
+            if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.insulinFromBG) + "U"
+            if (useBolusIOB) rMessage += "\nBolus IOB: " + format.format(bolusWizard.insulinFromBolusIOB) + "U"
+            if (useBasalIOB) rMessage += "\nBasal IOB: " + format.format(bolusWizard.insulinFromBasalsIOB) + "U"
+            if (useTrend) rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.insulinFromTrend) + "U"
+            if (percentage != 100) {
+                rMessage += "\nPercentage: " + format.format(bolusWizard.totalBeforePercentageAdjustment) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.calculatedTotalInsulin) + "U"
+            }
+            lastBolusWizard = bolusWizard
+        } else if ("opencpp" == act[0]) {
+            val activeProfileSwitch = activePlugin.activeTreatments.getProfileSwitchFromHistory(System.currentTimeMillis())
+            if (activeProfileSwitch == null) {
+                sendError("No active profile switch!")
+                return
+            } else { // read CPP values
+                rTitle = "opencpp"
+                rMessage = "opencpp"
+                rAction = "opencpp" + " " + activeProfileSwitch.percentage + " " + activeProfileSwitch.timeshift
+            }
+        } else if ("cppset" == act[0]) {
+            val activeProfileSwitch = activePlugin.activeTreatments.getProfileSwitchFromHistory(System.currentTimeMillis())
+            if (activeProfileSwitch == null) {
+                sendError("No active profile switch!")
+                return
+            } else { // read CPP values
+                rMessage = "CPP:" + "\n\n" +
+                    "Timeshift: " + act[1] + "\n" +
+                    "Percentage: " + act[2] + "%"
+                rAction = actionString
+            }
+        } else if ("tddstats" == act[0]) {
+            val activePump = activePlugin.activePump
+            // check if DB up to date
+            val dummies: MutableList<TDD> = LinkedList()
+            val historyList = getTDDList(dummies)
+            if (isOldData(historyList)) {
+                rTitle = "TDD"
+                rAction = "statusmessage"
+                rMessage = "OLD DATA - "
+                //if pump is not busy: try to fetch data
+                if (activePump.isBusy) {
+                    rMessage += resourceHelper.gs(R.string.pumpbusy)
+                } else {
+                    rMessage += "trying to fetch data from pump."
+                    commandQueue.loadTDDs(object : Callback() {
+                        override fun run() {
+                            val dummies1: MutableList<TDD> = LinkedList()
+                            val historyList1 = getTDDList(dummies1)
+                            if (isOldData(historyList1)) {
+                                sendStatusMessage("TDD: Still old data! Cannot load from pump.\n" + generateTDDMessage(historyList1, dummies1))
+                            } else {
+                                sendStatusMessage(generateTDDMessage(historyList1, dummies1))
+                            }
+                        }
+                    })
+                }
+            } else { // if up to date: prepare, send (check if CPP is activated -> add CPP stats)
+                rTitle = "TDD"
+                rAction = "statusmessage"
+                rMessage = generateTDDMessage(historyList, dummies)
+            }
+        } else if ("ecarbs" == act[0]) { ////////////////////////////////////////////// ECARBS
+            val carbs = SafeParse.stringToInt(act[1])
+            val starttime = SafeParse.stringToInt(act[2])
+            val duration = SafeParse.stringToInt(act[3])
+            val starttimestamp = System.currentTimeMillis() + starttime * 60 * 1000
+            val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+            rMessage += resourceHelper.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
+            rMessage += "\n" + resourceHelper.gs(R.string.time) + ": " + DateUtil.timeString(starttimestamp)
+            rMessage += "\n" + resourceHelper.gs(R.string.duration) + ": " + duration + "h"
+            if (carbsAfterConstraints - carbs != 0) {
+                rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            }
+            if (carbsAfterConstraints <= 0) {
+                sendError("Carbs = 0! No action taken!")
+                return
+            }
+            rAction += "ecarbs $carbsAfterConstraints $starttimestamp $duration"
+        } else if ("changeRequest" == act[0]) { ////////////////////////////////////////////// CHANGE REQUEST
+            rTitle = resourceHelper.gs(R.string.openloop_newsuggestion)
+            rAction = "changeRequest"
+            val finalLastRun = loopPlugin.lastRun
+            rMessage += finalLastRun.constraintsProcessed
+            wearPlugin.requestChangeConfirmation(rTitle, rMessage, rAction)
+            lastSentTimestamp = System.currentTimeMillis()
+            lastConfirmActionString = rAction
+            return
+        } else if ("cancelChangeRequest" == act[0]) { ////////////////////////////////////////////// CANCEL CHANGE REQUEST NOTIFICATION
+            rAction = "cancelChangeRequest"
+            wearPlugin.requestNotificationCancel(rAction)
+            return
+        } else return
+        // send result
+        wearPlugin.requestActionConfirmation(rTitle, rMessage, rAction)
+        lastSentTimestamp = System.currentTimeMillis()
+        lastConfirmActionString = rAction
+    }
+
+    private fun generateTDDMessage(historyList: MutableList<TDD>, dummies: MutableList<TDD>): String {
+        val profile = profileFunction.getProfile() ?: return "No profile loaded :("
+        if (historyList.isEmpty()) {
+            return "No history data!"
+        }
+        val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
+        var message = ""
+        val refTDD = profile.baseBasalSum() * 2
+        val pump = activePlugin.activePump
+        if (df.format(Date(historyList[0].date)) == df.format(Date())) {
+            val tdd = historyList[0].getTotal()
+            historyList.removeAt(0)
+            message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n"
+            message += "\n"
+        } else if (pump is DanaRPlugin) {
+            val tdd = danaRPump.dailyTotalUnits
+            message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n"
+            message += "\n"
+        }
+        var i = 0
+        var weighted03 = 0.0
+        var weighted05 = 0.0
+        var weighted07 = 0.0
+        Collections.reverse(historyList)
+        for (record in historyList) {
+            val tdd = record.getTotal()
+            if (i == 0) {
+                weighted03 = tdd
+                weighted05 = tdd
+                weighted07 = tdd
+            } else {
+                weighted07 = weighted07 * 0.3 + tdd * 0.7
+                weighted05 = weighted05 * 0.5 + tdd * 0.5
+                weighted03 = weighted03 * 0.7 + tdd * 0.3
+            }
+            i++
+        }
+        message += "weighted:\n"
+        message += "0.3: " + DecimalFormatter.to2Decimal(weighted03) + "U " + (DecimalFormatter.to0Decimal(100 * weighted03 / refTDD) + "%") + "\n"
+        message += "0.5: " + DecimalFormatter.to2Decimal(weighted05) + "U " + (DecimalFormatter.to0Decimal(100 * weighted05 / refTDD) + "%") + "\n"
+        message += "0.7: " + DecimalFormatter.to2Decimal(weighted07) + "U " + (DecimalFormatter.to0Decimal(100 * weighted07 / refTDD) + "%") + "\n"
+        message += "\n"
+        Collections.reverse(historyList)
+        //add TDDs:
+        for (record in historyList) {
+            val tdd = record.getTotal()
+            message += df.format(Date(record.date)) + " " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + (if (dummies.contains(record)) "x" else "") + "\n"
+        }
+        return message
+    }
+
+    private fun isOldData(historyList: List<TDD>): Boolean {
+        val activePump = activePlugin.activePump
+        val startsYesterday = activePump === danaRPlugin || activePump === danaRSPlugin || activePump === danaRv2Plugin || activePump === danaRKoreanPlugin || activePump === localInsightPlugin
+        val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
+        return historyList.size < 3 || df.format(Date(historyList[0].date)) != df.format(Date(System.currentTimeMillis() - if (startsYesterday) 1000 * 60 * 60 * 24 else 0))
+    }
+
+    private fun getTDDList(returnDummies: MutableList<TDD>): MutableList<TDD> {
+        var historyList = MainApp.getDbHelper().tdDs
+        historyList = historyList.subList(0, Math.min(10, historyList.size))
+        //fill single gaps - only needed for Dana*R data
+        val dummies: MutableList<TDD> = returnDummies
+        val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
+        for (i in 0 until historyList.size - 1) {
+            val elem1 = historyList[i]
+            val elem2 = historyList[i + 1]
+            if (df.format(Date(elem1!!.date)) != df.format(Date(elem2!!.date + 25 * 60 * 60 * 1000))) {
+                val dummy = TDD()
+                dummy.date = elem1.date - 24 * 60 * 60 * 1000
+                dummy.basal = elem1.basal / 2
+                dummy.bolus = elem1.bolus / 2
+                dummies.add(dummy)
+                elem1.basal /= 2.0
+                elem1.bolus /= 2.0
+            }
+        }
+        historyList.addAll(dummies)
+        Collections.sort(historyList) { lhs, rhs -> (rhs.date - lhs.date).toInt() }
+        return historyList
+    }
+
+    private val pumpStatus: String
+        get() = activePlugin.activePump.shortStatus(false)
+
+    // decide if enabled/disabled closed/open; what Plugin as APS?
+    private val loopStatus: String
+        get() {
+            var ret = ""
+            // decide if enabled/disabled closed/open; what Plugin as APS?
+            if (loopPlugin.isEnabled(loopPlugin.getType())) {
+                ret += if (constraintChecker.isClosedLoopAllowed().value()) {
+                    "CLOSED LOOP\n"
+                } else {
+                    "OPEN LOOP\n"
+                }
+                val aps = activePlugin.activeAPS
+                ret += "APS: " + (aps as PluginBase).name
+                if (loopPlugin.lastRun != null) {
+                    if (loopPlugin.lastRun.lastAPSRun != null) ret += "\nLast Run: " + DateUtil.timeString(loopPlugin.lastRun.lastAPSRun)
+                    if (loopPlugin.lastRun.lastTBREnact != 0L) ret += "\nLast Enact: " + DateUtil.timeString(loopPlugin.lastRun.lastTBREnact)
+                }
+            } else {
+                ret += "LOOP DISABLED\n"
+            }
+            return ret
+        }
+
+    //Check for Temp-Target:
+    private val targetsStatus: String
+        get() {
+            var ret = ""
+            if (!Config.APS) {
+                return "Targets only apply in APS mode!"
+            }
+            val profile = profileFunction.getProfile() ?: return "No profile set :("
+            //Check for Temp-Target:
+            val tempTarget = activePlugin.activeTreatments.tempTargetFromHistory
+            if (tempTarget != null) {
+                ret += "Temp Target: " + Profile.toTargetRangeString(tempTarget.low, tempTarget.low, Constants.MGDL, profileFunction.getUnits())
+                ret += "\nuntil: " + DateUtil.timeString(tempTarget.originalEnd())
+                ret += "\n\n"
+            }
+            ret += "DEFAULT RANGE: "
+            ret += Profile.fromMgdlToUnits(profile.targetLowMgdl, profileFunction.getUnits()).toString() + " - " + Profile.fromMgdlToUnits(profile.targetHighMgdl, profileFunction.getUnits())
+            ret += " target: " + Profile.fromMgdlToUnits(profile.targetMgdl, profileFunction.getUnits())
+            return ret
+        }
+
+    private val oAPSResultStatus: String
+        get() {
+            var ret = ""
+            if (!Config.APS)
+                return "Only apply in APS mode!"
+            val usedAPS = activePlugin.activeAPS
+            val result = usedAPS.lastAPSResult ?: return "Last result not available!"
+            ret += if (!result.isChangeRequested) {
+                resourceHelper.gs(R.string.nochangerequested) + "\n"
+            } else if (result.rate == 0.0 && result.duration == 0) {
+                resourceHelper.gs(R.string.canceltemp) + "\n"
+            } else {
+                resourceHelper.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(result.rate) + " U/h " +
+                    "(" + DecimalFormatter.to2Decimal(result.rate / activePlugin.activePump.baseBasalRate * 100) + "%)\n" +
+                    resourceHelper.gs(R.string.duration) + ": " + DecimalFormatter.to0Decimal(result.duration.toDouble()) + " min\n"
+            }
+            ret += "\n" + resourceHelper.gs(R.string.reason) + ": " + result.reason
+            return ret
+        }
+
+    @Synchronized
+    fun handleConfirmation(actionString: String) {
+        if (!sp.getBoolean("wearcontrol", false)) return
+        //Guard from old or duplicate confirmations
+        if (lastConfirmActionString == null) return
+        if (lastConfirmActionString != actionString) return
+        if (System.currentTimeMillis() - lastSentTimestamp > TIMEOUT) return
+        lastConfirmActionString = null
+        // do the parsing, check constraints and enact!
+        val act = actionString.split("\\s+").toTypedArray()
+        if ("fill" == act[0]) {
+            val amount = SafeParse.stringToDouble(act[1])
+            val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+            if (amount - insulinAfterConstraints != 0.0) {
+                ToastUtils.showToastInUiThread(context, "aborting: previously applied constraint changed")
+                sendError("aborting: previously applied constraint changed")
+                return
+            }
+            doFillBolus(amount)
+        } else if ("temptarget" == act[0]) {
+            val duration = SafeParse.stringToInt(act[2])
+            var low = SafeParse.stringToDouble(act[3])
+            var high = SafeParse.stringToDouble(act[4])
+            val isMGDL = java.lang.Boolean.parseBoolean(act[1])
+            if (!isMGDL) {
+                low *= Constants.MMOLL_TO_MGDL
+                high *= Constants.MMOLL_TO_MGDL
+            }
+            generateTempTarget(duration, low, high)
+        } else if ("wizard2" == act[0]) {
+            if (lastBolusWizard != null) { //use last calculation as confirmed string matches
+                doBolus(lastBolusWizard!!.calculatedTotalInsulin, lastBolusWizard!!.carbs)
+                lastBolusWizard = null
+            }
+        } else if ("bolus" == act[0]) {
+            val insulin = SafeParse.stringToDouble(act[1])
+            val carbs = SafeParse.stringToInt(act[2])
+            doBolus(insulin, carbs)
+        } else if ("cppset" == act[0]) {
+            val timeshift = SafeParse.stringToInt(act[1])
+            val percentage = SafeParse.stringToInt(act[2])
+            setCPP(timeshift, percentage)
+        } else if ("ecarbs" == act[0]) {
+            val carbs = SafeParse.stringToInt(act[1])
+            val starttime = SafeParse.stringToLong(act[2])
+            val duration = SafeParse.stringToInt(act[3])
+            doECarbs(carbs, starttime, duration)
+        } else if ("dismissoverviewnotification" == act[0]) {
+            rxBus.send(EventDismissNotification(SafeParse.stringToInt(act[1])))
+        } else if ("changeRequest" == act[0]) {
+            loopPlugin.acceptChangeRequest()
+            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.cancel(Constants.notificationID)
+        }
+        lastBolusWizard = null
+    }
+
+    private fun doECarbs(carbs: Int, time: Long, duration: Int) {
+        if (carbs > 0) {
+            if (duration == 0) {
+                carbsGenerator.createCarb(carbs, time, CareportalEvent.CARBCORRECTION, "watch")
+            } else {
+                carbsGenerator.generateCarbs(carbs, time, duration, "watch eCarbs")
+            }
+        }
+    }
+
+    private fun setCPP(timeshift: Int, percentage: Int) {
+        var msg = ""
+        //check for validity
+        if (percentage < Constants.CPP_MIN_PERCENTAGE || percentage > Constants.CPP_MAX_PERCENTAGE) {
+            msg += String.format(resourceHelper.gs(R.string.valueoutofrange), "Profile-Percentage") + "\n"
+        }
+        if (timeshift < 0 || timeshift > 23) {
+            msg += String.format(resourceHelper.gs(R.string.valueoutofrange), "Profile-Timeshift") + "\n"
+        }
+        val profile = profileFunction.getProfile()
+        if (profile == null) {
+            msg += resourceHelper.gs(R.string.notloadedplugins) + "\n"
+        }
+        if ("" != msg) {
+            msg += resourceHelper.gs(R.string.valuesnotstored)
+            val rTitle = "STATUS"
+            val rAction = "statusmessage"
+            wearPlugin.requestActionConfirmation(rTitle, msg, rAction)
+            lastSentTimestamp = System.currentTimeMillis()
+            lastConfirmActionString = rAction
+            return
+        }
+        //send profile to pumpe
+        activePlugin.activeTreatments.doProfileSwitch(0, percentage, timeshift)
+    }
+
+    private fun generateTempTarget(duration: Int, low: Double, high: Double) {
+        val tempTarget = TempTarget()
+            .date(System.currentTimeMillis())
+            .duration(duration)
+            .reason("WearPlugin")
+            .source(Source.USER)
+        if (tempTarget.durationInMinutes != 0) {
+            tempTarget.low(low).high(high)
+        } else {
+            tempTarget.low(0.0).high(0.0)
+        }
+        activePlugin.activeTreatments.addToHistoryTempTarget(tempTarget)
+    }
+
+    private fun doFillBolus(amount: Double) {
+        val detailedBolusInfo = DetailedBolusInfo()
+        detailedBolusInfo.insulin = amount
+        detailedBolusInfo.isValid = false
+        detailedBolusInfo.source = Source.USER
+        commandQueue.bolus(detailedBolusInfo, object : Callback() {
+            override fun run() {
+                if (!result.success) {
+                    sendError(resourceHelper.gs(R.string.treatmentdeliveryerror) +
+                        "\n" +
+                        result.comment)
+                }
+            }
+        })
+    }
+
+    private fun doBolus(amount: Double, carbs: Int) {
+        val detailedBolusInfo = DetailedBolusInfo()
+        detailedBolusInfo.insulin = amount
+        detailedBolusInfo.carbs = carbs.toDouble()
+        detailedBolusInfo.source = Source.USER
+        val storesCarbs = activePlugin.activePump.pumpDescription.storesCarbInfo
+        if (detailedBolusInfo.insulin > 0 || storesCarbs) {
+            commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                override fun run() {
+                    if (!result.success) {
+                        sendError(resourceHelper.gs(R.string.treatmentdeliveryerror) +
+                            "\n" +
+                            result.comment)
+                    }
+                }
+            })
+        } else {
+            activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+        }
+    }
+
+    @Synchronized private fun sendError(errormessage: String) {
+        wearPlugin.requestActionConfirmation("ERROR", errormessage, "error")
+        lastSentTimestamp = System.currentTimeMillis()
+        lastConfirmActionString = null
+        lastBolusWizard = null
+    }
+
+    @Synchronized
+    private fun sendStatusMessage(message: String) {
+        wearPlugin.requestActionConfirmation("TDD", message, "statusmessage")
+        lastSentTimestamp = System.currentTimeMillis()
+        lastConfirmActionString = null
+        lastBolusWizard = null
+    } /*
+    public synchronized static void expectNotificationAction(String message, int id) {
+        String actionstring = "dismissoverviewnotification " + id;
+        WearPlugin.getPlugin().requestActionConfirmation("DISMISS", message, actionstring);
+        lastSentTimestamp = System.currentTimeMillis();
+        lastConfirmActionString = actionstring;
+        lastBolusWizard = null;
+    }
+*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java
deleted file mode 100644
index 9eb157de24..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.general.wear;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import info.nightscout.androidaps.R;
-
-/**
- * Created by adrian on 17/11/16.
- */
-
-public class WearFragment extends Fragment {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.wear_fragment, container, false);
-
-        view.findViewById(R.id.wear_resend).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WearPlugin.getPlugin().resendDataToWatch();
-            }
-        });
-
-        view.findViewById(R.id.wear_opensettings).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WearPlugin.getPlugin().openSettings();
-            }
-        });
-
-        return view;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt
new file mode 100644
index 0000000000..105e2589c0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.general.wear
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import kotlinx.android.synthetic.main.wear_fragment.*
+import javax.inject.Inject
+
+class WearFragment : DaggerFragment() {
+    @Inject lateinit var wearPlugin: WearPlugin
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.wear_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        wear_resend.setOnClickListener { wearPlugin.resendDataToWatch() }
+        wear_opensettings.setOnClickListener { wearPlugin.openSettings() }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
deleted file mode 100644
index ec01bff68b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package info.nightscout.androidaps.plugins.general.wear;
-
-import android.content.Context;
-import android.content.Intent;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventBolusRequested;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventNewBasalProfile;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.events.EventTreatmentChange;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Created by adrian on 17/11/16.
- */
-
-public class WearPlugin extends PluginBase {
-
-    private static WatchUpdaterService watchUS;
-    private final Context ctx;
-
-    private static WearPlugin wearPlugin;
-    private static String TAG = "WearPlugin";
-
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    public static WearPlugin getPlugin() {
-        return wearPlugin;
-    }
-
-    public static WearPlugin initPlugin(Context ctx) {
-
-        if (wearPlugin == null) {
-            wearPlugin = new WearPlugin(ctx);
-        }
-
-        return wearPlugin;
-    }
-
-    WearPlugin(Context ctx) {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(WearFragment.class.getName())
-                .pluginName(R.string.wear)
-                .shortName(R.string.wear_shortname)
-                .preferencesId(R.xml.pref_wear)
-                .description(R.string.description_wear)
-        );
-        this.ctx = ctx;
-    }
-
-    @Override
-    protected void onStart() {
-        if (watchUS != null) {
-            watchUS.setSettings();
-        }
-        super.onStart();
-
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventOpenAPSUpdateGui.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(true, true, false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventExtendedBolusChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(true, true, false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTempBasalChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(true, true, false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTreatmentChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(true, true, false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventNewBasalProfile.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(false, true, false),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendDataToWatch(true, true, true),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            // possibly new high or low mark
-                            resendDataToWatch();
-                            // status may be formated differently
-                            sendDataToWatch(true, false, false);
-                        }, FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventRefreshOverview.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            if (WatchUpdaterService.shouldReportLoopStatus(LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
-                                sendDataToWatch(true, false, false);
-                        }, FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventBolusRequested.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            String status = String.format(MainApp.gs(R.string.bolusrequested), event.getAmount());
-                            Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS);
-                            intent.putExtra("progresspercent", 0);
-                            intent.putExtra("progressstatus", status);
-                            ctx.startService(intent);
-                        }, FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventDismissBolusProgressIfRunning.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            if (event.getResult() == null) return;
-                            String status;
-                            if (event.getResult().success) {
-                                status = MainApp.gs(R.string.success);
-                            } else {
-                                status = MainApp.gs(R.string.nosuccess);
-                            }
-                            Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS);
-                            intent.putExtra("progresspercent", 100);
-                            intent.putExtra("progressstatus", status);
-                            ctx.startService(intent);
-                        }, FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventOverviewBolusProgress.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            if (!event.isSMB() || SP.getBoolean("wear_notifySMB", true)) {
-                                Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS);
-                                intent.putExtra("progresspercent", event.getPercent());
-                                intent.putExtra("progressstatus", event.getStatus());
-                                ctx.startService(intent);
-                            }
-                        }, FabricPrivacy::logException
-                ));
-    }
-
-
-    @Override
-    protected void onStop() {
-        disposable.clear();
-        super.onStop();
-    }
-
-    private void sendDataToWatch(boolean status, boolean basals, boolean bgValue) {
-
-        //Log.d(TAG, "WR: WearPlugin:sendDataToWatch (status=" + status + ",basals=" + basals + ",bgValue=" + bgValue + ")");
-
-        if (isEnabled(getType())) { // only start service when this plugin is enabled
-
-            if (bgValue) {
-                ctx.startService(new Intent(ctx, WatchUpdaterService.class));
-            }
-
-            if (basals) {
-                ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_BASALS));
-            }
-
-            if (status) {
-                ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_STATUS));
-            }
-        }
-    }
-
-    void resendDataToWatch() {
-        //Log.d(TAG, "WR: WearPlugin:resendDataToWatch");
-        ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_RESEND));
-    }
-
-    void openSettings() {
-        //Log.d(TAG, "WR: WearPlugin:openSettings");
-        ctx.startService(new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_OPEN_SETTINGS));
-    }
-
-    void requestNotificationCancel(String actionstring) {
-        //Log.d(TAG, "WR: WearPlugin:requestNotificationCancel");
-
-        Intent intent = new Intent(ctx, WatchUpdaterService.class)
-                .setAction(WatchUpdaterService.ACTION_CANCEL_NOTIFICATION);
-        intent.putExtra("actionstring", actionstring);
-        ctx.startService(intent);
-    }
-
-    public void requestActionConfirmation(String title, String message, String actionstring) {
-
-        Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_ACTIONCONFIRMATIONREQUEST);
-        intent.putExtra("title", title);
-        intent.putExtra("message", message);
-        intent.putExtra("actionstring", actionstring);
-        ctx.startService(intent);
-    }
-
-    public void requestChangeConfirmation(String title, String message, String actionstring) {
-
-        Intent intent = new Intent(ctx, WatchUpdaterService.class).setAction(WatchUpdaterService.ACTION_SEND_CHANGECONFIRMATIONREQUEST);
-        intent.putExtra("title", title);
-        intent.putExtra("message", message);
-        intent.putExtra("actionstring", actionstring);
-        ctx.startService(intent);
-    }
-
-    public static void registerWatchUpdaterService(WatchUpdaterService wus) {
-        watchUS = wus;
-    }
-
-    public static void unRegisterWatchUpdaterService() {
-        watchUS = null;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
new file mode 100644
index 0000000000..62c964238c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
@@ -0,0 +1,183 @@
+package info.nightscout.androidaps.plugins.general.wear
+
+import android.content.Intent
+import dagger.Lazy
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WearPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val mainApp: MainApp,
+    private val fabricPrivacy: FabricPrivacy,
+    private val loopPlugin: Lazy<LoopPlugin>,
+    private val rxBus: RxBusWrapper
+
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.GENERAL)
+    .fragmentClass(WearFragment::class.java.name)
+    .pluginName(R.string.wear)
+    .shortName(R.string.wear_shortname)
+    .preferencesId(R.xml.pref_wear)
+    .description(R.string.description_wear),
+    aapsLogger, resourceHelper, injector
+) {
+
+    private val disposable = CompositeDisposable()
+    override fun onStart() {
+        super.onStart()
+        disposable.add(rxBus
+            .toObservable(EventOpenAPSUpdateGui::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = false) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = false) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = false) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventTreatmentChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = false) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventNewBasalProfile::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = false, basals = true, bgValue = false) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = true) }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                // possibly new high or low mark
+                resendDataToWatch()
+                // status may be formatted differently
+                sendDataToWatch(status = true, basals = false, bgValue = false)
+            }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventRefreshOverview::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                if (WatchUpdaterService.shouldReportLoopStatus(loopPlugin.get().isEnabled(PluginType.LOOP)))
+                    sendDataToWatch(status = true, basals = false, bgValue = false)
+            }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventBolusRequested::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event: EventBolusRequested ->
+                val status = String.format(resourceHelper.gs(R.string.bolusrequested), event.amount)
+                val intent = Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS)
+                intent.putExtra("progresspercent", 0)
+                intent.putExtra("progressstatus", status)
+                mainApp.startService(intent)
+            }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventDismissBolusProgressIfRunning::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event: EventDismissBolusProgressIfRunning ->
+                if (event.result == null) return@subscribe
+                val status: String = if (event.result.success) {
+                    resourceHelper.gs(R.string.success)
+                } else {
+                    resourceHelper.gs(R.string.nosuccess)
+                }
+                val intent = Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS)
+                intent.putExtra("progresspercent", 100)
+                intent.putExtra("progressstatus", status)
+                mainApp.startService(intent)
+            }) { fabricPrivacy.logException(it) })
+        disposable.add(rxBus
+            .toObservable(EventOverviewBolusProgress::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event: EventOverviewBolusProgress ->
+                if (!event.isSMB() || sp.getBoolean("wear_notifySMB", true)) {
+                    val intent = Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS)
+                    intent.putExtra("progresspercent", event.percent)
+                    intent.putExtra("progressstatus", event.status)
+                    mainApp.startService(intent)
+                }
+            }) { fabricPrivacy.logException(it) })
+    }
+
+    override fun onStop() {
+        disposable.clear()
+        super.onStop()
+    }
+
+    private fun sendDataToWatch(status: Boolean, basals: Boolean, bgValue: Boolean) {
+        //Log.d(TAG, "WR: WearPlugin:sendDataToWatch (status=" + status + ",basals=" + basals + ",bgValue=" + bgValue + ")");
+        if (isEnabled(getType())) {
+            // only start service when this plugin is enabled
+            if (bgValue) {
+                mainApp.startService(Intent(mainApp, WatchUpdaterService::class.java))
+            }
+            if (basals) {
+                mainApp.startService(Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BASALS))
+            }
+            if (status) {
+                mainApp.startService(Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_STATUS))
+            }
+        }
+    }
+
+    fun resendDataToWatch() {
+        //Log.d(TAG, "WR: WearPlugin:resendDataToWatch");
+        mainApp.startService(Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_RESEND))
+    }
+
+    fun openSettings() {
+        //Log.d(TAG, "WR: WearPlugin:openSettings");
+        mainApp.startService(Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_OPEN_SETTINGS))
+    }
+
+    fun requestNotificationCancel(actionString: String?) { //Log.d(TAG, "WR: WearPlugin:requestNotificationCancel");
+        val intent = Intent(mainApp, WatchUpdaterService::class.java)
+            .setAction(WatchUpdaterService.ACTION_CANCEL_NOTIFICATION)
+        intent.putExtra("actionstring", actionString)
+        mainApp.startService(intent)
+    }
+
+    fun requestActionConfirmation(title: String, message: String, actionString: String) {
+        val intent = Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_ACTIONCONFIRMATIONREQUEST)
+        intent.putExtra("title", title)
+        intent.putExtra("message", message)
+        intent.putExtra("actionstring", actionString)
+        mainApp.startService(intent)
+    }
+
+    fun requestChangeConfirmation(title: String, message: String, actionString: String) {
+        val intent = Intent(mainApp, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_CHANGECONFIRMATIONREQUEST)
+        intent.putExtra("title", title)
+        intent.putExtra("message", message)
+        intent.putExtra("actionstring", actionString)
+        mainApp.startService(intent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 39676f17b4..11eb0b39c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -1,15 +1,10 @@
 package info.nightscout.androidaps.plugins.general.wear.wearintegration;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
-import android.os.BatteryManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -26,13 +21,14 @@ import com.google.android.gms.wearable.PutDataRequest;
 import com.google.android.gms.wearable.Wearable;
 import com.google.android.gms.wearable.WearableListenerService;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjection;
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
@@ -40,26 +36,41 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 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.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.utils.BatteryLevel;
 import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class WatchUpdaterService extends WearableListenerService implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
+    @Inject public HasAndroidInjector injector;
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public WearPlugin wearPlugin;
+    @Inject public ResourceHelper resourceHelper;
+    @Inject public SP sp;
+    @Inject public ProfileFunction profileFunction;
+    @Inject public DefaultValueHelper defaultValueHelper;
+    @Inject public NSDeviceStatus nsDeviceStatus;
+    @Inject public ActivePluginProvider activePlugin;
+    @Inject public LoopPlugin loopPlugin;
+    @Inject public IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject public TreatmentsPlugin treatmentsPlugin;
+    @Inject public ActionStringHandler actionStringHandler;
 
     public static final String ACTION_RESEND = WatchUpdaterService.class.getName().concat(".Resend");
     public static final String ACTION_OPEN_SETTINGS = WatchUpdaterService.class.getName().concat(".OpenSettings");
@@ -87,11 +98,8 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     public static final String ACTION_CANCELNOTIFICATION_REQUEST_PATH = "/nightscout_watch_cancelnotificationrequest";
 
 
-    boolean wear_integration = false;
     private static boolean lastLoopStatus;
 
-    private static Logger log = LoggerFactory.getLogger(WatchUpdaterService.class);
-
     private Handler handler;
 
     // Phone
@@ -100,16 +108,12 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     // Wear
     private static final String CAPABILITY_WEAR_APP = "wear_app_sync_bgs";
     private static final String MESSAGE_PATH_WEAR = "/wear_message_path";
-    private String mWearNodeId = null;
-    private String localnode = null;
-    private String logPrefix = ""; // "WR: "
 
 
     @Override
     public void onCreate() {
-        listenForChangeInSettings();
-        setSettings();
-        if (wear_integration) {
+        AndroidInjection.inject(this);
+        if (wearIntegration()) {
             googleApiConnect();
         }
         if (handler == null) {
@@ -119,19 +123,10 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         }
     }
 
-    public void listenForChangeInSettings() {
-        WearPlugin.registerWatchUpdaterService(this);
+    private boolean wearIntegration() {
+        return wearPlugin.isEnabled(PluginType.GENERAL);
     }
 
-    public void setSettings() {
-        wear_integration = WearPlugin.getPlugin().isEnabled(PluginType.GENERAL);
-        // Log.d(TAG, "WR: wear_integration=" + wear_integration);
-        if (wear_integration) {
-            googleApiConnect();
-        }
-    }
-
-
     private void googleApiConnect() {
         if (googleApiClient != null && (googleApiClient.isConnected() || googleApiClient.isConnecting())) {
             googleApiClient.disconnect();
@@ -140,7 +135,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
                 .addOnConnectionFailedListener(this).addApi(Wearable.API).build();
         Wearable.MessageApi.addListener(googleApiClient, this);
         if (googleApiClient.isConnected()) {
-            log.debug(logPrefix + "API client is connected");
+            aapsLogger.debug(LTag.WEAR, "API client is connected");
         } else {
             // Log.d("WatchUpdater", logPrefix + "API client is not connected and is trying to connect");
             googleApiClient.connect();
@@ -153,7 +148,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         // Log.d(TAG, logPrefix + "onStartCommand: " + action);
 
-        if (wear_integration) {
+        if (wearIntegration()) {
             handler.post(() -> {
                 if (googleApiClient.isConnected()) {
                     if (ACTION_RESEND.equals(action)) {
@@ -193,9 +188,9 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
 
     private void updateWearSyncBgsCapability(CapabilityInfo capabilityInfo) {
-        Log.d("WatchUpdaterService", logPrefix + "CabilityInfo: " + capabilityInfo);
+        Log.d("WatchUpdaterService", "CabilityInfo: " + capabilityInfo);
         Set<Node> connectedNodes = capabilityInfo.getNodes();
-        mWearNodeId = pickBestNodeId(connectedNodes);
+        String mWearNodeId = pickBestNodeId(connectedNodes);
     }
 
 
@@ -240,7 +235,6 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         String id = peer.getId();
         String name = peer.getDisplayName();
         // Log.d(TAG, logPrefix + "onPeerDisconnected peer name & ID: " + name + "|" + id);
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     }
 
 
@@ -249,7 +243,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         // Log.d(TAG, logPrefix + "onMessageRecieved: " + event);
 
-        if (wear_integration) {
+        if (wearIntegration()) {
             if (event != null && event.getPath().equals(WEARABLE_RESEND_PATH)) {
                 resendData();
             }
@@ -260,37 +254,37 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
             if (event != null && event.getPath().equals(WEARABLE_INITIATE_ACTIONSTRING_PATH)) {
                 String actionstring = new String(event.getData());
-                log.debug("Wear: " + actionstring);
-                ActionStringHandler.handleInitiate(actionstring);
+                aapsLogger.debug(LTag.WEAR, "Wear: " + actionstring);
+                actionStringHandler.handleInitiate(actionstring);
             }
 
             if (event != null && event.getPath().equals(WEARABLE_CONFIRM_ACTIONSTRING_PATH)) {
                 String actionstring = new String(event.getData());
-                log.debug("Wear Confirm: " + actionstring);
-                ActionStringHandler.handleConfirmation(actionstring);
+                aapsLogger.debug(LTag.WEAR, "Wear Confirm: " + actionstring);
+                actionStringHandler.handleConfirmation(actionstring);
             }
         }
     }
 
     private void cancelBolus() {
-        ConfigBuilderPlugin.getPlugin().getActivePump().stopBolusDelivering();
+        activePlugin.getActivePump().stopBolusDelivering();
     }
 
     private void sendData() {
 
-        BgReading lastBG = DatabaseHelper.lastBg();
+        BgReading lastBG = iobCobCalculatorPlugin.lastBg();
         // Log.d(TAG, logPrefix + "LastBg=" + lastBG);
         if (lastBG != null) {
-            GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+            GlucoseStatus glucoseStatus = new GlucoseStatus(injector).getGlucoseStatusData();
 
             if (googleApiClient != null && !googleApiClient.isConnected() && !googleApiClient.isConnecting()) {
                 googleApiConnect();
             }
-            if (wear_integration) {
+            if (wearIntegration()) {
 
                 final DataMap dataMap = dataMapSingleBG(lastBG, glucoseStatus);
                 if (dataMap == null) {
-                    ToastUtils.showToastInUiThread(this, MainApp.gs(R.string.noprofile));
+                    ToastUtils.showToastInUiThread(this, resourceHelper.gs(R.string.noprofile));
                     return;
                 }
 
@@ -301,25 +295,10 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
 
     private DataMap dataMapSingleBG(BgReading lastBG, GlucoseStatus glucoseStatus) {
-        String units = ProfileFunctions.getSystemUnits();
+        String units = profileFunction.getUnits();
 
-        Double lowLine = OverviewPlugin.INSTANCE.determineLowLine();
-        Double highLine = OverviewPlugin.INSTANCE.determineHighLine();
-
-        // convert to mg/dl
-        if (!units.equals(Constants.MGDL)) {
-            lowLine *= Constants.MMOLL_TO_MGDL;
-            highLine *= Constants.MMOLL_TO_MGDL;
-
-        }
-
-        if (lowLine < 1) {
-            lowLine = OverviewPlugin.INSTANCE.getBgTargetLow();
-        }
-
-        if (highLine < 1) {
-            highLine = OverviewPlugin.INSTANCE.getBgTargetHigh();
-        }
+        double lowLine = defaultValueHelper.determineLowLine();
+        double highLine = defaultValueHelper.determineHighLine();
 
         long sgvLevel = 0L;
         if (lastBG.value > highLine) {
@@ -356,7 +335,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             deltastring += "-";
         }
 
-        boolean detailed = SP.getBoolean("wear_detailed_delta", false);
+        boolean detailed = sp.getBoolean(R.string.key_wear_detailed_delta, false);
         if (units.equals(Constants.MGDL)) {
             if (detailed) {
                 deltastring += DecimalFormatter.to1Decimal(Math.abs(deltaMGDL));
@@ -397,17 +376,17 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             googleApiConnect();
         }
         long startTime = System.currentTimeMillis() - (long) (60000 * 60 * 5.5);
-        BgReading last_bg = DatabaseHelper.lastBg();
+        BgReading last_bg = iobCobCalculatorPlugin.lastBg();
 
         if (last_bg == null) return;
 
         List<BgReading> graph_bgs = MainApp.getDbHelper().getBgreadingsDataFromTime(startTime, true);
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData(true);
+        GlucoseStatus glucoseStatus = new GlucoseStatus(injector).getGlucoseStatusData(true);
 
         if (!graph_bgs.isEmpty()) {
             DataMap entries = dataMapSingleBG(last_bg, glucoseStatus);
             if (entries == null) {
-                ToastUtils.showToastInUiThread(this, MainApp.gs(R.string.noprofile));
+                ToastUtils.showToastInUiThread(this, resourceHelper.gs(R.string.noprofile));
                 return;
             }
             final ArrayList<DataMap> dataMaps = new ArrayList<>(graph_bgs.size());
@@ -440,7 +419,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         ArrayList<DataMap> predictions = new ArrayList<>();
 
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
             return;
@@ -452,15 +431,15 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         double beginBasalValue = profile.getBasal(beginBasalSegmentTime);
         double endBasalValue = beginBasalValue;
 
-        TemporaryBasal tb1 = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(runningTime);
-        TemporaryBasal tb2 = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(runningTime);
+        TemporaryBasal tb1 = treatmentsPlugin.getTempBasalFromHistory(runningTime);
+        TemporaryBasal tb2 = treatmentsPlugin.getTempBasalFromHistory(runningTime); //TODO for Adrian ... what's the meaning?
         double tb_before = beginBasalValue;
         double tb_amount = beginBasalValue;
         long tb_start = runningTime;
 
         if (tb1 != null) {
             tb_before = beginBasalValue;
-            Profile profileTB = ProfileFunctions.getInstance().getProfile(runningTime);
+            Profile profileTB = profileFunction.getProfile(runningTime);
             if (profileTB != null) {
                 tb_amount = tb1.tempBasalConvertedToAbsolute(runningTime, profileTB);
                 tb_start = runningTime;
@@ -469,7 +448,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
 
         for (; runningTime < now; runningTime += 5 * 60 * 1000) {
-            Profile profileTB = ProfileFunctions.getInstance().getProfile(runningTime);
+            Profile profileTB = profileFunction.getProfile(runningTime);
             if (profileTB == null)
                 return;
             //basal rate
@@ -484,7 +463,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             }
 
             //temps
-            tb2 = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(runningTime);
+            tb2 = treatmentsPlugin.getTempBasalFromHistory(runningTime);
 
             if (tb1 == null && tb2 == null) {
                 //no temp stays no temp
@@ -517,13 +496,13 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             basals.add(basalMap(beginBasalSegmentTime, runningTime, beginBasalValue));
         }
         if (tb1 != null) {
-            tb2 = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now); //use "now" to express current situation
+            tb2 = treatmentsPlugin.getTempBasalFromHistory(now); //use "now" to express current situation
             if (tb2 == null) {
                 //express the cancelled temp by painting it down one minute early
                 temps.add(tempDatamap(tb_start, tb_before, now - 1 * 60 * 1000, endBasalValue, tb_amount));
             } else {
                 //express currently running temp by painting it a bit into the future
-                Profile profileNow = ProfileFunctions.getInstance().getProfile(now);
+                Profile profileNow = profileFunction.getProfile(now);
                 double currentAmount = tb2.tempBasalConvertedToAbsolute(now, profileNow);
                 if (currentAmount != tb_amount) {
                     temps.add(tempDatamap(tb_start, tb_before, now, tb_amount, tb_amount));
@@ -533,16 +512,16 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
                 }
             }
         } else {
-            tb2 = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now); //use "now" to express current situation
+            tb2 = treatmentsPlugin.getTempBasalFromHistory(now); //use "now" to express current situation
             if (tb2 != null) {
                 //onset at the end
-                Profile profileTB = ProfileFunctions.getInstance().getProfile(runningTime);
+                Profile profileTB = profileFunction.getProfile(runningTime);
                 double currentAmount = tb2.tempBasalConvertedToAbsolute(runningTime, profileTB);
                 temps.add(tempDatamap(now - 1 * 60 * 1000, endBasalValue, runningTime + 5 * 60 * 1000, currentAmount, currentAmount));
             }
         }
 
-        List<Treatment> treatments = TreatmentsPlugin.getPlugin().getTreatmentsFromHistory();
+        List<Treatment> treatments = treatmentsPlugin.getTreatmentsFromHistory();
         for (Treatment treatment : treatments) {
             if (treatment.date > startTimeWindow) {
                 boluses.add(treatmentMap(treatment.date, treatment.insulin, treatment.carbs, treatment.isSMB, treatment.isValid));
@@ -550,8 +529,8 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         }
 
-        final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
-        if (SP.getBoolean("wear_predictions", true) && finalLastRun != null && finalLastRun.request.hasPredictions && finalLastRun.constraintsProcessed != null) {
+        final LoopPlugin.LastRun finalLastRun = loopPlugin.lastRun;
+        if (sp.getBoolean("wear_predictions", true) && finalLastRun != null && finalLastRun.request.hasPredictions && finalLastRun.constraintsProcessed != null) {
             List<BgReading> predArray = finalLastRun.constraintsProcessed.getPredictions();
 
             if (!predArray.isEmpty()) {
@@ -649,7 +628,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMapRequest.getDataMap().putString("message", message);
             dataMapRequest.getDataMap().putString("actionstring", actionstring);
 
-            log.debug("Requesting confirmation from wear: " + actionstring);
+            aapsLogger.debug(LTag.WEAR, "Requesting confirmation from wear: " + actionstring);
 
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             debugData("sendActionConfirmationRequest", putDataRequest);
@@ -669,7 +648,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMapRequest.getDataMap().putString("message", message);
             dataMapRequest.getDataMap().putString("actionstring", actionstring);
 
-            log.debug("Requesting confirmation from wear: " + actionstring);
+            aapsLogger.debug(LTag.WEAR, "Requesting confirmation from wear: " + actionstring);
 
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             debugData("sendChangeConfirmationRequest", putDataRequest);
@@ -687,7 +666,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMapRequest.getDataMap().putString("cancelNotificationRequest", "cancelNotificationRequest");
             dataMapRequest.getDataMap().putString("actionstring", actionstring);
 
-            log.debug("Canceling notification on wear: " + actionstring);
+            aapsLogger.debug(LTag.WEAR, "Canceling notification on wear: " + actionstring);
 
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             debugData("sendCancelNotificationRequest", putDataRequest);
@@ -700,26 +679,25 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     private void sendStatus() {
 
         if (googleApiClient.isConnected()) {
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            String status = MainApp.gs(R.string.noprofile);
+            Profile profile = profileFunction.getProfile();
+            String status = resourceHelper.gs(R.string.noprofile);
             String iobSum, iobDetail, cobString, currentBasal, bgiString;
             iobSum = iobDetail = cobString = currentBasal = bgiString = "";
             if (profile != null) {
-                TreatmentsInterface treatmentsInterface = TreatmentsPlugin.getPlugin();
-                treatmentsInterface.updateTotalIOBTreatments();
-                IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
-                treatmentsInterface.updateTotalIOBTempBasals();
-                IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
+                treatmentsPlugin.updateTotalIOBTreatments();
+                IobTotal bolusIob = treatmentsPlugin.getLastCalculationTreatments().round();
+                treatmentsPlugin.updateTotalIOBTempBasals();
+                IobTotal basalIob = treatmentsPlugin.getLastCalculationTempBasals().round();
 
                 iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
                 iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
-                cobString = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "WatcherUpdaterService").generateCOBString();
-                currentBasal = generateBasalString(treatmentsInterface);
+                cobString = iobCobCalculatorPlugin.getCobInfo(false, "WatcherUpdaterService").generateCOBString();
+                currentBasal = generateBasalString();
 
                 //bgi
 
 
-                double bgi = -(bolusIob.activity + basalIob.activity) * 5 * Profile.fromMgdlToUnits(profile.getIsfMgdl(), ProfileFunctions.getSystemUnits());
+                double bgi = -(bolusIob.activity + basalIob.activity) * 5 * Profile.fromMgdlToUnits(profile.getIsfMgdl(), profileFunction.getUnits());
                 bgiString = "" + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to1Decimal(bgi);
 
                 status = generateStatusString(profile, currentBasal, iobSum, iobDetail, bgiString);
@@ -727,15 +705,15 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
 
             //batteries
-            int phoneBattery = getBatteryLevel(getApplicationContext());
-            String rigBattery = NSDeviceStatus.getInstance().getUploaderStatus().trim();
+            int phoneBattery = BatteryLevel.getBatteryLevel();
+            String rigBattery = nsDeviceStatus.getUploaderStatus().trim();
 
 
-            long openApsStatus = -1;
+            long openApsStatus;
             //OpenAPS status
             if (Config.APS) {
                 //we are AndroidAPS
-                openApsStatus = LoopPlugin.lastRun != null && LoopPlugin.lastRun.lastEnact != null && LoopPlugin.lastRun.lastEnact.getTime() != 0 ? LoopPlugin.lastRun.lastEnact.getTime() : -1;
+                openApsStatus = loopPlugin.lastRun != null && loopPlugin.lastRun.lastTBREnact != 0 ? loopPlugin.lastRun.lastTBREnact : -1;
             } else {
                 //NSClient or remote
                 openApsStatus = NSDeviceStatus.getOpenApsTimestamp();
@@ -746,14 +724,14 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMapRequest.getDataMap().putString("externalStatusString", status);
             dataMapRequest.getDataMap().putString("iobSum", iobSum);
             dataMapRequest.getDataMap().putString("iobDetail", iobDetail);
-            dataMapRequest.getDataMap().putBoolean("detailedIob", SP.getBoolean(R.string.key_wear_detailediob, false));
+            dataMapRequest.getDataMap().putBoolean("detailedIob", sp.getBoolean(R.string.key_wear_detailediob, false));
             dataMapRequest.getDataMap().putString("cob", cobString);
             dataMapRequest.getDataMap().putString("currentBasal", currentBasal);
             dataMapRequest.getDataMap().putString("battery", "" + phoneBattery);
             dataMapRequest.getDataMap().putString("rigBattery", rigBattery);
             dataMapRequest.getDataMap().putLong("openApsStatus", openApsStatus);
             dataMapRequest.getDataMap().putString("bgi", bgiString);
-            dataMapRequest.getDataMap().putBoolean("showBgi", SP.getBoolean(R.string.key_wear_showbgi, false));
+            dataMapRequest.getDataMap().putBoolean("showBgi", sp.getBoolean(R.string.key_wear_showbgi, false));
             dataMapRequest.getDataMap().putInt("batteryLevel", (phoneBattery >= 30) ? 1 : 0);
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             debugData("sendStatus", putDataRequest);
@@ -766,7 +744,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     private void sendPreferences() {
         if (googleApiClient.isConnected()) {
 
-            boolean wearcontrol = SP.getBoolean("wearcontrol", false);
+            boolean wearcontrol = sp.getBoolean("wearcontrol", false);
 
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_PREFERENCES_PATH);
             //unique content
@@ -785,7 +763,6 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         // Log.d(TAG, "WR: " + source + " " + data);
     }
 
-
     private void executeTask(AsyncTask task, DataMap... parameters) {
         task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Object[]) parameters);
         // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
@@ -802,21 +779,19 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         String status = "";
 
         if (profile == null) {
-            status = MainApp.gs(R.string.noprofile);
+            status = resourceHelper.gs(R.string.noprofile);
             return status;
         }
 
-        LoopPlugin activeloop = LoopPlugin.getPlugin();
-
-        if (!activeloop.isEnabled(PluginType.LOOP)) {
-            status += MainApp.gs(R.string.disabledloop) + "\n";
+        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
+            status += resourceHelper.gs(R.string.disabledloop) + "\n";
             lastLoopStatus = false;
         } else {
             lastLoopStatus = true;
         }
 
-        String iobString = "";
-        if (SP.getBoolean(R.string.key_wear_detailediob, false)) {
+        String iobString;
+        if (sp.getBoolean(R.string.key_wear_detailediob, false)) {
             iobString = iobSum + " " + iobDetail;
         } else {
             iobString = iobSum + "U";
@@ -825,7 +800,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         status += currentBasal + " " + iobString;
 
         //add BGI if shown, otherwise return
-        if (SP.getBoolean(R.string.key_wear_showbgi, false)) {
+        if (sp.getBoolean(R.string.key_wear_showbgi, false)) {
             status += " " + bgiString;
         }
 
@@ -833,19 +808,19 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     @NonNull
-    private String generateBasalString(TreatmentsInterface treatmentsInterface) {
+    private String generateBasalString() {
 
         String basalStringResult;
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
         if (profile == null)
             return "";
 
-        TemporaryBasal activeTemp = treatmentsInterface.getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             basalStringResult = activeTemp.toStringShort();
         } else {
-            if (SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)) {
+            if (sp.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)) {
                 basalStringResult = "100%";
             } else {
                 basalStringResult = DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
@@ -859,7 +834,6 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         if (googleApiClient != null && googleApiClient.isConnected()) {
             googleApiClient.disconnect();
         }
-        WearPlugin.unRegisterWatchUpdaterService();
     }
 
     @Override
@@ -867,23 +841,10 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     @Override
-    public void onConnectionFailed(ConnectionResult connectionResult) {
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
     }
 
     public static boolean shouldReportLoopStatus(boolean enabled) {
         return (lastLoopStatus != enabled);
     }
-
-    public static int getBatteryLevel(Context context) {
-        Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        if (batteryIntent != null) {
-            int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
-            int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
-            if (level == -1 || scale == -1) {
-                return 50;
-            }
-            return (int) (((float) level / (float) scale) * 100.0f);
-        }
-        return 50;
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
new file mode 100644
index 0000000000..79a8dd486b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
@@ -0,0 +1,150 @@
+package info.nightscout.androidaps.plugins.general.xdripStatusline
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StatusLinePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val sp: SP,
+    private val profileFunction: ProfileFunction,
+    resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val fabricPrivacy: FabricPrivacy,
+    private val activePlugin: ActivePluginProvider,
+    private val loopPlugin: LoopPlugin,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val rxBus: RxBusWrapper,
+    aapsLogger: AAPSLogger
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .pluginName(R.string.xdripstatus)
+        .shortName(R.string.xdripstatus_shortname)
+        .neverVisible(true)
+        .preferencesId(R.xml.pref_xdripstatus)
+        .description(R.string.description_xdrip_status_line),
+    aapsLogger, resourceHelper, injector
+) {
+
+    private val disposable = CompositeDisposable()
+    private var lastLoopStatus = false
+
+    companion object {
+        //broadcast related constants
+        @Suppress("SpellCheckingInspection")
+        private const val EXTRA_STATUSLINE = "com.eveningoutpost.dexdrip.Extras.Statusline"
+
+        @Suppress("SpellCheckingInspection")
+        private const val ACTION_NEW_EXTERNAL_STATUSLINE = "com.eveningoutpost.dexdrip.ExternalStatusline"
+
+        @Suppress("SpellCheckingInspection", "unused")
+        private const val RECEIVER_PERMISSION = "com.eveningoutpost.dexdrip.permissions.RECEIVE_EXTERNAL_STATUSLINE"
+    }
+
+    override fun onStart() {
+        super.onStart()
+        disposable += rxBus.toObservable(EventRefreshOverview::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ if (lastLoopStatus != loopPlugin.isEnabled(PluginType.LOOP)) sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventTempBasalChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventTreatmentChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventConfigBuilderChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+        disposable += rxBus.toObservable(EventAppInitialized::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ sendStatus() }) { fabricPrivacy.logException(it) }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        disposable.clear()
+        sendStatus()
+    }
+
+    private fun sendStatus() {
+        var status = "" // sent once on disable
+        val profile = profileFunction.getProfile()
+        if (isEnabled(PluginType.GENERAL) && profile != null) {
+            status = buildStatusString(profile)
+        }
+        //sendData
+        val bundle = Bundle()
+        bundle.putString(EXTRA_STATUSLINE, status)
+        val intent = Intent(ACTION_NEW_EXTERNAL_STATUSLINE)
+        intent.putExtras(bundle)
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+        context.sendBroadcast(intent, null)
+    }
+
+    private fun buildStatusString(profile: Profile): String {
+        var status = ""
+        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
+            status += resourceHelper.gs(R.string.disabledloop) + "\n"
+            lastLoopStatus = false
+        } else if (loopPlugin.isEnabled(PluginType.LOOP)) {
+            lastLoopStatus = true
+        }
+        //Temp basal
+        val activeTemp = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
+        if (activeTemp != null) {
+            status += activeTemp.toStringShort() + " "
+        }
+        //IOB
+        activePlugin.activeTreatments.updateTotalIOBTreatments()
+        val bolusIob = activePlugin.activeTreatments.lastCalculationTreatments.round()
+        activePlugin.activeTreatments.updateTotalIOBTempBasals()
+        val basalIob = activePlugin.activeTreatments.lastCalculationTempBasals.round()
+        status += DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U"
+        if (sp.getBoolean(R.string.key_xdripstatus_detailediob, true)) {
+            status += ("("
+                + DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
+                + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")")
+        }
+        if (sp.getBoolean(R.string.key_xdripstatus_showbgi, true)) {
+            val bgi = -(bolusIob.activity + basalIob.activity) * 5 * Profile.fromMgdlToUnits(profile.isfMgdl, profileFunction.getUnits())
+            status += " " + (if (bgi >= 0) "+" else "") + DecimalFormatter.to2Decimal(bgi)
+        }
+        // COB
+        status += " " + iobCobCalculatorPlugin.getCobInfo(false, "StatusLinePlugin").generateCOBString()
+        return status
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
deleted file mode 100644
index b810624e87..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package info.nightscout.androidaps.plugins.general.xdripStatusline;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-
-import androidx.annotation.NonNull;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventAppInitialized;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.events.EventTreatmentChange;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-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.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Created by adrian on 17/11/16.
- */
-
-public class StatuslinePlugin extends PluginBase {
-
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private static StatuslinePlugin statuslinePlugin;
-
-    public static StatuslinePlugin getPlugin() {
-        return statuslinePlugin;
-    }
-
-    //broadcast related constants
-    private static final String EXTRA_STATUSLINE = "com.eveningoutpost.dexdrip.Extras.Statusline";
-    private static final String ACTION_NEW_EXTERNAL_STATUSLINE = "com.eveningoutpost.dexdrip.ExternalStatusline";
-    private static final String RECEIVER_PERMISSION = "com.eveningoutpost.dexdrip.permissions.RECEIVE_EXTERNAL_STATUSLINE";
-
-
-    private boolean lastLoopStatus;
-
-    private final Context ctx;
-    private SharedPreferences mPrefs;
-
-
-    public static StatuslinePlugin initPlugin(Context ctx) {
-        if (statuslinePlugin == null) {
-            statuslinePlugin = new StatuslinePlugin(ctx);
-        }
-
-        return statuslinePlugin;
-    }
-
-    public StatuslinePlugin(Context ctx) {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .pluginName(R.string.xdripstatus)
-                .shortName(R.string.xdripstatus_shortname)
-                .neverVisible(true)
-                .preferencesId(R.xml.pref_xdripstatus)
-                .description(R.string.description_xdrip_status_line)
-        );
-        this.ctx = ctx;
-        this.mPrefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventRefreshOverview.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                            if ((lastLoopStatus != LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
-                                sendStatus();
-                        },
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventExtendedBolusChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTempBasalChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTreatmentChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventConfigBuilderChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppInitialized.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> sendStatus(),
-                        FabricPrivacy::logException
-                ));
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        disposable.clear();
-        sendStatus();
-    }
-
-    private void sendStatus() {
-        String status = ""; // sent once on disable
-
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-
-        if (isEnabled(PluginType.GENERAL) && profile != null) {
-            status = buildStatusString(profile);
-        }
-
-        //sendData
-        final Bundle bundle = new Bundle();
-        bundle.putString(EXTRA_STATUSLINE, status);
-        Intent intent = new Intent(ACTION_NEW_EXTERNAL_STATUSLINE);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        ctx.sendBroadcast(intent, null);
-    }
-
-    @NonNull
-    private String buildStatusString(Profile profile) {
-        String status = "";
-
-        if (ConfigBuilderPlugin.getPlugin().getActivePump() == null)
-            return "";
-
-        LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-
-        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-            status += MainApp.gs(R.string.disabledloop) + "\n";
-            lastLoopStatus = false;
-        } else if (loopPlugin.isEnabled(PluginType.LOOP)) {
-            lastLoopStatus = true;
-        }
-
-        //Temp basal
-        TreatmentsInterface treatmentsInterface = TreatmentsPlugin.getPlugin();
-
-        TemporaryBasal activeTemp = treatmentsInterface.getTempBasalFromHistory(System.currentTimeMillis());
-        if (activeTemp != null) {
-            status += activeTemp.toStringShort() + " ";
-        }
-
-        //IOB
-        treatmentsInterface.updateTotalIOBTreatments();
-        IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
-        treatmentsInterface.updateTotalIOBTempBasals();
-        IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
-        status += DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U";
-
-
-        if (mPrefs.getBoolean("xdripstatus_detailediob", true)) {
-            status += "("
-                    + DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
-                    + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
-        }
-
-        if (!mPrefs.getBoolean("xdripstatus_showbgi", false)) {
-            return status;
-        }
-
-        double bgi = -(bolusIob.activity + basalIob.activity) * 5 * Profile.fromMgdlToUnits(profile.getIsfMgdl(), ProfileFunctions.getSystemUnits());
-
-        status += " " + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to2Decimal(bgi);
-        status += " " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "StatuslinePlugin").generateCOBString();
-
-        return status;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java
deleted file mode 100644
index dec9239948..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-
-/**
- * Created by mike on 17.04.2017.
- */
-
-public class InsulinFragment extends Fragment {
-    TextView insulinName;
-    TextView insulinComment;
-    TextView insulinDia;
-    ActivityGraph insulinGraph;
-
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        try {
-            View view = inflater.inflate(R.layout.insulin_fragment, container, false);
-
-            insulinName = (TextView) view.findViewById(R.id.insulin_name);
-            insulinComment = (TextView) view.findViewById(R.id.insulin_comment);
-            insulinDia = (TextView) view.findViewById(R.id.insulin_dia);
-            insulinGraph = (ActivityGraph) view.findViewById(R.id.insuling_graph);
-
-            updateGUI();
-
-            return view;
-        } catch (Exception e) {
-            FabricPrivacy.logException(e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateGUI();
-    }
-
-    private void updateGUI() {
-        insulinName.setText(ConfigBuilderPlugin.getPlugin().getActiveInsulin().getFriendlyName());
-        insulinComment.setText(ConfigBuilderPlugin.getPlugin().getActiveInsulin().getComment());
-        insulinDia.setText(MainApp.gs(R.string.dia) + ":  " + ConfigBuilderPlugin.getPlugin().getActiveInsulin().getDia() + "h");
-        insulinGraph.show(ConfigBuilderPlugin.getPlugin().getActiveInsulin());
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt
new file mode 100644
index 0000000000..21737cac6d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.insulin_fragment.*
+import javax.inject.Inject
+
+class InsulinFragment : DaggerFragment() {
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.insulin_fragment, container, false)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        insulin_name?.setText(activePlugin.getActiveInsulin().getFriendlyName())
+        insulin_comment?.setText(activePlugin.getActiveInsulin().getComment())
+        insulin_dia?.text = resourceHelper.gs(R.string.dia) + ":  " + activePlugin.getActiveInsulin().getDia() + "h"
+        insuling_graph?.show(activePlugin.getActiveInsulin())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.java
deleted file mode 100644
index 8ad187d41a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.InsulinInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-/**
- * Created by adrian on 13.08.2017.
- */
-
-public abstract class InsulinOrefBasePlugin extends PluginBase implements InsulinInterface {
-
-    public static double MIN_DIA = 5;
-
-    long lastWarned = 0;
-
-    public InsulinOrefBasePlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.INSULIN)
-                .fragmentClass(InsulinFragment.class.getName())
-                .pluginName(R.string.fastactinginsulin)
-                .shortName(R.string.insulin_shortname)
-                .visibleByDefault(false)
-        );
-    }
-
-    @Override
-    public double getDia() {
-        double dia = getUserDefinedDia();
-        if (dia >= MIN_DIA) {
-            return dia;
-        } else {
-            sendShortDiaNotification(dia);
-            return MIN_DIA;
-        }
-    }
-
-    void sendShortDiaNotification(double dia) {
-        if ((System.currentTimeMillis() - lastWarned) > 60 * 1000) {
-            lastWarned = System.currentTimeMillis();
-            Notification notification = new Notification(Notification.SHORT_DIA, String.format(this.getNotificationPattern(), dia, MIN_DIA), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        }
-    }
-
-    public String getNotificationPattern() {
-        return MainApp.gs(R.string.dia_too_short);
-    }
-
-    public double getUserDefinedDia() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        return profile != null ? profile.getDia() : MIN_DIA;
-    }
-
-    public Iob iobCalcForTreatment(Treatment treatment, long time) {
-        return this.iobCalcForTreatment(treatment, time, 0d);
-    }
-
-    @Override
-    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
-        Iob result = new Iob();
-
-        int peak = getPeak();
-
-        if (treatment.insulin != 0d) {
-
-            long bolusTime = treatment.date;
-            double t = (time - bolusTime) / 1000d / 60d;
-
-            double td = getDia() * 60; //getDIA() always >= MIN_DIA
-            double tp = peak;
-
-            // force the IOB to 0 if over DIA hours have passed
-            if (t < td) {
-                double tau = tp * (1 - tp / td) / (1 - 2 * tp / td);
-                double a = 2 * tau / td;
-                double S = 1 / (1 - a + (1 + a) * Math.exp(-td / tau));
-                result.activityContrib = treatment.insulin * (S / Math.pow(tau, 2)) * t * (1 - t / td) * Math.exp(-t / tau);
-                result.iobContrib = treatment.insulin * (1 - S * (1 - a) * ((Math.pow(t, 2) / (tau * td * (1 - a)) - t / tau - 1) * Math.exp(-t / tau) + 1));
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public String getComment() {
-        String comment = commentStandardText();
-        double userDia = getUserDefinedDia();
-        if (userDia < MIN_DIA) {
-            comment += "\n" + String.format(MainApp.gs(R.string.dia_too_short), userDia, MIN_DIA);
-        }
-        return comment;
-    }
-
-    abstract int getPeak();
-
-    abstract String commentStandardText();
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
new file mode 100644
index 0000000000..e5a92588c3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
@@ -0,0 +1,104 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Iob
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+/**
+ * Created by adrian on 13.08.2017.
+ *
+ * parameters are injected from child class
+ *
+ */
+abstract class InsulinOrefBasePlugin(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    val profileFunction: ProfileFunction,
+    val rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.INSULIN)
+    .fragmentClass(InsulinFragment::class.java.name)
+    .shortName(R.string.insulin_shortname)
+    .visibleByDefault(false),
+    aapsLogger, resourceHelper, injector
+), InsulinInterface {
+
+    private var lastWarned: Long = 0
+    override fun getDia(): Double {
+        val dia = userDefinedDia
+        return if (dia >= MIN_DIA) {
+            dia
+        } else {
+            sendShortDiaNotification(dia)
+            MIN_DIA
+        }
+    }
+
+    open fun sendShortDiaNotification(dia: Double) {
+        if (System.currentTimeMillis() - lastWarned > 60 * 1000) {
+            lastWarned = System.currentTimeMillis()
+            val notification = Notification(Notification.SHORT_DIA, String.format(notificationPattern, dia, MIN_DIA), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        }
+    }
+
+    private val notificationPattern: String
+        get() = resourceHelper.gs(R.string.dia_too_short)
+
+    open val userDefinedDia: Double
+        get() {
+            val profile = profileFunction.getProfile()
+            return profile?.dia ?: MIN_DIA
+        }
+
+    fun iobCalcForTreatment(treatment: Treatment, time: Long): Iob {
+        return this.iobCalcForTreatment(treatment, time, 0.0)
+    }
+
+    override fun iobCalcForTreatment(treatment: Treatment, time: Long, dia: Double): Iob {
+        val result = Iob()
+        val peak = peak
+        if (treatment.insulin != 0.0) {
+            val bolusTime = treatment.date
+            val t = (time - bolusTime) / 1000.0 / 60.0
+            val td = getDia() * 60 //getDIA() always >= MIN_DIA
+            val tp = peak.toDouble()
+            // force the IOB to 0 if over DIA hours have passed
+            if (t < td) {
+                val tau = tp * (1 - tp / td) / (1 - 2 * tp / td)
+                val a = 2 * tau / td
+                val S = 1 / (1 - a + (1 + a) * Math.exp(-td / tau))
+                result.activityContrib = treatment.insulin * (S / Math.pow(tau, 2.0)) * t * (1 - t / td) * Math.exp(-t / tau)
+                result.iobContrib = treatment.insulin * (1 - S * (1 - a) * ((Math.pow(t, 2.0) / (tau * td * (1 - a)) - t / tau - 1) * Math.exp(-t / tau) + 1))
+            }
+        }
+        return result
+    }
+
+    override fun getComment(): String {
+        var comment = commentStandardText()
+        val userDia = userDefinedDia
+        if (userDia < MIN_DIA) {
+            comment += "\n" + resourceHelper.gs(R.string.dia_too_short, userDia, MIN_DIA)
+        }
+        return comment
+    }
+
+    abstract val peak: Int
+    abstract fun commentStandardText(): String
+
+    companion object {
+        const val MIN_DIA = 5.0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.java
deleted file mode 100644
index 3d32d2317b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefFreePeakPlugin extends InsulinOrefBasePlugin {
-
-    private static InsulinOrefFreePeakPlugin plugin = null;
-
-    public static InsulinOrefFreePeakPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new InsulinOrefFreePeakPlugin();
-        return plugin;
-    }
-
-    private static final int DEFAULT_PEAK = 75;
-
-    private InsulinOrefFreePeakPlugin() {
-        super();
-        pluginDescription
-                .pluginName(R.string.free_peak_oref)
-                .preferencesId(R.xml.pref_insulinoreffreepeak)
-                .description(R.string.description_insulin_free_peak);
-    }
-
-    @Override
-    public int getId() {
-        return OREF_FREE_PEAK;
-    }
-
-    public String getFriendlyName() {
-        return MainApp.gs(R.string.free_peak_oref);
-    }
-
-    @Override
-    public String commentStandardText() {
-        return MainApp.gs(R.string.insulin_peak_time) + ": " + getPeak();
-    }
-
-    @Override
-    int getPeak() {
-        return SP.getInt(R.string.key_insulin_oref_peak, DEFAULT_PEAK);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
new file mode 100644
index 0000000000..1ae2869b6e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by adrian on 14/08/17.
+ */
+@Singleton
+class InsulinOrefFreePeakPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val sp: SP,
+    resourceHelper: ResourceHelper,
+    profileFunction: ProfileFunction,
+    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+
+    override fun getId(): Int {
+        return InsulinInterface.OREF_FREE_PEAK
+    }
+
+    override fun getFriendlyName(): String {
+        return resourceHelper.gs(R.string.free_peak_oref)
+    }
+
+    override fun commentStandardText(): String {
+        return resourceHelper.gs(R.string.insulin_peak_time) + ": " + peak
+    }
+
+    override val peak: Int
+        get() = sp.getInt(R.string.key_insulin_oref_peak, DEFAULT_PEAK)
+
+    companion object {
+        private const val DEFAULT_PEAK = 75
+    }
+
+    init {
+        pluginDescription
+            .pluginName(R.string.free_peak_oref)
+            .preferencesId(R.xml.pref_insulinoreffreepeak)
+            .description(R.string.description_insulin_free_peak)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.java
deleted file mode 100644
index 5aceaaacaf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefRapidActingPlugin extends InsulinOrefBasePlugin {
-
-    private static InsulinOrefRapidActingPlugin plugin = null;
-
-    public static InsulinOrefRapidActingPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new InsulinOrefRapidActingPlugin();
-        return plugin;
-    }
-
-    private static final int PEAK = 75;
-
-    private InsulinOrefRapidActingPlugin() {
-        super();
-        pluginDescription
-                .pluginName(R.string.rapid_acting_oref)
-                .description(R.string.description_insulin_rapid);
-    }
-
-    @Override
-    public int getId() {
-        return OREF_RAPID_ACTING;
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return MainApp.gs(R.string.rapid_acting_oref);
-    }
-
-    @Override
-    public String commentStandardText() {
-        return MainApp.gs(R.string.fastactinginsulincomment);
-    }
-
-    @Override
-    int getPeak() {
-        return PEAK;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
new file mode 100644
index 0000000000..634ad2df5d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by adrian on 14/08/17.
+ */
+@Singleton
+class InsulinOrefRapidActingPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    profileFunction: ProfileFunction,
+    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+
+
+    override fun getId(): Int {
+        return InsulinInterface.OREF_RAPID_ACTING
+    }
+
+    override fun getFriendlyName(): String {
+        return resourceHelper.gs(R.string.rapid_acting_oref)
+    }
+
+    override fun commentStandardText(): String {
+        return resourceHelper.gs(R.string.fastactinginsulincomment)
+    }
+
+    override val peak = 75
+
+    init {
+        pluginDescription
+            .pluginName(R.string.rapid_acting_oref)
+            .description(R.string.description_insulin_rapid)
+            .setDefault()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.java
deleted file mode 100644
index 7e800cacc1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-/**
- * Created by adrian on 14/08/17.
- */
-
-public class InsulinOrefUltraRapidActingPlugin extends InsulinOrefBasePlugin {
-
-    private static InsulinOrefUltraRapidActingPlugin plugin = null;
-
-    public static InsulinOrefUltraRapidActingPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new InsulinOrefUltraRapidActingPlugin();
-        return plugin;
-    }
-
-    private static final int PEAK = 55;
-
-    private InsulinOrefUltraRapidActingPlugin() {
-        super();
-        pluginDescription
-                .pluginName(R.string.ultrarapid_oref)
-                .description(R.string.description_insulin_ultra_rapid);
-    }
-
-    @Override
-    public int getId() {
-        return OREF_ULTRA_RAPID_ACTING;
-    }
-
-    @Override
-    public String getName() {
-        return MainApp.gs(R.string.ultrarapid_oref);
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return MainApp.gs(R.string.ultrarapid_oref);
-    }
-
-    @Override
-    public String commentStandardText() {
-        return MainApp.gs(R.string.ultrafastactinginsulincomment);
-    }
-
-    @Override
-    int getPeak() {
-        return PEAK;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
new file mode 100644
index 0000000000..e2048d7a65
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by adrian on 14/08/17.
+ */
+@Singleton
+class InsulinOrefUltraRapidActingPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    profileFunction: ProfileFunction,
+    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+
+
+    override fun getId(): Int = InsulinInterface.OREF_ULTRA_RAPID_ACTING
+
+    override fun getFriendlyName(): String = resourceHelper.gs(R.string.ultrarapid_oref)
+
+    override fun commentStandardText(): String = resourceHelper.gs(R.string.ultrafastactinginsulincomment)
+
+    override val peak = 55
+
+    init {
+        pluginDescription
+            .pluginName(R.string.ultrarapid_oref)
+            .description(R.string.description_insulin_ultra_rapid)
+            .enableByDefault(true)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
index 0c93e0266f..6b3b4ef3de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
@@ -1,41 +1,47 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 25.04.2017.
- */
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class AutosensData implements DataPointWithLabelInterface {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
+    @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
+    @Inject ProfileFunction profileFunction;
+
+    public AutosensData(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+    }
 
     public void setChartTime(long chartTime) {
         this.chartTime = chartTime;
     }
 
-    static class CarbsInPast {
+    class CarbsInPast {
         long time = 0L;
         double carbs = 0d;
         double min5minCarbImpact = 0d;
@@ -45,20 +51,19 @@ public class AutosensData implements DataPointWithLabelInterface {
             time = t.date;
             carbs = t.carbs;
             remaining = t.carbs;
-            if (SensitivityAAPSPlugin.getPlugin().isEnabled(PluginType.SENSITIVITY) || SensitivityWeightedAveragePlugin.getPlugin().isEnabled(PluginType.SENSITIVITY)) {
-                double maxAbsorptionHours = SP.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
-                Profile profile = ProfileFunctions.getInstance().getProfile(t.date);
+            if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
+                double maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
+                Profile profile = profileFunction.getProfile(t.date);
                 double sens = profile.getIsfMgdl(t.date);
                 double ic = profile.getIc(t.date);
                 min5minCarbImpact = t.carbs / (maxAbsorptionHours * 60 / 5) * sens / ic;
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Min 5m carbs impact for " + carbs + "g @" + new Date(t.date).toLocaleString() + " for " + maxAbsorptionHours + "h calculated to " + min5minCarbImpact + " ISF: " + sens + " IC: " + ic);
+                aapsLogger.debug(LTag.AUTOSENS, "Min 5m carbs impact for " + carbs + "g @" + DateUtil.dateAndTimeString(t.date) + " for " + maxAbsorptionHours + "h calculated to " + min5minCarbImpact + " ISF: " + sens + " IC: " + ic);
             } else {
-                min5minCarbImpact = SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
+                min5minCarbImpact = sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
             }
         }
 
-       CarbsInPast (CarbsInPast other) {
+        CarbsInPast(CarbsInPast other) {
             this.time = other.time;
             this.carbs = other.carbs;
             this.min5minCarbImpact = other.min5minCarbImpact;
@@ -67,7 +72,7 @@ public class AutosensData implements DataPointWithLabelInterface {
 
         @Override
         public String toString() {
-            return String.format(Locale.ENGLISH, "CarbsInPast: time: %s carbs: %.02f min5minCI: %.02f remaining: %.2f", new Date(time).toLocaleString(), carbs, min5minCarbImpact, remaining);
+            return String.format(Locale.ENGLISH, "CarbsInPast: time: %s carbs: %.02f min5minCI: %.02f remaining: %.2f", DateUtil.dateAndTimeString(time), carbs, min5minCarbImpact, remaining);
         }
     }
 
@@ -103,13 +108,13 @@ public class AutosensData implements DataPointWithLabelInterface {
     @Override
     public String toString() {
         return String.format(Locale.ENGLISH, "AutosensData: %s pastSensitivity=%s  delta=%.02f  avgDelta=%.02f bgi=%.02f deviation=%.02f avgDeviation=%.02f absorbed=%.02f carbsFromBolus=%.02f cob=%.02f autosensRatio=%.02f slopeFromMaxDeviation=%.02f slopeFromMinDeviation=%.02f activeCarbsList=%s",
-                new Date(time).toLocaleString(), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
+                DateUtil.dateAndTimeString(time), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
     }
 
     public List<CarbsInPast> cloneCarbsList() {
         List<CarbsInPast> newActiveCarbsList = new ArrayList<>();
 
-        for(CarbsInPast c: activeCarbsList) {
+        for (CarbsInPast c : activeCarbsList) {
             newActiveCarbsList.add(new CarbsInPast(c));
         }
 
@@ -119,10 +124,10 @@ public class AutosensData implements DataPointWithLabelInterface {
     // remove carbs older than timeframe
     public void removeOldCarbs(long toTime) {
         double maxAbsorptionHours = Constants.DEFAULT_MAX_ABSORPTION_TIME;
-        if (SensitivityAAPSPlugin.getPlugin().isEnabled(PluginType.SENSITIVITY) || SensitivityWeightedAveragePlugin.getPlugin().isEnabled(PluginType.SENSITIVITY)) {
-            maxAbsorptionHours = SP.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
+        if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
+            maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
         } else {
-            maxAbsorptionHours = SP.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME);
+            maxAbsorptionHours = sp.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME);
         }
         for (int i = 0; i < activeCarbsList.size(); i++) {
             CarbsInPast c = activeCarbsList.get(i);
@@ -130,8 +135,7 @@ public class AutosensData implements DataPointWithLabelInterface {
                 activeCarbsList.remove(i--);
                 if (c.remaining > 0)
                     cob -= c.remaining;
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Removing carbs at " + new Date(toTime).toLocaleString() + " after " + maxAbsorptionHours + "h > " + c.toString());
+                aapsLogger.debug(LTag.AUTOSENS, "Removing carbs at " + DateUtil.dateAndTimeString(toTime) + " after " + maxAbsorptionHours + "h > " + c.toString());
             }
         }
     }
@@ -193,7 +197,7 @@ public class AutosensData implements DataPointWithLabelInterface {
 
     @Override
     public int getColor() {
-        return MainApp.gc(R.color.cob);
+        return resourceHelper.gc(R.color.cob);
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
index 082ebc057d..e1debef726 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
@@ -2,16 +2,14 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.LTag;
 
 /**
  * Created by mike on 06.01.2017.
  */
 public class AutosensResult {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
 
     //default values to show when autosens algorithm is not called
     public double ratio = 1d;
@@ -29,7 +27,7 @@ public class AutosensResult {
             ret.put("sensResult", sensResult);
             ret.put("ratio", ratio);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            LoggerFactory.getLogger(LTag.CORE.getTag()).error("Unhandled exception", e);
         }
         return ret;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
index 159c5865af..36585f97c3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
@@ -2,14 +2,15 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
 import androidx.annotation.Nullable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
@@ -19,8 +20,13 @@ import info.nightscout.androidaps.utils.Round;
  */
 
 public class GlucoseStatus {
-    private static Logger log = LoggerFactory.getLogger(GlucoseStatus.class);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public IobCobCalculatorPlugin iobCobCalculatorPlugin;
+
+    private HasAndroidInjector injector;
+
     public double glucose = 0d;
+    public double noise = 0d;
     public double delta = 0d;
     public double avgdelta = 0d;
     public double short_avgdelta = 0d;
@@ -30,16 +36,20 @@ public class GlucoseStatus {
 
     public String log() {
         return "Glucose: " + DecimalFormatter.to0Decimal(glucose) + " mg/dl " +
+                "Noise: " + DecimalFormatter.to0Decimal(noise) + " " +
                 "Delta: " + DecimalFormatter.to0Decimal(delta) + " mg/dl" +
                 "Short avg. delta: " + " " + DecimalFormatter.to2Decimal(short_avgdelta) + " mg/dl " +
                 "Long avg. delta: " + DecimalFormatter.to2Decimal(long_avgdelta) + " mg/dl";
     }
 
-    public GlucoseStatus() {
+    public GlucoseStatus(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+        this.injector = injector;
     }
 
     public GlucoseStatus round() {
         this.glucose = Round.roundTo(this.glucose, 0.1);
+        this.noise = Round.roundTo(this.noise, 0.01);
         this.delta = Round.roundTo(this.delta, 0.01);
         this.avgdelta = Round.roundTo(this.avgdelta, 0.01);
         this.short_avgdelta = Round.roundTo(this.short_avgdelta, 0.01);
@@ -49,36 +59,33 @@ public class GlucoseStatus {
 
 
     @Nullable
-    public static GlucoseStatus getGlucoseStatusData() {
+    public GlucoseStatus getGlucoseStatusData() {
         return getGlucoseStatusData(false);
     }
 
     @Nullable
-    public static GlucoseStatus getGlucoseStatusData(boolean allowOldData) {
+    public GlucoseStatus getGlucoseStatusData(boolean allowOldData) {
         // load 45min
         //long fromtime = DateUtil.now() - 60 * 1000L * 45;
         //List<BgReading> data = MainApp.getDbHelper().getBgreadingsDataFromTime(fromtime, false);
 
-        synchronized (IobCobCalculatorPlugin.getPlugin().getDataLock()) {
+        synchronized (iobCobCalculatorPlugin.getDataLock()) {
 
-            List<BgReading> data = IobCobCalculatorPlugin.getPlugin().getBgReadings();
+            List<BgReading> data = iobCobCalculatorPlugin.getBgReadings();
 
             if (data == null) {
-                if (L.isEnabled(L.GLUCOSE))
-                    log.debug("data=null");
+                aapsLogger.debug(LTag.GLUCOSE, "data=null");
                 return null;
             }
 
             int sizeRecords = data.size();
             if (sizeRecords == 0) {
-                if (L.isEnabled(L.GLUCOSE))
-                    log.debug("sizeRecords==0");
+                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==0");
                 return null;
             }
 
             if (data.get(0).date < DateUtil.now() - 7 * 60 * 1000L && !allowOldData) {
-                if (L.isEnabled(L.GLUCOSE))
-                    log.debug("olddata");
+                aapsLogger.debug(LTag.GLUCOSE, "olddata");
                 return null;
             }
 
@@ -87,15 +94,15 @@ public class GlucoseStatus {
             double change;
 
             if (sizeRecords == 1) {
-                GlucoseStatus status = new GlucoseStatus();
+                GlucoseStatus status = new GlucoseStatus(injector);
                 status.glucose = now.value;
+                status.noise = 0d;
                 status.short_avgdelta = 0d;
                 status.delta = 0d;
                 status.long_avgdelta = 0d;
                 status.avgdelta = 0d; // for OpenAPS MA
                 status.date = now_date;
-                if (L.isEnabled(L.GLUCOSE))
-                    log.debug("sizeRecords==1");
+                aapsLogger.debug(LTag.GLUCOSE, "sizeRecords==1");
                 return status.round();
             }
 
@@ -119,8 +126,7 @@ public class GlucoseStatus {
                     change = now.value - then.value;
                     avgdelta = change / minutesago * 5;
 
-                    if (L.isEnabled(L.GLUCOSE))
-                        log.debug(then.toString() + " minutesago=" + minutesago + " avgdelta=" + avgdelta);
+                    aapsLogger.debug(LTag.GLUCOSE, then.toString() + " minutesago=" + minutesago + " avgdelta=" + avgdelta);
 
                     // use the average of all data points in the last 2.5m for all further "now" calculations
                     if (0 < minutesago && minutesago < 2.5) {
@@ -145,9 +151,10 @@ public class GlucoseStatus {
                 }
             }
 
-            GlucoseStatus status = new GlucoseStatus();
+            GlucoseStatus status = new GlucoseStatus(injector);
             status.glucose = now.value;
             status.date = now_date;
+            status.noise = 0d; //for now set to nothing as not all CGMs report noise
 
             status.short_avgdelta = average(short_deltas);
 
@@ -160,8 +167,7 @@ public class GlucoseStatus {
             status.long_avgdelta = average(long_deltas);
             status.avgdelta = status.short_avgdelta; // for OpenAPS MA
 
-            if (L.isEnabled(L.GLUCOSE))
-                log.debug(status.log());
+            aapsLogger.debug(LTag.GLUCOSE, status.log());
             return status.round();
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 67d46df22d..602843889c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -7,16 +7,19 @@ import androidx.annotation.Nullable;
 import androidx.collection.LongSparseArray;
 
 import org.json.JSONArray;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TemporaryBasal;
@@ -26,43 +29,47 @@ import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 import static info.nightscout.androidaps.utils.DateUtil.now;
 
-/**
- * Created by mike on 24.04.2017.
- */
-
+@Singleton
 public class IobCobCalculatorPlugin extends PluginBase {
-    private Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+    private final HasAndroidInjector injector;
+    private final SP sp;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final ActivePluginProvider activePlugin;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final SensitivityOref1Plugin sensitivityOref1Plugin;
+    private final SensitivityAAPSPlugin sensitivityAAPSPlugin;
+    private final SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
+    private final FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static IobCobCalculatorPlugin plugin = null;
-
-    public static IobCobCalculatorPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new IobCobCalculatorPlugin();
-        return plugin;
-    }
-
     private LongSparseArray<IobTotal> iobTable = new LongSparseArray<>(); // oldest at index 0
     private LongSparseArray<AutosensData> autosensDataTable = new LongSparseArray<>(); // oldest at index 0
     private LongSparseArray<BasalData> basalDataTable = new LongSparseArray<>(); // oldest at index 0
@@ -75,128 +82,122 @@ public class IobCobCalculatorPlugin extends PluginBase {
     boolean stopCalculationTrigger = false;
     private Thread thread = null;
 
-    public IobCobCalculatorPlugin() {
+    @Inject
+    public IobCobCalculatorPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            SP sp,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            ActivePluginProvider activePlugin,
+            TreatmentsPlugin treatmentsPlugin,
+            SensitivityOref1Plugin sensitivityOref1Plugin,
+            SensitivityAAPSPlugin sensitivityAAPSPlugin,
+            SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin,
+            FabricPrivacy fabricPrivacy
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .pluginName(R.string.iobcobcalculator)
-                .showInList(false)
-                .neverVisible(true)
-                .alwaysEnabled(true)
+                        .mainType(PluginType.GENERAL)
+                        .pluginName(R.string.iobcobcalculator)
+                        .showInList(false)
+                        .neverVisible(true)
+                        .alwaysEnabled(true),
+                aapsLogger, resourceHelper, injector
         );
+        this.injector = injector;
+        this.sp = sp;
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.activePlugin = activePlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.sensitivityOref1Plugin = sensitivityOref1Plugin;
+        this.sensitivityAAPSPlugin = sensitivityAAPSPlugin;
+        this.sensitivityWeightedAveragePlugin = sensitivityWeightedAveragePlugin;
+        this.fabricPrivacy = fabricPrivacy;
     }
 
     @Override
     protected void onStart() {
         super.onStart();
         // EventConfigBuilderChange
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventConfigBuilderChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (this != getPlugin()) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Ignoring event for non default instance");
-                        return;
-                    }
                     stopCalculation("onEventConfigBuilderChange");
                     synchronized (dataLock) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Invalidating cached data because of configuration change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
+                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of configuration change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
                         iobTable = new LongSparseArray<>();
                         autosensDataTable = new LongSparseArray<>();
                     }
                     runCalculation("onEventConfigBuilderChange", System.currentTimeMillis(), false, true, event);
-                }, FabricPrivacy::logException)
+                }, fabricPrivacy::logException)
         );
         // EventNewBasalProfile
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNewBasalProfile.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (this != getPlugin()) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Ignoring event for non default instance");
-                        return;
-                    }
-                    if (ConfigBuilderPlugin.getPlugin() == null)
-                        return; // app still initializing
                     if (event == null) { // on init no need of reset
                         return;
                     }
                     stopCalculation("onNewProfile");
                     synchronized (dataLock) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Invalidating cached data because of new profile. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
+                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of new profile. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
                         iobTable = new LongSparseArray<>();
                         autosensDataTable = new LongSparseArray<>();
                         basalDataTable = new LongSparseArray<>();
                     }
                     runCalculation("onNewProfile", System.currentTimeMillis(), false, true, event);
-                }, FabricPrivacy::logException)
+                }, fabricPrivacy::logException)
         );
         // EventNewBG
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNewBG.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (this != getPlugin()) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Ignoring event for non default instance");
-                        return;
-                    }
                     stopCalculation("onEventNewBG");
                     runCalculation("onEventNewBG", System.currentTimeMillis(), true, true, event);
-                }, FabricPrivacy::logException)
+                }, fabricPrivacy::logException)
         );
         // EventPreferenceChange
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (this != getPlugin()) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Ignoring event for non default instance");
-                        return;
-                    }
-                    if (event.isChanged(R.string.key_openapsama_autosens_period) ||
-                            event.isChanged(R.string.key_age) ||
-                            event.isChanged(R.string.key_absorption_maxtime) ||
-                            event.isChanged(R.string.key_openapsama_min_5m_carbimpact) ||
-                            event.isChanged(R.string.key_absorption_cutoff) ||
-                            event.isChanged(R.string.key_openapsama_autosens_max) ||
-                            event.isChanged(R.string.key_openapsama_autosens_min) ||
-                            event.isChanged(R.string.key_insulin_oref_peak)
+                    if (event.isChanged(resourceHelper, R.string.key_openapsama_autosens_period) ||
+                            event.isChanged(resourceHelper, R.string.key_age) ||
+                            event.isChanged(resourceHelper, R.string.key_absorption_maxtime) ||
+                            event.isChanged(resourceHelper, R.string.key_openapsama_min_5m_carbimpact) ||
+                            event.isChanged(resourceHelper, R.string.key_absorption_cutoff) ||
+                            event.isChanged(resourceHelper, R.string.key_openapsama_autosens_max) ||
+                            event.isChanged(resourceHelper, R.string.key_openapsama_autosens_min) ||
+                            event.isChanged(resourceHelper, R.string.key_insulin_oref_peak)
                     ) {
                         stopCalculation("onEventPreferenceChange");
                         synchronized (dataLock) {
-                            if (L.isEnabled(L.AUTOSENS))
-                                log.debug("Invalidating cached data because of preference change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records" + " BasalData: " + basalDataTable.size() + " records");
+                            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of preference change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records" + " BasalData: " + basalDataTable.size() + " records");
                             iobTable = new LongSparseArray<>();
                             autosensDataTable = new LongSparseArray<>();
                             basalDataTable = new LongSparseArray<>();
                         }
                         runCalculation("onEventPreferenceChange", System.currentTimeMillis(), false, true, event);
                     }
-                }, FabricPrivacy::logException)
+                }, fabricPrivacy::logException)
         );
         // EventAppInitialized
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppInitialized.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (this != getPlugin()) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Ignoring event for non default instance");
-                        return;
-                    }
-                    runCalculation("onEventAppInitialized", System.currentTimeMillis(), true, true, event);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> runCalculation("onEventAppInitialized", System.currentTimeMillis(), true, true, event), fabricPrivacy::logException)
         );
         // EventNewHistoryData
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventNewHistoryData.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> newHistoryData(event), FabricPrivacy::logException)
+                .subscribe(this::newHistoryData, fabricPrivacy::logException)
         );
     }
 
@@ -235,7 +236,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
     }
 
     void loadBgData(long to) {
-        Profile profile = ProfileFunctions.getInstance().getProfile(to);
+        Profile profile = profileFunction.getProfile(to);
         double dia = Constants.defaultDIA;
         if (profile != null) dia = profile.getDia();
         long start = to - T.hours((long) (24 + dia)).msecs();
@@ -243,12 +244,10 @@ public class IobCobCalculatorPlugin extends PluginBase {
             // if close to now expect there can be some readings with time in close future (caused by wrong time setting)
             // so read all records
             bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, false);
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start));
+            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start));
         } else {
             bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, to, false);
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start) + " End date: " + DateUtil.dateAndTimeString(to));
+            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start) + " End date: " + DateUtil.dateAndTimeString(to));
         }
     }
 
@@ -268,15 +267,13 @@ public class IobCobCalculatorPlugin extends PluginBase {
                 totalDiff += diff;
                 diff = Math.abs(diff);
                 if (diff > T.secs(30).msecs()) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Interval detection: values: " + bgReadings.size() + " diff: " + (diff / 1000) + "[s] is5minData: " + false);
+                    getAapsLogger().debug(LTag.AUTOSENS, "Interval detection: values: " + bgReadings.size() + " diff: " + (diff / 1000) + "[s] is5minData: " + false);
                     return false;
                 }
             }
             long averageDiff = totalDiff / bgReadings.size() / 1000;
             boolean is5mindata = averageDiff < 1;
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Interval detection: values: " + bgReadings.size() + " averageDiff: " + averageDiff + "[s] is5minData: " + is5mindata);
+            getAapsLogger().debug(LTag.AUTOSENS, "Interval detection: values: " + bgReadings.size() + " averageDiff: " + averageDiff + "[s] is5minData: " + is5mindata);
             return is5mindata;
         }
     }
@@ -338,7 +335,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
                 long timeDiffToNew = newer.date - currentTime;
 
                 double currentBg = newer.value - (double) timeDiffToNew / (newer.date - older.date) * bgDelta;
-                BgReading newBgreading = new BgReading();
+                BgReading newBgreading = new BgReading(injector);
                 newBgreading.date = currentTime;
                 newBgreading.value = Math.round(currentBg);
                 bucketed_data.add(newBgreading);
@@ -358,8 +355,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
 
         bucketed_data = new ArrayList<>();
         bucketed_data.add(bgReadings.get(0));
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Adding. bgTime: " + DateUtil.toISOString(bgReadings.get(0).date) + " lastbgTime: " + "none-first-value" + " " + bgReadings.get(0).toString());
+        getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgReadings.get(0).date) + " lastbgTime: " + "none-first-value" + " " + bgReadings.get(0).toString());
         int j = 0;
         for (int i = 1; i < bgReadings.size(); ++i) {
             long bgTime = bgReadings.get(i).date;
@@ -379,7 +375,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
                 while (elapsed_minutes > 5) {
                     nextbgTime = lastbgTime - 5 * 60 * 1000;
                     j++;
-                    BgReading newBgreading = new BgReading();
+                    BgReading newBgreading = new BgReading(injector);
                     newBgreading.date = nextbgTime;
                     double gapDelta = bgReadings.get(i).value - lastbg;
                     //console.error(gapDelta, lastbg, elapsed_minutes);
@@ -387,28 +383,25 @@ public class IobCobCalculatorPlugin extends PluginBase {
                     newBgreading.value = Math.round(nextbg);
                     //console.error("Interpolated", bucketed_data[j]);
                     bucketed_data.add(newBgreading);
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
+                    getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
 
                     elapsed_minutes = elapsed_minutes - 5;
                     lastbg = nextbg;
                     lastbgTime = nextbgTime;
                 }
                 j++;
-                BgReading newBgreading = new BgReading();
+                BgReading newBgreading = new BgReading(injector);
                 newBgreading.value = bgReadings.get(i).value;
                 newBgreading.date = bgTime;
                 bucketed_data.add(newBgreading);
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
+                getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else if (Math.abs(elapsed_minutes) > 2) {
                 j++;
-                BgReading newBgreading = new BgReading();
+                BgReading newBgreading = new BgReading(injector);
                 newBgreading.value = bgReadings.get(i).value;
                 newBgreading.date = bgTime;
                 bucketed_data.add(newBgreading);
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
+                getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else {
                 bucketed_data.get(j).value = (bucketed_data.get(j).value + bgReadings.get(i).value) / 2;
                 //log.error("***** Average");
@@ -421,34 +414,30 @@ public class IobCobCalculatorPlugin extends PluginBase {
             BgReading previous = bucketed_data.get(i + 1);
             long msecDiff = current.date - previous.date;
             long adjusted = (msecDiff - T.mins(5).msecs()) / 1000;
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.date) + " to: " + DateUtil.toISOString(previous.date + T.mins(5).msecs()) + " by " + adjusted + " sec");
+            getAapsLogger().debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.date) + " to: " + DateUtil.toISOString(previous.date + T.mins(5).msecs()) + " by " + adjusted + " sec");
             if (Math.abs(adjusted) > 90) {
                 // too big adjustment, fallback to non 5 min data
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Fallback to non 5 min data");
+                getAapsLogger().debug(LTag.AUTOSENS, "Fallback to non 5 min data");
                 createBucketedDataRecalculated();
                 return;
             }
             current.date = previous.date + T.mins(5).msecs();
         }
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Bucketed data created. Size: " + bucketed_data.size());
+        getAapsLogger().debug(LTag.AUTOSENS, "Bucketed data created. Size: " + bucketed_data.size());
     }
 
-    public long calculateDetectionStart(long from, boolean limitDataToOldestAvailable) {
-        Profile profile = ProfileFunctions.getInstance().getProfile(from);
+    long calculateDetectionStart(long from, boolean limitDataToOldestAvailable) {
+        Profile profile = profileFunction.getProfile(from);
         double dia = Constants.defaultDIA;
         if (profile != null) dia = profile.getDia();
 
-        long oldestDataAvailable = TreatmentsPlugin.getPlugin().oldestDataAvailable();
+        long oldestDataAvailable = treatmentsPlugin.oldestDataAvailable();
         long getBGDataFrom;
         if (limitDataToOldestAvailable) {
             getBGDataFrom = Math.max(oldestDataAvailable, (long) (from - T.hours(1).msecs() * (24 + dia)));
             if (getBGDataFrom == oldestDataAvailable)
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Limiting data to oldest available temps: " + DateUtil.dateAndTimeFullString(oldestDataAvailable));
+                getAapsLogger().debug(LTag.AUTOSENS, "Limiting data to oldest available temps: " + DateUtil.dateAndTimeString(oldestDataAvailable));
         } else
             getBGDataFrom = (long) (from - T.hours(1).msecs() * (24 + dia));
         return getBGDataFrom;
@@ -460,13 +449,13 @@ public class IobCobCalculatorPlugin extends PluginBase {
         }
     }
 
-    public IobTotal calculateFromTreatmentsAndTempsSynchronized(long time, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
+    private IobTotal calculateFromTreatmentsAndTempsSynchronized(long time, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
         synchronized (dataLock) {
             return calculateFromTreatmentsAndTemps(time, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget);
         }
     }
 
-    public IobTotal calculateFromTreatmentsAndTemps(long time, Profile profile) {
+    IobTotal calculateFromTreatmentsAndTemps(long time, Profile profile) {
         long now = System.currentTimeMillis();
         time = roundUpTime(time);
         if (time < now && iobTable.get(time) != null) {
@@ -475,23 +464,22 @@ public class IobCobCalculatorPlugin extends PluginBase {
         } else {
             //log.debug(">>> calculateFromTreatmentsAndTemps Cache miss " + new Date(time).toLocaleString());
         }
-        IobTotal bolusIob = TreatmentsPlugin.getPlugin().getCalculationToTimeTreatments(time).round();
-        IobTotal basalIob = TreatmentsPlugin.getPlugin().getCalculationToTimeTempBasals(time, true, now).round();
-        if (OpenAPSSMBPlugin.getPlugin().isEnabled(PluginType.APS)) {
-            // Add expected zero temp basal for next 240 mins
-            IobTotal basalIobWithZeroTemp = basalIob.copy();
-            TemporaryBasal t = new TemporaryBasal()
-                    .date(now + 60 * 1000L)
-                    .duration(240)
-                    .absolute(0);
-            if (t.date < time) {
-                IobTotal calc = t.iobCalc(time, profile);
-                basalIobWithZeroTemp.plus(calc);
-            }
-
-            basalIob.iobWithZeroTemp = IobTotal.combine(bolusIob, basalIobWithZeroTemp).round();
+        IobTotal bolusIob = treatmentsPlugin.getCalculationToTimeTreatments(time).round();
+        IobTotal basalIob = treatmentsPlugin.getCalculationToTimeTempBasals(time, true, now).round();
+        // OpenAPSSMB only
+        // Add expected zero temp basal for next 240 mins
+        IobTotal basalIobWithZeroTemp = basalIob.copy();
+        TemporaryBasal t = new TemporaryBasal()
+                .date(now + 60 * 1000L)
+                .duration(240)
+                .absolute(0);
+        if (t.date < time) {
+            IobTotal calc = t.iobCalc(time, profile);
+            basalIobWithZeroTemp.plus(calc);
         }
 
+        basalIob.iobWithZeroTemp = IobTotal.combine(bolusIob, basalIobWithZeroTemp).round();
+
         IobTotal iobTotal = IobTotal.combine(bolusIob, basalIob).round();
         if (time < System.currentTimeMillis()) {
             iobTable.put(time, iobTotal);
@@ -499,29 +487,28 @@ public class IobCobCalculatorPlugin extends PluginBase {
         return iobTotal;
     }
 
-    public IobTotal calculateFromTreatmentsAndTemps(long time, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
+    private IobTotal calculateFromTreatmentsAndTemps(long time, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
         long now = DateUtil.now();
 
-        IobTotal bolusIob = TreatmentsPlugin.getPlugin().getCalculationToTimeTreatments(time).round();
-        IobTotal basalIob = TreatmentsPlugin.getPlugin().getCalculationToTimeTempBasals(time, now, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget).round();
-        if (OpenAPSSMBPlugin.getPlugin().isEnabled(PluginType.APS)) {
-            // Add expected zero temp basal for next 240 mins
-            IobTotal basalIobWithZeroTemp = basalIob.copy();
-            TemporaryBasal t = new TemporaryBasal()
-                    .date(now + 60 * 1000L)
-                    .duration(240)
-                    .absolute(0);
-            if (t.date < time) {
-                Profile profile = ProfileFunctions.getInstance().getProfile(t.date);
-                if (profile != null) {
-                    IobTotal calc = t.iobCalc(time, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget);
-                    basalIobWithZeroTemp.plus(calc);
-                }
+        IobTotal bolusIob = treatmentsPlugin.getCalculationToTimeTreatments(time).round();
+        IobTotal basalIob = treatmentsPlugin.getCalculationToTimeTempBasals(time, now, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget).round();
+        // OpenAPSSMB only
+        // Add expected zero temp basal for next 240 mins
+        IobTotal basalIobWithZeroTemp = basalIob.copy();
+        TemporaryBasal t = new TemporaryBasal()
+                .date(now + 60 * 1000L)
+                .duration(240)
+                .absolute(0);
+        if (t.date < time) {
+            Profile profile = profileFunction.getProfile(t.date);
+            if (profile != null) {
+                IobTotal calc = t.iobCalc(time, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget);
+                basalIobWithZeroTemp.plus(calc);
             }
-
-            basalIob.iobWithZeroTemp = IobTotal.combine(bolusIob, basalIobWithZeroTemp).round();
         }
 
+        basalIob.iobWithZeroTemp = IobTotal.combine(bolusIob, basalIobWithZeroTemp).round();
+
         return IobTotal.combine(bolusIob, basalIob).round();
     }
 
@@ -543,7 +530,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
             BasalData retval = basalDataTable.get(time);
             if (retval == null) {
                 retval = new BasalData();
-                TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(time);
+                TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(time);
                 retval.basal = profile.getBasal(time);
                 if (tb != null) {
                     retval.isTempBasalRunning = true;
@@ -589,14 +576,12 @@ public class IobCobCalculatorPlugin extends PluginBase {
     @Nullable
     public AutosensData getLastAutosensDataSynchronized(String reason) {
         if (thread != null && thread.isAlive()) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA is waiting for calculation thread: " + reason);
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA is waiting for calculation thread: " + reason);
             try {
                 thread.join(5000);
             } catch (InterruptedException ignored) {
             }
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA finished waiting for calculation thread: " + reason);
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA finished waiting for calculation thread: " + reason);
         }
         synchronized (dataLock) {
             return getLastAutosensData(reason);
@@ -610,7 +595,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
         Double displayCob = null;
         double futureCarbs = 0;
         long now = now();
-        List<Treatment> treatments = TreatmentsPlugin.getPlugin().getTreatmentsFromHistory();
+        List<Treatment> treatments = treatmentsPlugin.getTreatmentsFromHistory();
 
         if (autosensData != null) {
             displayCob = autosensData.cob;
@@ -648,8 +633,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
     @Nullable
     public AutosensData getLastAutosensData(String reason) {
         if (autosensDataTable.size() < 1) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA null: autosensDataTable empty (" + reason + ")");
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: autosensDataTable empty (" + reason + ")");
             return null;
         }
         AutosensData data;
@@ -659,20 +643,18 @@ public class IobCobCalculatorPlugin extends PluginBase {
             // data can be processed on the background
             // in this rare case better return null and do not block UI
             // APS plugin should use getLastAutosensDataSynchronized where the blocking is not an issue
-            log.debug("AUTOSENSDATA null: Exception catched (" + reason + ")");
+            getAapsLogger().error("AUTOSENSDATA null: Exception catched (" + reason + ")");
             return null;
         }
         if (data == null) {
-            log.debug("AUTOSENSDATA null: data==null");
+            getAapsLogger().error("AUTOSENSDATA null: data==null");
             return null;
         }
         if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
             return null;
         } else {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA (" + reason + ") " + data.toString());
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA (" + reason + ") " + data.toString());
             return data;
         }
     }
@@ -684,6 +666,55 @@ public class IobCobCalculatorPlugin extends PluginBase {
             return "autosensDataTable empty";
     }
 
+    public MealData getMealData() {
+        MealData result = new MealData();
+
+        Profile profile = profileFunction.getProfile();
+        if (profile == null) return result;
+
+        long now = System.currentTimeMillis();
+        long dia_ago = now - (Double.valueOf(profile.getDia() * T.hours(1).msecs())).longValue();
+
+        double maxAbsorptionHours = Constants.DEFAULT_MAX_ABSORPTION_TIME;
+        if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
+            maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
+        } else {
+            maxAbsorptionHours = sp.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME);
+        }
+        long absorptionTime_ago = now - (Double.valueOf(maxAbsorptionHours * T.hours(1).msecs())).longValue();
+
+        List<Treatment> treatments = treatmentsPlugin.getTreatmentsFromHistory();
+        for (Treatment treatment : treatments) {
+            if (!treatment.isValid)
+                continue;
+            long t = treatment.date;
+
+            if (t > dia_ago && t <= now) {
+                if (treatment.insulin > 0 && treatment.mealBolus) {
+                    result.boluses += treatment.insulin;
+                }
+            }
+
+            if (t > absorptionTime_ago && t <= now) {
+                if (treatment.carbs >= 1) {
+                    result.carbs += treatment.carbs;
+                    if (t > result.lastCarbTime)
+                        result.lastCarbTime = t;
+                }
+            }
+        }
+
+        AutosensData autosensData = getLastAutosensDataSynchronized("getMealData()");
+        if (autosensData != null) {
+            result.mealCOB = autosensData.cob;
+            result.slopeFromMinDeviation = autosensData.slopeFromMinDeviation;
+            result.slopeFromMaxDeviation = autosensData.slopeFromMaxDeviation;
+            result.usedMinCarbsImpact = autosensData.usedMinCarbsImpact;
+        }
+        result.lastBolusTime = treatmentsPlugin.getLastBolusTime();
+        return result;
+    }
+
     public IobTotal[] calculateIobArrayInDia(Profile profile) {
         // predict IOB out to DIA plus 30m
         long time = System.currentTimeMillis();
@@ -726,9 +757,9 @@ public class IobCobCalculatorPlugin extends PluginBase {
         return sb.toString();
     }
 
-    public AutosensResult detectSensitivityWithLock(long fromTime, long toTime) {
+    AutosensResult detectSensitivityWithLock(long fromTime, long toTime) {
         synchronized (dataLock) {
-            return ConfigBuilderPlugin.getPlugin().getActiveSensitivity().detectSensitivity(this, fromTime, toTime);
+            return activePlugin.getActiveSensitivity().detectSensitivity(this, fromTime, toTime);
         }
     }
 
@@ -743,46 +774,36 @@ public class IobCobCalculatorPlugin extends PluginBase {
     public void stopCalculation(String from) {
         if (thread != null && thread.getState() != Thread.State.TERMINATED) {
             stopCalculationTrigger = true;
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Stopping calculation thread: " + from);
+            getAapsLogger().debug(LTag.AUTOSENS, "Stopping calculation thread: " + from);
             while (thread.getState() != Thread.State.TERMINATED) {
                 SystemClock.sleep(100);
             }
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Calculation thread stopped: " + from);
+            getAapsLogger().debug(LTag.AUTOSENS, "Calculation thread stopped: " + from);
         }
     }
 
     public void runCalculation(String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Starting calculation thread: " + from + " to " + DateUtil.dateAndTimeString(end));
+        getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + DateUtil.dateAndTimeString(end));
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
-            if (SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY))
-                thread = new IobCobOref1Thread(this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+            if (sensitivityOref1Plugin.isEnabled())
+                thread = new IobCobOref1Thread(injector, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             else
-                thread = new IobCobThread(this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+                thread = new IobCobThread(injector, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             thread.start();
         }
     }
 
     // When historical data is changed (comming from NS etc) finished calculations after this date must be invalidated
-    public void newHistoryData(EventNewHistoryData ev) {
-        if (this != getPlugin()) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Ignoring event for non default instance");
-            return;
-        }
+    private void newHistoryData(EventNewHistoryData ev) {
         //log.debug("Locking onNewHistoryData");
         stopCalculation("onEventNewHistoryData");
         synchronized (dataLock) {
             // clear up 5 min back for proper COB calculation
             long time = ev.getTime() - 5 * 60 * 1000L;
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Invalidating cached data to: " + DateUtil.dateAndTimeFullString(time));
+            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data to: " + DateUtil.dateAndTimeString(time));
             for (int index = iobTable.size() - 1; index >= 0; index--) {
                 if (iobTable.keyAt(index) > time) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Removing from iobTable: " + DateUtil.dateAndTimeFullString(iobTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from iobTable: " + DateUtil.dateAndTimeString(iobTable.keyAt(index)));
                     iobTable.removeAt(index);
                 } else {
                     break;
@@ -790,8 +811,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
             }
             for (int index = autosensDataTable.size() - 1; index >= 0; index--) {
                 if (autosensDataTable.keyAt(index) > time) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Removing from autosensDataTable: " + DateUtil.dateAndTimeFullString(autosensDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + DateUtil.dateAndTimeString(autosensDataTable.keyAt(index)));
                     autosensDataTable.removeAt(index);
                 } else {
                     break;
@@ -799,8 +819,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
             }
             for (int index = basalDataTable.size() - 1; index >= 0; index--) {
                 if (basalDataTable.keyAt(index) > time) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Removing from basalDataTable: " + DateUtil.dateAndTimeFullString(basalDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from basalDataTable: " + DateUtil.dateAndTimeString(basalDataTable.keyAt(index)));
                     basalDataTable.removeAt(index);
                 } else {
                     break;
@@ -813,14 +832,47 @@ public class IobCobCalculatorPlugin extends PluginBase {
 
     public void clearCache() {
         synchronized (dataLock) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Clearing cached data.");
+            getAapsLogger().debug(LTag.AUTOSENS, "Clearing cached data.");
             iobTable = new LongSparseArray<>();
             autosensDataTable = new LongSparseArray<>();
             basalDataTable = new LongSparseArray<>();
         }
     }
 
+    /*
+     * Return last BgReading from database or null if db is empty
+     */
+    @Nullable
+    public BgReading lastBg() {
+        List<BgReading> bgList = getBgReadings();
+
+        if (bgList == null)
+            return null;
+
+        for (int i = 0; i < bgList.size(); i++)
+            if (bgList.get(i).value >= 39)
+                return bgList.get(i);
+        return null;
+    }
+
+    /*
+     * Return bg reading if not old ( <9 min )
+     * or null if older
+     */
+    @Nullable
+    public BgReading actualBg() {
+        BgReading lastBg = lastBg();
+
+        if (lastBg == null)
+            return null;
+
+        if (lastBg.date > System.currentTimeMillis() - 9 * 60 * 1000)
+            return lastBg;
+
+        return null;
+    }
+
+
     // From https://gist.github.com/IceCreamYou/6ffa1b18c4c8f6aeaad2
     // Returns the value at a given percentile in a sorted numeric array.
     // "Linear interpolation between closest ranks" method
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index 9fe87856b7..505b9a799f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -6,41 +6,44 @@ import android.os.SystemClock;
 
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.MidnightTime;
 import info.nightscout.androidaps.utils.Profiler;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 import static info.nightscout.androidaps.utils.DateUtil.now;
 import static java.util.Calendar.MINUTE;
@@ -50,10 +53,21 @@ import static java.util.Calendar.MINUTE;
  */
 
 public class IobCobOref1Thread extends Thread {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
     private final Event cause;
 
-    private IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject Context context;
+    @Inject ActivePluginProvider activePluginProvider;
+    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
+    @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
+    @Inject BuildHelper buildHelper;
+
+    private final HasAndroidInjector injector;
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -61,19 +75,20 @@ public class IobCobOref1Thread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    IobCobOref1Thread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    IobCobOref1Thread(HasAndroidInjector injector, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
+        injector.androidInjector().inject(this);
+        this.injector = injector;
 
-        this.iobCobCalculatorPlugin = plugin;
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;
         this.from = from;
         this.cause = cause;
         this.end = end;
 
-        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        PowerManager powerManager = (PowerManager) context.getApplicationContext().getSystemService(Context.POWER_SERVICE);
         if (powerManager != null)
-            mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.gs(R.string.app_name) + ":iobCobThread");
+            mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, resourceHelper.gs(R.string.app_name) + ":iobCobThread");
     }
 
     @Override
@@ -82,16 +97,9 @@ public class IobCobOref1Thread extends Thread {
         if (mWakeLock != null)
             mWakeLock.acquire(T.mins(10).msecs());
         try {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA thread started: " + from);
-            if (ConfigBuilderPlugin.getPlugin() == null) {
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
-                return; // app still initializing
-            }
-            if (!ProfileFunctions.getInstance().isProfileValid("IobCobThread")) {
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Aborting calculation thread (No profile): " + from);
+            aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread started: " + from);
+            if (!profileFunction.isProfileValid("IobCobThread")) {
+                aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (No profile): " + from);
                 return; // app still initializing
             }
             //log.debug("Locking calculateSensitivityData");
@@ -107,24 +115,21 @@ public class IobCobOref1Thread extends Thread {
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
                 if (bucketed_data == null || bucketed_data.size() < 3) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Aborting calculation thread (No bucketed data available): " + from);
+                    aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (No bucketed data available): " + from);
                     return;
                 }
 
                 long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
+                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + DateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
                 for (int i = bucketed_data.size() - 4; i >= 0; i--) {
-                    String progress = i + (MainApp.isDev() ? " (" + from + ")" : "");
-                    RxBus.INSTANCE.send(new EventIobCalculationProgress(progress));
+                    String progress = i + (buildHelper.isDev() ? " (" + from + ")" : "");
+                    rxBus.send(new EventIobCalculationProgress(progress));
 
                     if (iobCobCalculatorPlugin.stopCalculationTrigger) {
                         iobCobCalculatorPlugin.stopCalculationTrigger = false;
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Aborting calculation thread (trigger): " + from);
+                        aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (trigger): " + from);
                         return;
                     }
                     // check if data already exists
@@ -139,19 +144,17 @@ public class IobCobOref1Thread extends Thread {
                         continue;
                     }
 
-                    Profile profile = ProfileFunctions.getInstance().getProfile(bgTime);
+                    Profile profile = profileFunction.getProfile(bgTime);
                     if (profile == null) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Aborting calculation thread (no profile): " + from);
+                        aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (no profile): " + from);
                         return; // profile not set yet
                     }
 
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
+                    aapsLogger.debug(LTag.AUTOSENS, "Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
 
                     double sens = profile.getIsfMgdl(bgTime);
 
-                    AutosensData autosensData = new AutosensData();
+                    AutosensData autosensData = new AutosensData(injector);
                     autosensData.time = bgTime;
                     if (previous != null)
                         autosensData.activeCarbsList = previous.cloneCarbsList();
@@ -164,7 +167,7 @@ public class IobCobOref1Thread extends Thread {
                     double delta;
                     bg = bucketed_data.get(i).value;
                     if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
-                        log.error("! value < 39");
+                        aapsLogger.error("! value < 39");
                         continue;
                     }
                     autosensData.bg = bg;
@@ -188,23 +191,20 @@ public class IobCobOref1Thread extends Thread {
                         AutosensData hourAgoData = iobCobCalculatorPlugin.getAutosensData(hourago);
                         if (hourAgoData != null) {
                             int initialIndex = autosensDataTable.indexOfKey(hourAgoData.time);
-                            if (L.isEnabled(L.AUTOSENS))
-                                log.debug(">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + hourAgoData.toString());
+                            aapsLogger.debug(LTag.AUTOSENS, ">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + hourAgoData.toString());
                             int past = 1;
                             try {
                                 for (; past < 12; past++) {
                                     AutosensData ad = autosensDataTable.valueAt(initialIndex + past);
-                                    if (L.isEnabled(L.AUTOSENS)) {
-                                        log.debug(">>>>> past=" + past + " ad=" + (ad != null ? ad.toString() : null));
-                                        if (ad == null) {
-                                            log.debug(autosensDataTable.toString());
-                                            log.debug(bucketed_data.toString());
-                                            log.debug(IobCobCalculatorPlugin.getPlugin().getBgReadings().toString());
-                                            Notification notification = new Notification(Notification.SENDLOGFILES, MainApp.gs(R.string.sendlogfiles), Notification.LOW);
-                                            RxBus.INSTANCE.send(new EventNewNotification(notification));
-                                            SP.putBoolean("log_AUTOSENS", true);
-                                            break;
-                                        }
+                                    aapsLogger.debug(LTag.AUTOSENS, ">>>>> past=" + past + " ad=" + (ad != null ? ad.toString() : null));
+                                    if (ad == null) {
+                                        aapsLogger.debug(LTag.AUTOSENS, autosensDataTable.toString());
+                                        aapsLogger.debug(LTag.AUTOSENS, bucketed_data.toString());
+                                        aapsLogger.debug(LTag.AUTOSENS, iobCobCalculatorPlugin.getBgReadings().toString());
+                                        Notification notification = new Notification(Notification.SENDLOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW);
+                                        rxBus.send(new EventNewNotification(notification));
+                                        sp.putBoolean("log_AUTOSENS", true);
+                                        break;
                                     }
                                     // let it here crash on NPE to get more data as i cannot reproduce this bug
                                     double deviationSlope = (ad.avgDeviation - avgDeviation) / (ad.time - bgTime) * 1000 * 60 * 5;
@@ -221,26 +221,25 @@ public class IobCobOref1Thread extends Thread {
                                     //    log.debug("Deviations: " + new Date(bgTime) + new Date(ad.time) + " avgDeviation=" + avgDeviation + " deviationSlope=" + deviationSlope + " slopeFromMaxDeviation=" + slopeFromMaxDeviation + " slopeFromMinDeviation=" + slopeFromMinDeviation);
                                 }
                             } catch (Exception e) {
-                                log.error("Unhandled exception", e);
-                                FabricPrivacy.logException(e);
-                                log.debug(autosensDataTable.toString());
-                                log.debug(bucketed_data.toString());
-                                log.debug(IobCobCalculatorPlugin.getPlugin().getBgReadings().toString());
-                                Notification notification = new Notification(Notification.SENDLOGFILES, MainApp.gs(R.string.sendlogfiles), Notification.LOW);
-                                RxBus.INSTANCE.send(new EventNewNotification(notification));
-                                SP.putBoolean("log_AUTOSENS", true);
+                                aapsLogger.error("Unhandled exception", e);
+                                FabricPrivacy.getInstance().logException(e);
+                                aapsLogger.debug(autosensDataTable.toString());
+                                aapsLogger.debug(bucketed_data.toString());
+                                aapsLogger.debug(iobCobCalculatorPlugin.getBgReadings().toString());
+                                Notification notification = new Notification(Notification.SENDLOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW);
+                                rxBus.send(new EventNewNotification(notification));
+                                sp.putBoolean("log_AUTOSENS", true);
                                 break;
                             }
                         } else {
-                            if (L.isEnabled(L.AUTOSENS))
-                                log.debug(">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + "null");
+                            aapsLogger.debug(LTag.AUTOSENS, ">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + "null");
                         }
                     }
 
-                    List<Treatment> recentCarbTreatments = TreatmentsPlugin.getPlugin().getCarbTreatments5MinBackFromHistory(bgTime);
+                    List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
-                        autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentCarbTreatment));
+                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment));
                         autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentCarbTreatment.carbs) + "g]";
                     }
 
@@ -257,7 +256,7 @@ public class IobCobOref1Thread extends Thread {
 //                            }
 //                        } else {
                         //Oref sensitivity
-                        totalMinCarbsImpact = SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
+                        totalMinCarbsImpact = sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
 //                        }
 
                         // figure out how many carbs that represents
@@ -357,8 +356,8 @@ public class IobCobOref1Thread extends Thread {
 
                     // add an extra negative deviation if a high temptarget is running and exercise mode is set
                     // TODO AS-FIX
-                    if (false && SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
-                        TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory(bgTime);
+                    if (false && sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
+                        TempTarget tempTarget = activePluginProvider.getActiveTreatments().getTempTargetFromHistory(bgTime);
                         if (tempTarget != null && tempTarget.target() >= 100) {
                             autosensData.extraDeviation.add(-(tempTarget.target() - 100) / 20);
                         }
@@ -375,30 +374,24 @@ public class IobCobOref1Thread extends Thread {
                     previous = autosensData;
                     if (bgTime < now())
                         autosensDataTable.put(bgTime, autosensData);
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
+                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
                     AutosensResult sensitivity = iobCobCalculatorPlugin.detectSensitivityWithLock(oldestTimeWithData, bgTime);
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Sensitivity result: " + sensitivity.toString());
+                    aapsLogger.debug(LTag.AUTOSENS, "Sensitivity result: " + sensitivity.toString());
                     autosensData.autosensResult = sensitivity;
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug(autosensData.toString());
+                    aapsLogger.debug(LTag.AUTOSENS, autosensData.toString());
                 }
             }
             new Thread(() -> {
                 SystemClock.sleep(1000);
-                RxBus.INSTANCE.send(new EventAutosensCalculationFinished(cause));
+                rxBus.send(new EventAutosensCalculationFinished(cause));
             }).start();
         } finally {
             if (mWakeLock != null)
                 mWakeLock.release();
-            RxBus.INSTANCE.send(new EventIobCalculationProgress(""));
-            if (L.isEnabled(L.AUTOSENS)) {
-                log.debug("AUTOSENSDATA thread ended: " + from);
-                log.debug("Midnights: " + MidnightTime.log());
-            }
-            Profiler.log(log, "IobCobOref1Thread", start);
+            rxBus.send(new EventIobCalculationProgress(""));
+            aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread ended: " + from);
+            aapsLogger.debug(LTag.AUTOSENS, "Midnights: " + MidnightTime.log());
+            Profiler.log(aapsLogger, LTag.AUTOSENS, "IobCobOref1Thread", start);
         }
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index 7389e39b8d..6e30d776b2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -6,26 +6,25 @@ import android.os.SystemClock;
 
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
@@ -33,14 +32,15 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCa
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.MidnightTime;
 import info.nightscout.androidaps.utils.Profiler;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 import static info.nightscout.androidaps.utils.DateUtil.now;
 
@@ -49,10 +49,21 @@ import static info.nightscout.androidaps.utils.DateUtil.now;
  */
 
 public class IobCobThread extends Thread {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
     private final Event cause;
 
-    private IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject Context context;
+    @Inject ActivePluginProvider activePluginProvider;
+    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
+    @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
+    @Inject BuildHelper buildHelper;
+
+    private final HasAndroidInjector injector;
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -60,19 +71,20 @@ public class IobCobThread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    IobCobThread(IobCobCalculatorPlugin plugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    @Inject IobCobThread(HasAndroidInjector injector, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
+        injector.androidInjector().inject(this);
+        this.injector = injector;
 
-        this.iobCobCalculatorPlugin = plugin;
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;
         this.from = from;
         this.cause = cause;
         this.end = end;
 
-        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        PowerManager powerManager = (PowerManager) context.getApplicationContext().getSystemService(Context.POWER_SERVICE);
         if (powerManager != null)
-            mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.gs(R.string.app_name) + ":iobCobThread");
+            mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, resourceHelper.gs(R.string.app_name) + ":iobCobThread");
     }
 
     @Override
@@ -81,16 +93,9 @@ public class IobCobThread extends Thread {
         if (mWakeLock != null)
             mWakeLock.acquire(T.mins(10).msecs());
         try {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("AUTOSENSDATA thread started: " + from);
-            if (ConfigBuilderPlugin.getPlugin() == null) {
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
-                return; // app still initializing
-            }
-            if (!ProfileFunctions.getInstance().isProfileValid("IobCobThread")) {
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Aborting calculation thread (No profile): " + from);
+            aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread started: " + from);
+            if (!profileFunction.isProfileValid("IobCobThread")) {
+                aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (No profile): " + from);
                 return; // app still initializing
             }
             //log.debug("Locking calculateSensitivityData");
@@ -106,24 +111,21 @@ public class IobCobThread extends Thread {
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
                 if (bucketed_data == null || bucketed_data.size() < 3) {
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Aborting calculation thread (No bucketed data available): " + from);
+                    aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (No bucketed data available): " + from);
                     return;
                 }
 
                 long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
+                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + DateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
                 for (int i = bucketed_data.size() - 4; i >= 0; i--) {
-                    String progress = i + (MainApp.isDev() ? " (" + from + ")" : "");
-                    RxBus.INSTANCE.send(new EventIobCalculationProgress(progress));
+                    String progress = i + (buildHelper.isDev() ? " (" + from + ")" : "");
+                    rxBus.send(new EventIobCalculationProgress(progress));
 
                     if (iobCobCalculatorPlugin.stopCalculationTrigger) {
                         iobCobCalculatorPlugin.stopCalculationTrigger = false;
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Aborting calculation thread (trigger): " + from);
+                        aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (trigger): " + from);
                         return;
                     }
                     // check if data already exists
@@ -138,19 +140,17 @@ public class IobCobThread extends Thread {
                         continue;
                     }
 
-                    Profile profile = ProfileFunctions.getInstance().getProfile(bgTime);
+                    Profile profile = profileFunction.getProfile(bgTime);
                     if (profile == null) {
-                        if (L.isEnabled(L.AUTOSENS))
-                            log.debug("Aborting calculation thread (no profile): " + from);
+                        aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (no profile): " + from);
                         return; // profile not set yet
                     }
 
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
+                    aapsLogger.debug(LTag.AUTOSENS, "Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
 
                     double sens = profile.getIsfMgdl(bgTime);
 
-                    AutosensData autosensData = new AutosensData();
+                    AutosensData autosensData = new AutosensData(injector);
                     autosensData.time = bgTime;
                     if (previous != null)
                         autosensData.activeCarbsList = previous.cloneCarbsList();
@@ -163,7 +163,7 @@ public class IobCobThread extends Thread {
                     double delta;
                     bg = bucketed_data.get(i).value;
                     if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
-                        log.error("! value < 39");
+                        aapsLogger.error("! value < 39");
                         continue;
                     }
                     autosensData.bg = bg;
@@ -187,23 +187,20 @@ public class IobCobThread extends Thread {
                         AutosensData hourAgoData = iobCobCalculatorPlugin.getAutosensData(hourago);
                         if (hourAgoData != null) {
                             int initialIndex = autosensDataTable.indexOfKey(hourAgoData.time);
-                            if (L.isEnabled(L.AUTOSENS))
-                                log.debug(">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + hourAgoData.toString());
+                            aapsLogger.debug(LTag.AUTOSENS, ">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + hourAgoData.toString());
                             int past = 1;
                             try {
                                 for (; past < 12; past++) {
                                     AutosensData ad = autosensDataTable.valueAt(initialIndex + past);
-                                    if (L.isEnabled(L.AUTOSENS)) {
-                                        log.debug(">>>>> past=" + past + " ad=" + (ad != null ? ad.toString() : null));
-                                        if (ad == null) {
-                                            log.debug(autosensDataTable.toString());
-                                            log.debug(bucketed_data.toString());
-                                            log.debug(IobCobCalculatorPlugin.getPlugin().getBgReadings().toString());
-                                            Notification notification = new Notification(Notification.SENDLOGFILES, MainApp.gs(R.string.sendlogfiles), Notification.LOW);
-                                            RxBus.INSTANCE.send(new EventNewNotification(notification));
-                                            SP.putBoolean("log_AUTOSENS", true);
-                                            break;
-                                        }
+                                    aapsLogger.debug(LTag.AUTOSENS, ">>>>> past=" + past + " ad=" + (ad != null ? ad.toString() : null));
+                                    if (ad == null) {
+                                        aapsLogger.debug(LTag.AUTOSENS, autosensDataTable.toString());
+                                        aapsLogger.debug(LTag.AUTOSENS, bucketed_data.toString());
+                                        aapsLogger.debug(LTag.AUTOSENS, iobCobCalculatorPlugin.getBgReadings().toString());
+                                        Notification notification = new Notification(Notification.SENDLOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW);
+                                        rxBus.send(new EventNewNotification(notification));
+                                        sp.putBoolean("log_AUTOSENS", true);
+                                        break;
                                     }
                                     // let it here crash on NPE to get more data as i cannot reproduce this bug
                                     double deviationSlope = (ad.avgDeviation - avgDeviation) / (ad.time - bgTime) * 1000 * 60 * 5;
@@ -220,26 +217,25 @@ public class IobCobThread extends Thread {
                                     //    log.debug("Deviations: " + new Date(bgTime) + new Date(ad.time) + " avgDeviation=" + avgDeviation + " deviationSlope=" + deviationSlope + " slopeFromMaxDeviation=" + slopeFromMaxDeviation + " slopeFromMinDeviation=" + slopeFromMinDeviation);
                                 }
                             } catch (Exception e) {
-                                log.error("Unhandled exception", e);
-                                FabricPrivacy.logException(e);
-                                log.debug(autosensDataTable.toString());
-                                log.debug(bucketed_data.toString());
-                                log.debug(IobCobCalculatorPlugin.getPlugin().getBgReadings().toString());
-                                Notification notification = new Notification(Notification.SENDLOGFILES, MainApp.gs(R.string.sendlogfiles), Notification.LOW);
-                                RxBus.INSTANCE.send(new EventNewNotification(notification));
-                                SP.putBoolean("log_AUTOSENS", true);
+                                aapsLogger.error("Unhandled exception", e);
+                                FabricPrivacy.getInstance().logException(e);
+                                aapsLogger.debug(autosensDataTable.toString());
+                                aapsLogger.debug(bucketed_data.toString());
+                                aapsLogger.debug(iobCobCalculatorPlugin.getBgReadings().toString());
+                                Notification notification = new Notification(Notification.SENDLOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW);
+                                rxBus.send(new EventNewNotification(notification));
+                                sp.putBoolean("log_AUTOSENS", true);
                                 break;
                             }
                         } else {
-                            if (L.isEnabled(L.AUTOSENS))
-                                log.debug(">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + "null");
+                            aapsLogger.debug(LTag.AUTOSENS, ">>>>> bucketed_data.size()=" + bucketed_data.size() + " i=" + i + " hourAgoData=" + "null");
                         }
                     }
 
-                    List<Treatment> recentCarbTreatments = TreatmentsPlugin.getPlugin().getCarbTreatments5MinBackFromHistory(bgTime);
+                    List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
-                        autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentCarbTreatment));
+                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment));
                         autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentCarbTreatment.carbs) + "g]";
                     }
 
@@ -248,7 +244,7 @@ public class IobCobThread extends Thread {
                     if (previous != null && previous.cob > 0) {
                         // calculate sum of min carb impact from all active treatments
                         double totalMinCarbsImpact = 0d;
-                        if (SensitivityAAPSPlugin.getPlugin().isEnabled(PluginType.SENSITIVITY) || SensitivityWeightedAveragePlugin.getPlugin().isEnabled(PluginType.SENSITIVITY)) {
+                        if (sensitivityAAPSPlugin.isEnabled(PluginType.SENSITIVITY) || sensitivityWeightedAveragePlugin.isEnabled(PluginType.SENSITIVITY)) {
                             //when the impact depends on a max time, sum them up as smaller carb sizes make them smaller
                             for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
                                 AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
@@ -256,7 +252,7 @@ public class IobCobThread extends Thread {
                             }
                         } else {
                             //Oref sensitivity
-                            totalMinCarbsImpact = SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
+                            totalMinCarbsImpact = sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
                         }
 
                         // figure out how many carbs that represents
@@ -301,29 +297,24 @@ public class IobCobThread extends Thread {
                     previous = autosensData;
                     if (bgTime < now())
                         autosensDataTable.put(bgTime, autosensData);
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
+                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
                     AutosensResult sensitivity = iobCobCalculatorPlugin.detectSensitivityWithLock(oldestTimeWithData, bgTime);
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug("Sensitivity result: " + sensitivity.toString());
+                    aapsLogger.debug(LTag.AUTOSENS, "Sensitivity result: " + sensitivity.toString());
                     autosensData.autosensResult = sensitivity;
-                    if (L.isEnabled(L.AUTOSENS))
-                        log.debug(autosensData.toString());
+                    aapsLogger.debug(LTag.AUTOSENS, autosensData.toString());
                 }
             }
             new Thread(() -> {
                 SystemClock.sleep(1000);
-                RxBus.INSTANCE.send(new EventAutosensCalculationFinished(cause));
+                rxBus.send(new EventAutosensCalculationFinished(cause));
             }).start();
         } finally {
             if (mWakeLock != null)
                 mWakeLock.release();
-            RxBus.INSTANCE.send(new EventIobCalculationProgress(""));
-            if (L.isEnabled(L.AUTOSENS)) {
-                log.debug("AUTOSENSDATA thread ended: " + from);
-                log.debug("Midnights: " + MidnightTime.log());
-            }
-            Profiler.log(log, "IobCobThread", start);
+            rxBus.send(new EventIobCalculationProgress(""));
+            aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread ended: " + from);
+            aapsLogger.debug(LTag.AUTOSENS, "Midnights: " + MidnightTime.log());
+            Profiler.log(aapsLogger, LTag.AUTOSENS, "IobCobThread", start);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 4478c025d4..17382cb593 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -8,23 +8,32 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.MIN_DIA
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.Companion.MIN_DIA
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.localprofile_fragment.*
 import java.text.DecimalFormat
+import javax.inject.Inject
+
+class LocalProfileFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+    @Inject lateinit var hardLimits: HardLimits
 
-class LocalProfileFragment : Fragment() {
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     private var basalView: TimeListEdit? = null
@@ -32,23 +41,23 @@ class LocalProfileFragment : Fragment() {
 
     private val save = Runnable {
         doEdit()
-        basalView?.updateLabel(MainApp.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel())
+        basalView?.updateLabel(resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel())
     }
 
     private val textWatch = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {}
         override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
         override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-            LocalProfilePlugin.currentProfile().dia = SafeParse.stringToDouble(localprofile_dia.text.toString())
-            LocalProfilePlugin.currentProfile().name = localprofile_name.text.toString()
+            localProfilePlugin.currentProfile().dia = SafeParse.stringToDouble(localprofile_dia.text.toString())
+            localProfilePlugin.currentProfile().name = localprofile_name.text.toString()
             doEdit()
         }
     }
 
     private fun sumLabel(): String {
-        val profile = LocalProfilePlugin.createProfileStore().getDefaultProfile()
+        val profile = localProfilePlugin.createProfileStore().getDefaultProfile()
         val sum = profile?.baseBasalSum() ?: 0.0
-        return " ∑" + DecimalFormatter.to2Decimal(sum) + MainApp.gs(R.string.insulin_unit_shortname)
+        return " ∑" + DecimalFormatter.to2Decimal(sum) + resourceHelper.gs(R.string.insulin_unit_shortname)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -85,76 +94,76 @@ class LocalProfileFragment : Fragment() {
     }
 
     fun build() {
-        val pumpDescription = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription ?: return
-        val units = if (LocalProfilePlugin.currentProfile().mgdl) Constants.MGDL else Constants.MMOL
+        val pumpDescription = activePlugin.activePump.pumpDescription
+        val units = if (localProfilePlugin.currentProfile().mgdl) Constants.MGDL else Constants.MMOL
 
         localprofile_name.removeTextChangedListener(textWatch)
-        localprofile_name.setText(LocalProfilePlugin.currentProfile().name)
+        localprofile_name.setText(localProfilePlugin.currentProfile().name)
         localprofile_name.addTextChangedListener(textWatch)
-        localprofile_dia.setParams(LocalProfilePlugin.currentProfile().dia, HardLimits.MINDIA, HardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
-        localprofile_dia.setTag("LP_DIA")
-        TimeListEdit(context, view, R.id.localprofile_ic, "IC", MainApp.gs(R.string.nsprofileview_ic_label), LocalProfilePlugin.currentProfile().ic, null, HardLimits.MINIC, HardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", MainApp.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), LocalProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, hardLimits.MINDIA, hardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
+        localprofile_dia.tag = "LP_DIA"
+        TimeListEdit(context, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
+        basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", MainApp.gs(R.string.nsprofileview_isf_label), LocalProfilePlugin.currentProfile().isf, null, HardLimits.MINISF, HardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", MainApp.gs(R.string.nsprofileview_target_label), LocalProfilePlugin.currentProfile().targetLow, LocalProfilePlugin.currentProfile().targetHigh, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
         } else {
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", MainApp.gs(R.string.nsprofileview_isf_label), LocalProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(HardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(HardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", MainApp.gs(R.string.nsprofileview_target_label), LocalProfilePlugin.currentProfile().targetLow, LocalProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
         }
 
         // Spinner
         spinner = SpinnerHelper(view?.findViewById(R.id.localprofile_spinner))
-        val profileList: ArrayList<CharSequence> = LocalProfilePlugin.profile?.getProfileList()
+        val profileList: ArrayList<CharSequence> = localProfilePlugin.profile?.getProfileList()
             ?: ArrayList()
         context?.let { context ->
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             spinner?.adapter = adapter
-            spinner?.setSelection(LocalProfilePlugin.currentProfileIndex)
+            spinner?.setSelection(localProfilePlugin.currentProfileIndex)
         } ?: return
         spinner?.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
             }
 
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                if (LocalProfilePlugin.isEdited) {
+                if (localProfilePlugin.isEdited) {
                     activity?.let { activity ->
-                        OKDialog.showConfirmation(activity, MainApp.gs(R.string.doyouwantswitchprofile), Runnable {
-                            LocalProfilePlugin.currentProfileIndex = position
+                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.doyouwantswitchprofile), Runnable {
+                            localProfilePlugin.currentProfileIndex = position
                             build()
                         }, Runnable {
-                            spinner?.setSelection(LocalProfilePlugin.currentProfileIndex)
+                            spinner?.setSelection(localProfilePlugin.currentProfileIndex)
                         })
                     }
                 } else {
-                    LocalProfilePlugin.currentProfileIndex = position
+                    localProfilePlugin.currentProfileIndex = position
                     build()
                 }
             }
         })
 
         localprofile_profile_add.setOnClickListener {
-            if (LocalProfilePlugin.isEdited) {
-                activity?.let { OKDialog.show(it, "", MainApp.gs(R.string.saveorresetchangesfirst)) }
+            if (localProfilePlugin.isEdited) {
+                activity?.let { OKDialog.show(it, "", resourceHelper.gs(R.string.saveorresetchangesfirst)) }
             } else {
-                LocalProfilePlugin.addNewProfile()
+                localProfilePlugin.addNewProfile()
                 build()
             }
         }
 
         localprofile_profile_clone.setOnClickListener {
-            if (LocalProfilePlugin.isEdited) {
-                activity?.let { OKDialog.show(it, "", MainApp.gs(R.string.saveorresetchangesfirst)) }
+            if (localProfilePlugin.isEdited) {
+                activity?.let { OKDialog.show(it, "", resourceHelper.gs(R.string.saveorresetchangesfirst)) }
             } else {
-                LocalProfilePlugin.cloneProfile()
+                localProfilePlugin.cloneProfile()
                 build()
             }
         }
 
         localprofile_profile_remove.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.deletecurrentprofile), Runnable {
-                    LocalProfilePlugin.removeCurrentProfile()
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.deletecurrentprofile), Runnable {
+                    localProfilePlugin.removeCurrentProfile()
                     build()
                 }, null)
             }
@@ -163,32 +172,32 @@ class LocalProfileFragment : Fragment() {
         // this is probably not possible because it leads to invalid profile
         // if (!pumpDescription.isTempBasalCapable) localprofile_basal.visibility = View.GONE
 
-        @Suppress("SETTEXTL18N")
-        localprofile_units.text = MainApp.gs(R.string.units_colon) + " " + (if (LocalProfilePlugin.currentProfile().mgdl) MainApp.gs(R.string.mgdl) else MainApp.gs(R.string.mmol))
+        @Suppress("SetTextI18n")
+        localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
 
         localprofile_profileswitch.setOnClickListener {
-            // TODO: select in dialog LocalProfilePlugin.currentProfileIndex
+            // TODO: select in dialog localProfilePlugin.currentProfileIndex
             fragmentManager?.let { ProfileSwitchDialog().show(it, "NewNSTreatmentDialog") }
         }
 
         localprofile_reset.setOnClickListener {
-            LocalProfilePlugin.loadSettings()
-            @Suppress("SETTEXTL18N")
-            localprofile_units.text = MainApp.gs(R.string.units_colon) + " " + (if (LocalProfilePlugin.currentProfile().mgdl) MainApp.gs(R.string.mgdl) else MainApp.gs(R.string.mmol))
-            localprofile_dia.setParams(LocalProfilePlugin.currentProfile().dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
-            localprofile_dia.setTag("LP_DIA")
-            TimeListEdit(context, view, R.id.localprofile_ic, "IC", MainApp.gs(R.string.nsprofileview_ic_label) + ":", LocalProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", MainApp.gs(R.string.nsprofileview_isf_label) + ":", LocalProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
-            basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", MainApp.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), LocalProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", MainApp.gs(R.string.nsprofileview_target_label) + ":", LocalProfilePlugin.currentProfile().targetLow, LocalProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
+            localProfilePlugin.loadSettings()
+            @Suppress("SetTextI18n")
+            localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
+            localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
+            localprofile_dia.tag = "LP_DIA"
+            TimeListEdit(context, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
+            basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
             updateGUI()
         }
 
         localprofile_save.setOnClickListener {
-            if (!LocalProfilePlugin.isValidEditState()) {
+            if (!localProfilePlugin.isValidEditState()) {
                 return@setOnClickListener  //Should not happen as saveButton should not be visible if not valid
             }
-            LocalProfilePlugin.storeSettings(activity)
+            localProfilePlugin.storeSettings(activity)
             build()
         }
         updateGUI()
@@ -197,11 +206,11 @@ class LocalProfileFragment : Fragment() {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
+        disposable += rxBus
             .toObservable(EventLocalProfileChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ build() }, { FabricPrivacy.logException(it) })
-        )
+            .subscribe({ build() }, { fabricPrivacy.logException(it) }
+            )
         build()
     }
 
@@ -212,16 +221,16 @@ class LocalProfileFragment : Fragment() {
     }
 
     fun doEdit() {
-        LocalProfilePlugin.isEdited = true
+        localProfilePlugin.isEdited = true
         updateGUI()
     }
 
     fun updateGUI() {
         if (localprofile_profileswitch == null) return
-        val isValid = LocalProfilePlugin.isValidEditState()
-        val isEdited = LocalProfilePlugin.isEdited
+        val isValid = localProfilePlugin.isValidEditState()
+        val isEdited = localProfilePlugin.isEdited
         if (isValid) {
-            this.view?.setBackgroundColor(MainApp.gc(R.color.ok_background))
+            this.view?.setBackgroundColor(resourceHelper.gc(R.color.ok_background))
 
             if (isEdited) {
                 //edited profile -> save first
@@ -232,7 +241,7 @@ class LocalProfileFragment : Fragment() {
                 localprofile_save.visibility = View.GONE
             }
         } else {
-            this.view?.setBackgroundColor(MainApp.gc(R.color.error_background))
+            this.view?.setBackgroundColor(resourceHelper.gc(R.color.error_background))
             localprofile_profileswitch.visibility = View.GONE
             localprofile_save.visibility = View.GONE //don't save an invalid profile
         }
@@ -246,12 +255,12 @@ class LocalProfileFragment : Fragment() {
     }
 
     private fun processVisibilityOnClick(selected: View) {
-        dia_tab.setBackgroundColor(MainApp.gc(R.color.defaultbackground))
-        ic_tab.setBackgroundColor(MainApp.gc(R.color.defaultbackground))
-        isf_tab.setBackgroundColor(MainApp.gc(R.color.defaultbackground))
-        basal_tab.setBackgroundColor(MainApp.gc(R.color.defaultbackground))
-        target_tab.setBackgroundColor(MainApp.gc(R.color.defaultbackground))
-        selected.setBackgroundColor(MainApp.gc(R.color.tabBgColorSelected))
+        dia_tab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        ic_tab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        isf_tab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        basal_tab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        target_tab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        selected.setBackgroundColor(resourceHelper.gc(R.color.tabBgColorSelected))
         localprofile_dia_placeholder.visibility = View.GONE
         localprofile_ic.visibility = View.GONE
         localprofile_isf.visibility = View.GONE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index a3e3819b51..5e2e984337 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.profile.local
 
 import android.app.Activity
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.ProfileStore
@@ -11,41 +11,58 @@ import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.ProfileInterface
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.OKDialog
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.collections.ArrayList
+import kotlin.math.max
 
-object LocalProfilePlugin : PluginBase(PluginDescription()
+@Singleton
+class LocalProfilePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val profileFunction: ProfileFunction
+) : PluginBase(PluginDescription()
     .mainType(PluginType.PROFILE)
     .fragmentClass(LocalProfileFragment::class.java.name)
+    .enableByDefault(true)
     .pluginName(R.string.localprofile)
     .shortName(R.string.localprofile_shortname)
-    .description(R.string.description_profile_local)), ProfileInterface {
+    .description(R.string.description_profile_local)
+    .setDefault(),
+    aapsLogger, resourceHelper, injector
+), ProfileInterface {
+
+    var rawProfile: ProfileStore? = null
+
+    private val defaultArray = "[{\"time\":\"00:00\",\"timeAsSeconds\":0,\"value\":0}]"
+
+    companion object {
+        @JvmStatic
+        val LOCAL_PROFILE = "LocalProfile"
+    }
 
     override fun onStart() {
         super.onStart()
         loadSettings()
     }
 
-    private val log = LoggerFactory.getLogger(L.PROFILE)
-
-    private var rawProfile: ProfileStore? = null
-
-    const val LOCAL_PROFILE = "LocalProfile"
-
-    private const val DEFAULTARRAY = "[{\"time\":\"00:00\",\"timeAsSeconds\":0,\"value\":0}]"
-
     class SingleProfile {
         internal var name: String? = null
         internal var mgdl: Boolean = false
@@ -69,7 +86,7 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
             return sp
         }
 
-        fun copyFrom(profile: Profile, newName: String): SingleProfile {
+        fun copyFrom(rawProfile: ProfileStore?, profile: Profile, newName: String): SingleProfile {
             var verifiedName = newName
             if (rawProfile?.getSpecificProfile(newName) != null) {
                 verifiedName += " " + DateUtil.now().toString()
@@ -90,14 +107,14 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
     var isEdited: Boolean = false
     var profiles: ArrayList<SingleProfile> = ArrayList()
 
-    internal var numOfProfiles = 0
+    var numOfProfiles = 0
     internal var currentProfileIndex = 0
 
     fun currentProfile() = profiles[currentProfileIndex]
 
     @Synchronized
     fun isValidEditState(): Boolean {
-        return createProfileStore().getDefaultProfile()?.isValid(MainApp.gs(R.string.localprofile), false)
+        return createProfileStore().getDefaultProfile()?.isValid(resourceHelper.gs(R.string.localprofile), false)
             ?: false
     }
 
@@ -106,23 +123,22 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
         for (i in 0 until numOfProfiles) {
             profiles[i].run {
                 val LOCAL_PROFILE_NUMBERED = LOCAL_PROFILE + "_" + i + "_"
-                SP.putString(LOCAL_PROFILE_NUMBERED + "name", name)
-                SP.putBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", mgdl)
-                SP.putDouble(LOCAL_PROFILE_NUMBERED + "dia", dia)
-                SP.putString(LOCAL_PROFILE_NUMBERED + "ic", ic.toString())
-                SP.putString(LOCAL_PROFILE_NUMBERED + "isf", isf.toString())
-                SP.putString(LOCAL_PROFILE_NUMBERED + "basal", basal.toString())
-                SP.putString(LOCAL_PROFILE_NUMBERED + "targetlow", targetLow.toString())
-                SP.putString(LOCAL_PROFILE_NUMBERED + "targethigh", targetHigh.toString())
+                sp.putString(LOCAL_PROFILE_NUMBERED + "name", name!!)
+                sp.putBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", mgdl)
+                sp.putDouble(LOCAL_PROFILE_NUMBERED + "dia", dia)
+                sp.putString(LOCAL_PROFILE_NUMBERED + "ic", ic.toString())
+                sp.putString(LOCAL_PROFILE_NUMBERED + "isf", isf.toString())
+                sp.putString(LOCAL_PROFILE_NUMBERED + "basal", basal.toString())
+                sp.putString(LOCAL_PROFILE_NUMBERED + "targetlow", targetLow.toString())
+                sp.putString(LOCAL_PROFILE_NUMBERED + "targethigh", targetHigh.toString())
             }
         }
-        SP.putInt(LOCAL_PROFILE + "_profiles", numOfProfiles)
+        sp.putInt(LOCAL_PROFILE + "_profiles", numOfProfiles)
 
         createAndStoreConvertedProfile()
         isEdited = false
-        if (L.isEnabled(L.PROFILE))
-            log.debug("Storing settings: " + rawProfile?.data.toString())
-        RxBus.send(EventProfileStoreChanged())
+        aapsLogger.debug(LTag.PROFILE, "Storing settings: " + rawProfile?.data.toString())
+        rxBus.send(EventProfileStoreChanged())
         var namesOK = true
         profiles.forEach {
             val name = it.name ?: "."
@@ -132,77 +148,77 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
             rawProfile?.let { NSUpload.uploadProfileStore(it.data) }
         else
             activity?.let {
-                OKDialog.show(it, "", MainApp.gs(R.string.profilenamecontainsdot))
+                OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))
             }
     }
 
     @Synchronized
     fun loadSettings() {
-        if (SP.contains(LOCAL_PROFILE + "mgdl")) {
+        if (sp.contains(LOCAL_PROFILE + "mgdl")) {
             doConversion()
             return
         }
 
-        numOfProfiles = SP.getInt(LOCAL_PROFILE + "_profiles", 0)
+        numOfProfiles = sp.getInt(LOCAL_PROFILE + "_profiles", 0)
         profiles.clear()
-        numOfProfiles = Math.max(numOfProfiles, 1) // create at least one default profile if none exists
+        numOfProfiles = max(numOfProfiles, 1) // create at least one default profile if none exists
 
         for (i in 0 until numOfProfiles) {
             val p = SingleProfile()
             val LOCAL_PROFILE_NUMBERED = LOCAL_PROFILE + "_" + i + "_"
 
-            p.name = SP.getString(LOCAL_PROFILE_NUMBERED + "name", LOCAL_PROFILE + i)
+            p.name = sp.getString(LOCAL_PROFILE_NUMBERED + "name", LOCAL_PROFILE + i)
             if (isExistingName(p.name)) continue
-            p.mgdl = SP.getBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", false)
-            p.dia = SP.getDouble(LOCAL_PROFILE_NUMBERED + "dia", Constants.defaultDIA)
+            p.mgdl = sp.getBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", false)
+            p.dia = sp.getDouble(LOCAL_PROFILE_NUMBERED + "dia", Constants.defaultDIA)
             try {
-                p.ic = JSONArray(SP.getString(LOCAL_PROFILE_NUMBERED + "ic", DEFAULTARRAY))
+                p.ic = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "ic", defaultArray))
             } catch (e1: JSONException) {
                 try {
-                    p.ic = JSONArray(DEFAULTARRAY)
+                    p.ic = JSONArray(defaultArray)
                 } catch (ignored: JSONException) {
                 }
-                log.error("Exception", e1)
+                aapsLogger.error("Exception", e1)
             }
 
             try {
-                p.isf = JSONArray(SP.getString(LOCAL_PROFILE_NUMBERED + "isf", DEFAULTARRAY))
+                p.isf = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "isf", defaultArray))
             } catch (e1: JSONException) {
                 try {
-                    p.isf = JSONArray(DEFAULTARRAY)
+                    p.isf = JSONArray(defaultArray)
                 } catch (ignored: JSONException) {
                 }
-                log.error("Exception", e1)
+                aapsLogger.error("Exception", e1)
             }
 
             try {
-                p.basal = JSONArray(SP.getString(LOCAL_PROFILE_NUMBERED + "basal", DEFAULTARRAY))
+                p.basal = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "basal", defaultArray))
             } catch (e1: JSONException) {
                 try {
-                    p.basal = JSONArray(DEFAULTARRAY)
+                    p.basal = JSONArray(defaultArray)
                 } catch (ignored: JSONException) {
                 }
-                log.error("Exception", e1)
+                aapsLogger.error("Exception", e1)
             }
 
             try {
-                p.targetLow = JSONArray(SP.getString(LOCAL_PROFILE_NUMBERED + "targetlow", DEFAULTARRAY))
+                p.targetLow = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "targetlow", defaultArray))
             } catch (e1: JSONException) {
                 try {
-                    p.targetLow = JSONArray(DEFAULTARRAY)
+                    p.targetLow = JSONArray(defaultArray)
                 } catch (ignored: JSONException) {
                 }
-                log.error("Exception", e1)
+                aapsLogger.error("Exception", e1)
             }
 
             try {
-                p.targetHigh = JSONArray(SP.getString(LOCAL_PROFILE_NUMBERED + "targethigh", DEFAULTARRAY))
+                p.targetHigh = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "targethigh", defaultArray))
             } catch (e1: JSONException) {
                 try {
-                    p.targetHigh = JSONArray(DEFAULTARRAY)
+                    p.targetHigh = JSONArray(defaultArray)
                 } catch (ignored: JSONException) {
                 }
-                log.error("Exception", e1)
+                aapsLogger.error("Exception", e1)
             }
 
             profiles.add(p)
@@ -221,66 +237,65 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
 
     @Synchronized
     private fun doConversion() { // conversion from 2.3 to 2.4 format
-        if (L.isEnabled(L.PROFILE))
-            log.debug("Loading stored settings")
+        aapsLogger.debug(LTag.PROFILE, "Loading stored settings")
         val p = SingleProfile()
 
-        p.mgdl = SP.getBoolean(LOCAL_PROFILE + "mgdl", ProfileFunctions.getSystemUnits() == Constants.MGDL)
-        p.dia = SP.getDouble(LOCAL_PROFILE + "dia", Constants.defaultDIA)
+        p.mgdl = sp.getBoolean(LOCAL_PROFILE + "mgdl", profileFunction.getUnits() == Constants.MGDL)
+        p.dia = sp.getDouble(LOCAL_PROFILE + "dia", Constants.defaultDIA)
         try {
-            p.ic = JSONArray(SP.getString(LOCAL_PROFILE + "ic", DEFAULTARRAY))
+            p.ic = JSONArray(sp.getString(LOCAL_PROFILE + "ic", defaultArray))
         } catch (e1: JSONException) {
             try {
-                p.ic = JSONArray(DEFAULTARRAY)
+                p.ic = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
 
         try {
-            p.isf = JSONArray(SP.getString(LOCAL_PROFILE + "isf", DEFAULTARRAY))
+            p.isf = JSONArray(sp.getString(LOCAL_PROFILE + "isf", defaultArray))
         } catch (e1: JSONException) {
             try {
-                p.isf = JSONArray(DEFAULTARRAY)
+                p.isf = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
 
         try {
-            p.basal = JSONArray(SP.getString(LOCAL_PROFILE + "basal", DEFAULTARRAY))
+            p.basal = JSONArray(sp.getString(LOCAL_PROFILE + "basal", defaultArray))
         } catch (e1: JSONException) {
             try {
-                p.basal = JSONArray(DEFAULTARRAY)
+                p.basal = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
 
         try {
-            p.targetLow = JSONArray(SP.getString(LOCAL_PROFILE + "targetlow", DEFAULTARRAY))
+            p.targetLow = JSONArray(sp.getString(LOCAL_PROFILE + "targetlow", defaultArray))
         } catch (e1: JSONException) {
             try {
-                p.targetLow = JSONArray(DEFAULTARRAY)
+                p.targetLow = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
 
         try {
-            p.targetHigh = JSONArray(SP.getString(LOCAL_PROFILE + "targethigh", DEFAULTARRAY))
+            p.targetHigh = JSONArray(sp.getString(LOCAL_PROFILE + "targethigh", defaultArray))
         } catch (e1: JSONException) {
             try {
-                p.targetHigh = JSONArray(DEFAULTARRAY)
+                p.targetHigh = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
         p.name = LOCAL_PROFILE
 
-        SP.remove(LOCAL_PROFILE + "mgdl")
-        SP.remove(LOCAL_PROFILE + "mmol")
-        SP.remove(LOCAL_PROFILE + "dia")
-        SP.remove(LOCAL_PROFILE + "ic")
-        SP.remove(LOCAL_PROFILE + "isf")
-        SP.remove(LOCAL_PROFILE + "basal")
-        SP.remove(LOCAL_PROFILE + "targetlow")
-        SP.remove(LOCAL_PROFILE + "targethigh")
+        sp.remove(LOCAL_PROFILE + "mgdl")
+        sp.remove(LOCAL_PROFILE + "mmol")
+        sp.remove(LOCAL_PROFILE + "dia")
+        sp.remove(LOCAL_PROFILE + "ic")
+        sp.remove(LOCAL_PROFILE + "isf")
+        sp.remove(LOCAL_PROFILE + "basal")
+        sp.remove(LOCAL_PROFILE + "targetlow")
+        sp.remove(LOCAL_PROFILE + "targethigh")
 
         currentProfileIndex = 0
         numOfProfiles = 1
@@ -338,19 +353,19 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
         var free = 0
         for (i in 1..10000) {
             if (rawProfile?.getSpecificProfile(LOCAL_PROFILE + i) == null) {
-                free = i;
+                free = i
                 break
             }
         }
         val p = SingleProfile()
         p.name = LOCAL_PROFILE + free
-        p.mgdl = ProfileFunctions.getSystemUnits() == Constants.MGDL
+        p.mgdl = profileFunction.getUnits() == Constants.MGDL
         p.dia = Constants.defaultDIA
-        p.ic = JSONArray(DEFAULTARRAY)
-        p.isf = JSONArray(DEFAULTARRAY)
-        p.basal = JSONArray(DEFAULTARRAY)
-        p.targetLow = JSONArray(DEFAULTARRAY)
-        p.targetHigh = JSONArray(DEFAULTARRAY)
+        p.ic = JSONArray(defaultArray)
+        p.isf = JSONArray(defaultArray)
+        p.basal = JSONArray(defaultArray)
+        p.targetLow = JSONArray(defaultArray)
+        p.targetHigh = JSONArray(defaultArray)
         profiles.add(p)
         currentProfileIndex = profiles.size - 1
         numOfProfiles++
@@ -411,10 +426,10 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
             json.put("startDate", DateUtil.toISOAsUTC(DateUtil.now()))
             json.put("store", store)
         } catch (e: JSONException) {
-            log.error("Unhandled exception", e)
+            aapsLogger.error("Unhandled exception", e)
         }
 
-        return ProfileStore(json)
+        return ProfileStore(injector, json)
     }
 
     override fun getProfile(): ProfileStore? {
@@ -425,5 +440,4 @@ object LocalProfilePlugin : PluginBase(PluginDescription()
         return DecimalFormatter.to2Decimal(rawProfile?.getDefaultProfile()?.percentageBasalSum()
             ?: 0.0) + "U "
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
index 6c111faf3f..cb6f9c9178 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
@@ -6,23 +6,34 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.close.*
 import kotlinx.android.synthetic.main.nsprofile_fragment.*
 import kotlinx.android.synthetic.main.profileviewer_fragment.*
+import javax.inject.Inject
+
+class NSProfileFragment : DaggerFragment() {
+
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var nsProfilePlugin: NSProfilePlugin
 
-class NSProfileFragment : Fragment() {
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -37,12 +48,12 @@ class NSProfileFragment : Fragment() {
 
         nsprofile_profileswitch.setOnClickListener {
             val name = nsprofile_spinner.selectedItem?.toString() ?: ""
-            NSProfilePlugin.getPlugin().profile?.let { store ->
+            nsProfilePlugin.profile?.let { store ->
                 store.getSpecificProfile(name)?.let {
                     activity?.let { activity ->
-                        OKDialog.showConfirmation(activity, MainApp.gs(R.string.nsprofile),
-                            MainApp.gs(R.string.activate_profile) + ": " + name + " ?", Runnable {
-                            ProfileFunctions.doProfileSwitch(store, name, 0, 100, 0, DateUtil.now())
+                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.nsprofile),
+                            resourceHelper.gs(R.string.activate_profile) + ": " + name + " ?", Runnable {
+                            treatmentsPlugin.doProfileSwitch(store, name, 0, 100, 0, DateUtil.now())
                         })
                     }
                 }
@@ -69,15 +80,15 @@ class NSProfileFragment : Fragment() {
 
                 nsprofile_profileswitch.visibility = View.GONE
 
-                NSProfilePlugin.getPlugin().profile?.let { store ->
+                nsProfilePlugin.profile?.let { store ->
                     store.getSpecificProfile(name)?.let { profile ->
                         profileview_units.text = profile.units
-                        profileview_dia.text = MainApp.gs(R.string.format_hours, profile.dia)
+                        profileview_dia.text = resourceHelper.gs(R.string.format_hours, profile.dia)
                         profileview_activeprofile.text = name
                         profileview_ic.text = profile.icList
                         profileview_isf.text = profile.isfList
                         profileview_basal.text = profile.basalList
-                        profileview_basaltotal.text = String.format(MainApp.gs(R.string.profile_total), DecimalFormatter.to2Decimal(profile.baseBasalSum()))
+                        profileview_basaltotal.text = String.format(resourceHelper.gs(R.string.profile_total), DecimalFormatter.to2Decimal(profile.baseBasalSum()))
                         profileview_target.text = profile.targetList
                         basal_graph.show(profile)
                         if (profile.isValid("NSProfileFragment")) {
@@ -96,11 +107,10 @@ class NSProfileFragment : Fragment() {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
+        disposable += rxBus
             .toObservable(EventNSProfileUpdateGUI::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        )
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
         updateGUI()
     }
 
@@ -115,13 +125,13 @@ class NSProfileFragment : Fragment() {
         if (profileview_noprofile == null) return
         profileview_noprofile.visibility = View.VISIBLE
 
-        NSProfilePlugin.getPlugin().profile?.let { profileStore ->
+        nsProfilePlugin.profile?.let { profileStore ->
             val profileList = profileStore.getProfileList()
             val adapter = ArrayAdapter(context!!, R.layout.spinner_centered, profileList)
             nsprofile_spinner.adapter = adapter
             // set selected to actual profile
             for (p in profileList.indices) {
-                if (profileList[p] == ProfileFunctions.getInstance().profileName)
+                if (profileList[p] == profileFunction.getProfileName())
                     nsprofile_spinner.setSelection(p)
             }
             profileview_noprofile.visibility = View.GONE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
deleted file mode 100644
index 41711b47bd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package info.nightscout.androidaps.plugins.profile.ns;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.events.EventProfileStoreChanged;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class NSProfilePlugin extends PluginBase implements ProfileInterface {
-    private static Logger log = LoggerFactory.getLogger(L.PROFILE);
-
-    private static NSProfilePlugin nsProfilePlugin;
-
-    public static NSProfilePlugin getPlugin() {
-        if (nsProfilePlugin == null)
-            nsProfilePlugin = new NSProfilePlugin();
-        return nsProfilePlugin;
-    }
-
-    private ProfileStore profile = null;
-
-    private NSProfilePlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.PROFILE)
-                .fragmentClass(NSProfileFragment.class.getName())
-                .pluginName(R.string.nsprofile)
-                .shortName(R.string.profileviewer_shortname)
-                .alwaysEnabled(Config.NSCLIENT)
-                .alwaysVisible(Config.NSCLIENT)
-                .showInList(!Config.NSCLIENT)
-                .description(R.string.description_profile_nightscout)
-        );
-        loadNSProfile();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    public void handleNewData(Intent intent) {
-        try {
-            Bundle bundles = intent.getExtras();
-            if (bundles == null) return;
-
-            String activeProfile = bundles.getString("activeprofile");
-            String profileString = bundles.getString("profile");
-            profile = new ProfileStore(new JSONObject(profileString));
-            storeNSProfile();
-            if (isEnabled(PluginType.PROFILE)) {
-                RxBus.INSTANCE.send(new EventProfileStoreChanged());
-                RxBus.INSTANCE.send(new EventNSProfileUpdateGUI());
-            }
-            if (L.isEnabled(L.PROFILE))
-                log.debug("Received profileStore: " + activeProfile + " " + profile);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-    }
-
-    private void storeNSProfile() {
-        SP.putString("profile", profile.getData().toString());
-        if (L.isEnabled(L.PROFILE))
-            log.debug("Storing profile");
-    }
-
-    private void loadNSProfile() {
-        if (L.isEnabled(L.PROFILE))
-            log.debug("Loading stored profile");
-        String profileString = SP.getString("profile", null);
-        if (profileString != null) {
-            if (L.isEnabled(L.PROFILE))
-                log.debug("Loaded profile: " + profileString);
-            try {
-                profile = new ProfileStore(new JSONObject(profileString));
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-                profile = null;
-            }
-        } else {
-            if (L.isEnabled(L.PROFILE))
-                log.debug("Stored profile not found");
-            // force restart of nsclient to fetch profile
-            RxBus.INSTANCE.send(new EventNSClientRestart());
-        }
-    }
-
-    @Nullable
-    @Override
-    public ProfileStore getProfile() {
-        return profile;
-    }
-
-    @Override
-    public String getProfileName() {
-        return profile.getDefaultProfileName();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt
new file mode 100644
index 0000000000..a93cbaad01
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.profile.ns
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.events.EventProfileStoreChanged
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ProfileInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NSProfilePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    private val sp: SP
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.PROFILE)
+    .fragmentClass(NSProfileFragment::class.java.name)
+    .pluginName(R.string.nsprofile)
+    .shortName(R.string.profileviewer_shortname)
+    .alwaysEnabled(Config.NSCLIENT)
+    .alwaysVisible(Config.NSCLIENT)
+    .showInList(!Config.NSCLIENT)
+    .description(R.string.description_profile_nightscout),
+    aapsLogger, resourceHelper, injector
+), ProfileInterface {
+
+    private var profile: ProfileStore? = null
+
+    override fun onStart() {
+        super.onStart()
+        loadNSProfile()
+    }
+
+    fun handleNewData(intent: Intent) {
+        val bundles = intent.extras ?: return
+
+        @Suppress("SpellCheckingInspection")
+        val activeProfile = bundles.getString("activeprofile")
+        val profileString = bundles.getString("profile")
+        profile = ProfileStore(injector, JSONObject(profileString))
+        storeNSProfile()
+        if (isEnabled()) {
+            rxBus.send(EventProfileStoreChanged())
+            rxBus.send(EventNSProfileUpdateGUI())
+        }
+        aapsLogger.debug(LTag.PROFILE, "Received profileStore: $activeProfile $profile")
+    }
+
+    private fun storeNSProfile() {
+        sp.putString("profile", profile!!.data.toString())
+        aapsLogger.debug(LTag.PROFILE, "Storing profile")
+    }
+
+    private fun loadNSProfile() {
+        aapsLogger.debug(LTag.PROFILE, "Loading stored profile")
+        val profileString = sp.getStringOrNull("profile", null)
+        if (profileString != null) {
+            aapsLogger.debug(LTag.PROFILE, "Loaded profile: $profileString")
+            profile = ProfileStore(injector, JSONObject(profileString))
+        } else {
+            aapsLogger.debug(LTag.PROFILE, "Stored profile not found")
+            // force restart of nsclient to fetch profile
+            rxBus.send(EventNSClientRestart())
+        }
+    }
+
+    override fun getProfile(): ProfileStore? {
+        return profile
+    }
+
+    override fun getProfileName(): String {
+        return profile!!.getDefaultProfileName()!!
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index bfd5c6104e..e44060d9ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -12,24 +12,32 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class ComboFragment extends Fragment implements View.OnClickListener {
+public class ComboFragment extends DaggerFragment implements View.OnClickListener {
+    @Inject ComboPlugin comboPlugin;
+    @Inject CommandQueue commandQueue;
+    @Inject ResourceHelper resourceHelper;
+    @Inject RxBusWrapper rxBus;
+    @Inject SP sp;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private TextView stateView;
@@ -69,15 +77,15 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
     @Override
     public synchronized void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventComboPumpUpdateGUI.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
+                .subscribe(event -> updateGui(), exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventQueueChanged.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
+                .subscribe(event -> updateGui(), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         updateGui();
     }
@@ -100,7 +108,7 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
         switch (view.getId()) {
             case R.id.combo_refresh_button:
                 refreshButton.setEnabled(false);
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("User request", new Callback() {
+                commandQueue.readStatus("User request", new Callback() {
                     @Override
                     public void run() {
                         runOnUiThread(() -> refreshButton.setEnabled(true));
@@ -111,16 +119,15 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
     }
 
     public void updateGui() {
-        ComboPlugin plugin = ComboPlugin.getPlugin();
 
         // state
-        stateView.setText(plugin.getStateSummary());
-        PumpState ps = plugin.getPump().state;
+        stateView.setText(comboPlugin.getStateSummary());
+        PumpState ps = comboPlugin.getPump().state;
         if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY
                 || ps.activeAlert != null && ps.activeAlert.errorCode != null) {
             stateView.setTextColor(Color.RED);
             stateView.setTypeface(null, Typeface.BOLD);
-        } else if (plugin.getPump().state.suspended
+        } else if (comboPlugin.getPump().state.suspended
                 || ps.activeAlert != null && ps.activeAlert.warningCode != null) {
             stateView.setTextColor(Color.YELLOW);
             stateView.setTypeface(null, Typeface.BOLD);
@@ -130,26 +137,26 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
         }
 
         // activity
-        String activity = plugin.getPump().activity;
+        String activity = comboPlugin.getPump().activity;
         if (activity != null) {
             activityView.setTextColor(Color.WHITE);
             activityView.setTextSize(14);
             activityView.setText(activity);
-        } else if (ConfigBuilderPlugin.getPlugin().getCommandQueue().size() > 0) {
+        } else if (commandQueue.size() > 0) {
             activityView.setTextColor(Color.WHITE);
             activityView.setTextSize(14);
             activityView.setText("");
-        } else if (plugin.isInitialized()) {
+        } else if (comboPlugin.isInitialized()) {
             activityView.setTextColor(Color.WHITE);
             activityView.setTextSize(20);
             activityView.setText("{fa-bed}");
         } else {
             activityView.setTextColor(Color.RED);
             activityView.setTextSize(14);
-            activityView.setText(MainApp.gs(R.string.pump_unreachable));
+            activityView.setText(resourceHelper.gs(R.string.pump_unreachable));
         }
 
-        if (plugin.isInitialized()) {
+        if (comboPlugin.isInitialized()) {
             // battery
             batteryView.setTextSize(20);
             if (ps.batteryState == PumpState.EMPTY) {
@@ -164,15 +171,15 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
             }
 
             // reservoir
-            int reservoirLevel = plugin.getPump().reservoirLevel;
+            int reservoirLevel = comboPlugin.getPump().reservoirLevel;
             if (reservoirLevel != -1) {
-                reservoirView.setText(reservoirLevel + " " + MainApp.gs(R.string.insulin_unit_shortname));
+                reservoirView.setText(reservoirLevel + " " + resourceHelper.gs(R.string.insulin_unit_shortname));
             } else if (ps.insulinState == PumpState.LOW) {
-                reservoirView.setText(MainApp.gs(R.string.combo_reservoir_low));
+                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_low));
             } else if (ps.insulinState == PumpState.EMPTY) {
-                reservoirView.setText(MainApp.gs(R.string.combo_reservoir_empty));
+                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_empty));
             } else {
-                reservoirView.setText(MainApp.gs(R.string.combo_reservoir_normal));
+                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_normal));
             }
 
             if (ps.insulinState == PumpState.UNKNOWN) {
@@ -190,13 +197,13 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
             }
 
             // last connection
-            String minAgo = DateUtil.minAgo(plugin.getPump().lastSuccessfulCmdTime);
-            long min = (System.currentTimeMillis() - plugin.getPump().lastSuccessfulCmdTime) / 1000 / 60;
-            if (plugin.getPump().lastSuccessfulCmdTime + 60 * 1000 > System.currentTimeMillis()) {
+            String minAgo = DateUtil.minAgo(resourceHelper, comboPlugin.getPump().lastSuccessfulCmdTime);
+            long min = (System.currentTimeMillis() - comboPlugin.getPump().lastSuccessfulCmdTime) / 1000 / 60;
+            if (comboPlugin.getPump().lastSuccessfulCmdTime + 60 * 1000 > System.currentTimeMillis()) {
                 lastConnectionView.setText(R.string.combo_pump_connected_now);
                 lastConnectionView.setTextColor(Color.WHITE);
-            } else if (plugin.getPump().lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis()) {
-                lastConnectionView.setText(MainApp.gs(R.string.combo_no_pump_connection, min));
+            } else if (comboPlugin.getPump().lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis()) {
+                lastConnectionView.setText(resourceHelper.gs(R.string.combo_no_pump_connection, min));
                 lastConnectionView.setTextColor(Color.RED);
             } else {
                 lastConnectionView.setText(minAgo);
@@ -204,41 +211,41 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
             }
 
             // last bolus
-            Bolus bolus = plugin.getPump().lastBolus;
+            Bolus bolus = comboPlugin.getPump().lastBolus;
             if (bolus != null) {
                 long agoMsc = System.currentTimeMillis() - bolus.timestamp;
                 double bolusMinAgo = agoMsc / 60d / 1000d;
-                String unit = MainApp.gs(R.string.insulin_unit_shortname);
+                String unit = resourceHelper.gs(R.string.insulin_unit_shortname);
                 String ago;
                 if ((agoMsc < 60 * 1000)) {
-                    ago = MainApp.gs(R.string.combo_pump_connected_now);
+                    ago = resourceHelper.gs(R.string.combo_pump_connected_now);
                 } else if (bolusMinAgo < 60) {
-                    ago = DateUtil.minAgo(bolus.timestamp);
+                    ago = DateUtil.minAgo(resourceHelper, bolus.timestamp);
                 } else {
-                    ago = DateUtil.hourAgo(bolus.timestamp);
+                    ago = DateUtil.hourAgo(bolus.timestamp, resourceHelper);
                 }
-                lastBolusView.setText(MainApp.gs(R.string.combo_last_bolus, bolus.amount, unit, ago));
+                lastBolusView.setText(resourceHelper.gs(R.string.combo_last_bolus, bolus.amount, unit, ago));
             } else {
                 lastBolusView.setText("");
             }
 
             // base basal rate
-            baseBasalRate.setText(MainApp.gs(R.string.pump_basebasalrate, plugin.getBaseBasalRate()));
+            baseBasalRate.setText(resourceHelper.gs(R.string.pump_basebasalrate, comboPlugin.getBaseBasalRate()));
 
             // TBR
             String tbrStr = "";
             if (ps.tbrPercent != -1 && ps.tbrPercent != 100) {
-                long minSinceRead = (System.currentTimeMillis() - plugin.getPump().state.timestamp) / 1000 / 60;
+                long minSinceRead = (System.currentTimeMillis() - comboPlugin.getPump().state.timestamp) / 1000 / 60;
                 long remaining = ps.tbrRemainingDuration - minSinceRead;
                 if (remaining >= 0) {
-                    tbrStr = MainApp.gs(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
+                    tbrStr = resourceHelper.gs(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
                 }
             }
             tempBasalText.setText(tbrStr);
 
             // stats
-            bolusCount.setText(String.valueOf(SP.getLong(ComboPlugin.COMBO_BOLUSES_DELIVERED, 0L)));
-            tbrCount.setText(String.valueOf(SP.getLong(ComboPlugin.COMBO_TBRS_SET, 0L)));
+            bolusCount.setText(String.valueOf(sp.getLong(ComboPlugin.COMBO_BOLUSES_DELIVERED, 0L)));
+            tbrCount.setText(String.valueOf(sp.getLong(ComboPlugin.COMBO_TBRS_SET, 0L)));
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 32a17f8a89..5700a235a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.combo;
 
+import android.content.Context;
 import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
 
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -18,6 +16,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -30,18 +32,19 @@ import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
 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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -66,28 +69,28 @@ import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class ComboPlugin extends PluginBase implements PumpInterface, ConstraintsInterface {
-    private static final Logger log = LoggerFactory.getLogger(L.PUMP);
+@Singleton
+public class ComboPlugin extends PumpPluginBase implements PumpInterface, ConstraintsInterface {
     static final String COMBO_TBRS_SET = "combo_tbrs_set";
     static final String COMBO_BOLUSES_DELIVERED = "combo_boluses_delivered";
 
-    private static ComboPlugin plugin = null;
-
-    public static ComboPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new ComboPlugin();
-        return plugin;
-    }
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final info.nightscout.androidaps.utils.sharedPreferences.SP sp;
+    private RxBusWrapper rxBus;
+    private final CommandQueueProvider commandQueue;
+    private final Context context;
 
     private final static PumpDescription pumpDescription = new PumpDescription();
 
-    @NonNull
-    private final RuffyCommands ruffyScripter;
+    private RuffyCommands ruffyScripter;
 
     @NonNull
     private static final ComboPump pump = new ComboPump();
@@ -126,21 +129,46 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      */
     private volatile List<Bolus> recentBoluses = new ArrayList<>(0);
 
-    private static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult()
-            .success(false).enacted(false).comment(MainApp.gs(R.string.combo_pump_unsupported_operation));
+    private PumpEnactResult OPERATION_NOT_SUPPORTED;
 
-    private ComboPlugin() {
+    @Inject
+    public ComboPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            ProfileFunction profileFunction,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            Context context
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.PUMP)
-                .fragmentClass(ComboFragment.class.getName())
-                .pluginName(R.string.combopump)
-                .shortName(R.string.combopump_shortname)
-                .description(R.string.description_pump_combo)
+                        .mainType(PluginType.PUMP)
+                        .fragmentClass(ComboFragment.class.getName())
+                        .pluginName(R.string.combopump)
+                        .shortName(R.string.combopump_shortname)
+                        .description(R.string.description_pump_combo),
+                injector, aapsLogger, resourceHelper, commandQueue
         );
-        ruffyScripter = new RuffyScripter(MainApp.instance().getApplicationContext());
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.sp = sp;
+        this.commandQueue = commandQueue;
+        this.context = context;
+
         pumpDescription.setPumpDescription(PumpType.AccuChekCombo);
     }
 
+    @Override protected void onStart() {
+        super.onStart();
+        ruffyScripter = new RuffyScripter(context);
+        OPERATION_NOT_SUPPORTED = new PumpEnactResult(getInjector())
+                .success(false).enacted(false).comment(getResourceHelper().gs(R.string.combo_pump_unsupported_operation));
+    }
+
     public ComboPump getPump() {
         return pump;
     }
@@ -152,20 +180,15 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                     ? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message
                     : "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message;
         } else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY)) {
-            return MainApp.gs(R.string.combo_pump_state_suspended_due_to_error);
+            return getResourceHelper().gs(R.string.combo_pump_state_suspended_due_to_error);
         } else if (ps.suspended) {
-            return MainApp.gs(R.string.combo_pump_state_suspended_by_user);
+            return getResourceHelper().gs(R.string.combo_pump_state_suspended_by_user);
         } else if (!pump.initialized) {
-            return MainApp.gs(R.string.combo_pump_state_initializing);
+            return getResourceHelper().gs(R.string.combo_pump_state_initializing);
         } else if (!validBasalRateProfileSelectedOnPump) {
-            return MainApp.gs(R.string.loopdisabled);
+            return getResourceHelper().gs(R.string.loopdisabled);
         }
-        return MainApp.gs(R.string.combo_pump_state_running);
-    }
-
-    @Override
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        confirmPumpPluginActivation(newState, activity, type);
+        return getResourceHelper().gs(R.string.combo_pump_state_running);
     }
 
     @Override
@@ -216,8 +239,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
     @Override
     public void disconnect(String reason) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("Disconnect called with reason: " + reason);
+        getAapsLogger().debug(LTag.PUMP, "Disconnect called with reason: " + reason);
         ruffyScripter.disconnect();
     }
 
@@ -226,47 +248,47 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         // we're not doing that
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult setNewBasalProfile(Profile profile) {
         if (!isInitialized()) {
             // note that this should not happen anymore since the queue is present, which
             // issues a READSTATE when starting to issue commands which initializes the pump
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            return new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.pumpNotInitializedProfileNotSet));
+            getAapsLogger().error("setNewBasalProfile not initialized");
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet));
         }
 
         BasalProfile requestedBasalProfile = convertProfileToComboProfile(profile);
         if (pump.basalProfile.equals(requestedBasalProfile)) {
             //dismiss previously "FAILED" overview notifications
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            return new PumpEnactResult().success(true).enacted(false);
+            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            return new PumpEnactResult(getInjector()).success(true).enacted(false);
         }
 
         CommandResult stateResult = runCommand(null, 1, ruffyScripter::readPumpState);
         if (stateResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) {
-            return new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.combo_force_disabled_notification));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(getResourceHelper().gs(R.string.combo_force_disabled_notification));
         }
 
-        CommandResult setResult = runCommand(MainApp.gs(R.string.combo_activity_setting_basal_profile), 2,
+        CommandResult setResult = runCommand(getResourceHelper().gs(R.string.combo_activity_setting_basal_profile), 2,
                 () -> ruffyScripter.setBasalProfile(requestedBasalProfile));
         if (!setResult.success) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            return new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.failedupdatebasalprofile));
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, getResourceHelper().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(getResourceHelper().gs(R.string.failedupdatebasalprofile));
         }
 
         pump.basalProfile = requestedBasalProfile;
 
         //dismiss previously "FAILED" overview notifications
-        RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        RxBus.INSTANCE.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+        rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+        rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
         //issue success notification
-        Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
-        return new PumpEnactResult().success(true).enacted(true);
+        Notification notification = new Notification(Notification.PROFILE_SET_OK, getResourceHelper().gs(R.string.profile_set_ok), Notification.INFO, 60);
+        rxBus.send(new EventNewNotification(notification));
+        return new PumpEnactResult(getInjector()).success(true).enacted(true);
     }
 
     @Override
@@ -315,8 +337,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      */
     @Override
     public synchronized void getPumpStatus() {
-        if (L.isEnabled(L.PUMP))
-            log.debug("getPumpStatus called");
+        getAapsLogger().debug(LTag.PUMP, "getPumpStatus called");
         if (!pump.initialized) {
             initializePump();
         } else {
@@ -328,12 +349,10 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
     private synchronized void initializePump() {
         long maxWait = System.currentTimeMillis() + 15 * 1000;
         while (!ruffyScripter.isPumpAvailable()) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Waiting for ruffy service to come up ...");
+            getAapsLogger().debug(LTag.PUMP, "Waiting for ruffy service to come up ...");
             SystemClock.sleep(100);
             if (System.currentTimeMillis() > maxWait) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("ruffy service unavailable, wtf");
+                getAapsLogger().debug(LTag.PUMP, "ruffy service unavailable, wtf");
                 return;
             }
         }
@@ -341,8 +360,8 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         // trigger a connect, which will update state and check history
         CommandResult stateResult = runCommand(null, 1, ruffyScripter::readPumpState);
         if (stateResult.invalidSetup) {
-            RxBus.INSTANCE.send(new EventNewNotification(
-                    new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_invalid_setup), Notification.URGENT)));
+            rxBus.send(new EventNewNotification(
+                    new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_invalid_setup), Notification.URGENT)));
             return;
         }
         if (!stateResult.success) {
@@ -352,22 +371,21 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         // note that since the history is checked upon every connect, the above already updated
         // the DB with any changed history records
         if (pumpHistoryChanged) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Pump history has changed and was imported");
+            getAapsLogger().debug(LTag.PUMP, "Pump history has changed and was imported");
             pumpHistoryChanged = false;
         }
 
         if (stateResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) {
             Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                    MainApp.gs(R.string.combo_force_disabled_notification),
+                    getResourceHelper().gs(R.string.combo_force_disabled_notification),
                     Notification.URGENT);
             n.soundId = R.raw.alarm;
-            RxBus.INSTANCE.send(new EventNewNotification(n));
+            rxBus.send(new EventNewNotification(n));
             return;
         }
 
         // read basal profile into cache (KeepAlive will trigger a profile update if needed)
-        CommandResult readBasalResult = runCommand(MainApp.gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
+        CommandResult readBasalResult = runCommand(getResourceHelper().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
         if (!readBasalResult.success) {
             return;
         }
@@ -375,7 +393,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         setValidBasalRateProfileSelectedOnPump(true);
 
         pump.initialized = true;
-        RxBus.INSTANCE.send(new EventInitializationChanged());
+        rxBus.send(new EventInitializationChanged());
 
         // show notification to check pump date if last bolus is older than 24 hours
         // or is in the future
@@ -383,14 +401,14 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             long lastBolusTimestamp = recentBoluses.get(0).timestamp;
             long now = System.currentTimeMillis();
             if (lastBolusTimestamp < now - 24 * 60 * 60 * 1000 || lastBolusTimestamp > now + 5 * 60 * 1000) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_check_date), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_check_date), Notification.URGENT);
+                rxBus.send(new EventNewNotification(notification));
             }
         }
 
         // ComboFragment updates state fully only after the pump has initialized,
         // so force an update after initialization completed
-        RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+        rxBus.send(new EventComboPumpUpdateGUI());
     }
 
     /**
@@ -406,7 +424,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         if (result.state.menu != null) {
             pump.state = result.state;
         }
-        RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+        rxBus.send(new EventComboPumpUpdateGUI());
     }
 
     @Override
@@ -432,83 +450,83 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         }
     }
 
-    private static BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
+    private BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
         EventOverviewBolusProgress event = EventOverviewBolusProgress.INSTANCE;
         switch (state) {
             case PROGRAMMING:
-                event.setStatus(MainApp.gs(R.string.combo_programming_bolus));
+                event.setStatus(getResourceHelper().gs(R.string.combo_programming_bolus));
                 break;
             case DELIVERING:
-                event.setStatus(MainApp.gs(R.string.bolusdelivering, delivered));
+                event.setStatus(getResourceHelper().gs(R.string.bolusdelivering, delivered));
                 break;
             case DELIVERED:
-                event.setStatus(MainApp.gs(R.string.bolusdelivered, delivered));
+                event.setStatus(getResourceHelper().gs(R.string.bolusdelivered, delivered));
                 break;
             case STOPPING:
-                event.setStatus(MainApp.gs(R.string.bolusstopping));
+                event.setStatus(getResourceHelper().gs(R.string.bolusstopping));
                 break;
             case STOPPED:
-                event.setStatus(MainApp.gs(R.string.bolusstopped));
+                event.setStatus(getResourceHelper().gs(R.string.bolusstopped));
                 break;
         }
         event.setPercent(percent);
-        RxBus.INSTANCE.send(event);
+        rxBus.send(event);
     };
 
     /**
      * Updates Treatment records with carbs and boluses and delivers a bolus if needed
      */
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         try {
             if (detailedBolusInfo.insulin == 0 && detailedBolusInfo.carbs == 0) {
                 // neither carbs nor bolus requested
-                log.error("deliverTreatment: Invalid input");
-                return new PumpEnactResult().success(false).enacted(false)
+                getAapsLogger().error("deliverTreatment: Invalid input");
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
                         .bolusDelivered(0d).carbsDelivered(0d)
-                        .comment(MainApp.gs(R.string.danar_invalidinput));
+                        .comment(getResourceHelper().gs(R.string.danar_invalidinput));
             } else if (detailedBolusInfo.insulin > 0) {
                 // bolus needed, ask pump to deliver it
                 return deliverBolus(detailedBolusInfo);
             } else {
                 // no bolus required, carb only treatment
-                TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
+                treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
 
                 EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
                 bolusingEvent.setT(new Treatment());
                 bolusingEvent.getT().isSMB = detailedBolusInfo.isSMB;
                 bolusingEvent.setPercent(100);
-                RxBus.INSTANCE.send(bolusingEvent);
+                rxBus.send(bolusingEvent);
 
-                return new PumpEnactResult().success(true).enacted(true)
+                return new PumpEnactResult(getInjector()).success(true).enacted(true)
                         .bolusDelivered(0d).carbsDelivered(detailedBolusInfo.carbs)
-                        .comment(MainApp.gs(R.string.virtualpump_resultok));
+                        .comment(getResourceHelper().gs(R.string.virtualpump_resultok));
             }
         } finally {
-            RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+            rxBus.send(new EventComboPumpUpdateGUI());
         }
     }
 
     @NonNull
     private PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
         try {
-            pump.activity = MainApp.gs(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin);
-            RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+            pump.activity = getResourceHelper().gs(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin);
+            rxBus.send(new EventComboPumpUpdateGUI());
 
             // check pump is ready and all pump bolus records are known
             CommandResult stateResult = runCommand(null, 2, () -> ruffyScripter.readQuickInfo(1));
             if (!stateResult.success) {
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.combo_error_no_connection_no_bolus_delivered));
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.combo_error_no_connection_no_bolus_delivered));
             }
             if (stateResult.reservoirLevel != -1 && stateResult.reservoirLevel - 0.5 < detailedBolusInfo.insulin) {
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.combo_reservoir_level_insufficient_for_bolus));
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.combo_reservoir_level_insufficient_for_bolus));
             }
             // the commands above ensured a connection was made, which updated this field
             if (pumpHistoryChanged) {
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.combo_bolus_rejected_due_to_pump_history_change));
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.combo_bolus_rejected_due_to_pump_history_change));
             }
 
             Bolus previousBolus = stateResult.history != null && !stateResult.history.bolusHistory.isEmpty()
@@ -519,10 +537,9 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             // within the last 1-2 minutes
             if (Math.abs(previousBolus.amount - detailedBolusInfo.insulin) < 0.01
                     && previousBolus.timestamp + 60 * 1000 > System.currentTimeMillis()) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Bolus request rejected, same bolus was successfully delivered very recently");
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.bolus_frequency_exceeded));
+                getAapsLogger().debug(LTag.PUMP, "Bolus request rejected, same bolus was successfully delivered very recently");
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.bolus_frequency_exceeded));
             }
 
             // if the last bolus was given in the current minute, wait till the pump clock moves
@@ -534,26 +551,24 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             while (previousBolus.timestamp == timeCheckResult.state.pumpTime
                     && maxWaitTimeout > System.currentTimeMillis()) {
                 if (cancelBolus) {
-                    return new PumpEnactResult().success(true).enacted(false);
+                    return new PumpEnactResult(getInjector()).success(true).enacted(false);
                 }
                 if (!timeCheckResult.success) {
-                    return new PumpEnactResult().success(false).enacted(false)
-                            .comment(MainApp.gs(R.string.combo_error_no_connection_no_bolus_delivered));
+                    return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                            .comment(getResourceHelper().gs(R.string.combo_error_no_connection_no_bolus_delivered));
                 }
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Waiting for pump clock to advance for the next unused bolus record timestamp");
+                getAapsLogger().debug(LTag.PUMP, "Waiting for pump clock to advance for the next unused bolus record timestamp");
                 SystemClock.sleep(2000);
                 timeCheckResult = runCommand(null, 0, ruffyScripter::readPumpState);
                 waitLoops++;
             }
             if (waitLoops > 0) {
                 long waitDuration = (System.currentTimeMillis() - waitStartTime) / 1000;
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Waited " + waitDuration + "s for pump to switch to a fresh minute before bolusing");
+                getAapsLogger().debug(LTag.PUMP, "Waited " + waitDuration + "s for pump to switch to a fresh minute before bolusing");
             }
 
             if (cancelBolus) {
-                return new PumpEnactResult().success(true).enacted(false);
+                return new PumpEnactResult(getInjector()).success(true).enacted(false);
             }
 
             Treatment treatment = new Treatment();
@@ -574,8 +589,8 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             // (reads 2 records to update `recentBoluses` further down)
             CommandResult postBolusStateResult = runCommand(null, 3, () -> ruffyScripter.readQuickInfo(2));
             if (!postBolusStateResult.success) {
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.combo_error_bolus_verification_failed));
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.combo_error_bolus_verification_failed));
             }
             Bolus lastPumpBolus = postBolusStateResult.history != null && !postBolusStateResult.history.bolusHistory.isEmpty()
                     ? postBolusStateResult.history.bolusHistory.get(0)
@@ -584,25 +599,25 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             // no bolus delivered?
             if (lastPumpBolus == null || lastPumpBolus.equals(previousBolus)) {
                 if (cancelBolus) {
-                    return new PumpEnactResult().success(true).enacted(false);
+                    return new PumpEnactResult(getInjector()).success(true).enacted(false);
                 } else {
-                    return new PumpEnactResult()
+                    return new PumpEnactResult(getInjector())
                             .success(false)
                             .enacted(false)
-                            .comment(MainApp.gs(R.string.combo_error_no_bolus_delivered));
+                            .comment(getResourceHelper().gs(R.string.combo_error_no_bolus_delivered));
                 }
             }
 
             // at least some insulin delivered, so add it to treatments
             if (!addBolusToTreatments(detailedBolusInfo, lastPumpBolus))
-                return new PumpEnactResult().success(false).enacted(true)
-                        .comment(MainApp.gs(R.string.combo_error_updating_treatment_record));
+                return new PumpEnactResult(getInjector()).success(false).enacted(true)
+                        .comment(getResourceHelper().gs(R.string.combo_error_updating_treatment_record));
 
             // check pump bolus record has a sane timestamp
             long now = System.currentTimeMillis();
             if (lastPumpBolus.timestamp < now - 10 * 60 * 1000 || lastPumpBolus.timestamp > now + 10 * 60 * 1000) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_suspious_bolus_time), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_suspious_bolus_time), Notification.URGENT);
+                rxBus.send(new EventNewNotification(notification));
             }
 
             // update `recentBoluses` so the bolus was just delivered won't be detected as a new
@@ -612,31 +627,31 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             // only a partial bolus was delivered
             if (Math.abs(lastPumpBolus.amount - detailedBolusInfo.insulin) > 0.01) {
                 if (cancelBolus) {
-                    return new PumpEnactResult().success(true).enacted(true);
+                    return new PumpEnactResult(getInjector()).success(true).enacted(true);
                 }
-                return new PumpEnactResult().success(false).enacted(true)
-                        .comment(MainApp.gs(R.string.combo_error_partial_bolus_delivered,
+                return new PumpEnactResult(getInjector()).success(false).enacted(true)
+                        .comment(getResourceHelper().gs(R.string.combo_error_partial_bolus_delivered,
                                 lastPumpBolus.amount, detailedBolusInfo.insulin));
             }
 
             // full bolus was delivered successfully
             incrementBolusCount();
-            return new PumpEnactResult()
+            return new PumpEnactResult(getInjector())
                     .success(true)
                     .enacted(lastPumpBolus.amount > 0)
                     .bolusDelivered(lastPumpBolus.amount)
                     .carbsDelivered(detailedBolusInfo.carbs);
         } finally {
             pump.activity = null;
-            RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
-            RxBus.INSTANCE.send(new EventRefreshOverview("Bolus"));
+            rxBus.send(new EventComboPumpUpdateGUI());
+            rxBus.send(new EventRefreshOverview("Bolus"));
             cancelBolus = false;
         }
     }
 
     private void incrementTbrCount() {
         try {
-            SP.putLong(COMBO_TBRS_SET, SP.getLong(COMBO_TBRS_SET, 0L) + 1);
+            sp.putLong(COMBO_TBRS_SET, sp.getLong(COMBO_TBRS_SET, 0L) + 1);
         } catch (Exception e) {
             // ignore
         }
@@ -644,7 +659,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
     private void incrementBolusCount() {
         try {
-            SP.putLong(COMBO_BOLUSES_DELIVERED, SP.getLong(COMBO_BOLUSES_DELIVERED, 0L) + 1);
+            sp.putLong(COMBO_BOLUSES_DELIVERED, sp.getLong(COMBO_BOLUSES_DELIVERED, 0L) + 1);
         } catch (Exception e) {
             // ignore
         }
@@ -654,18 +669,31 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * Creates a treatment record based on the request in DetailBolusInfo and the delivered bolus.
      */
     private boolean addBolusToTreatments(DetailedBolusInfo detailedBolusInfo, Bolus lastPumpBolus) {
-        DetailedBolusInfo dbi = detailedBolusInfo.copy();
-        dbi.date = calculateFakeBolusDate(lastPumpBolus);
-        dbi.pumpId = dbi.date;
-        dbi.source = Source.PUMP;
-        dbi.insulin = lastPumpBolus.amount;
+        DetailedBolusInfo bolusInfo = detailedBolusInfo.copy();
+        bolusInfo.date = calculateFakeBolusDate(lastPumpBolus);
+        bolusInfo.pumpId = bolusInfo.date;
+        bolusInfo.source = Source.PUMP;
+        bolusInfo.insulin = lastPumpBolus.amount;
         try {
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, true);
+            if (bolusInfo.carbs > 0 && bolusInfo.carbTime != 0) {
+                // split out a separate carbs record without a pumpId
+                DetailedBolusInfo carbInfo = new DetailedBolusInfo();
+                carbInfo.date = bolusInfo.date + bolusInfo.carbTime * 60L * 1000L;
+                carbInfo.carbs = bolusInfo.carbs;
+                carbInfo.source = Source.USER;
+                treatmentsPlugin.addToHistoryTreatment(carbInfo, true);
+
+                // remove carbs from bolusInfo to not trigger any unwanted code paths in
+                // TreatmentsPlugin.addToHistoryTreatment() method
+                bolusInfo.carbTime = 0;
+                bolusInfo.carbs = 0;
+            }
+            treatmentsPlugin.addToHistoryTreatment(bolusInfo, true);
         } catch (Exception e) {
-            log.error("Adding treatment record failed", e);
-            if (dbi.isSMB) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+            getAapsLogger().error("Adding treatment record failed", e);
+            if (bolusInfo.isSMB) {
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
+                rxBus.send(new EventNewNotification(notification));
             }
             return false;
         }
@@ -689,15 +717,13 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      *              might have other issues though (what happens if the tbr which wasn't re-set to
      *              the new value (and thus still has the old duration of e.g. 1 min) expires?)
      */
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean force) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("setTempBasalAbsolute called with a rate of " + absoluteRate + " for " + durationInMinutes + " min.");
+        getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute called with a rate of " + absoluteRate + " for " + durationInMinutes + " min.");
         int unroundedPercentage = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
         int roundedPercentage = (int) (Math.round(absoluteRate / getBaseBasalRate() * 10) * 10);
         if (unroundedPercentage != roundedPercentage) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Rounded requested rate " + unroundedPercentage + "% -> " + roundedPercentage + "%");
+            getAapsLogger().debug(LTag.PUMP, "Rounded requested rate " + unroundedPercentage + "% -> " + roundedPercentage + "%");
         }
 
         return setTempBasalPercent(roundedPercentage, durationInMinutes);
@@ -709,32 +735,29 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * @param forceNew Driver always applies the requested TBR and simply overrides whatever TBR
      *                 is or isn't running at the moment
      */
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, final Integer durationInMinutes, Profile profile, boolean forceNew) {
         return setTempBasalPercent(percent, durationInMinutes);
     }
 
     private PumpEnactResult setTempBasalPercent(Integer percent, final Integer durationInMinutes) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("setTempBasalPercent called with " + percent + "% for " + durationInMinutes + "min");
+        getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent called with " + percent + "% for " + durationInMinutes + "min");
 
         if (pumpHistoryChanged && percent > 110) {
-            return new PumpEnactResult().success(false).enacted(false)
-                    .comment(MainApp.gs(R.string.combo_high_temp_rejected_due_to_pump_history_changes));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                    .comment(getResourceHelper().gs(R.string.combo_high_temp_rejected_due_to_pump_history_changes));
         }
 
         int adjustedPercent = percent;
 
         if (adjustedPercent > pumpDescription.maxTempPercent) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Reducing requested TBR to the maximum support by the pump: " + percent + " -> " + pumpDescription.maxTempPercent);
+            getAapsLogger().debug(LTag.PUMP, "Reducing requested TBR to the maximum support by the pump: " + percent + " -> " + pumpDescription.maxTempPercent);
             adjustedPercent = pumpDescription.maxTempPercent;
         }
 
         if (adjustedPercent % 10 != 0) {
             Long rounded = Math.round(adjustedPercent / 10d) * 10;
-            if (L.isEnabled(L.PUMP))
-                log.debug("Rounded requested percentage:" + adjustedPercent + " -> " + rounded);
+            getAapsLogger().debug(LTag.PUMP, "Rounded requested percentage:" + adjustedPercent + " -> " + rounded);
             adjustedPercent = rounded.intValue();
         }
 
@@ -744,10 +767,10 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         }
 
         int finalAdjustedPercent = adjustedPercent;
-        CommandResult commandResult = runCommand(MainApp.gs(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes),
+        CommandResult commandResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes),
                 3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
         if (!commandResult.success) {
-            return new PumpEnactResult().success(false).enacted(false);
+            return new PumpEnactResult(getInjector()).success(false).enacted(false);
         }
 
         PumpState state = commandResult.state;
@@ -758,17 +781,17 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                     .duration(state.tbrRemainingDuration)
                     .percent(state.tbrPercent)
                     .source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStart);
+            treatmentsPlugin.addToHistoryTempBasal(tempStart);
 
-            RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+            rxBus.send(new EventComboPumpUpdateGUI());
         }
 
         incrementTbrCount();
-        return new PumpEnactResult().success(true).enacted(true).isPercent(true)
+        return new PumpEnactResult(getInjector()).success(true).enacted(true).isPercent(true)
                 .percent(state.tbrPercent).duration(state.tbrRemainingDuration);
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
         return OPERATION_NOT_SUPPORTED;
     }
@@ -781,44 +804,41 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * make absolutely sure no TBR is running (such a request is also made when resuming the
      * loop, irregardless of whether a TBR is running or not).
      */
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("cancelTempBasal called");
-        final TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        getAapsLogger().debug(LTag.PUMP, "cancelTempBasal called");
+        final TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (enforceNew) {
-            CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_refreshing), 2, ruffyScripter::readPumpState);
+            CommandResult stateResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_refreshing), 2, ruffyScripter::readPumpState);
             if (!stateResult.success) {
-                return new PumpEnactResult().success(false).enacted(false);
+                return new PumpEnactResult(getInjector()).success(false).enacted(false);
             }
             if (!stateResult.state.tbrActive) {
-                return new PumpEnactResult().success(true).enacted(false);
+                return new PumpEnactResult(getInjector()).success(true).enacted(false);
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelTempBasal: hard-cancelling TBR since force requested");
-            CommandResult cancelResult = runCommand(MainApp.gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
+            getAapsLogger().debug(LTag.PUMP, "cancelTempBasal: hard-cancelling TBR since force requested");
+            CommandResult cancelResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
             if (!cancelResult.success) {
-                return new PumpEnactResult().success(false).enacted(false);
+                return new PumpEnactResult(getInjector()).success(false).enacted(false);
             }
             if (!cancelResult.state.tbrActive) {
                 TemporaryBasal tempBasal = new TemporaryBasal()
                         .date(cancelResult.state.timestamp)
                         .duration(0)
                         .source(Source.USER);
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempBasal);
-                return new PumpEnactResult().isTempCancel(true).success(true).enacted(true);
+                treatmentsPlugin.addToHistoryTempBasal(tempBasal);
+                return new PumpEnactResult(getInjector()).isTempCancel(true).success(true).enacted(true);
             } else {
-                return new PumpEnactResult().success(false).enacted(false);
+                return new PumpEnactResult(getInjector()).success(false).enacted(false);
             }
         } else if (activeTemp == null) {
-            return new PumpEnactResult().success(true).enacted(false);
+            return new PumpEnactResult(getInjector()).success(true).enacted(false);
         } else if ((activeTemp.percentRate >= 90 && activeTemp.percentRate <= 110) && activeTemp.getPlannedRemainingMinutes() <= 15) {
             // Let fake neutral temp keep run (see below)
             // Note that since this runs on the queue a connection is opened regardless, but this
             // case doesn't occur all that often, so it's not worth optimizing (1.3k SetTBR vs 4 cancelTBR).
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelTempBasal: skipping changing tbr since it already is at " + activeTemp.percentRate + "% and running for another " + activeTemp.getPlannedRemainingMinutes() + " mins.");
-            return new PumpEnactResult().success(true).enacted(true)
+            getAapsLogger().debug(LTag.PUMP, "cancelTempBasal: skipping changing tbr since it already is at " + activeTemp.percentRate + "% and running for another " + activeTemp.getPlannedRemainingMinutes() + " mins.");
+            return new PumpEnactResult(getInjector()).success(true).enacted(true)
                     .comment("cancelTempBasal skipping changing tbr since it already is at "
                             + activeTemp.percentRate + "% and running for another "
                             + activeTemp.getPlannedRemainingMinutes() + " mins.");
@@ -826,8 +846,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             // Set a fake neutral temp to avoid TBR cancel alert. Decide 90% vs 110% based on
             // on whether the TBR we're cancelling is above or below 100%.
             final int percentage = (activeTemp.percentRate > 100) ? 110 : 90;
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelTempBasal: changing TBR to " + percentage + "% for 15 mins.");
+            getAapsLogger().debug(LTag.PUMP, "cancelTempBasal: changing TBR to " + percentage + "% for 15 mins.");
             return setTempBasalPercent(percentage, 15);
         }
     }
@@ -847,8 +866,8 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         try {
             if (!ruffyScripter.isConnected()) {
                 String originalActivity = pump.activity;
-                pump.activity = MainApp.gs(R.string.combo_activity_checking_pump_state);
-                RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+                pump.activity = getResourceHelper().gs(R.string.combo_activity_checking_pump_state);
+                rxBus.send(new EventComboPumpUpdateGUI());
                 CommandResult preCheckError = runOnConnectChecks();
                 pump.activity = originalActivity;
                 if (preCheckError != null) {
@@ -859,15 +878,14 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
             if (activity != null) {
                 pump.activity = activity;
-                RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+                rxBus.send(new EventComboPumpUpdateGUI());
             }
 
             commandResult = commandExecution.execute();
 
             if (!commandResult.success && retries > 0) {
                 for (int retryAttempts = 1; !commandResult.success && retryAttempts <= retries; retryAttempts++) {
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Command was not successful, retries requested, doing retry #" + retryAttempts);
+                    getAapsLogger().debug(LTag.PUMP, "Command was not successful, retries requested, doing retry #" + retryAttempts);
                     commandResult = commandExecution.execute();
                 }
             }
@@ -881,18 +899,18 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                 if (validBasalRateProfileSelectedOnPump && commandResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) {
                     setValidBasalRateProfileSelectedOnPump(false);
                     Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                            MainApp.gs(R.string.combo_force_disabled_notification),
+                            getResourceHelper().gs(R.string.combo_force_disabled_notification),
                             Notification.URGENT);
                     n.soundId = R.raw.alarm;
-                    RxBus.INSTANCE.send(new EventNewNotification(n));
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, null);
+                    rxBus.send(new EventNewNotification(n));
+                    commandQueue.cancelTempBasal(true, null);
                 }
                 updateLocalData(commandResult);
             }
         } finally {
             if (activity != null) {
                 pump.activity = null;
-                RxBus.INSTANCE.send(new EventComboPumpUpdateGUI());
+                rxBus.send(new EventComboPumpUpdateGUI());
             }
         }
 
@@ -926,11 +944,11 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                 ruffyScripter.confirmAlert(activeAlert.warningCode);
             } else if (activeAlert.errorCode != null) {
                 Notification notification = new Notification();
-                notification.date = new Date();
+                notification.date = DateUtil.now();
                 notification.id = Notification.COMBO_PUMP_ALARM;
                 notification.level = Notification.URGENT;
-                notification.text = MainApp.gs(R.string.combo_is_in_error_state, activeAlert.errorCode, activeAlert.message);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+                notification.text = getResourceHelper().gs(R.string.combo_is_in_error_state, activeAlert.errorCode, activeAlert.message);
+                rxBus.send(new EventNewNotification(notification));
                 return preCheckResult.success(false);
             }
         }
@@ -946,16 +964,15 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             }
         } else {
             long now = System.currentTimeMillis();
-            TemporaryBasal aapsTbr = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+            TemporaryBasal aapsTbr = treatmentsPlugin.getTempBasalFromHistory(now);
             if (aapsTbr == null || aapsTbr.percentRate != 0) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Creating 15m zero temp since pump is suspended");
+                getAapsLogger().debug(LTag.PUMP, "Creating 15m zero temp since pump is suspended");
                 TemporaryBasal newTempBasal = new TemporaryBasal()
                         .date(now)
                         .percent(0)
                         .duration(15)
                         .source(Source.USER);
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(newTempBasal);
+                treatmentsPlugin.addToHistoryTempBasal(newTempBasal);
             }
         }
 
@@ -989,14 +1006,14 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         }
 
         if (Math.abs(pumpBasalRate - getBaseBasalRate()) > 0.001) {
-            CommandResult readBasalResult = runCommand(MainApp.gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
+            CommandResult readBasalResult = runCommand(getResourceHelper().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
             if (readBasalResult.success) {
                 pump.basalProfile = readBasalResult.basalProfile;
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_warning_pump_basal_rate_changed), Notification.NORMAL);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_warning_pump_basal_rate_changed), Notification.NORMAL);
+                rxBus.send(new EventNewNotification(notification));
             } else {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_error_failure_reading_changed_basal_rate), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_error_failure_reading_changed_basal_rate), Notification.URGENT);
+                rxBus.send(new EventNewNotification(notification));
             }
         }
     }
@@ -1009,15 +1026,13 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         if (state.pumpTime == 0) {
             // time couldn't be read (e.g. a warning is displayed on the menu , hiding the time field)
         } else if (Math.abs(state.pumpTime - System.currentTimeMillis()) >= 10 * 60 * 1000) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_notification_check_time_date), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            getAapsLogger().debug(LTag.PUMP, "Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_notification_check_time_date), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
         } else if (Math.abs(state.pumpTime - System.currentTimeMillis()) >= 3 * 60 * 1000) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_notification_check_time_date), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            getAapsLogger().debug(LTag.PUMP, "Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_notification_check_time_date), Notification.NORMAL);
+            rxBus.send(new EventNewNotification(notification));
         }
     }
 
@@ -1029,17 +1044,17 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             throw new IllegalArgumentException(activeAlert.toString());
         }
         Notification notification = new Notification();
-        notification.date = new Date();
+        notification.date = DateUtil.now();
         notification.id = Notification.COMBO_PUMP_ALARM;
         notification.level = Notification.NORMAL;
         if (activeAlert.warningCode == PumpWarningCodes.CARTRIDGE_LOW) {
-            notification.text = MainApp.gs(R.string.combo_pump_cartridge_low_warrning);
+            notification.text = getResourceHelper().gs(R.string.combo_pump_cartridge_low_warrning);
         } else if (activeAlert.warningCode == PumpWarningCodes.BATTERY_LOW) {
-            notification.text = MainApp.gs(R.string.combo_pump_battery_low_warrning);
+            notification.text = getResourceHelper().gs(R.string.combo_pump_battery_low_warrning);
         } else if (activeAlert.warningCode == PumpWarningCodes.TBR_CANCELLED) {
-            notification.text = MainApp.gs(R.string.combo_pump_tbr_cancelled_warrning);
+            notification.text = getResourceHelper().gs(R.string.combo_pump_tbr_cancelled_warrning);
         }
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
+        rxBus.send(new EventNewNotification(notification));
     }
 
     private void checkForUnsafeUsage(CommandResult commandResult) {
@@ -1059,12 +1074,12 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             lowSuspendOnlyLoopEnforcedUntil = lastViolation + 6 * 60 * 60 * 1000;
             if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis() && violationWarningRaisedForBolusAt != lowSuspendOnlyLoopEnforcedUntil) {
                 Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                        MainApp.gs(R.string.combo_low_suspend_forced_notification),
+                        getResourceHelper().gs(R.string.combo_low_suspend_forced_notification),
                         Notification.URGENT);
                 n.soundId = R.raw.alarm;
-                RxBus.INSTANCE.send(new EventNewNotification(n));
+                rxBus.send(new EventNewNotification(n));
                 violationWarningRaisedForBolusAt = lowSuspendOnlyLoopEnforcedUntil;
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, null);
+                commandQueue.cancelTempBasal(true, null);
             }
         }
     }
@@ -1075,41 +1090,38 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
     private void checkAndResolveTbrMismatch(PumpState state) {
         // compare with: info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal.updateTempBasalInDB()
         long now = System.currentTimeMillis();
-        TemporaryBasal aapsTbr = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+        TemporaryBasal aapsTbr = treatmentsPlugin.getTempBasalFromHistory(now);
         if (aapsTbr == null && state.tbrActive && state.tbrRemainingDuration > 2) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Creating temp basal from pump TBR");
+            getAapsLogger().debug(LTag.PUMP, "Creating temp basal from pump TBR");
             TemporaryBasal newTempBasal = new TemporaryBasal()
                     .date(now)
                     .percent(state.tbrPercent)
                     .duration(state.tbrRemainingDuration)
                     .source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(newTempBasal);
+            treatmentsPlugin.addToHistoryTempBasal(newTempBasal);
         } else if (aapsTbr != null && aapsTbr.getPlannedRemainingMinutes() > 2 && !state.tbrActive) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Ending AAPS-TBR since pump has no TBR active");
+            getAapsLogger().debug(LTag.PUMP, "Ending AAPS-TBR since pump has no TBR active");
             TemporaryBasal tempStop = new TemporaryBasal()
                     .date(now)
                     .duration(0)
                     .source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStop);
+            treatmentsPlugin.addToHistoryTempBasal(tempStop);
         } else if (aapsTbr != null && state.tbrActive
                 && (aapsTbr.percentRate != state.tbrPercent ||
                 Math.abs(aapsTbr.getPlannedRemainingMinutes() - state.tbrRemainingDuration) > 2)) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("AAPSs and pump-TBR differ; ending AAPS-TBR and creating new TBR based on pump TBR");
+            getAapsLogger().debug(LTag.PUMP, "AAPSs and pump-TBR differ; ending AAPS-TBR and creating new TBR based on pump TBR");
             TemporaryBasal tempStop = new TemporaryBasal()
                     .date(now - 1000)
                     .duration(0)
                     .source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStop);
+            treatmentsPlugin.addToHistoryTempBasal(tempStop);
 
             TemporaryBasal newTempBasal = new TemporaryBasal()
                     .date(now)
                     .percent(state.tbrPercent)
                     .duration(state.tbrRemainingDuration)
                     .source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(newTempBasal);
+            treatmentsPlugin.addToHistoryTempBasal(newTempBasal);
         }
     }
 
@@ -1117,7 +1129,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * Reads the pump's history and updates the DB accordingly.
      */
     private boolean readHistory(@Nullable PumpHistoryRequest request) {
-        CommandResult historyResult = runCommand(MainApp.gs(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
+        CommandResult historyResult = runCommand(getResourceHelper().gs(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
         PumpHistory history = historyResult.history;
         if (!historyResult.success || history == null) {
             return false;
@@ -1148,7 +1160,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             dbi.source = Source.PUMP;
             dbi.insulin = pumpBolus.amount;
             dbi.eventType = CareportalEvent.CORRECTIONBOLUS;
-            if (TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, true)) {
+            if (treatmentsPlugin.addToHistoryTreatment(dbi, true)) {
                 updated = true;
             }
         }
@@ -1175,13 +1187,12 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * @return null on success or the failed command result
      */
     private CommandResult checkHistory() {
-        CommandResult quickInfoResult = runCommand(MainApp.gs(R.string.combo_activity_checking_for_history_changes), 3,
+        CommandResult quickInfoResult = runCommand(getResourceHelper().gs(R.string.combo_activity_checking_for_history_changes), 3,
                 () -> ruffyScripter.readQuickInfo(2));
 
         // no history, nothing to check or complain about
         if (quickInfoResult.history == null || quickInfoResult.history.bolusHistory.isEmpty()) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Setting 'pumpHistoryChanged' false");
+            getAapsLogger().debug(LTag.PUMP, "Setting 'pumpHistoryChanged' false");
             pumpHistoryChanged = false;
             return null;
         }
@@ -1190,22 +1201,20 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         List<Bolus> initialPumpBolusHistory = quickInfoResult.history.bolusHistory;
         if (recentBoluses.size() == 1 && initialPumpBolusHistory.size() >= 1
                 && recentBoluses.get(0).equals(quickInfoResult.history.bolusHistory.get(0))) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Setting 'pumpHistoryChanged' false");
+            getAapsLogger().debug(LTag.PUMP, "Setting 'pumpHistoryChanged' false");
             pumpHistoryChanged = false;
             return null;
         } else if (recentBoluses.size() == 2 && initialPumpBolusHistory.size() >= 2
                 && recentBoluses.get(0).equals(quickInfoResult.history.bolusHistory.get(0))
                 && recentBoluses.get(1).equals(quickInfoResult.history.bolusHistory.get(1))) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Setting 'pumpHistoryChanged' false");
+            getAapsLogger().debug(LTag.PUMP, "Setting 'pumpHistoryChanged' false");
             pumpHistoryChanged = false;
             return null;
         }
 
         // fetch new records
         long lastKnownPumpRecordTimestamp = recentBoluses.isEmpty() ? 0 : recentBoluses.get(0).timestamp;
-        CommandResult historyResult = runCommand(MainApp.gs(R.string.combo_activity_reading_pump_history), 3, () ->
+        CommandResult historyResult = runCommand(getResourceHelper().gs(R.string.combo_activity_reading_pump_history), 3, () ->
                 ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(lastKnownPumpRecordTimestamp)));
         if (!historyResult.success) {
             pumpHistoryChanged = true;
@@ -1218,16 +1227,15 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         // for.
         HashSet<Bolus> bolusSet = new HashSet<>(historyResult.history.bolusHistory);
         if (bolusSet.size() != historyResult.history.bolusHistory.size()) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Bolus with same amount within the same minute imported. Only one will make it to the DB.");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.
+            getAapsLogger().debug(LTag.PUMP, "Bolus with same amount within the same minute imported. Only one will make it to the DB.");
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.
                     combo_error_multiple_boluses_with_identical_timestamp), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            rxBus.send(new EventNewNotification(notification));
         }
 
         pumpHistoryChanged = updateDbFromPumpHistory(historyResult.history);
-        if (L.isEnabled(L.PUMP) && pumpHistoryChanged) {
-            log.debug("Setting 'pumpHistoryChanged' true");
+        if (pumpHistoryChanged) {
+            getAapsLogger().debug(LTag.PUMP, "Setting 'pumpHistoryChanged' true");
         }
 
         List<Bolus> updatedPumpBolusHistory = historyResult.history.bolusHistory;
@@ -1238,12 +1246,12 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return null;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelExtendedBolus() {
         return OPERATION_NOT_SUPPORTED;
     }
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
         if (!pump.initialized) {
             return null;
@@ -1267,7 +1275,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
             JSONObject extendedJson = new JSONObject();
             extendedJson.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extendedJson.put("ActiveProfile", ProfileFunctions.getInstance().getProfileName());
+            extendedJson.put("ActiveProfile", profileFunction.getProfileName());
             PumpState ps = pump.state;
             if (ps.tbrActive) {
                 extendedJson.put("TempBasalAbsoluteRate", ps.basalRate);
@@ -1288,33 +1296,33 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
 
             return pumpJson;
         } catch (Exception e) {
-            log.warn("Failed to gather device status for upload", e);
+            getAapsLogger().warn(LTag.PUMP, "Failed to gather device status for upload " + e);
         }
 
         return null;
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return ManufacturerType.Roche;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.AccuChekCombo;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
         return InstanceId.INSTANCE.instanceId(); // TODO replace by real serial
     }
 
-    @Override
+    @NonNull @Override
     public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
 
-    @Override
+    @NonNull @Override
     public String shortStatus(boolean veryShort) {
         return getStateSummary();
     }
@@ -1324,9 +1332,9 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return false;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = readHistory(new PumpHistoryRequest().tddHistory(PumpHistoryRequest.FULL));
         if (result.success) {
             List<Tdd> tdds = pump.tddHistory;
@@ -1360,17 +1368,17 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
     private long violationWarningRaisedForBolusAt = 0;
     private boolean validBasalRateProfileSelectedOnPump = true;
 
-    @Override
-    public Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
+    @NonNull @Override
+    public Constraint<Boolean> isLoopInvocationAllowed(@NonNull Constraint<Boolean> value) {
         if (!validBasalRateProfileSelectedOnPump)
-            value.set(false, MainApp.gs(R.string.novalidbasalrate), this);
+            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.novalidbasalrate), this);
         return value;
     }
 
-    @Override
-    public Constraint<Double> applyMaxIOBConstraints(Constraint<Double> maxIob) {
+    @NonNull @Override
+    public Constraint<Double> applyMaxIOBConstraints(@NonNull Constraint<Double> maxIob) {
         if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis())
-            maxIob.setIfSmaller(0d, String.format(MainApp.gs(R.string.limitingmaxiob), 0d, MainApp.gs(R.string.unsafeusage)), this);
+            maxIob.setIfSmaller(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingmaxiob), 0d, getResourceHelper().gs(R.string.unsafeusage)), this);
         return maxIob;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
index c057b9244b..b36a5f2a71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
@@ -26,6 +26,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadQuickInfoCommand;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.BolusCommand;
@@ -45,7 +46,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.SetT
  * operations and are cleanly separated from the thread management, connection management etc
  */
 public class RuffyScripter implements RuffyCommands {
-    private static final Logger log = LoggerFactory.getLogger(RuffyScripter.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(RuffyScripter.class);
 
     private IRuffyService ruffyService;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
index da18cc5c53..42a94f78ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
@@ -23,7 +24,7 @@ import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusP
 import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.STOPPING;
 
 public class BolusCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(BolusCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(BolusCommand.class);
 
     protected final double bolus;
     private final BolusProgressReporter bolusProgressReporter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
index 4b54c87c42..b92aca13d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
@@ -4,11 +4,12 @@ import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
 
 public class CancelTbrCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(CancelTbrCommand.class);
 
     @Override
     public Integer getReconnectWarningId() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
index b7145d233d..83e553df6c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
@@ -9,11 +9,12 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 
 public class ReadBasalProfileCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(ReadBasalProfileCommand.class);
 
     @Override
     public void execute() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
index b50ccaeb2c..40065ae7b1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Calendar;
 import java.util.Date;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpAlert;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tbr;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 
 public class ReadHistoryCommand extends BaseCommand {
-    private static Logger log = LoggerFactory.getLogger(ReadHistoryCommand.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(ReadHistoryCommand.class);
 
     private final PumpHistoryRequest request;
     private final PumpHistory history = new PumpHistory();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
index eb68f1c5e1..86b21f43eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
@@ -9,11 +9,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
 
 public class ReadQuickInfoCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(ReadQuickInfoCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(ReadQuickInfoCommand.class);
 
     private final int numberOfBolusRecordsToRetrieve;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
index 4d18b3d24e..c10f863850 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
@@ -12,11 +12,12 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.List;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 
 public class SetBasalProfileCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(SetBasalProfileCommand.class);
 
     private final BasalProfile basalProfile;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
index a4459cea66..1d8e1b8d4a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
@@ -12,12 +12,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
 
 public class SetTbrCommand extends BaseCommand {
-    private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(SetTbrCommand.class);
 
     private final long percentage;
     private final long duration;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index b1d5db0e2a..00ecd5ef0c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -4,17 +4,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
@@ -22,24 +20,26 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
 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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
@@ -49,16 +49,21 @@ import io.reactivex.schedulers.Schedulers;
 
 // When using this class, make sure that your first step is to create mConnection (see MedtronicPumpPlugin)
 
-public abstract class PumpPluginAbstract extends PluginBase implements PumpInterface, ConstraintsInterface {
+public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpInterface, ConstraintsInterface {
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
-
-    protected static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult().success(false)
-            .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_supported_by_pump_driver));
-    protected static final PumpEnactResult OPERATION_NOT_YET_SUPPORTED = new PumpEnactResult().success(false)
-            .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_yet_supported_by_pump));
+    protected AAPSLogger aapsLogger;
+    protected RxBusWrapper rxBus;
+    protected ActivePluginProvider activePlugin;
+    protected Context context;
+    protected FabricPrivacy fabricPrivacy;
 
+    /*
+        protected static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult().success(false)
+                .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_supported_by_pump_driver));
+        protected static final PumpEnactResult OPERATION_NOT_YET_SUPPORTED = new PumpEnactResult().success(false)
+                .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_yet_supported_by_pump));
+    */
     protected PumpDescription pumpDescription = new PumpDescription();
     protected PumpStatus pumpStatus;
     protected ServiceConnection serviceConnection = null;
@@ -68,14 +73,28 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     protected boolean displayConnectionMessages = false;
 
 
-    protected PumpPluginAbstract(PluginDescription pluginDescription, PumpType pumpType) {
+    protected PumpPluginAbstract(
+            PluginDescription pluginDescription,
+            PumpType pumpType,
+            HasAndroidInjector injector,
+            ResourceHelper resourceHelper,
+            AAPSLogger aapsLogger,
+            CommandQueueProvider commandQueue,
+            RxBusWrapper rxBus,
+            ActivePluginProvider activePlugin,
+            Context context,
+            FabricPrivacy fabricPrivacy
+    ) {
 
-        super(pluginDescription);
+        super(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue);
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.activePlugin = activePlugin;
+        this.context = context;
+        this.fabricPrivacy = fabricPrivacy;
 
         pumpDescription.setPumpDescription(pumpType);
 
-        initPumpStatusData();
-
     }
 
 
@@ -85,18 +104,18 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     @Override
     protected void onStart() {
         super.onStart();
-        Context context = MainApp.instance().getApplicationContext();
+        // TODO: moved from constructor .... test if it works
+        initPumpStatusData();
+
         Intent intent = new Intent(context, getServiceClass());
         context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
 
         serviceRunning = true;
 
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    MainApp.instance().getApplicationContext().unbindService(serviceConnection);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> context.unbindService(serviceConnection), exception -> fabricPrivacy.logException(exception))
         );
         onStartCustomActions();
     }
@@ -104,7 +123,6 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
 
     @Override
     protected void onStop() {
-        Context context = MainApp.instance().getApplicationContext();
         context.unbindService(serviceConnection);
 
         serviceRunning = false;
@@ -119,11 +137,6 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
      */
     public abstract void onStartCustomActions();
 
-    @Override
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        confirmPumpPluginActivation(newState, activity, type);
-    }
-
     /**
      * Service class (same one you did serviceConnection for)
      *
@@ -152,114 +165,105 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
 
 
     public boolean isConnected() {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("isConnected [PumpPluginAbstract].");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "isConnected [PumpPluginAbstract].");
         return PumpDriverState.isConnected(pumpState);
     }
 
 
     public boolean isConnecting() {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("isConnecting [PumpPluginAbstract].");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "isConnecting [PumpPluginAbstract].");
         return pumpState == PumpDriverState.Connecting;
     }
 
 
     public void connect(String reason) {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("connect (reason={}) [PumpPluginAbstract] - default (empty) implementation.", reason);
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "connect (reason={}) [PumpPluginAbstract] - default (empty) implementation." + reason);
     }
 
 
     public void disconnect(String reason) {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("disconnect (reason={}) [PumpPluginAbstract] - default (empty) implementation.", reason);
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "disconnect (reason={}) [PumpPluginAbstract] - default (empty) implementation." + reason);
     }
 
 
     public void stopConnecting() {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("stopConnecting [PumpPluginAbstract] - default (empty) implementation.");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "stopConnecting [PumpPluginAbstract] - default (empty) implementation.");
     }
 
 
     @Override
     public boolean isHandshakeInProgress() {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("isHandshakeInProgress [PumpPluginAbstract] - default (empty) implementation.");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "isHandshakeInProgress [PumpPluginAbstract] - default (empty) implementation.");
         return false;
     }
 
 
     @Override
     public void finishHandshaking() {
-        if (displayConnectionMessages && isLoggingEnabled())
-            LOG.warn("finishHandshaking [PumpPluginAbstract] - default (empty) implementation.");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "finishHandshaking [PumpPluginAbstract] - default (empty) implementation.");
     }
 
 
     public void getPumpStatus() {
-        if (isLoggingEnabled())
-            LOG.warn("getPumpStatus [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "getPumpStatus [PumpPluginAbstract] - Not implemented.");
     }
 
 
     // Upload to pump new basal profile
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        if (isLoggingEnabled())
-            LOG.warn("setNewBasalProfile [PumpPluginAbstract] - Not implemented.");
+    @NonNull public PumpEnactResult setNewBasalProfile(Profile profile) {
+        aapsLogger.debug(LTag.PUMP, "setNewBasalProfile [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
 
     public boolean isThisProfileSet(Profile profile) {
-        if (isLoggingEnabled())
-            LOG.warn("isThisProfileSet [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "isThisProfileSet [PumpPluginAbstract] - Not implemented.");
         return true;
     }
 
 
     public long lastDataTime() {
-        if (isLoggingEnabled())
-            LOG.warn("lastDataTime [PumpPluginAbstract].");
+        aapsLogger.debug(LTag.PUMP, "lastDataTime [PumpPluginAbstract].");
         return pumpStatus.lastConnection;
     }
 
 
     public double getBaseBasalRate() {
-        if (isLoggingEnabled())
-            LOG.warn("getBaseBasalRate [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "getBaseBasalRate [PumpPluginAbstract] - Not implemented.");
         return 0.0d;
     } // base basal rate, not temp basal
 
 
     public void stopBolusDelivering() {
-        if (isLoggingEnabled())
-            LOG.warn("stopBolusDelivering [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "stopBolusDelivering [PumpPluginAbstract] - Not implemented.");
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile,
                                                 boolean enforceNew) {
-        if (isLoggingEnabled())
-            LOG.warn("setTempBasalAbsolute [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile,
                                                boolean enforceNew) {
-        if (isLoggingEnabled())
-            LOG.warn("setTempBasalPercent [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "setTempBasalPercent [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
 
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        if (isLoggingEnabled())
-            LOG.warn("setExtendedBolus [PumpPluginAbstract] - Not implemented.");
+    @NonNull public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
+        aapsLogger.debug(LTag.PUMP, "setExtendedBolus [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
@@ -267,16 +271,14 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     // some pumps might set a very short temp close to 100% as cancelling a temp can be noisy
     // when the cancel request is requested by the user (forced), the pump should always do a real cancel
 
-    public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-        if (isLoggingEnabled())
-            LOG.warn("cancelTempBasal [PumpPluginAbstract] - Not implemented.");
+    @NonNull public PumpEnactResult cancelTempBasal(boolean enforceNew) {
+        aapsLogger.debug(LTag.PUMP, "cancelTempBasal [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
 
-    public PumpEnactResult cancelExtendedBolus() {
-        if (isLoggingEnabled())
-            LOG.warn("cancelExtendedBolus [PumpPluginAbstract] - Not implemented.");
+    @NonNull public PumpEnactResult cancelExtendedBolus() {
+        aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
@@ -288,15 +290,14 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     // }
 
     public String deviceID() {
-        if (isLoggingEnabled())
-            LOG.warn("deviceID [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "deviceID [PumpPluginAbstract] - Not implemented.");
         return "FakeDevice";
     }
 
 
     // Pump capabilities
 
-    public PumpDescription getPumpDescription() {
+    @NonNull public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
 
@@ -304,26 +305,23 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     // Short info for SMS, Wear etc
 
     public boolean isFakingTempsByExtendedBoluses() {
-        if (isLoggingEnabled())
-            LOG.warn("isFakingTempsByExtendedBoluses [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "isFakingTempsByExtendedBoluses [PumpPluginAbstract] - Not implemented.");
         return false;
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
-        if (isLoggingEnabled())
-            LOG.warn("loadTDDs [PumpPluginAbstract] - Not implemented.");
+        aapsLogger.debug(LTag.PUMP, "loadTDDs [PumpPluginAbstract] - Not implemented.");
         return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
     }
 
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
 
-        long now = System.currentTimeMillis();
         if ((pumpStatus.lastConnection + 5 * 60 * 1000L) < System.currentTimeMillis()) {
-            return null;
+            return new JSONObject();
         }
 
         JSONObject pump = new JSONObject();
@@ -336,10 +334,10 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
             try {
                 extended.put("ActiveProfile", profileName);
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
 
-            TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+            TemporaryBasal tb = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate",
                         tb.tempBasalConvertedToAbsolute(System.currentTimeMillis(), profile));
@@ -347,7 +345,7 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
 
-            ExtendedBolus eb = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+            ExtendedBolus eb = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(System.currentTimeMillis());
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
                 extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
@@ -362,18 +360,18 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
             pump.put("reservoir", pumpStatus.reservoirRemainingUnits);
             pump.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            LOG.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return pump;
     }
 
 
     // FIXME i18n, null checks: iob, TDD
-    @Override
+    @NonNull @Override
     public String shortStatus(boolean veryShort) {
         String ret = "";
         if (pumpStatus.lastConnection != 0) {
-            Long agoMsec = System.currentTimeMillis() - pumpStatus.lastConnection;
+            long agoMsec = System.currentTimeMillis() - pumpStatus.lastConnection;
             int agoMin = (int) (agoMsec / 60d / 1000d);
             ret += "LastConn: " + agoMin + " min ago\n";
         }
@@ -381,12 +379,11 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
             ret += "LastBolus: " + DecimalFormatter.to2Decimal(pumpStatus.lastBolusAmount) + "U @" + //
                     android.text.format.DateFormat.format("HH:mm", pumpStatus.lastBolusTime) + "\n";
         }
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin()
-                .getRealTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             ret += "Temp: " + activeTemp.toStringFull() + "\n";
         }
-        ExtendedBolus activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(
+        ExtendedBolus activeExtendedBolus = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(
                 System.currentTimeMillis());
         if (activeExtendedBolus != null) {
             ret += "Extended: " + activeExtendedBolus.toString() + "\n";
@@ -402,37 +399,35 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
 
         try {
             if (detailedBolusInfo.insulin == 0 && detailedBolusInfo.carbs == 0) {
                 // neither carbs nor bolus requested
-                if (isLoggingEnabled())
-                    LOG.error("deliverTreatment: Invalid input");
-                return new PumpEnactResult().success(false).enacted(false).bolusDelivered(0d).carbsDelivered(0d)
-                        .comment(MainApp.gs(R.string.danar_invalidinput));
+                aapsLogger.error("deliverTreatment: Invalid input");
+                return new PumpEnactResult(getInjector()).success(false).enacted(false).bolusDelivered(0d).carbsDelivered(0d)
+                        .comment(getResourceHelper().gs(R.string.danar_invalidinput));
             } else if (detailedBolusInfo.insulin > 0) {
                 // bolus needed, ask pump to deliver it
                 return deliverBolus(detailedBolusInfo);
             } else {
                 if (MedtronicHistoryData.doubleBolusDebug)
-                    LOG.debug("DoubleBolusDebug: deliverTreatment::(carb only entry)");
+                    aapsLogger.debug("DoubleBolusDebug: deliverTreatment::(carb only entry)");
 
                 // no bolus required, carb only treatment
-                TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
+                activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
 
                 EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
                 bolusingEvent.setT(new Treatment());
                 bolusingEvent.getT().isSMB = detailedBolusInfo.isSMB;
                 bolusingEvent.setPercent(100);
-                RxBus.INSTANCE.send(bolusingEvent);
+                rxBus.send(bolusingEvent);
 
-                if (isLoggingEnabled())
-                    LOG.debug("deliverTreatment: Carb only treatment.");
+                aapsLogger.debug(LTag.PUMP, "deliverTreatment: Carb only treatment.");
 
-                return new PumpEnactResult().success(true).enacted(true).bolusDelivered(0d)
-                        .carbsDelivered(detailedBolusInfo.carbs).comment(MainApp.gs(R.string.virtualpump_resultok));
+                return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
+                        .carbsDelivered(detailedBolusInfo.carbs).comment(getResourceHelper().gs(R.string.virtualpump_resultok));
             }
         } finally {
             triggerUIChange();
@@ -440,20 +435,12 @@ public abstract class PumpPluginAbstract extends PluginBase implements PumpInter
 
     }
 
-
-    public boolean isLoggingEnabled() {
-        return L.isEnabled(L.PUMP);
-    }
-
-
     protected abstract PumpEnactResult deliverBolus(DetailedBolusInfo detailedBolusInfo);
 
-
     protected abstract void triggerUIChange();
 
-
-    public static PumpEnactResult getOperationNotSupportedWithCustomText(int resourceId) {
-        return new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(resourceId));
+    private PumpEnactResult getOperationNotSupportedWithCustomText(int resourceId) {
+        return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(getResourceHelper().gs(resourceId));
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index d7833a4fe4..51a63f62bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -1,41 +1,38 @@
 package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
 import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
 import info.nightscout.androidaps.utils.T
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.math.abs
 
-object DetailedBolusInfoStorage {
-    private val log = LoggerFactory.getLogger(L.PUMP)
+@Singleton
+class DetailedBolusInfoStorage @Inject constructor(
+    val aapsLogger: AAPSLogger
+){
+
     val store = ArrayList<DetailedBolusInfo>()
 
     @Synchronized
     fun add(detailedBolusInfo: DetailedBolusInfo) {
-        log.debug("Stored bolus info: $detailedBolusInfo")
+        aapsLogger.debug("Stored bolus info: $detailedBolusInfo")
         store.add(detailedBolusInfo)
     }
 
     @Synchronized
     fun findDetailedBolusInfo(bolusTime: Long, bolus: Double): DetailedBolusInfo? {
-
-        if (MedtronicHistoryData.doubleBolusDebug)
-            log.debug("DoubleBolusDebug: findDetailedBolusInfo::bolusTime={}, bolus={}", bolusTime, bolus)
-
         // Look for info with bolus
         for (i in store.indices) {
             val d = store[i]
-            if (L.isEnabled(L.PUMP))
-                log.debug("Existing bolus info: " + store[i])
+                aapsLogger.debug(LTag.PUMP, "Existing bolus info: " + store[i])
             if (bolusTime > d.date - T.mins(1).msecs() && bolusTime < d.date + T.mins(1).msecs() && abs(store[i].insulin - bolus) < 0.01) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Using & removing bolus info: " + store[i])
+                aapsLogger.debug(LTag.PUMP, "Using & removing bolus info: ${store[i]}")
                 store.removeAt(i)
-                if (MedtronicHistoryData.doubleBolusDebug)
-                    log.debug("DoubleBolusDebug: findDetailedBolusInfo::selectedBolus[DetailedBolusInfo={}]", d)
-
                 return d
             }
         }
@@ -43,14 +40,22 @@ object DetailedBolusInfoStorage {
         for (i in store.indices) {
             val d = store[i]
             if (bolusTime > d.date - T.mins(1).msecs() && bolusTime < d.date + T.mins(1).msecs() && bolus <= store[i].insulin + 0.01) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Using & removing bolus info: " + store[i])
+                aapsLogger.debug(LTag.PUMP, "Using TIME-ONLY & removing bolus info: ${store[i]}")
                 store.removeAt(i)
-                if (MedtronicHistoryData.doubleBolusDebug)
-                    log.debug("DoubleBolusDebug: findDetailedBolusInfo::selectedBolus[DetailedBolusInfo={}]", d)
                 return d
             }
         }
+        // If not found, use last record if amount is the same
+        if (store.size > 0) {
+            val d = store[store.size - 1]
+            if (abs(d.insulin - bolus) < 0.01) {
+                aapsLogger.debug(LTag.PUMP, "Using LAST & removing bolus info: $d")
+                store.removeAt(store.size - 1)
+                return d
+            }
+        }
+        //Not found
+        aapsLogger.debug(LTag.PUMP, "Bolus info not found")
         return null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
index ae0a0d34f7..e292808ded 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
@@ -25,14 +25,11 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,10 +37,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
@@ -51,12 +50,16 @@ import info.nightscout.androidaps.plugins.pump.common.utils.LocationHelper;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 // IMPORTANT: This activity needs to be called from RileyLinkSelectPreference (see pref_medtronic.xml as example)
 public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RileyLinkBLEScanActivity.class);
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
 
     private static final int PERMISSION_REQUEST_COARSE_LOCATION = 30241; // arbitrary.
     private static final int REQUEST_ENABLE_BT = 30242; // arbitrary
@@ -90,7 +93,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
         mHandler = new Handler();
 
         mLeDeviceListAdapter = new LeDeviceListAdapter();
-        listBTScan = (ListView) findViewById(R.id.rileylink_listBTScan);
+        listBTScan = findViewById(R.id.rileylink_listBTScan);
         listBTScan.setAdapter(mLeDeviceListAdapter);
         listBTScan.setOnItemClickListener((parent, view, position, id) -> {
 
@@ -100,22 +103,22 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                 mLEScanner.stopScan(mScanCallback2);
             }
 
-            TextView textview = (TextView) view.findViewById(R.id.rileylink_device_address);
+            TextView textview = view.findViewById(R.id.rileylink_device_address);
             String bleAddress = textview.getText().toString();
 
-            SP.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress);
+            sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress);
 
             RileyLinkUtil.getRileyLinkSelectPreference().setSummary(bleAddress);
 
             MedtronicPumpStatus pumpStatus = MedtronicUtil.getPumpStatus();
             pumpStatus.verifyConfiguration(); // force reloading of address
 
-            RxBus.INSTANCE.send(new EventMedtronicPumpConfigurationChanged());
+            rxBus.send(new EventMedtronicPumpConfigurationChanged());
 
             finish();
         });
 
-        toolbarBTScan = (Toolbar) findViewById(R.id.rileylink_toolbarBTScan);
+        toolbarBTScan = findViewById(R.id.rileylink_toolbarBTScan);
         toolbarBTScan.setTitle(R.string.rileylink_scanner_title);
         setSupportActionBar(toolbarBTScan);
 
@@ -127,8 +130,8 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_rileylink_ble_scan, menu);
 
-        actionTitleStart = MainApp.gs(R.string.rileylink_scanner_scan_scan);
-        actionTitleStop = MainApp.gs(R.string.rileylink_scanner_scan_stop);
+        actionTitleStart = resourceHelper.gs(R.string.rileylink_scanner_scan_scan);
+        actionTitleStop = resourceHelper.gs(R.string.rileylink_scanner_scan_stop);
 
         menuItem = menu.getItem(0);
 
@@ -271,7 +274,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
         @Override
         public void onScanFailed(int errorCode) {
             Log.e("Scan Failed", "Error Code: " + errorCode);
-            Toast.makeText(mContext, MainApp.gs(R.string.rileylink_scanner_scanning_error, errorCode),
+            Toast.makeText(mContext, resourceHelper.gs(R.string.rileylink_scanner_scanning_error, errorCode),
                     Toast.LENGTH_LONG).show();
         }
 
@@ -294,7 +297,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                 if (mScanning) {
                     mScanning = false;
                     mLEScanner.stopScan(mScanCallback2);
-                    LOG.debug("scanLeDevice: Scanning Stop");
+                    aapsLogger.debug("scanLeDevice: Scanning Stop");
                     Toast.makeText(mContext, R.string.rileylink_scanner_scanning_finished, Toast.LENGTH_SHORT).show();
                     menuItem.setTitle(actionTitleStart);
                 }
@@ -302,7 +305,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
 
             mScanning = true;
             mLEScanner.startScan(filters, settings, mScanCallback2);
-            LOG.debug("scanLeDevice: Scanning Start");
+            aapsLogger.debug("scanLeDevice: Scanning Start");
             Toast.makeText(this, R.string.rileylink_scanner_scanning, Toast.LENGTH_SHORT).show();
 
             menuItem.setTitle(actionTitleStop);
@@ -312,7 +315,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                 mScanning = false;
                 mLEScanner.stopScan(mScanCallback2);
 
-                LOG.debug("scanLeDevice: Scanning Stop");
+                aapsLogger.debug("scanLeDevice: Scanning Stop");
                 Toast.makeText(this, R.string.rileylink_scanner_scanning_finished, Toast.LENGTH_SHORT).show();
 
                 menuItem.setTitle(actionTitleStart);
@@ -333,7 +336,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             mLeDevices = new ArrayList<>();
             rileyLinkDevices = new HashMap<>();
             mInflator = RileyLinkBLEScanActivity.this.getLayoutInflater();
-            currentlySelectedAddress = SP.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+            currentlySelectedAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
         }
 
 
@@ -380,8 +383,8 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             if (view == null) {
                 view = mInflator.inflate(R.layout.rileylink_scan_item, null);
                 viewHolder = new ViewHolder();
-                viewHolder.deviceAddress = (TextView) view.findViewById(R.id.rileylink_device_address);
-                viewHolder.deviceName = (TextView) view.findViewById(R.id.rileylink_device_name);
+                viewHolder.deviceAddress = view.findViewById(R.id.rileylink_device_address);
+                viewHolder.deviceName = view.findViewById(R.id.rileylink_device_name);
                 view.setTag(viewHolder);
             } else {
                 viewHolder = (ViewHolder) view.getTag();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index 69837afd7c..5a30a75fe1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import android.content.Context;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
@@ -32,7 +33,7 @@ import info.nightscout.androidaps.utils.SP;
  */
 public abstract class RileyLinkCommunicationManager {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     private static final int SCAN_TIMEOUT = 1500;
     private static final int ALLOWED_PUMP_UNREACHABLE = 10 * 60 * 1000; // 10 minutes
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
index 3c7ba730a7..71006e2c34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.UUID;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding.Encoding4b6b;
@@ -43,7 +44,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDe
 
 public class RileyLinkUtil {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
     protected static List<RLHistoryItem> historyRileyLink = new ArrayList<>();
     protected static RileyLinkCommunicationManager rileyLinkCommunicationManager;
     static ServiceTask currentTask;
@@ -124,7 +125,7 @@ public class RileyLinkUtil {
 
             RileyLinkUtil.historyRileyLink.add(new RLHistoryItem(RileyLinkUtil.rileyLinkServiceData.serviceState,
                     RileyLinkUtil.rileyLinkServiceData.errorCode, targetDevice));
-            RxBus.INSTANCE.send(new EventMedtronicDeviceStatusChange(newState, errorCode));
+            RxBus.Companion.getINSTANCE().send(new EventMedtronicDeviceStatusChange(newState, errorCode));
             return null;
 
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index 1fb24821e1..031de05e23 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -10,6 +10,7 @@ import java.util.UUID;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.Reset;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
@@ -40,7 +41,7 @@ public class RFSpy {
 
     public static final long RILEYLINK_FREQ_XTAL = 24000000;
     public static final int EXPECTED_MAX_BLUETOOTH_LATENCY_MS = 7500; // 1500
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
     public int notConnectedCount = 0;
     private RileyLinkBLE rileyLinkBle;
     private RFSpyReader reader;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
index 063cdb877b..69b1f245fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
@@ -12,6 +12,7 @@ import android.os.AsyncTask;
 import android.os.SystemClock;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
@@ -24,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
  */
 public class RFSpyReader {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
     private static AsyncTask<Void, Void, Void> readerTask;
     private RileyLinkBLE rileyLinkBle;
     private Semaphore waitForRadioData = new Semaphore(0, true);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
index aab5e35142..42b7f8ce6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
@@ -20,6 +20,7 @@ import java.util.UUID;
 import java.util.concurrent.Semaphore;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
  */
 public class RileyLinkBLE {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private final Context context;
     public boolean gattDebugEnabled = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
index 646d7aac9a..2b170cd0fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.CRC;
  */
 public class RadioResponse {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     public boolean decodedOK = false;
     public int rssi;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
index 40f24cf135..47f13f3095 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.List;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -16,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 
 public class Encoding4b6bGeoff extends Encoding4b6bAbstract {
 
-    public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bGeoff.class);
+    public static final Logger LOG = StacktraceLoggerWrapper.getLogger(Encoding4b6bGeoff.class);
 
 
     public byte[] encode4b6b(byte[] data) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
index 6609138011..6b4bd73760 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -16,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 
 public class Encoding4b6bGo extends Encoding4b6bAbstract {
 
-    public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bGo.class);
+    public static final Logger LOG = StacktraceLoggerWrapper.getLogger(Encoding4b6bGo.class);
     private static Map<Short, Short> decodeGoMap;
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
index a7b005b9b8..56ec7751a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 
@@ -16,9 +17,8 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
  */
 
 public class Encoding4b6bLoop extends Encoding4b6bAbstract {
-    private static final Logger log = LoggerFactory.getLogger(Encoding4b6bLoop.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(Encoding4b6bLoop.class);
 
-    public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bLoop.class);
     public Map<Integer, Byte> codesRev = null;
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
index 6c12a8ef77..a891fce501 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
@@ -11,6 +11,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.os.SystemClock;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
 
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.Gatt
  */
 public class CharacteristicReadOperation extends BLECommOperation {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private BluetoothGattCharacteristic characteristic;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
index 488b03af27..54f20d517d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
@@ -11,6 +11,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.os.SystemClock;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
 
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.Gatt
  */
 public class CharacteristicWriteOperation extends BLECommOperation {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private BluetoothGattCharacteristic characteristic;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
index 9e631c1c7c..82f3359198 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
@@ -10,6 +10,7 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.SystemClock;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 
 /**
@@ -17,7 +18,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLink
  */
 public class DescriptorWriteOperation extends BLECommOperation {
 
-    private static final Logger LOG = LoggerFactory.getLogger(DescriptorWriteOperation.class);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(DescriptorWriteOperation.class);
 
     private BluetoothGattDescriptor descr;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
index 37a6656a6e..5d6b2a655b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
@@ -14,15 +14,19 @@ import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
 
+    @Inject ResourceHelper resourceHelper;
+
     TextView connectionStatus;
     TextView configuredAddress;
     TextView connectedDevice;
@@ -47,14 +51,14 @@ public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
         // primary sections of the activity.
 
         // Set up the ViewPager with the sections adapter.
-        mViewPager = (ViewPager) findViewById(R.id.rileylink_settings_container);
+        mViewPager = findViewById(R.id.rileylink_settings_container);
         // mViewPager.setAdapter(mSectionsPagerAdapter);
         setupViewPager(mViewPager);
 
-        tabLayout = (TabLayout) findViewById(R.id.rileylink_settings_tabs);
+        tabLayout = findViewById(R.id.rileylink_settings_tabs);
         tabLayout.setupWithViewPager(mViewPager);
 
-        floatingActionButton = (FloatingActionButton) findViewById(R.id.rileylink_settings_fab);
+        floatingActionButton = findViewById(R.id.rileylink_settings_fab);
         floatingActionButton.setOnClickListener(v -> {
 
             RefreshableInterface selectableInterface = (RefreshableInterface) mSectionsPagerAdapter
@@ -110,8 +114,8 @@ public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
 
         mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
-        mSectionsPagerAdapter.addFragment(new RileyLinkStatusGeneral(), MainApp.gs(R.string.rileylink_settings_tab1));
-        mSectionsPagerAdapter.addFragment(new RileyLinkStatusHistory(), MainApp.gs(R.string.rileylink_settings_tab2));
+        mSectionsPagerAdapter.addFragment(new RileyLinkStatusGeneral(), resourceHelper.gs(R.string.rileylink_settings_tab1));
+        mSectionsPagerAdapter.addFragment(new RileyLinkStatusHistory(), resourceHelper.gs(R.string.rileylink_settings_tab2));
         //mSectionsPagerAdapter.addFragment(new RileyLinkStatusDevice(), "Medtronic");
 
         mViewPager.setAdapter(mSectionsPagerAdapter);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java
deleted file mode 100644
index 78b7def1af..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-
-public class RileyLinkBluetoothStateReceiver extends BroadcastReceiver {
-
-    private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-
-        PumpInterface activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-        if (action != null && activePump != null) {
-
-            final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
-            switch (state) {
-                case BluetoothAdapter.STATE_OFF:
-                case BluetoothAdapter.STATE_TURNING_OFF:
-                case BluetoothAdapter.STATE_TURNING_ON:
-                    break;
-
-                case BluetoothAdapter.STATE_ON: {
-                        LOG.debug("RileyLinkBluetoothStateReceiver: Bluetooth back on. Sending broadcast to RileyLink Framework");
-                        RileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.BluetoothReconnected);
-                }
-                break;
-            }
-        }
-    }
-
-
-    public void unregisterBroadcasts() {
-        MainApp.instance().unregisterReceiver(this);
-    }
-
-
-    public void registerBroadcasts() {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        MainApp.instance().registerReceiver(this, filter);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt
new file mode 100644
index 0000000000..c677ae0c1e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service
+
+import android.bluetooth.BluetoothAdapter
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import javax.inject.Inject
+
+class RileyLinkBluetoothStateReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        val action = intent.action
+        if (action != null) {
+            val state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)
+            when (state) {
+                BluetoothAdapter.STATE_OFF, BluetoothAdapter.STATE_TURNING_OFF, BluetoothAdapter.STATE_TURNING_ON -> {
+                }
+
+                BluetoothAdapter.STATE_ON                                                                         -> {
+                    aapsLogger.debug("RileyLinkBluetoothStateReceiver: Bluetooth back on. Sending broadcast to RileyLink Framework")
+                    RileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.BluetoothReconnected)
+                }
+            }
+        }
+    }
+
+    fun unregisterBroadcasts(context: Context) {
+        context.unregisterReceiver(this)
+    }
+
+    fun registerBroadcasts(context: Context) {
+        val filter = IntentFilter()
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED)
+        context.registerReceiver(this, filter)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
index d8a897955e..9dfb05fc63 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.utils.SP;
  */
 public class RileyLinkBroadcastReceiver extends BroadcastReceiver {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     RileyLinkService serviceInstance;
     protected Map<String, List<String>> broadcastIdentifiers = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
index 29781d191b..6f629c2414 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
@@ -1,17 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service;
 
-import static info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil.getRileyLinkCommunicationManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import info.nightscout.androidaps.logging.L;
+import javax.inject.Inject;
+
+import dagger.android.DaggerService;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -25,33 +23,47 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceTransport;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+
+import static info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil.getRileyLinkCommunicationManager;
 
 /**
  * Created by andy on 5/6/18.
  * Split from original file and renamed.
  */
-public abstract class RileyLinkService extends Service {
+public abstract class RileyLinkService extends DaggerService {
+
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject Context context;
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
 
     public RileyLinkBLE rileyLinkBLE; // android-bluetooth management
     protected BluetoothAdapter bluetoothAdapter;
     protected RFSpy rfspy; // interface for RL xxx Mhz radio.
-    protected Context context;
     protected RileyLinkBroadcastReceiver mBroadcastReceiver;
     protected RileyLinkServiceData rileyLinkServiceData;
     protected RileyLinkBluetoothStateReceiver bluetoothStateReceiver;
 
-    public RileyLinkService(Context context) {
-        super();
-        this.context = context;
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        //LOG.debug("onCreate");
+
         RileyLinkUtil.setContext(this.context);
         RileyLinkUtil.setRileyLinkService(this);
         RileyLinkUtil.setEncoding(getEncoding());
         initRileyLinkServiceData();
-    }
 
+        mBroadcastReceiver = new RileyLinkBroadcastReceiver(this, this.context);
+        mBroadcastReceiver.registerBroadcasts();
+
+
+        bluetoothStateReceiver = new RileyLinkBluetoothStateReceiver();
+        bluetoothStateReceiver.registerBroadcasts(this);
+
+        //LOG.debug("onCreate(): It's ALIVE!");
+    }
 
     /**
      * Get Encoding for RileyLink communication
@@ -67,14 +79,14 @@ public abstract class RileyLinkService extends Service {
 
     @Override
     public boolean onUnbind(Intent intent) {
-        //LOG.warn("onUnbind");
+        //aapsLogger.warn(LTag.PUMPCOMM, "onUnbind");
         return super.onUnbind(intent);
     }
 
 
     @Override
     public void onRebind(Intent intent) {
-        //LOG.warn("onRebind");
+        //aapsLogger.warn(LTag.PUMPCOMM, "onRebind");
         super.onRebind(intent);
     }
 
@@ -89,33 +101,17 @@ public abstract class RileyLinkService extends Service {
             rileyLinkBLE = null;
         }
 
-        if (mBroadcastReceiver!=null) {
+        if (mBroadcastReceiver != null) {
             mBroadcastReceiver.unregisterBroadcasts();
         }
 
-        if (bluetoothStateReceiver!=null) {
-            bluetoothStateReceiver.unregisterBroadcasts();
+        if (bluetoothStateReceiver != null) {
+            bluetoothStateReceiver.unregisterBroadcasts(this);
         }
 
     }
 
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        //LOG.debug("onCreate");
-
-        mBroadcastReceiver = new RileyLinkBroadcastReceiver(this, this.context);
-        mBroadcastReceiver.registerBroadcasts();
-
-
-        bluetoothStateReceiver = new RileyLinkBluetoothStateReceiver();
-        bluetoothStateReceiver.registerBroadcasts();
-
-        //LOG.debug("onCreate(): It's ALIVE!");
-    }
-
-
     /**
      * Prefix for Device specific broadcast identifier prefix (for example MSG_PUMP_ for pump or
      * MSG_POD_ for Omnipod)
@@ -144,19 +140,18 @@ public abstract class RileyLinkService extends Service {
 
 
     public boolean bluetoothInit() {
-        if (isLogEnabled())
-            LOG.debug("bluetoothInit: attempting to get an adapter");
+        aapsLogger.debug(LTag.PUMPCOMM, "bluetoothInit: attempting to get an adapter");
         RileyLinkUtil.setServiceState(RileyLinkServiceState.BluetoothInitializing);
 
         bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
         if (bluetoothAdapter == null) {
-            LOG.error("Unable to obtain a BluetoothAdapter.");
+            aapsLogger.error("Unable to obtain a BluetoothAdapter.");
             RileyLinkUtil.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
         } else {
 
             if (!bluetoothAdapter.isEnabled()) {
-                LOG.error("Bluetooth is not enabled.");
+                aapsLogger.error("Bluetooth is not enabled.");
                 RileyLinkUtil.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.BluetoothDisabled);
             } else {
                 RileyLinkUtil.setServiceState(RileyLinkServiceState.BluetoothReady);
@@ -180,13 +175,11 @@ public abstract class RileyLinkService extends Service {
 
         if (rileyLinkBLE.isConnected()) {
             if (deviceAddress.equals(rileyLinkServiceData.rileylinkAddress)) {
-                if (isLogEnabled())
-                    LOG.info("No change to RL address.  Not reconnecting.");
+                aapsLogger.info(LTag.PUMPCOMM, "No change to RL address.  Not reconnecting.");
                 return false;
             } else {
-                if (isLogEnabled())
-                    LOG.warn("Disconnecting from old RL (" + rileyLinkServiceData.rileylinkAddress
-                            + "), reconnecting to new: " + deviceAddress);
+                aapsLogger.warn(LTag.PUMPCOMM, "Disconnecting from old RL (" + rileyLinkServiceData.rileylinkAddress
+                        + "), reconnecting to new: " + deviceAddress);
 
                 rileyLinkBLE.disconnect();
                 // prolly need to shut down listening thread too?
@@ -197,12 +190,11 @@ public abstract class RileyLinkService extends Service {
                 return true;
             }
         } else {
-            if (isLogEnabled())
-                LOG.debug("Using RL " + deviceAddress);
+            aapsLogger.debug(LTag.PUMPCOMM, "Using RL " + deviceAddress);
 
             if (RileyLinkUtil.getServiceState() == RileyLinkServiceState.NotStarted) {
                 if (!bluetoothInit()) {
-                    LOG.error("RileyLink can't get activated, Bluetooth is not functioning correctly. {}",
+                    aapsLogger.error("RileyLink can't get activated, Bluetooth is not functioning correctly. {}",
                             RileyLinkUtil.getError() != null ? RileyLinkUtil.getError().name() : "Unknown error (null)");
                     return false;
                 }
@@ -228,7 +220,7 @@ public abstract class RileyLinkService extends Service {
         double lastGoodFrequency = 0.0d;
 
         if (rileyLinkServiceData.lastGoodFrequency == null) {
-            lastGoodFrequency = SP.getDouble(RileyLinkConst.Prefs.LastGoodDeviceFrequency, 0.0d);
+            lastGoodFrequency = sp.getDouble(RileyLinkConst.Prefs.LastGoodDeviceFrequency, 0.0d);
         } else {
             lastGoodFrequency = rileyLinkServiceData.lastGoodFrequency;
         }
@@ -238,9 +230,8 @@ public abstract class RileyLinkService extends Service {
         newFrequency = getDeviceCommunicationManager().tuneForDevice();
 
         if ((newFrequency != 0.0) && (newFrequency != lastGoodFrequency)) {
-            if (isLogEnabled())
-                LOG.info("Saving new pump frequency of {} MHz", newFrequency);
-            SP.putDouble(RileyLinkConst.Prefs.LastGoodDeviceFrequency, newFrequency);
+            aapsLogger.info(LTag.PUMPCOMM, "Saving new pump frequency of {} MHz", newFrequency);
+            sp.putDouble(RileyLinkConst.Prefs.LastGoodDeviceFrequency, newFrequency);
             rileyLinkServiceData.lastGoodFrequency = newFrequency;
             rileyLinkServiceData.tuneUpDone = true;
             rileyLinkServiceData.lastTuneUpTime = System.currentTimeMillis();
@@ -276,11 +267,6 @@ public abstract class RileyLinkService extends Service {
     }
 
 
-    private boolean isLogEnabled() {
-        return L.isEnabled(L.PUMPCOMM);
-    }
-
-
     public void changeRileyLinkEncoding(RileyLinkEncodingType encodingType) {
         if (rfspy != null) {
             rfspy.setRileyLinkEncoding(encodingType);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
index 9856b21b66..1697e0640d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
@@ -24,7 +25,7 @@ public class InitializePumpManagerTask extends ServiceTask {
 
     private static final String TAG = "InitPumpManagerTask";
     private RileyLinkTargetDevice targetDevice;
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     public InitializePumpManagerTask(RileyLinkTargetDevice targetDevice) {
         super();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
index cce127ffdf..cc17f81b45 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
@@ -25,11 +25,11 @@ public class ResetRileyLinkConfigurationTask extends PumpTask {
 
     @Override
     public void run() {
-        RxBus.INSTANCE.send(new EventRefreshButtonState(false));
+        RxBus.Companion.getINSTANCE().send(new EventRefreshButtonState(false));
         MedtronicPumpPlugin.isBusy = true;
         RileyLinkMedtronicService.getInstance().resetRileyLinkConfiguration();
         MedtronicPumpPlugin.isBusy = false;
-        RxBus.INSTANCE.send(new EventRefreshButtonState(true));
+        RxBus.Companion.getINSTANCE().send(new EventRefreshButtonState(true));
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
index 5feb5ab405..1035d7d2d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
@@ -25,10 +25,10 @@ public class WakeAndTuneTask extends PumpTask {
 
     @Override
     public void run() {
-        RxBus.INSTANCE.send(new EventRefreshButtonState(false));
+        RxBus.Companion.getINSTANCE().send(new EventRefreshButtonState(false));
         MedtronicPumpPlugin.isBusy = true;
         RileyLinkMedtronicService.getInstance().doTuneUpDevice();
         MedtronicPumpPlugin.isBusy = false;
-        RxBus.INSTANCE.send(new EventRefreshButtonState(true));
+        RxBus.Companion.getINSTANCE().send(new EventRefreshButtonState(true));
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/RileyLinkSelectPreference.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/RileyLinkSelectPreference.java
index de9d28d46b..360f6e4798 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/RileyLinkSelectPreference.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/RileyLinkSelectPreference.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.ui;
 
 import android.content.Context;
-import android.preference.Preference;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 
 import info.nightscout.androidaps.MainApp;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 783553f431..17dfd96083 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -13,13 +13,14 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * This is simple version of ATechDate, limited only to one format (yyyymmddHHMIss)
  */
 public class DateTimeUtil {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     /**
      * DateTime is packed as long: yyyymmddHHMMss
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 57dadbdc55..b448990575 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -1,89 +1,94 @@
 package info.nightscout.androidaps.plugins.pump.danaR;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 import java.util.List;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
 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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 28.01.2018.
  */
 
-public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
-    protected Logger log = LoggerFactory.getLogger(L.PUMP);
-
+public abstract class AbstractDanaRPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
     protected AbstractDanaRExecutionService sExecutionService;
 
     protected boolean useExtendedBoluses = false;
 
-    public PumpDescription pumpDescription = new PumpDescription();
+    protected PumpDescription pumpDescription = new PumpDescription();
+    protected DanaRPump danaRPump;
+    protected ConstraintChecker constraintChecker;
+    protected RxBusWrapper rxBus;
+    protected TreatmentsPlugin treatmentsPlugin;
+    protected SP sp;
 
-    protected AbstractDanaRPlugin() {
+    protected AbstractDanaRPlugin(
+            HasAndroidInjector injector,
+            DanaRPump danaRPump,
+            ResourceHelper resourceHelper,
+            ConstraintChecker constraintChecker,
+            AAPSLogger aapsLogger,
+            CommandQueueProvider commandQueue,
+            RxBusWrapper rxBus,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.PUMP)
-                .fragmentClass(DanaRFragment.class.getName())
-                .pluginName(R.string.danarspump)
-                .shortName(R.string.danarpump_shortname)
-                .preferencesId(R.xml.pref_danars)
-                .description(R.string.description_pump_dana_r)
+                        .mainType(PluginType.PUMP)
+                        .fragmentClass(DanaRFragment.class.getName())
+                        .pluginName(R.string.danarspump)
+                        .shortName(R.string.danarpump_shortname)
+                        .preferencesId(R.xml.pref_danars)
+                        .description(R.string.description_pump_dana_r),
+                injector, aapsLogger, resourceHelper, commandQueue
         );
-    }
-
-    @Override
-    public void onStateChange(PluginType type, State oldState, State newState) {
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginType.PUMP && newState == State.DISABLED && isProfileInterfaceEnabled) {
-            setPluginEnabled(PluginType.PROFILE, false);
-            NSProfilePlugin.getPlugin().setPluginEnabled(PluginType.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginType.PROFILE, true);
-        }
-    }
-
-    @Override
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        confirmPumpPluginActivation(newState, activity, type);
+        this.danaRPump = danaRPump;
+        this.constraintChecker = constraintChecker;
+        this.rxBus = rxBus;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.sp = sp;
     }
 
     @Override
     public boolean isSuspended() {
-        return DanaRPump.getInstance().pumpSuspended;
+        return danaRPump.getPumpSuspended();
     }
 
     @Override
@@ -93,34 +98,34 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     }
 
     // Pump interface
-    @Override
+    @NonNull @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
         if (sExecutionService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
+            getAapsLogger().error("setNewBasalProfile sExecutionService is null");
             result.comment = "setNewBasalProfile sExecutionService is null";
             return result;
         }
         if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = MainApp.gs(R.string.pumpNotInitializedProfileNotSet);
+            getAapsLogger().error("setNewBasalProfile not initialized");
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet);
             return result;
         } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
         }
         if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = MainApp.gs(R.string.failedupdatebasalprofile);
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, getResourceHelper().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = getResourceHelper().gs(R.string.failedupdatebasalprofile);
             return result;
         } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, getResourceHelper().gs(R.string.profile_set_ok), Notification.INFO, 60);
+            rxBus.send(new EventNewNotification(notification));
             result.success = true;
             result.enacted = true;
             result.comment = "OK";
@@ -132,17 +137,15 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     public boolean isThisProfileSet(Profile profile) {
         if (!isInitialized())
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.pumpProfiles == null)
+        if (danaRPump.getPumpProfiles() == null)
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
+        int basalValues = danaRPump.getBasal48Enable() ? 48 : 24;
+        int basalIncrement = danaRPump.getBasal48Enable() ? 30 * 60 : 60 * 60;
         for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
+            Double pumpValue = danaRPump.getPumpProfiles()[danaRPump.getActiveProfile()][h];
             Double profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement);
             if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
+                getAapsLogger().debug(LTag.PUMP, "Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
                 return false;
             }
         }
@@ -151,142 +154,141 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
 
     @Override
     public long lastDataTime() {
-        return DanaRPump.getInstance().lastConnection;
+        return danaRPump.getLastConnection();
     }
 
     @Override
     public double getBaseBasalRate() {
-        return DanaRPump.getInstance().currentBasal;
+        return danaRPump.getCurrentBasal();
     }
 
     @Override
-    public double getReservoirLevel() { return DanaRPump.getInstance().reservoirRemainingUnits; }
+    public double getReservoirLevel() {
+        return danaRPump.getReservoirRemainingUnits();
+    }
 
     @Override
-    public int getBatteryLevel() { return DanaRPump.getInstance().batteryRemaining; }
+    public int getBatteryLevel() {
+        return danaRPump.getBatteryRemaining();
+    }
 
     @Override
     public void stopBolusDelivering() {
         if (sExecutionService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
+            getAapsLogger().error("stopBolusDelivering sExecutionService is null");
             return;
         }
         sExecutionService.bolusStop();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = DanaRPump.getInstance();
-        PumpEnactResult result = new PumpEnactResult();
-        percent = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
+        DanaRPump pump = danaRPump;
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
             result.isTempCancel = false;
             result.enacted = false;
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
+            result.comment = getResourceHelper().gs(R.string.danar_invalidinput);
+            getAapsLogger().error("setTempBasalPercent: Invalid input");
             return result;
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
         if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: Correct value already set");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
             return result;
         }
         int durationInHours = Math.max(durationInMinutes / 60, 1);
         boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: OK");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.tempbasaldeliveryerror);
-        log.error("setTempBasalPercent: Failed to set temp basal");
+        result.comment = getResourceHelper().gs(R.string.tempbasaldeliveryerror);
+        getAapsLogger().error("setTempBasalPercent: Failed to set temp basal");
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        insulin = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
+        DanaRPump pump = danaRPump;
+        insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
         // needs to be rounded
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
 
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.duration = pump.getExtendedBolusRemainingMinutes();
+            result.absolute = pump.getExtendedBolusAbsoluteRate();
             result.isPercent = false;
             result.isTempCancel = false;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
+            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + pump.getExtendedBolusAmount() + " Asked: " + insulin);
             return result;
         }
         boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+        if (connectionOK && pump.isExtendedInProgress() && Math.abs(pump.getExtendedBolusAmount() - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            if (!SP.getBoolean("danar_useextended", false))
-                result.bolusDelivered = pump.extendedBolusAmount;
+            result.duration = pump.getExtendedBolusRemainingMinutes();
+            result.absolute = pump.getExtendedBolusAbsoluteRate();
+            if (!sp.getBoolean("danar_useextended", false))
+                result.bolusDelivered = pump.getExtendedBolusAmount();
             result.isPercent = false;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setExtendedBolus: OK");
+            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
+        result.comment = getResourceHelper().gs(R.string.danar_valuenotsetproperly);
+        getAapsLogger().error("setExtendedBolus: Failed to extended bolus");
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null) {
             sExecutionService.extendedBolusStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isExtendedInProgress) {
+        if (!danaRPump.isExtendedInProgress()) {
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelExtendedBolus: OK");
+            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
+            result.comment = getResourceHelper().gs(R.string.danar_valuenotsetproperly);
+            getAapsLogger().error("cancelExtendedBolus: Failed to cancel extended bolus");
             return result;
         }
     }
@@ -295,8 +297,8 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     public void connect(String from) {
         if (sExecutionService != null) {
             sExecutionService.connect();
-            pumpDescription.basalStep = DanaRPump.getInstance().basalStep;
-            pumpDescription.bolusStep = DanaRPump.getInstance().bolusStep;
+            pumpDescription.basalStep = danaRPump.getBasalStep();
+            pumpDescription.bolusStep = danaRPump.getBolusStep();
         }
     }
 
@@ -324,16 +326,16 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     public void getPumpStatus() {
         if (sExecutionService != null) {
             sExecutionService.getPumpStatus();
-            pumpDescription.basalStep = DanaRPump.getInstance().basalStep;
-            pumpDescription.bolusStep = DanaRPump.getInstance().bolusStep;
+            pumpDescription.basalStep = danaRPump.getBasalStep();
+            pumpDescription.bolusStep = danaRPump.getBolusStep();
         }
     }
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profilename) {
-        DanaRPump pump = DanaRPump.getInstance();
+        DanaRPump pump = danaRPump;
         long now = System.currentTimeMillis();
-        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return null;
         }
         JSONObject pumpjson = new JSONObject();
@@ -341,22 +343,21 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
         JSONObject status = new JSONObject();
         JSONObject extended = new JSONObject();
         try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
+            battery.put("percent", pump.getBatteryRemaining());
+            status.put("status", pump.getPumpSuspended() ? "suspended" : "normal");
+            status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime != 0) {
-                extended.put("LastBolus", DateUtil.dateAndTimeFullString(pump.lastBolusTime));
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
+            if (pump.getLastBolusTime() != 0) {
+                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.getLastBolusTime()));
+                extended.put("LastBolusAmount", pump.getLastBolusAmount());
             }
-            TemporaryBasal tb = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(now);
+            TemporaryBasal tb = treatmentsPlugin.getRealTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
                 extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
-            ExtendedBolus eb = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
+            ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
                 extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
@@ -371,25 +372,25 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
             pumpjson.put("battery", battery);
             pumpjson.put("status", status);
             pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
+            pumpjson.put("reservoir", (int) pump.getReservoirRemainingUnits());
             pumpjson.put("clock", DateUtil.toISOString(new Date()));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            getAapsLogger().error("Unhandled exception", e);
         }
         return pumpjson;
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return ManufacturerType.Sooil;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
-        return DanaRPump.getInstance().serialNumber;
+        return danaRPump.getSerialNumber();
     }
 
-    @Override
+    @NonNull @Override
     public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
@@ -407,61 +408,61 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
      * Constraint interface
      */
 
-    @Override
-    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
-        absoluteRate.setIfSmaller(DanaRPump.getInstance().maxBasal, String.format(MainApp.gs(R.string.limitingbasalratio), DanaRPump.getInstance().maxBasal, MainApp.gs(R.string.pumplimit)), this);
+    @NonNull @Override
+    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
+        absoluteRate.setIfSmaller(getAapsLogger(), danaRPump.getMaxBasal(), String.format(getResourceHelper().gs(R.string.limitingbasalratio), danaRPump.getMaxBasal(), getResourceHelper().gs(R.string.pumplimit)), this);
         return absoluteRate;
     }
 
-    @Override
-    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
-        percentRate.setIfGreater(0, String.format(MainApp.gs(R.string.limitingpercentrate), 0, MainApp.gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getPumpDescription().maxTempPercent, String.format(MainApp.gs(R.string.limitingpercentrate), getPumpDescription().maxTempPercent, MainApp.gs(R.string.pumplimit)), this);
+    @NonNull @Override
+    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
+        percentRate.setIfGreater(getAapsLogger(), 0, String.format(getResourceHelper().gs(R.string.limitingpercentrate), 0, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().maxTempPercent, String.format(getResourceHelper().gs(R.string.limitingpercentrate), getPumpDescription().maxTempPercent, getResourceHelper().gs(R.string.pumplimit)), this);
 
         return percentRate;
     }
 
-    @Override
+    @NonNull @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(DanaRPump.getInstance().maxBolus, String.format(MainApp.gs(R.string.limitingbolus), DanaRPump.getInstance().maxBolus, MainApp.gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), danaRPump.getMaxBolus(), String.format(getResourceHelper().gs(R.string.limitingbolus), danaRPump.getMaxBolus(), getResourceHelper().gs(R.string.pumplimit)), this);
         return insulin;
     }
 
-    @Override
-    public Constraint<Double> applyExtendedBolusConstraints(Constraint<Double> insulin) {
+    @NonNull @Override
+    public Constraint<Double> applyExtendedBolusConstraints(@NonNull Constraint<Double> insulin) {
         return applyBolusConstraints(insulin);
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
         return loadHistory(RecordTypes.RECORD_TYPE_DAILY);
     }
 
     // Reply for sms communicator
-    public String shortStatus(boolean veryShort) {
-        DanaRPump pump = DanaRPump.getInstance();
+    @NonNull public String shortStatus(boolean veryShort) {
+        DanaRPump pump = danaRPump;
         String ret = "";
-        if (pump.lastConnection != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
+        if (pump.getLastConnection() != 0) {
+            long agoMsec = System.currentTimeMillis() - pump.getLastConnection();
             int agoMin = (int) (agoMsec / 60d / 1000d);
             ret += "LastConn: " + agoMin + " minago\n";
         }
-        if (pump.lastBolusTime != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
+        if (pump.getLastBolusTime() != 0) {
+            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.getLastBolusAmount()) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.getLastBolusTime()) + "\n";
         }
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             ret += "Temp: " + activeTemp.toStringFull() + "\n";
         }
-        ExtendedBolus activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        ExtendedBolus activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (activeExtendedBolus != null) {
             ret += "Extended: " + activeExtendedBolus.toString() + "\n";
         }
         if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
+            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.getDailyTotalUnits()) + " / " + pump.getMaxDailyTotalUnits() + " U\n";
         }
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
+        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.getReservoirRemainingUnits()) + "U\n";
+        ret += "Batt: " + pump.getBatteryRemaining() + "\n";
         return ret;
     }
     // TODO: daily total constraint
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
index d02bf4690a..b255b1b556 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.bluetooth.*;
 import android.content.Context;
-import android.preference.ListPreference;
+import androidx.preference.ListPreference;
 import android.util.AttributeSet;
 
 import java.util.Set;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index af1e80602e..2e7104c9e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -6,37 +6,46 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.TDDStatsActivity
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpInterface
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.SetWarnColor
 import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.plusAssign
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.danar_fragment.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+class DanaRFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var resourceHelper: ResourceHelper
 
-class DanaRFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.PUMP)
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     private val loopHandler = Handler()
@@ -57,14 +66,14 @@ class DanaRFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        dana_pumpstatus.setBackgroundColor(MainApp.gc(R.color.colorInitializingBorder))
+        dana_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
         danar_history.setOnClickListener { startActivity(Intent(context, DanaRHistoryActivity::class.java)) }
         danar_viewprofile.setOnClickListener {
             fragmentManager?.let { fragmentManager ->
-                val profile = DanaRPump.getInstance().createConvertedProfile()?.getDefaultProfile()
+                val profile = danaRPump.createConvertedProfile()?.getDefaultProfile()
                     ?: return@let
-                val profileName = DanaRPump.getInstance().createConvertedProfile()?.getDefaultProfileName()
+                val profileName = danaRPump.createConvertedProfile()?.getDefaultProfileName()
                     ?: return@let
                 val args = Bundle()
                 args.putLong("time", DateUtil.now())
@@ -80,10 +89,9 @@ class DanaRFragment : Fragment() {
         danar_stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
         danar_user_options.setOnClickListener { startActivity(Intent(context, DanaRUserOptionsActivity::class.java)) }
         danar_btconnection.setOnClickListener {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Clicked connect to pump")
-            DanaRPump.getInstance().lastConnection = 0
-            ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("Clicked connect to pump", null)
+            aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
+            danaRPump.lastConnection = 0
+            commandQueue.readStatus("Clicked connect to pump", null)
         }
     }
 
@@ -91,38 +99,44 @@ class DanaRFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
-        disposable += RxBus
+        disposable += rxBus
             .toObservable(EventDanaRNewStatus::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
             .toObservable(EventExtendedBolusChange::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
             .toObservable(EventTempBasalChange::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
             .toObservable(EventQueueChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 when {
-                    it.sStatus == EventPumpStatusChanged.Status.CONNECTING   -> danar_btconnection?.text = "{fa-bluetooth-b spin} " + it.sSecondsElapsed + "s"
-                    it.sStatus == EventPumpStatusChanged.Status.CONNECTED    -> danar_btconnection?.text = "{fa-bluetooth}"
-                    it.sStatus == EventPumpStatusChanged.Status.DISCONNECTED -> danar_btconnection?.text = "{fa-bluetooth-b}"
+                    it.status == EventPumpStatusChanged.Status.CONNECTING   ->
+                        @Suppress("SetTextI18n")
+                        danar_btconnection?.text = "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
+                    it.status == EventPumpStatusChanged.Status.CONNECTED    ->
+                        @Suppress("SetTextI18n")
+                        danar_btconnection?.text = "{fa-bluetooth}"
+                    it.status == EventPumpStatusChanged.Status.DISCONNECTED ->
+                        @Suppress("SetTextI18n")
+                        danar_btconnection?.text = "{fa-bluetooth-b}"
                 }
-                if (it.getStatus() != "") {
-                    dana_pumpstatus?.text = it.getStatus()
+                if (it.getStatus(resourceHelper) != "") {
+                    dana_pumpstatus?.text = it.getStatus(resourceHelper)
                     dana_pumpstatuslayout?.visibility = View.VISIBLE
                 } else {
                     dana_pumpstatuslayout?.visibility = View.GONE
                 }
-            }, { FabricPrivacy.logException(it) })
+            }, { fabricPrivacy.logException(it) })
         updateGUI()
     }
 
@@ -137,12 +151,12 @@ class DanaRFragment : Fragment() {
     @Synchronized
     internal fun updateGUI() {
         if (danar_dailyunits == null) return
-        val pump = DanaRPump.getInstance()
-        val plugin: PumpInterface = ConfigBuilderPlugin.getPlugin().activePump ?: return
+        val pump = danaRPump
+        val plugin: PumpInterface = activePlugin.activePump
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
-            danar_lastconnection.text = DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.gs(R.string.minago), agoMin) + ")"
+            danar_lastconnection.text = DateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
             SetWarnColor.setColor(danar_lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
@@ -150,39 +164,40 @@ class DanaRFragment : Fragment() {
             val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
-                danar_lastbolus.text = DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime) + " " + MainApp.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+                danar_lastbolus.text = DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
             else
                 danar_lastbolus.text = ""
         }
 
-        danar_dailyunits.text = MainApp.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
+        danar_dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
         SetWarnColor.setColor(danar_dailyunits, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75, pump.maxDailyTotalUnits * 0.9)
-        danar_basabasalrate.text = "( " + (pump.activeProfile + 1) + " )  " + MainApp.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+        danar_basabasalrate.text = "( " + (pump.activeProfile + 1) + " )  " + resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
         // DanaRPlugin, DanaRKoreanPlugin
-        if (ConfigBuilderPlugin.getPlugin().activePump!!.isFakingTempsByExtendedBoluses) {
-            danar_tempbasal.text = TreatmentsPlugin.getPlugin()
-                .getRealTempBasalFromHistory(System.currentTimeMillis())?.toStringFull() ?: ""
+        if (activePlugin.activePump.isFakingTempsByExtendedBoluses == true) {
+            danar_tempbasal.text = activePlugin.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+                ?: ""
         } else {
             // v2 plugin
-            danar_tempbasal.text = TreatmentsPlugin.getPlugin()
-                .getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull() ?: ""
+            danar_tempbasal.text = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+                ?: ""
         }
-        danar_extendedbolus.text = TreatmentsPlugin.getPlugin()
-            .getExtendedBolusFromHistory(System.currentTimeMillis())?.toString() ?: ""
-        danar_reservoir.text = MainApp.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
+        danar_extendedbolus.text = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())?.toString()
+            ?: ""
+        danar_reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
         SetWarnColor.setColorInverse(danar_reservoir, pump.reservoirRemainingUnits, 50.0, 20.0)
         danar_battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         SetWarnColor.setColorInverse(danar_battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
-        danar_iob.text = MainApp.gs(R.string.formatinsulinunits, pump.iob)
+        danar_iob.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
         if (pump.model != 0 || pump.protocol != 0 || pump.productCode != 0) {
-            danar_firmware.text = String.format(MainApp.gs(R.string.danar_model), pump.model, pump.protocol, pump.productCode)
+            danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.model, pump.protocol, pump.productCode)
         } else {
+            @Suppress("SetTextI18n")
             danar_firmware.text = "OLD"
         }
         danar_basalstep.text = pump.basalStep.toString()
         danar_bolusstep.text = pump.bolusStep.toString()
         danar_serialnumber.text = pump.serialNumber
-        val status = ConfigBuilderPlugin.getPlugin().commandQueue.spannedStatus()
+        val status = commandQueue.spannedStatus()
         if (status.toString() == "") {
             danar_queue.visibility = View.GONE
         } else {
@@ -191,7 +206,7 @@ class DanaRFragment : Fragment() {
         }
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
-        val isKorean = DanaRKoreanPlugin.getPlugin().isEnabled(PluginType.PUMP)
+        val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
         if (isKorean || danar_firmware.text === "OLD" || pump.model == 3) {
             danar_user_options.visibility = View.GONE
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index e9293b39a6..3c6ce84c42 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -6,7 +6,12 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 
-import info.nightscout.androidaps.MainApp;
+import androidx.annotation.NonNull;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
@@ -15,73 +20,84 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
 import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class DanaRPlugin extends AbstractDanaRPlugin {
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static DanaRPlugin plugin = null;
+    private final AAPSLogger aapsLogger;
+    private final Context context;
+    private final ResourceHelper resourceHelper;
+    private final ConstraintChecker constraintChecker;
 
-    public static DanaRPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new DanaRPlugin();
-        return plugin;
-    }
+    @Inject
+    public DanaRPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            Context context,
+            ResourceHelper resourceHelper,
+            ConstraintChecker constraintChecker,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            DanaRPump danaRPump
+    ) {
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        this.aapsLogger = aapsLogger;
+        this.context = context;
+        this.resourceHelper = resourceHelper;
+        this.constraintChecker = constraintChecker;
 
-    public DanaRPlugin() {
-        super();
-        useExtendedBoluses = SP.getBoolean(R.string.key_danar_useextended, false);
+        useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
         pumpDescription.setPumpDescription(PumpType.DanaR);
     }
 
     @Override
     protected void onStart() {
-        Context context = MainApp.instance().getApplicationContext();
         Intent intent = new Intent(context, DanaRExecutionService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     if (isEnabled(PluginType.PUMP)) {
                         boolean previousValue = useExtendedBoluses;
-                        useExtendedBoluses = SP.getBoolean(R.string.key_danar_useextended, false);
+                        useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
 
-                        if (useExtendedBoluses != previousValue && TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress()) {
+                        if (useExtendedBoluses != previousValue && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
                             sExecutionService.extendedBolusStop();
                         }
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    MainApp.instance().getApplicationContext().unbindService(mConnection);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         super.onStart();
     }
 
     @Override
     protected void onStop() {
-        Context context = MainApp.instance().getApplicationContext();
         context.unbindService(mConnection);
 
         disposable.clear();
@@ -91,23 +107,22 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is disconnected");
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
             sExecutionService = null;
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is connected");
+            aapsLogger.debug(LTag.PUMP, "Service is connected");
             DanaRExecutionService.LocalBinder mLocalBinder = (DanaRExecutionService.LocalBinder) service;
             sExecutionService = mLocalBinder.getServiceInstance();
         }
     };
 
     // Plugin base interface
+    @NonNull
     @Override
     public String getName() {
-        return MainApp.gs(R.string.danarpump);
+        return resourceHelper.gs(R.string.danarpump);
     }
 
     @Override
@@ -123,8 +138,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        DanaRPump pump = DanaRPump.getInstance();
-        return pump.lastConnection > 0 && pump.isExtendedBolusEnabled && pump.maxBasal > 0 && pump.isPasswordOK();
+        return danaRPump.getLastConnection() > 0 && danaRPump.isExtendedBolusEnabled() && danaRPump.getMaxBasal() > 0 && danaRPump.isPasswordOK();
     }
 
     @Override
@@ -137,53 +151,50 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         sExecutionService.finishHandshaking();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             Treatment t = new Treatment();
             t.isSMB = detailedBolusInfo.isSMB;
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0)
                 connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, detailedBolusInfo.carbTime, t);
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, MsgBolusStartWithSpeed.errorCode);
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
             else
-                result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
+                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             detailedBolusInfo.insulin = t.insulin;
             detailedBolusInfo.date = System.currentTimeMillis();
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
+            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
             return result;
         } else {
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("deliverTreatment: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
     }
 
     // This is called from APS
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
         // Recheck pump status if older than 30 min
         //This should not be needed while using queue because connection should be done before calling this
         //if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
         //    connect("setTempBasalAbsolute old data");
         //}
-        DanaRPump pump = DanaRPump.getInstance();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        PumpEnactResult result = new PumpEnactResult();
-
-        absoluteRate = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
         final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate();
@@ -191,20 +202,18 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(now);
-        ExtendedBolus activeExtended = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
+        ExtendedBolus activeExtended = treatmentsPlugin.getExtendedBolusFromHistory(now);
 
         if (doTempOff) {
             // If extended in progress
             if (activeExtended != null && useExtendedBoluses) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping extended bolus (doTempOff)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doTempOff)");
                 return cancelExtendedBolus();
             }
             // If temp in progress
             if (activeTemp != null) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doTempOff)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
                 return cancelRealTempBasal();
             }
             result.success = true;
@@ -212,8 +221,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             result.percent = 100;
             result.isPercent = true;
             result.isTempCancel = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: doTempOff OK");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK");
             return result;
         }
 
@@ -224,24 +232,21 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             if (percentRate > getPumpDescription().maxTempPercent) {
                 percentRate = getPumpDescription().maxTempPercent;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Calculated percent rate: " + percentRate);
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: " + percentRate);
 
             // If extended in progress
             if (activeExtended != null && useExtendedBoluses) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)");
                 result = cancelExtendedBolus();
                 if (!result.success) {
-                    log.error("setTempBasalAbsolute: Failed to stop previous extended bolus (doLowTemp || doHighTemp)");
+                    aapsLogger.error("setTempBasalAbsolute: Failed to stop previous extended bolus (doLowTemp || doHighTemp)");
                     return result;
                 }
             }
             // Check if some temp is already in progress
             if (activeTemp != null) {
                 // Correct basal already set ?
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: currently running: " + activeTemp.toString());
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running: " + activeTemp.toString());
                 if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
                     if (enforceNew) {
                         cancelTempBasal(true);
@@ -252,119 +257,110 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
                         result.duration = activeTemp.getPlannedRemainingMinutes();
                         result.isPercent = true;
                         result.isTempCancel = false;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
                         return result;
                     }
                 }
             }
             // Convert duration from minutes to hours
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
             return setTempBasalPercent(percentRate, durationInMinutes, profile, false);
         }
         if (doExtendedTemp) {
             // Check if some temp is already in progress
             if (activeTemp != null) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doExtendedTemp)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doExtendedTemp)");
                 result = cancelRealTempBasal();
                 // Check for proper result
                 if (!result.success) {
-                    log.error("setTempBasalAbsolute: Failed to stop previous temp basal (doExtendedTemp)");
+                    aapsLogger.error("setTempBasalAbsolute: Failed to stop previous temp basal (doExtendedTemp)");
                     return result;
                 }
             }
 
             // Calculate # of halfHours from minutes
-            Integer durationInHalfHours = Math.max(durationInMinutes / 30, 1);
+            int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
             // We keep current basal running so need to sub current basal
             Double extendedRateToSet = absoluteRate - getBaseBasalRate();
-            extendedRateToSet = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(extendedRateToSet), profile).value();
+            extendedRateToSet = constraintChecker.applyBasalConstraints(new Constraint<>(extendedRateToSet), profile).value();
             // needs to be rounded to 0.1
             extendedRateToSet = Round.roundTo(extendedRateToSet, pumpDescription.extendedBolusStep * 2); // *2 because of halfhours
 
             // What is current rate of extended bolusing in u/h?
-            if (L.isEnabled(L.PUMP)) {
-                log.debug("setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + pump.extendedBolusAbsoluteRate + "U/h duration remaining: " + pump.extendedBolusRemainingMinutes + "min");
-                log.debug("setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
-            }
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaRPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaRPump.getExtendedBolusRemainingMinutes() + "min");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
 
             // Compare with extended rate in progress
-            if (activeExtended != null && Math.abs(pump.extendedBolusAbsoluteRate - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
+            if (activeExtended != null && Math.abs(danaRPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
                 // correct extended already set
                 result.success = true;
-                result.absolute = pump.extendedBolusAbsoluteRate;
+                result.absolute = danaRPump.getExtendedBolusAbsoluteRate();
                 result.enacted = false;
-                result.duration = pump.extendedBolusRemainingMinutes;
+                result.duration = danaRPump.getExtendedBolusRemainingMinutes();
                 result.isPercent = false;
                 result.isTempCancel = false;
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Correct extended already set");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct extended already set");
                 return result;
             }
 
             // Now set new extended, no need to to stop previous (if running) because it's replaced
             Double extendedAmount = extendedRateToSet / 2 * durationInHalfHours;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting extended: " + extendedAmount + "U  halfhours: " + durationInHalfHours);
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting extended: " + extendedAmount + "U  halfhours: " + durationInHalfHours);
             result = setExtendedBolus(extendedAmount, durationInMinutes);
             if (!result.success) {
-                log.error("setTempBasalAbsolute: Failed to set extended bolus");
+                aapsLogger.error("setTempBasalAbsolute: Failed to set extended bolus");
                 return result;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Extended bolus set ok");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus set ok");
             result.absolute = result.absolute + getBaseBasalRate();
             return result;
         }
         // We should never end here
-        log.error("setTempBasalAbsolute: Internal error");
+        aapsLogger.error("setTempBasalAbsolute: Internal error");
         result.success = false;
         result.comment = "Internal error";
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress())
+        if (treatmentsPlugin.isInHistoryRealTempBasalInProgress())
             return cancelRealTempBasal();
-        if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
+        if (treatmentsPlugin.isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
             return cancelExtendedBolus();
         }
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         result.enacted = false;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         result.isTempCancel = true;
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.DanaR;
     }
 
     private PumpEnactResult cancelRealTempBasal() {
-        PumpEnactResult result = new PumpEnactResult();
-        TemporaryBasal runningTB = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isTempBasalInProgress) {
+        if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelRealTempBasal: OK");
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
             result.isTempCancel = true;
-            log.error("cancelRealTempBasal: Failed to cancel temp basal");
+            aapsLogger.error("cancelRealTempBasal: Failed to cancel temp basal");
             return result;
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java
deleted file mode 100644
index baa636ea81..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 04.07.2016.
- */
-public class DanaRPump {
-    private static Logger log = LoggerFactory.getLogger(L.PUMP);
-
-    private static DanaRPump instance = null;
-
-    public static DanaRPump getInstance() {
-        if (instance == null) instance = new DanaRPump();
-        return instance;
-    }
-
-    public static void reset() {
-        log.debug("DanaRPump reset");
-        instance = null;
-    }
-
-    public static final int UNITS_MGDL = 0;
-    public static final int UNITS_MMOL = 1;
-
-    public static final int DELIVERY_PRIME = 0x01;
-    public static final int DELIVERY_STEP_BOLUS = 0x02;
-    public static final int DELIVERY_BASAL = 0x04;
-    public static final int DELIVERY_EXT_BOLUS = 0x08;
-
-    public static final String PROFILE_PREFIX = "DanaR-";
-
-    // v2 history entries
-    public static final int TEMPSTART = 1;
-    public static final int TEMPSTOP = 2;
-    public static final int EXTENDEDSTART = 3;
-    public static final int EXTENDEDSTOP = 4;
-    public static final int BOLUS = 5;
-    public static final int DUALBOLUS = 6;
-    public static final int DUALEXTENDEDSTART = 7;
-    public static final int DUALEXTENDEDSTOP = 8;
-    public static final int SUSPENDON = 9;
-    public static final int SUSPENDOFF = 10;
-    public static final int REFILL = 11;
-    public static final int PRIME = 12;
-    public static final int PROFILECHANGE = 13;
-    public static final int CARBS = 14;
-    public static final int PRIMECANNULA = 15;
-
-    public long lastConnection = 0;
-    public long lastSettingsRead =0;
-
-    // Info
-    public String serialNumber = "";
-    public long shippingDate = 0;
-    public String shippingCountry = "";
-    public boolean isNewPump = true;
-    public int password = -1;
-    public long pumpTime = 0;
-
-    public static final int DOMESTIC_MODEL = 0x01;
-    public static final int EXPORT_MODEL = 0x03;
-    public int model = 0;
-    public int protocol = 0;
-    public int productCode = 0;
-
-    public boolean isConfigUD;
-    public boolean isExtendedBolusEnabled;
-    public boolean isEasyModeEnabled;
-
-    // Status
-    public boolean pumpSuspended;
-    public boolean calculatorEnabled;
-    public double dailyTotalUnits;
-    public double dailyTotalBolusUnits = 0; // RS only
-    public double dailyTotalBasalUnits = 0; // RS only
-    public int maxDailyTotalUnits;
-
-    public double bolusStep = 0.1;
-    public double basalStep = 0.1;
-
-    public double iob;
-
-    public double reservoirRemainingUnits;
-    public int batteryRemaining;
-
-    public boolean bolusBlocked;
-    public long lastBolusTime = 0;
-    public double lastBolusAmount;
-
-    public double currentBasal;
-
-    public boolean isTempBasalInProgress;
-    public int tempBasalPercent;
-    public int tempBasalRemainingMin;
-    public int tempBasalTotalSec;
-    public long tempBasalStart;
-
-    public boolean isDualBolusInProgress;
-    public boolean isExtendedInProgress;
-    public int extendedBolusMinutes;
-    public double extendedBolusAmount;
-    public double extendedBolusAbsoluteRate;
-    public int extendedBolusSoFarInMinutes;
-    public long extendedBolusStart;
-    public int extendedBolusRemainingMinutes;
-    public double extendedBolusDeliveredSoFar; //RS only
-
-    // Profile
-    public int units;
-    public int easyBasalMode;
-    public boolean basal48Enable = false;
-    public int currentCIR;
-    public double currentCF;
-    public double currentAI;
-    public double currentTarget;
-    public int currentAIDR;
-
-    public int morningCIR;
-    public double morningCF;
-    public int afternoonCIR;
-    public double afternoonCF;
-    public int eveningCIR;
-    public double eveningCF;
-    public int nightCIR;
-    public double nightCF;
-
-
-    public int activeProfile = 0;
-    public double[][] pumpProfiles = null;
-
-    //Limits
-    public double maxBolus;
-    public double maxBasal;
-
-    // DanaRS specific
-
-    public String rs_password = "";
-
-    // User settings
-    public int timeDisplayType;
-    public int buttonScrollOnOff;
-    public int beepAndAlarm;
-    public int lcdOnTimeSec;
-    public int backlightOnTimeSec;
-    public int selectedLanguage;
-    public int shutdownHour;
-    public int lowReservoirRate;
-    public int cannulaVolume;
-    public int refillAmount;
-    public byte[] userOptionsFrompump;
-    public double initialBolusAmount;
-    // Bolus settings
-    public int bolusCalculationOption;
-    public int missedBolusConfig;
-
-    public String getUnits() {
-        return units == UNITS_MGDL ? Constants.MGDL : Constants.MMOL;
-    }
-
-    public ProfileStore createConvertedProfile() {
-        JSONObject json = new JSONObject();
-        JSONObject store = new JSONObject();
-        JSONObject profile = new JSONObject();
-
-//        Morning / 6:00–10:59
-//        Afternoon / 11:00–16:59
-//        Evening / 17:00–21:59
-//        Night / 22:00–5:59
-
-        double dia = SP.getDouble(R.string.key_danarprofile_dia, Constants.defaultDIA);
-
-        try {
-            json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1));
-            json.put("store", store);
-            profile.put("dia", dia);
-
-            JSONArray carbratios = new JSONArray();
-            carbratios.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR));
-            carbratios.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR));
-            carbratios.put(new JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR));
-            carbratios.put(new JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR));
-            carbratios.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR));
-            profile.put("carbratio", carbratios);
-
-            JSONArray sens = new JSONArray();
-            sens.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF));
-            sens.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF));
-            sens.put(new JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCF));
-            sens.put(new JSONObject().put("time", "17:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCF));
-            sens.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCF));
-            profile.put("sens", sens);
-
-            JSONArray basals = new JSONArray();
-            int basalValues = basal48Enable ? 48 : 24;
-            int basalIncrement = basal48Enable ? 30 * 60 : 60 * 60;
-            for (int h = 0; h < basalValues; h++) {
-                String time;
-                DecimalFormat df = new DecimalFormat("00");
-                if (basal48Enable) {
-                    time = df.format((long) h / 2) + ":" + df.format(30 * (h % 2));
-                } else {
-                    time = df.format(h) + ":00";
-                }
-                basals.put(new JSONObject().put("time", time).put("timeAsSeconds", h * basalIncrement).put("value", pumpProfiles[activeProfile][h]));
-            }
-            profile.put("basal", basals);
-
-            profile.put("target_low", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)));
-            profile.put("target_high", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)));
-            profile.put("units", units == UNITS_MGDL ? Constants.MGDL : Constants.MMOL);
-            store.put(PROFILE_PREFIX + (activeProfile + 1), profile);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        } catch (Exception e) {
-            return null;
-        }
-
-        return new ProfileStore(json);
-    }
-
-    public String createConvertedProfileName() {
-        return PROFILE_PREFIX + (activeProfile + 1);
-    }
-
-    public double[] buildDanaRProfileRecord(Profile nsProfile) {
-        double[] record = new double[24];
-        for (Integer hour = 0; hour < 24; hour++) {
-            //Some values get truncated to the next lower one.
-            // -> round them to two decimals and make sure we are a small delta larger (that will get truncated)
-            double value = Math.round(100d * nsProfile.getBasalTimeFromMidnight((Integer) (hour * 60 * 60)))/100d + 0.00001;
-            if (L.isEnabled(L.PUMP))
-                log.debug("NS basal value for " + hour + ":00 is " + value);
-            record[hour] = value;
-        }
-        return record;
-    }
-
-    public boolean isPasswordOK() {
-        if (password != -1 && password != SP.getInt(R.string.key_danar_password, -1)) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
new file mode 100644
index 0000000000..0621fd80ad
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -0,0 +1,240 @@
+package info.nightscout.androidaps.plugins.pump.danaR
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.text.DecimalFormat
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by mike on 04.07.2016.
+ */
+@Singleton
+class DanaRPump @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val injector: HasAndroidInjector
+) {
+
+    var lastConnection: Long = 0
+    var lastSettingsRead: Long = 0
+
+    // Info
+    var serialNumber = ""
+    var shippingDate: Long = 0
+    var shippingCountry = ""
+    var isNewPump = true
+    var password = -1
+    var pumpTime: Long = 0
+    var model = 0
+    var protocol = 0
+    var productCode = 0
+    var isConfigUD = false
+    var isExtendedBolusEnabled = false
+    var isEasyModeEnabled = false
+
+    // Status
+    var pumpSuspended = false
+    var calculatorEnabled = false
+    var dailyTotalUnits = 0.0
+    var dailyTotalBolusUnits = 0.0 // RS only
+    var dailyTotalBasalUnits = 0.0 // RS only
+    var maxDailyTotalUnits = 0
+    var bolusStep = 0.1
+    var basalStep = 0.1
+    var iob = 0.0
+    var reservoirRemainingUnits = 0.0
+    var batteryRemaining = 0
+    var bolusBlocked = false
+    var lastBolusTime: Long = 0
+    var lastBolusAmount = 0.0
+    var currentBasal = 0.0
+    var isTempBasalInProgress = false
+    var tempBasalPercent = 0
+    var tempBasalRemainingMin = 0
+    var tempBasalTotalSec = 0
+    var tempBasalStart: Long = 0
+    var isDualBolusInProgress = false
+    var isExtendedInProgress = false
+    var extendedBolusMinutes = 0
+    var extendedBolusAmount = 0.0
+    var extendedBolusAbsoluteRate = 0.0
+    var extendedBolusSoFarInMinutes = 0
+    var extendedBolusStart: Long = 0
+    var extendedBolusRemainingMinutes = 0
+    var extendedBolusDeliveredSoFar = 0.0 //RS only = 0.0
+
+    // Profile
+    var units = 0
+    var easyBasalMode = 0
+    var basal48Enable = false
+    var currentCIR = 0
+    var currentCF = 0.0
+    var currentAI = 0.0
+    var currentTarget = 0.0
+    var currentAIDR = 0
+    var morningCIR = 0
+    var morningCF = 0.0
+    var afternoonCIR = 0
+    var afternoonCF = 0.0
+    var eveningCIR = 0
+    var eveningCF = 0.0
+    var nightCIR = 0
+    var nightCF = 0.0
+    var activeProfile = 0
+
+    //var pumpProfiles = arrayOf<Array<Double>>()
+    var pumpProfiles: Array<Array<Double>>? = null
+
+    //Limits
+    var maxBolus = 0.0
+    var maxBasal = 0.0
+
+    // DanaRS specific
+    var rsPassword = ""
+
+    // User settings
+    var timeDisplayType = 0
+    var buttonScrollOnOff = 0
+    var beepAndAlarm = 0
+    var lcdOnTimeSec = 0
+    var backlightOnTimeSec = 0
+    var selectedLanguage = 0
+    var shutdownHour = 0
+    var lowReservoirRate = 0
+    var cannulaVolume = 0
+    var refillAmount = 0
+    var userOptionsFrompump: ByteArray? = null
+    var initialBolusAmount = 0.0
+
+    // Bolus settings
+    var bolusCalculationOption = 0
+    var missedBolusConfig = 0
+    fun getUnits(): String {
+        return if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL
+    }
+
+    // DanaR,Rv2,RK specific flags
+    // last start bolus erroCode
+    var messageStartErrorCode: Int = 0
+    var historyDoneReceived: Boolean = false
+    var bolusingTreatment: Treatment? = null // actually delivered treatment
+    var bolusAmountToBeDelivered = 0.0 // amount to be delivered
+    var bolusProgressLastTimeStamp: Long = 0 // timestamp of last bolus progress message
+    var bolusStopped = false // bolus finished
+    var bolusStopForced = false // bolus forced to stop by user
+
+    fun createConvertedProfile(): ProfileStore? {
+        pumpProfiles?.let {
+            val json = JSONObject()
+            val store = JSONObject()
+            val profile = JSONObject()
+            //        Morning / 6:00–10:59
+            //        Afternoon / 11:00–16:59
+            //        Evening / 17:00–21:59
+            //        Night / 22:00–5:59
+            try {
+                json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1))
+                json.put("store", store)
+                profile.put("dia", Constants.defaultDIA)
+                val carbratios = JSONArray()
+                carbratios.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR))
+                carbratios.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR))
+                carbratios.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR))
+                carbratios.put(JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR))
+                carbratios.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR))
+                profile.put("carbratio", carbratios)
+                val sens = JSONArray()
+                sens.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF))
+                sens.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF))
+                sens.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCF))
+                sens.put(JSONObject().put("time", "17:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCF))
+                sens.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCF))
+                profile.put("sens", sens)
+                val basals = JSONArray()
+                val basalValues = if (basal48Enable) 48 else 24
+                val basalIncrement = if (basal48Enable) 30 * 60 else 60 * 60
+                for (h in 0 until basalValues) {
+                    var time: String
+                    val df = DecimalFormat("00")
+                    time = if (basal48Enable) {
+                        df.format(h.toLong() / 2) + ":" + df.format(30 * (h % 2).toLong())
+                    } else {
+                        df.format(h.toLong()) + ":00"
+                    }
+                    basals.put(JSONObject().put("time", time).put("timeAsSeconds", h * basalIncrement).put("value", it[activeProfile][h]))
+                }
+                profile.put("basal", basals)
+                profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)))
+                profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)))
+                profile.put("units", if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL)
+                store.put(PROFILE_PREFIX + (activeProfile + 1), profile)
+            } catch (e: JSONException) {
+                aapsLogger.error("Unhandled exception", e)
+            } catch (e: Exception) {
+                return null
+            }
+            return ProfileStore(injector, json)
+        }
+        return null
+    }
+
+    fun buildDanaRProfileRecord(nsProfile: Profile): Array<Double> {
+        val record = Array(24) { 0.0 }
+        for (hour in 0..23) {
+            //Some values get truncated to the next lower one.
+            // -> round them to two decimals and make sure we are a small delta larger (that will get truncated)
+            val value = Math.round(100.0 * nsProfile.getBasalTimeFromMidnight((hour * 60 * 60))) / 100.0 + 0.00001
+            aapsLogger.debug(LTag.PUMP, "NS basal value for $hour:00 is $value")
+            record[hour] = value
+        }
+        return record
+    }
+
+    val isPasswordOK: Boolean
+        get() = !(password != -1 && password != sp.getInt(R.string.key_danar_password, -1))
+
+    fun reset() {
+        aapsLogger.debug(LTag.PUMP, "DanaRPump reset")
+        lastConnection = 0
+    }
+
+    companion object {
+        const val UNITS_MGDL = 0
+        const val UNITS_MMOL = 1
+        const val DELIVERY_PRIME = 0x01
+        const val DELIVERY_STEP_BOLUS = 0x02
+        const val DELIVERY_BASAL = 0x04
+        const val DELIVERY_EXT_BOLUS = 0x08
+        const val PROFILE_PREFIX = "DanaR-"
+
+        // v2 history entries
+        const val TEMPSTART = 1
+        const val TEMPSTOP = 2
+        const val EXTENDEDSTART = 3
+        const val EXTENDEDSTOP = 4
+        const val BOLUS = 5
+        const val DUALBOLUS = 6
+        const val DUALEXTENDEDSTART = 7
+        const val DUALEXTENDEDSTOP = 8
+        const val SUSPENDON = 9
+        const val SUSPENDOFF = 10
+        const val REFILL = 11
+        const val PRIME = 12
+        const val PROFILECHANGE = 13
+        const val CARBS = 14
+        const val PRIMECANNULA = 15
+        const val DOMESTIC_MODEL = 0x01
+        const val EXPORT_MODEL = 0x03
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
index 782ec42eed..652ecf88b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
@@ -11,6 +11,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableBase;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.utils.CRC;
  * Created by mike on 17.07.2016.
  */
 public class SerialIOThread extends AbstractSerialIOThread {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private InputStream mInputStream = null;
     private OutputStream mOutputStream = null;
@@ -31,10 +32,12 @@ public class SerialIOThread extends AbstractSerialIOThread {
 
     private MessageBase processedMessage;
     private MessageHashTableBase hashTable;
+    private DanaRPump danaRPump;
 
-    public SerialIOThread(BluetoothSocket rfcommSocket, MessageHashTableBase hashTable) {
+    public SerialIOThread(BluetoothSocket rfcommSocket, MessageHashTableBase hashTable, DanaRPump danaRPump) {
         super();
         this.hashTable = hashTable;
+        this.danaRPump = danaRPump;
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -172,7 +175,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
             if (L.isEnabled(L.PUMPBTCOMM))
                 log.error("Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
-                DanaRPump.getInstance().isNewPump = false;
+                danaRPump.setNewPump(false);
                 if (L.isEnabled(L.PUMPCOMM))
                     log.debug("Old firmware detected");
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index 361f8e716e..0daed24ddb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -16,11 +16,12 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
@@ -29,14 +30,24 @@ import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.danar_historyactivity.*
-import org.slf4j.LoggerFactory
 import java.util.*
+import javax.inject.Inject
 
 class DanaRHistoryActivity : NoSplashAppCompatActivity() {
-    private val log = LoggerFactory.getLogger(L.PUMP)
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+
     private val disposable = CompositeDisposable()
 
     private var showingType = RecordTypes.RECORD_TYPE_ALARM
@@ -48,18 +59,17 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        disposable.add(toObservable(EventPumpStatusChanged::class.java)
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ danar_history_status.text = it.getStatus() }) { FabricPrivacy.logException(it) }
-        )
-        disposable.add(toObservable(EventDanaRSyncStatus::class.java)
+            .subscribe({ danar_history_status.text = it.getStatus(resourceHelper) }) { fabricPrivacy.logException(it) }
+        disposable += rxBus
+            .toObservable(EventDanaRSyncStatus::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                if (L.isEnabled(L.PUMP))
-                    log.debug("EventDanaRSyncStatus: " + it.message)
+                aapsLogger.debug(LTag.PUMP, "EventDanaRSyncStatus: " + it.message)
                 danar_history_status.text = it.message
-            }) { FabricPrivacy.logException(it) }
-        )
+            }) { fabricPrivacy.logException(it) }
     }
 
     override fun onPause() {
@@ -76,47 +86,47 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
         danar_history_recyclerview.adapter = RecyclerViewAdapter(historyList)
         danar_history_status.visibility = View.GONE
 
-        val isKorean = DanaRKoreanPlugin.getPlugin().isEnabled(PluginType.PUMP)
-        val isRS = DanaRSPlugin.getPlugin().isEnabled(PluginType.PUMP)
+        val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
+        val isRS = danaRSPlugin.isEnabled(PluginType.PUMP)
 
         // Types
         val typeList = ArrayList<TypeList>()
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, MainApp.gs(R.string.danar_history_alarm)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, MainApp.gs(R.string.danar_history_basalhours)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, MainApp.gs(R.string.danar_history_bolus)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_CARBO, MainApp.gs(R.string.danar_history_carbohydrates)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, MainApp.gs(R.string.danar_history_dailyinsulin)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, MainApp.gs(R.string.danar_history_glucose)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, resourceHelper.gs(R.string.danar_history_alarm)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, resourceHelper.gs(R.string.danar_history_basalhours)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, resourceHelper.gs(R.string.danar_history_bolus)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_CARBO, resourceHelper.gs(R.string.danar_history_carbohydrates)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, resourceHelper.gs(R.string.danar_history_dailyinsulin)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, resourceHelper.gs(R.string.danar_history_glucose)))
         if (!isKorean && !isRS) {
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_ERROR, MainApp.gs(R.string.danar_history_errors)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_ERROR, resourceHelper.gs(R.string.danar_history_errors)))
         }
-        if (isRS) typeList.add(TypeList(RecordTypes.RECORD_TYPE_PRIME, MainApp.gs(R.string.danar_history_prime)))
+        if (isRS) typeList.add(TypeList(RecordTypes.RECORD_TYPE_PRIME, resourceHelper.gs(R.string.danar_history_prime)))
         if (!isKorean) {
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, MainApp.gs(R.string.danar_history_refill)))
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, MainApp.gs(R.string.danar_history_syspend)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, resourceHelper.gs(R.string.danar_history_refill)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, resourceHelper.gs(R.string.danar_history_syspend)))
         }
         danar_history_spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
 
         danar_history_reload.setOnClickListener {
             val selected = danar_history_spinner.selectedItem as TypeList
             runOnUiThread {
-                danar_history_reload.visibility = View.GONE
-                danar_history_status.visibility = View.VISIBLE
+                danar_history_reload?.visibility = View.GONE
+                danar_history_status?.visibility = View.VISIBLE
             }
             clearCardView()
-            ConfigBuilderPlugin.getPlugin().commandQueue.loadHistory(selected.type, object : Callback() {
+            commandQueue.loadHistory(selected.type, object : Callback() {
                 override fun run() {
                     loadDataFromDB(selected.type)
                     runOnUiThread {
-                        danar_history_reload.visibility = View.VISIBLE
-                        danar_history_status.visibility = View.GONE
+                        danar_history_reload?.visibility = View.VISIBLE
+                        danar_history_status?.visibility = View.GONE
                     }
                 }
             })
         }
         danar_history_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
-                val selected = danar_history_spinner.selectedItem as TypeList
+                val selected = danar_history_spinner?.selectedItem as TypeList? ?: return
                 loadDataFromDB(selected.type)
                 showingType = selected.type
             }
@@ -165,9 +175,9 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                 }
 
                 RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                              -> {
-                    holder.dailyBasal.text = MainApp.gs(R.string.formatinsulinunits, record.recordDailyBasal)
-                    holder.dailyBolus.text = MainApp.gs(R.string.formatinsulinunits, record.recordDailyBolus)
-                    holder.dailyTotal.text = MainApp.gs(R.string.formatinsulinunits, record.recordDailyBolus + record.recordDailyBasal)
+                    holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBasal)
+                    holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus)
+                    holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus + record.recordDailyBasal)
                     holder.time.text = DateUtil.dateString(record.recordDate)
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.GONE
@@ -181,7 +191,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                 }
 
                 RecordTypes.RECORD_TYPE_GLUCOSE                                                                                                                                                            -> {
-                    holder.value.text = Profile.toUnitsString(record.recordValue, record.recordValue * Constants.MGDL_TO_MMOLL, ProfileFunctions.getSystemUnits())
+                    holder.value.text = Profile.toUnitsString(record.recordValue, record.recordValue * Constants.MGDL_TO_MMOLL, profileFunction.getUnits())
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
                     holder.stringValue.visibility = View.GONE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
deleted file mode 100644
index bf6f80af0b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.activities;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.DanaRHistoryRecord;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-
-/**
- * Created by mike on 20.07.2016.
- */
-
-public class DanaRNSHistorySync {
-    private static Logger log = LoggerFactory.getLogger(L.PUMP);
-    private List<DanaRHistoryRecord> historyRecords;
-
-    private final static int SYNC_BOLUS = 0b00000001;
-    private final static int SYNC_ERROR = 0b00000010;
-    private final static int SYNC_REFILL = 0b00000100;
-    private final static int SYNC_GLUCOSE = 0b00001000;
-    private final static int SYNC_CARBO = 0b00010000;
-    private final static int SYNC_ALARM = 0b00100000;
-    private final static int SYNC_BASALHOURS = 0b01000000;
-    public final static int SYNC_ALL = 0b11111111;
-
-    public final static String DANARSIGNATURE = "DANARMESSAGE";
-
-    public DanaRNSHistorySync(List<DanaRHistoryRecord> historyRecords) {
-        this.historyRecords = historyRecords;
-    }
-
-
-    public void sync(int what) {
-        try {
-            Calendar cal = Calendar.getInstance();
-            long records = historyRecords.size();
-            long processing = 0;
-            long uploaded = 0;
-            if (L.isEnabled(L.PUMP))
-                log.debug("Database contains " + records + " records");
-            EventDanaRSyncStatus ev = new EventDanaRSyncStatus("");
-            for (DanaRHistoryRecord record : historyRecords) {
-                processing++;
-                if (record._id != null) continue;
-                //log.debug(record.bytes);
-                JSONObject nsrec = new JSONObject();
-                ev.setMessage(MainApp.gs(R.string.uploading) + " " + processing + "/" + records + " "); // TODO: translations
-                switch (record.recordCode) {
-                    case RecordTypes.RECORD_TYPE_BOLUS:
-                        if ((what & SYNC_BOLUS) == 0) break;
-                        switch (record.bolusType) {
-                            case "S":
-                                if (L.isEnabled(L.PUMP))
-                                    log.debug("Syncing standard bolus record " + record.recordValue + "U " + DateUtil.toISOString(record.recordDate));
-                                nsrec.put(DANARSIGNATURE, record.bytes);
-                                nsrec.put("eventType", "Meal Bolus");
-                                nsrec.put("insulin", record.recordValue);
-                                nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                                nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                                NSUpload.uploadCareportalEntryToNS(nsrec);
-                                uploaded++;
-                                ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_sbolus));
-                                break;
-                            case "E":
-                                if (record.recordDuration > 0) {
-                                    if (L.isEnabled(L.PUMP))
-                                        log.debug("Syncing extended bolus record " + record.recordValue + "U " + DateUtil.toISOString(record.recordDate));
-                                    nsrec.put(DANARSIGNATURE, record.bytes);
-                                    nsrec.put("eventType", CareportalEvent.COMBOBOLUS);
-                                    nsrec.put("insulin", 0);
-                                    nsrec.put("duration", record.recordDuration);
-                                    nsrec.put("relative", record.recordValue / record.recordDuration * 60);
-                                    nsrec.put("splitNow", 0);
-                                    nsrec.put("splitExt", 100);
-                                    cal.setTimeInMillis(record.recordDate);
-                                    cal.add(Calendar.MINUTE, -1 * record.recordDuration);
-                                    nsrec.put("created_at", DateUtil.toISOString(cal.getTime()));
-                                    nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                                    NSUpload.uploadCareportalEntryToNS(nsrec);
-                                    uploaded++;
-                                    ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_ebolus));
-                                } else {
-                                    if (L.isEnabled(L.PUMP))
-                                        log.debug("NOT Syncing extended bolus record " + record.recordValue + "U " + DateUtil.toISOString(record.recordDate) + " zero duration");
-                                }
-                                break;
-                            case "DS":
-                                if (L.isEnabled(L.PUMP))
-                                    log.debug("Syncing dual(S) bolus record " + record.recordValue + "U " + DateUtil.toISOString(record.recordDate));
-                                nsrec.put(DANARSIGNATURE, record.bytes);
-                                nsrec.put("eventType", CareportalEvent.COMBOBOLUS);
-                                nsrec.put("insulin", record.recordValue);
-                                nsrec.put("splitNow", 100);
-                                nsrec.put("splitExt", 0);
-                                nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                                nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                                NSUpload.uploadCareportalEntryToNS(nsrec);
-                                uploaded++;
-                                ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_dsbolus));
-                                break;
-                            case "DE":
-                                if (L.isEnabled(L.PUMP))
-                                    log.debug("Syncing dual(E) bolus record " + record.recordValue + "U " + DateUtil.toISOString(record.recordDate));
-                                nsrec.put(DANARSIGNATURE, record.bytes);
-                                nsrec.put("eventType", CareportalEvent.COMBOBOLUS);
-                                nsrec.put("duration", record.recordDuration);
-                                nsrec.put("relative", record.recordValue / record.recordDuration * 60);
-                                nsrec.put("splitNow", 0);
-                                nsrec.put("splitExt", 100);
-                                cal.setTimeInMillis(record.recordDate);
-                                cal.add(Calendar.MINUTE, -1 * record.recordDuration);
-                                nsrec.put("created_at", DateUtil.toISOString(cal.getTime()));
-                                nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                                NSUpload.uploadCareportalEntryToNS(nsrec);
-                                uploaded++;
-                                ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_debolus));
-                                break;
-                            default:
-                                log.error("Unknown bolus record");
-                                break;
-                        }
-                        break;
-                    case RecordTypes.RECORD_TYPE_ERROR:
-                        if ((what & SYNC_ERROR) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing error record " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", "Note");
-                        nsrec.put("notes", "Error");
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_error));
-                        break;
-                    case RecordTypes.RECORD_TYPE_REFILL:
-                        if ((what & SYNC_REFILL) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing refill record " + record.recordValue + " " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", "Insulin Change");
-                        nsrec.put("notes", "Refill " + record.recordValue + "U");
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_refill));
-                        break;
-                    case RecordTypes.RECORD_TYPE_BASALHOUR:
-                        if ((what & SYNC_BASALHOURS) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing basal hour record " + record.recordValue + " " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", CareportalEvent.TEMPBASAL);
-                        nsrec.put("absolute", record.recordValue);
-                        nsrec.put("duration", 60);
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_basalhour));
-                        break;
-                    case RecordTypes.RECORD_TYPE_TB:
-                        //log.debug("Ignoring TB record " + record.bytes + " " + DateUtil.toISOString(record.recordDate));
-                        break;
-                    case RecordTypes.RECORD_TYPE_GLUCOSE:
-                        if ((what & SYNC_GLUCOSE) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing glucose record " + record.recordValue + " " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", "BG Check");
-                        nsrec.put("glucose", Profile.fromMgdlToUnits(record.recordValue, ProfileFunctions.getSystemUnits()));
-                        nsrec.put("glucoseType", "Finger");
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_glucose));
-                        break;
-                    case RecordTypes.RECORD_TYPE_CARBO:
-                        if ((what & SYNC_CARBO) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing carbo record " + record.recordValue + "g " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", "Meal Bolus");
-                        nsrec.put("carbs", record.recordValue);
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_carbohydrate));
-                        break;
-                    case RecordTypes.RECORD_TYPE_ALARM:
-                        if ((what & SYNC_ALARM) == 0) break;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("Syncing alarm record " + record.recordAlarm + " " + DateUtil.toISOString(record.recordDate));
-                        nsrec.put(DANARSIGNATURE, record.bytes);
-                        nsrec.put("eventType", "Note");
-                        nsrec.put("notes", "Alarm: " + record.recordAlarm);
-                        nsrec.put("created_at", DateUtil.toISOString(record.recordDate));
-                        nsrec.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                        NSUpload.uploadCareportalEntryToNS(nsrec);
-                        uploaded++;
-                        ev.setMessage(ev.getMessage() + MainApp.gs(R.string.danar_alarm));
-                        break;
-                    case RecordTypes.RECORD_TYPE_SUSPEND: // TODO: this too
-                    case RecordTypes.RECORD_TYPE_DAILY:
-                    case RecordTypes.RECORD_TYPE_PRIME:
-                        // Ignore
-                        break;
-                    default:
-                        log.error("Unknown record type");
-                        break;
-                }
-                RxBus.INSTANCE.send(ev);
-            }
-            ev.setMessage(String.format(MainApp.gs(R.string.danar_totaluploaded), uploaded));
-            RxBus.INSTANCE.send(ev);
-
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
index a3a6c3c083..0c6a73a267 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
@@ -8,42 +8,55 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.danar_user_options_activity.*
-import org.slf4j.LoggerFactory
 import java.text.DecimalFormat
+import javax.inject.Inject
 import kotlin.math.max
 import kotlin.math.min
 
 class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
-
-    private val log = LoggerFactory.getLogger(L.PUMP)
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var danaRPlugin: DanaRPlugin
+    @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var commandQueue: CommandQueueProvider
 
     private val disposable = CompositeDisposable()
 
     // This is for Dana pumps only
-    private var isRS = DanaRSPlugin.getPlugin().isEnabled(PluginType.PUMP)
-    private var isDanaR = DanaRPlugin.getPlugin().isEnabled(PluginType.PUMP)
-    private var isDanaRv2 = DanaRv2Plugin.getPlugin().isEnabled(PluginType.PUMP)
+    private fun isRS() = danaRSPlugin.isEnabled(PluginType.PUMP)
+
+    private fun isDanaR() = danaRPlugin.isEnabled(PluginType.PUMP)
+    private fun isDanaRv2() = danaRv2Plugin.isEnabled(PluginType.PUMP)
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(toObservable(EventInitializationChanged::class.java)
+        disposable += rxBus
+            .toObservable(EventInitializationChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ setData() }) { FabricPrivacy.logException(it) }
-        )
+            .subscribe({ setData() }) { fabricPrivacy.logException(it) }
     }
 
     @Synchronized
@@ -57,23 +70,23 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
         setContentView(R.layout.danar_user_options_activity)
 
         save_user_options.setOnClickListener { onSaveClick() }
-        val pump = DanaRPump.getInstance()
 
         if (L.isEnabled(L.PUMP))
-            log.debug("UserOptionsLoaded:" + (System.currentTimeMillis() - pump.lastConnection) / 1000 + " s ago"
-                + "\ntimeDisplayType:" + pump.timeDisplayType
-                + "\nbuttonScroll:" + pump.buttonScrollOnOff
-                + "\ntimeDisplayType:" + pump.timeDisplayType
-                + "\nlcdOnTimeSec:" + pump.lcdOnTimeSec
-                + "\nbackLight:" + pump.backlightOnTimeSec
-                + "\npumpUnits:" + pump.units
-                + "\nlowReservoir:" + pump.lowReservoirRate)
+            aapsLogger.debug(LTag.PUMP,
+                "UserOptionsLoaded:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
+                    + "\ntimeDisplayType:" + danaRPump.timeDisplayType
+                    + "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
+                    + "\ntimeDisplayType:" + danaRPump.timeDisplayType
+                    + "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
+                    + "\nbackLight:" + danaRPump.backlightOnTimeSec
+                    + "\npumpUnits:" + danaRPump.units
+                    + "\nlowReservoir:" + danaRPump.lowReservoirRate)
 
-        danar_screentimeout.setParams(pump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
-        danar_backlight.setParams(pump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
-        danar_shutdown.setParams(pump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
-        danar_lowreservoir.setParams(pump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
-        when (pump.beepAndAlarm) {
+        danar_screentimeout.setParams(danaRPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
+        danar_backlight.setParams(danaRPump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
+        danar_shutdown.setParams(danaRPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
+        danar_lowreservoir.setParams(danaRPump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
+        when (danaRPump.beepAndAlarm) {
             0x01  -> danar_pumpalarm_sound.isChecked = true
             0x02  -> danar_pumpalarm_vibrate.isChecked = true
             0x11  -> danar_pumpalarm_both.isChecked = true
@@ -93,64 +106,61 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
                 danar_beep.isChecked = true
             }
         }
-        if (pump.lastSettingsRead == 0L)
-            log.error("No settings loaded from pump!") else setData()
+        if (danaRPump.lastSettingsRead == 0L)
+            aapsLogger.error(LTag.PUMP, "No settings loaded from pump!") else setData()
     }
 
     fun setData() {
-        val pump = DanaRPump.getInstance()
         // in DanaRS timeDisplay values are reversed
-        danar_timeformat.isChecked = !isRS && pump.timeDisplayType != 0 || isRS && pump.timeDisplayType == 0
-        danar_buttonscroll.isChecked = pump.buttonScrollOnOff != 0
-        danar_beep.isChecked = pump.beepAndAlarm > 4
-        danar_screentimeout.value = pump.lcdOnTimeSec.toDouble()
-        danar_backlight.value = pump.backlightOnTimeSec.toDouble()
-        danar_units.isChecked = pump.getUnits() == Constants.MMOL
-        danar_shutdown.value = pump.shutdownHour.toDouble()
-        danar_lowreservoir.value = pump.lowReservoirRate.toDouble()
+        danar_timeformat.isChecked = !isRS() && danaRPump.timeDisplayType != 0 || isRS() && danaRPump.timeDisplayType == 0
+        danar_buttonscroll.isChecked = danaRPump.buttonScrollOnOff != 0
+        danar_beep.isChecked = danaRPump.beepAndAlarm > 4
+        danar_screentimeout.value = danaRPump.lcdOnTimeSec.toDouble()
+        danar_backlight.value = danaRPump.backlightOnTimeSec.toDouble()
+        danar_units.isChecked = danaRPump.getUnits() == Constants.MMOL
+        danar_shutdown.value = danaRPump.shutdownHour.toDouble()
+        danar_lowreservoir.value = danaRPump.lowReservoirRate.toDouble()
     }
 
     private fun onSaveClick() {
         //exit if pump is not DanaRS, DanaR, or DanaR with upgraded firmware
-        if (!isRS && !isDanaR && !isDanaRv2) return
+        if (!isRS() && !isDanaR() && !isDanaRv2()) return
 
-        val pump = DanaRPump.getInstance()
-
-        if (isRS) // displayTime on RS is reversed
-            pump.timeDisplayType = if (danar_timeformat.isChecked) 0 else 1
+        if (isRS()) // displayTime on RS is reversed
+            danaRPump.timeDisplayType = if (danar_timeformat.isChecked) 0 else 1
         else
-            pump.timeDisplayType = if (danar_timeformat.isChecked) 1 else 0
+            danaRPump.timeDisplayType = if (danar_timeformat.isChecked) 1 else 0
 
-        pump.buttonScrollOnOff = if (danar_buttonscroll.isChecked) 1 else 0
-        pump.beepAndAlarm = when {
+        danaRPump.buttonScrollOnOff = if (danar_buttonscroll.isChecked) 1 else 0
+        danaRPump.beepAndAlarm = when {
             danar_pumpalarm_sound.isChecked   -> 1
             danar_pumpalarm_vibrate.isChecked -> 2
             danar_pumpalarm_both.isChecked    -> 3
             else                              -> 1
         }
-        if (danar_beep.isChecked) pump.beepAndAlarm += 4
+        if (danar_beep.isChecked) danaRPump.beepAndAlarm += 4
 
         // step is 5 seconds, 5 to 240
-        pump.lcdOnTimeSec = min(max(danar_screentimeout.value.toInt() / 5 * 5, 5), 240)
+        danaRPump.lcdOnTimeSec = min(max(danar_screentimeout.value.toInt() / 5 * 5, 5), 240)
         // 1 to 60
-        pump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), 1), 60)
+        danaRPump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), 1), 60)
 
-        pump.units = if (danar_units.isChecked) 1 else 0
+        danaRPump.units = if (danar_units.isChecked) 1 else 0
 
-        pump.shutdownHour = min(danar_shutdown.value.toInt(),24)
+        danaRPump.shutdownHour = min(danar_shutdown.value.toInt(), 24)
 
         // 10 to 50
-        pump.lowReservoirRate = min(max(danar_lowreservoir.value.toInt() * 10 / 10, 10), 50)
+        danaRPump.lowReservoirRate = min(max(danar_lowreservoir.value.toInt() * 10 / 10, 10), 50)
 
-        ConfigBuilderPlugin.getPlugin().commandQueue.setUserOptions(object : Callback() {
+        commandQueue.setUserOptions(object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
+                    val i = Intent(mainApp, ErrorHelperActivity::class.java)
                     i.putExtra("soundid", R.raw.boluserror)
                     i.putExtra("status", result.comment)
-                    i.putExtra("title", MainApp.gs(R.string.pumperror))
+                    i.putExtra("title", resourceHelper.gs(R.string.pumperror))
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    MainApp.instance().startActivity(i)
+                    mainApp.startActivity(i)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
index bf2ca4b83b..f52d62d9c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
@@ -13,6 +13,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.CRC;
 
 /*
@@ -22,8 +23,8 @@ import info.nightscout.androidaps.utils.CRC;
  */
 
 public class MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    protected byte[] buffer = new byte[512];
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
+    public byte[] buffer = new byte[512];
     private int position = 6;
 
     public boolean received = false;
@@ -91,7 +92,7 @@ public class MessageBase {
     }
 
     public String getMessageName() {
-        return MessageOriginalNames.getName(getCommand());
+        return MessageOriginalNames.INSTANCE.getName(getCommand());
     }
 
     public void handleMessage(byte[] bytes) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
index 6d3129f5ba..22c27a9c5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
@@ -1,62 +1,91 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageHashTableR @Inject constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    constraintChecker: ConstraintChecker,
+    danaRPump: DanaRPump,
+    danaRPlugin: DanaRPlugin,
+    danaRKoreanPlugin: DanaRKoreanPlugin,
+    configBuilderPlugin: ConfigBuilderPlugin,
+    commandQueue: CommandQueueProvider,
+    activePlugin: ActivePluginProvider
+) : MessageHashTableBase {
 
-object MessageHashTableR : MessageHashTableBase {
     var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed())       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal())           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended())       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic())               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus())                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime())        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic())       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption())      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError())              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill())             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend())            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour())          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone())               // 0x31F1 CMD_HISTORY_DONT_USED
-        put(MsgSettingBasal())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions())        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile())      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll())   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile())           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions())            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile())   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone())            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue())                // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
+        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))
+        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))
+        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))
+        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgCheckValue(aapsLogger, danaRPump, danaRPlugin))
     }
 
     override fun put(message: MessageBase) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
deleted file mode 100644
index 2cba96f838..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MessageOriginalNames {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private static HashMap<Integer, String> messageNames;
-
-    static {
-        messageNames = new HashMap<>();
-
-        messageNames.put(0x3001, "CMD_CONNECT");
-        messageNames.put(0x3002, "CMD_DISCONNECT");
-
-        messageNames.put(0x3101, "CMD_HISTORY_MEAL_INS");
-        messageNames.put(0x3102, "CMD_HISTORY_DAY_INS");
-        messageNames.put(0x3103, "CMD_HISTORY_AIR_SUB");
-        messageNames.put(0x3104, "CMD_HISTORY_GLUCOSE");
-        messageNames.put(0x3105, "CMD_HISTORY_ALARM");
-        messageNames.put(0x3106, "CMD_HISTORY_ERROR");
-        messageNames.put(0x3107, "CMD_HISTORY_CARBOHY");
-        messageNames.put(0x3108, "CMD_HISTORY_REFILL");
-        messageNames.put(0x3109, "CMD_HISTORY_SUSPEND");
-        messageNames.put(0x310a, "CMD_HISTORY_BASAL_HOUR");
-        messageNames.put(0x310b, "CMD_HISTORY_TB");
-        messageNames.put(0x31f1, "CMD_HISTORY_STOP");
-        messageNames.put(0x31f2, "CMD_HISTORY_LAST_T_R");
-        messageNames.put(0x31f3, "CMD_HISTORY_LAST_T_S");
-
-        messageNames.put(0x0501, "CMD_HISPAGE_MEAL_INS");
-        messageNames.put(0x0502, "CMD_HISPAGE_DAY_INS");
-        messageNames.put(0x0503, "CMD_HISPAGE_AIR_SUB");
-        messageNames.put(0x0504, "CMD_HISPAGE_GLUCOSE");
-        messageNames.put(0x0505, "CMD_HISPAGE_ALARM");
-        messageNames.put(0x0506, "CMD_HISPAGE_ERROR");
-        messageNames.put(0x0507, "CMD_HISPAGE_CARBOHY");
-        messageNames.put(0x0508, "CMD_HISPAGE_REFILL");
-        messageNames.put(0x050a, "CMD_HISPAGE_DAILTY_PRE_DATA");
-        messageNames.put(0x050b, "CMD_HISPAGE_BOLUS_AVG");
-        messageNames.put(0x050c, "CMD_HISPAGE_BASAL_RECORD");
-        messageNames.put(0x050d, "CMD_HISPAGE_TB");
-
-        messageNames.put(0x3201, "CMD_SETTING_V_MEAL_INS_I");
-        messageNames.put(0x3202, "CMD_SETTING_V_BASAL_INS_I");
-        messageNames.put(0x3203, "CMD_SETTING_V_MEAL_SETTING_I");
-        messageNames.put(0x3204, "CMD_SETTING_V_CCC_I");
-        messageNames.put(0x3205, "CMD_SETTING_V_MAX_VALUE_I");
-        messageNames.put(0x3206, "CMD_SETTING_V_BASAL_PROFILE_ALL");
-        messageNames.put(0x3207, "CMD_SETTING_V_SHIPPING_I");
-        messageNames.put(0x3208, "CMD_SETTING_V_CLOGGIN_SENS_I");
-        messageNames.put(0x3209, "CMD_SETTING_V_GLUCOSEandEASY");
-        messageNames.put(0x320a, "CMD_SETTING_V_TIME_I");
-        messageNames.put(0x320b, "CMD_SETTING_V_USER_OPTIONS");
-        messageNames.put(0x320c, "CMD_SETTING_V_PROFILE_NUMBER");
-        messageNames.put(0x320d, "CMD_SETTING_V_CIR_CF_VALUE");
-
-        messageNames.put(0x3301, "CMD_SETTING_MEAL_INS_S");
-        messageNames.put(0x3302, "CMD_SETTING_BASAL_INS_S");
-        messageNames.put(0x3303, "CMD_SETTING_MEAL_SETTING_S");
-        messageNames.put(0x3304, "CMD_SETTING_CCC_S");
-        messageNames.put(0x3305, "CMD_SETTING_MAX_VALUE_S");
-        messageNames.put(0x3306, "CMD_SETTING_BASAL_PROFILE_S");
-        messageNames.put(0x3307, "CMD_SETTING_SHIPPING_S");
-        messageNames.put(0x3308, "CMD_SETTING_CLOGGIN_SENS_S");
-        messageNames.put(0x3309, "CMD_SETTING_GLUCOSEandEASY_S");
-        messageNames.put(0x330a, "CMD_SETTING_TIME_S");
-        messageNames.put(0x330b, "CMD_SETTING_USER_OPTIONS_S");
-        messageNames.put(0x330c, "CMD_SETTING_PROFILE_NUMBER_S");
-        messageNames.put(0x330d, "CMD_SETTING_CIR_CF_VALUE_S");
-
-        messageNames.put(0x0101, "CMD_MEALINS_STOP");
-        messageNames.put(0x0102, "CMD_MEALINS_START_DATA");
-        messageNames.put(0x0103, "CMD_MEALINS_START_NODATA");
-        messageNames.put(0x0104, "CMD_MEALINS_START_DATA_SPEED");
-        messageNames.put(0x0105, "CMD_MEALINS_START_NODATA_SPEED");
-
-        messageNames.put(0x0201, "CMD_PUMP_ACT_INS_VALUE");
-        messageNames.put(0x0202, "CMD_PUMP_THIS_REMAINDER_MEAL_INS");
-        messageNames.put(0x0203, "CMD_PUMP_BASE_SET");
-        messageNames.put(0x0204, "CMD_PUMP_CALCULATION_SETTING");
-        messageNames.put(0x0205, "CMD_PUMP_EXERCISE_MODE");
-        messageNames.put(0x0206, "CMD_PUMP_MEAL_INS_I");
-
-        messageNames.put(0x0207, "CMD_PUMP_EXPANS_INS_I");
-        messageNames.put(0x0208, "CMD_PUMP_EXPANS_INS_RQ");
-
-        messageNames.put(0x0209, "CMD_PUMP_DUAL_INS_RQ");
-        messageNames.put(0x020a, "CMD_PUMP_INITVIEW_I");
-        messageNames.put(0x020b, "CMD_PUMP_STATUS");
-        messageNames.put(0x020c, "CMD_PUMP_CAR_N_CIR");
-
-        messageNames.put(0x0301, "CMD_PUMPINIT_TIME_INFO");
-        messageNames.put(0x0302, "CMD_PUMPINIT_BOLUS_INFO");
-        messageNames.put(0x0303, "CMD_PUMPINIT_INIT_INFO");
-        messageNames.put(0x0304, "CMD_PUMPINIT_OPTION");
-
-        messageNames.put(0x0401, "CMD_PUMPSET_EXERCISE_S");
-        messageNames.put(0x0402, "CMD_PUMPSET_HIS_S");
-        messageNames.put(0x0403, "CMD_PUMPSET_EXERCISE_STOP");
-
-        messageNames.put(0x0404, "CMD_PUMPSET_PAUSE");
-        messageNames.put(0x0405, "CMD_PUMPSET_PAUSE_STOP");
-
-        messageNames.put(0x0406, "CMD_PUMPSET_EXPANS_INS_STOP");
-        messageNames.put(0x0407, "CMD_PUMPSET_EXPANS_INS_S");
-
-        messageNames.put(0x0408, "CMD_PUMPSET_DUAL_S");
-        messageNames.put(0x0409, "CMD_PUMPSET_EASY_OFF");
-
-
-        messageNames.put(0x0601, "CMD_PUMPOWAY_SYSTEM_STATUS");
-        messageNames.put(0x0602, "CMD_PUMPOWAY_GLUCOSE_ALARM");
-        messageNames.put(0x0603, "CMD_PUMPOWAY_LOW_INSULIN_ALARM");
-        messageNames.put(0x0610, "CMD_PUMP_ALARM_TIEOUT");
-
-        messageNames.put(0x0701, "CMD_MSGRECEP_TAKE_SUGAR");
-        messageNames.put(0x0702, "CMD_MSGRECEP_GO_TO_DOCTOR");
-        messageNames.put(0x0703, "CMD_MSGRECEP_CALL_TO_CAREGIVER");
-        messageNames.put(0x0704, "CMD_MSGRECEP_CHECK_GLUCOSE_AGAIN");
-        messageNames.put(0x0705, "CMD_MSGRECEP_CALL_TO_HOME");
-        messageNames.put(0x0706, "CMD_MSGRECEP_DO_DELIVER");
-
-        messageNames.put(0x0801, "CMD_MSGSEND_YES_I_DO");
-        messageNames.put(0x0802, "CMD_MSGSEND_NO_I_CANNOT");
-        messageNames.put(0x0803, "CMD_MSGSEND_CALL_TO_ME_MOM");
-        messageNames.put(0x0804, "CMD_MSGSEND_DO_NOT_INFUSE");
-
-        messageNames.put(0x0901, "CMD_FILL_REFILL_COUNT");
-        messageNames.put(0x0902, "CMD_FILL_PRIME_CHECK");
-        messageNames.put(0x0903, "CMD_FILL_PRIME_END");
-        messageNames.put(0x0904, "CMD_FILL_PRIME_STOP");
-        messageNames.put(0x0905, "CMD_FILL_PRIME_PAUSE");
-        messageNames.put(0x0906, "CMD_FILL_PRIME_RATE");
-
-        messageNames.put(0x41f2, "CMD_HISTORY_ALL");
-        messageNames.put(0x42f2, "CMD_HISTORY_NEW");
-
-        messageNames.put(0x41f1, "CMD_HISTORY_ALL_DONE");
-        messageNames.put(0x42f1, "CMD_HISTORY_NEW_DONE");
-
-        messageNames.put(0xF0F1, "CMD_PUMP_CHECK_VALUE");
-        messageNames.put(0xF0F2, "CMD_PUMP_TIMECHANGE_CHECK");
-        messageNames.put(0xF0F3, "CMD_PUMP_TIMECHANGE_CLEAR");
-        messageNames.put(0x43F2, "CMD_HISTORY_DATEOVER_ALL");
-        messageNames.put(0x4300, "CMD_HISTORY_DATEOVER_DONE");
-
-        messageNames.put(0xE001, "CMD_PUMPSTATUS_APS");
-        messageNames.put(0xE002, "CMD_PUMPSET_APSTEMP");
-        messageNames.put(0xE003, "CMD_GET_HISTORY");
-        messageNames.put(0xE004, "CMD_SET_HISTORY_ENTRY");
-    }
-
-
-    public static String getName(Integer command) {
-        if (messageNames.containsKey(command))
-            return messageNames.get(command);
-        else {
-            log.error("Unknown command: " + String.format("%04X", command));
-            return "UNKNOWN_COMMAND";
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt
new file mode 100644
index 0000000000..dd3dd75512
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt
@@ -0,0 +1,135 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import java.util.*
+
+object MessageOriginalNames {
+
+    private var messageNames: HashMap<Int, String> = HashMap()
+
+    fun getName(command: Int): String? {
+        return if (messageNames.containsKey(command))
+            messageNames[command]
+        else
+            throw IllegalStateException("Unknown command: " + String.format("%04X", command))
+    }
+
+    init {
+        messageNames[0x3001] = "CMD_CONNECT"
+        messageNames[0x3002] = "CMD_DISCONNECT"
+        messageNames[0x3101] = "CMD_HISTORY_MEAL_INS"
+        messageNames[0x3102] = "CMD_HISTORY_DAY_INS"
+        messageNames[0x3103] = "CMD_HISTORY_AIR_SUB"
+        messageNames[0x3104] = "CMD_HISTORY_GLUCOSE"
+        messageNames[0x3105] = "CMD_HISTORY_ALARM"
+        messageNames[0x3106] = "CMD_HISTORY_ERROR"
+        messageNames[0x3107] = "CMD_HISTORY_CARBOHY"
+        messageNames[0x3108] = "CMD_HISTORY_REFILL"
+        messageNames[0x3109] = "CMD_HISTORY_SUSPEND"
+        messageNames[0x310a] = "CMD_HISTORY_BASAL_HOUR"
+        messageNames[0x310b] = "CMD_HISTORY_TB"
+        messageNames[0x31f1] = "CMD_HISTORY_STOP"
+        messageNames[0x31f2] = "CMD_HISTORY_LAST_T_R"
+        messageNames[0x31f3] = "CMD_HISTORY_LAST_T_S"
+        messageNames[0x0501] = "CMD_HISPAGE_MEAL_INS"
+        messageNames[0x0502] = "CMD_HISPAGE_DAY_INS"
+        messageNames[0x0503] = "CMD_HISPAGE_AIR_SUB"
+        messageNames[0x0504] = "CMD_HISPAGE_GLUCOSE"
+        messageNames[0x0505] = "CMD_HISPAGE_ALARM"
+        messageNames[0x0506] = "CMD_HISPAGE_ERROR"
+        messageNames[0x0507] = "CMD_HISPAGE_CARBOHY"
+        messageNames[0x0508] = "CMD_HISPAGE_REFILL"
+        messageNames[0x050a] = "CMD_HISPAGE_DAILTY_PRE_DATA"
+        messageNames[0x050b] = "CMD_HISPAGE_BOLUS_AVG"
+        messageNames[0x050c] = "CMD_HISPAGE_BASAL_RECORD"
+        messageNames[0x050d] = "CMD_HISPAGE_TB"
+        messageNames[0x3201] = "CMD_SETTING_V_MEAL_INS_I"
+        messageNames[0x3202] = "CMD_SETTING_V_BASAL_INS_I"
+        messageNames[0x3203] = "CMD_SETTING_V_MEAL_SETTING_I"
+        messageNames[0x3204] = "CMD_SETTING_V_CCC_I"
+        messageNames[0x3205] = "CMD_SETTING_V_MAX_VALUE_I"
+        messageNames[0x3206] = "CMD_SETTING_V_BASAL_PROFILE_ALL"
+        messageNames[0x3207] = "CMD_SETTING_V_SHIPPING_I"
+        messageNames[0x3208] = "CMD_SETTING_V_CLOGGIN_SENS_I"
+        messageNames[0x3209] = "CMD_SETTING_V_GLUCOSEandEASY"
+        messageNames[0x320a] = "CMD_SETTING_V_TIME_I"
+        messageNames[0x320b] = "CMD_SETTING_V_USER_OPTIONS"
+        messageNames[0x320c] = "CMD_SETTING_V_PROFILE_NUMBER"
+        messageNames[0x320d] = "CMD_SETTING_V_CIR_CF_VALUE"
+        messageNames[0x3301] = "CMD_SETTING_MEAL_INS_S"
+        messageNames[0x3302] = "CMD_SETTING_BASAL_INS_S"
+        messageNames[0x3303] = "CMD_SETTING_MEAL_SETTING_S"
+        messageNames[0x3304] = "CMD_SETTING_CCC_S"
+        messageNames[0x3305] = "CMD_SETTING_MAX_VALUE_S"
+        messageNames[0x3306] = "CMD_SETTING_BASAL_PROFILE_S"
+        messageNames[0x3307] = "CMD_SETTING_SHIPPING_S"
+        messageNames[0x3308] = "CMD_SETTING_CLOGGIN_SENS_S"
+        messageNames[0x3309] = "CMD_SETTING_GLUCOSEandEASY_S"
+        messageNames[0x330a] = "CMD_SETTING_TIME_S"
+        messageNames[0x330b] = "CMD_SETTING_USER_OPTIONS_S"
+        messageNames[0x330c] = "CMD_SETTING_PROFILE_NUMBER_S"
+        messageNames[0x330d] = "CMD_SETTING_CIR_CF_VALUE_S"
+        messageNames[0x0101] = "CMD_MEALINS_STOP"
+        messageNames[0x0102] = "CMD_MEALINS_START_DATA"
+        messageNames[0x0103] = "CMD_MEALINS_START_NODATA"
+        messageNames[0x0104] = "CMD_MEALINS_START_DATA_SPEED"
+        messageNames[0x0105] = "CMD_MEALINS_START_NODATA_SPEED"
+        messageNames[0x0201] = "CMD_PUMP_ACT_INS_VALUE"
+        messageNames[0x0202] = "CMD_PUMP_THIS_REMAINDER_MEAL_INS"
+        messageNames[0x0203] = "CMD_PUMP_BASE_SET"
+        messageNames[0x0204] = "CMD_PUMP_CALCULATION_SETTING"
+        messageNames[0x0205] = "CMD_PUMP_EXERCISE_MODE"
+        messageNames[0x0206] = "CMD_PUMP_MEAL_INS_I"
+        messageNames[0x0207] = "CMD_PUMP_EXPANS_INS_I"
+        messageNames[0x0208] = "CMD_PUMP_EXPANS_INS_RQ"
+        messageNames[0x0209] = "CMD_PUMP_DUAL_INS_RQ"
+        messageNames[0x020a] = "CMD_PUMP_INITVIEW_I"
+        messageNames[0x020b] = "CMD_PUMP_STATUS"
+        messageNames[0x020c] = "CMD_PUMP_CAR_N_CIR"
+        messageNames[0x0301] = "CMD_PUMPINIT_TIME_INFO"
+        messageNames[0x0302] = "CMD_PUMPINIT_BOLUS_INFO"
+        messageNames[0x0303] = "CMD_PUMPINIT_INIT_INFO"
+        messageNames[0x0304] = "CMD_PUMPINIT_OPTION"
+        messageNames[0x0401] = "CMD_PUMPSET_EXERCISE_S"
+        messageNames[0x0402] = "CMD_PUMPSET_HIS_S"
+        messageNames[0x0403] = "CMD_PUMPSET_EXERCISE_STOP"
+        messageNames[0x0404] = "CMD_PUMPSET_PAUSE"
+        messageNames[0x0405] = "CMD_PUMPSET_PAUSE_STOP"
+        messageNames[0x0406] = "CMD_PUMPSET_EXPANS_INS_STOP"
+        messageNames[0x0407] = "CMD_PUMPSET_EXPANS_INS_S"
+        messageNames[0x0408] = "CMD_PUMPSET_DUAL_S"
+        messageNames[0x0409] = "CMD_PUMPSET_EASY_OFF"
+        messageNames[0x0601] = "CMD_PUMPOWAY_SYSTEM_STATUS"
+        messageNames[0x0602] = "CMD_PUMPOWAY_GLUCOSE_ALARM"
+        messageNames[0x0603] = "CMD_PUMPOWAY_LOW_INSULIN_ALARM"
+        messageNames[0x0610] = "CMD_PUMP_ALARM_TIEOUT"
+        messageNames[0x0701] = "CMD_MSGRECEP_TAKE_SUGAR"
+        messageNames[0x0702] = "CMD_MSGRECEP_GO_TO_DOCTOR"
+        messageNames[0x0703] = "CMD_MSGRECEP_CALL_TO_CAREGIVER"
+        messageNames[0x0704] = "CMD_MSGRECEP_CHECK_GLUCOSE_AGAIN"
+        messageNames[0x0705] = "CMD_MSGRECEP_CALL_TO_HOME"
+        messageNames[0x0706] = "CMD_MSGRECEP_DO_DELIVER"
+        messageNames[0x0801] = "CMD_MSGSEND_YES_I_DO"
+        messageNames[0x0802] = "CMD_MSGSEND_NO_I_CANNOT"
+        messageNames[0x0803] = "CMD_MSGSEND_CALL_TO_ME_MOM"
+        messageNames[0x0804] = "CMD_MSGSEND_DO_NOT_INFUSE"
+        messageNames[0x0901] = "CMD_FILL_REFILL_COUNT"
+        messageNames[0x0902] = "CMD_FILL_PRIME_CHECK"
+        messageNames[0x0903] = "CMD_FILL_PRIME_END"
+        messageNames[0x0904] = "CMD_FILL_PRIME_STOP"
+        messageNames[0x0905] = "CMD_FILL_PRIME_PAUSE"
+        messageNames[0x0906] = "CMD_FILL_PRIME_RATE"
+        messageNames[0x41f2] = "CMD_HISTORY_ALL"
+        messageNames[0x42f2] = "CMD_HISTORY_NEW"
+        messageNames[0x41f1] = "CMD_HISTORY_ALL_DONE"
+        messageNames[0x42f1] = "CMD_HISTORY_NEW_DONE"
+        messageNames[0xF0F1] = "CMD_PUMP_CHECK_VALUE"
+        messageNames[0xF0F2] = "CMD_PUMP_TIMECHANGE_CHECK"
+        messageNames[0xF0F3] = "CMD_PUMP_TIMECHANGE_CLEAR"
+        messageNames[0x43F2] = "CMD_HISTORY_DATEOVER_ALL"
+        messageNames[0x4300] = "CMD_HISTORY_DATEOVER_DONE"
+        messageNames[0xE001] = "CMD_PUMPSTATUS_APS"
+        messageNames[0xE002] = "CMD_PUMPSET_APSTEMP"
+        messageNames[0xE003] = "CMD_GET_HISTORY"
+        messageNames[0xE004] = "CMD_SET_HISTORY_ENTRY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
deleted file mode 100644
index 362b72c929..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-public class MsgBolusProgress extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private static Treatment t;
-    private static double amount;
-
-    public static long lastReceive = 0;
-    public int progress = -1;
-
-    public MsgBolusProgress() {
-        SetCommand(0x0202);
-    }
-
-    public MsgBolusProgress(double amount, Treatment t) {
-        this();
-        this.amount = amount;
-        this.t = t;
-        lastReceive = System.currentTimeMillis();
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: amount: " + amount + " treatment: " + t.toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        progress = intFromBuff(bytes, 0, 2);
-        lastReceive = System.currentTimeMillis();
-        Double done = (amount * 100 - progress) / 100d;
-        t.insulin = done;
-        EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-        bolusingEvent.setStatus(String.format(MainApp.gs(R.string.bolusdelivering), done));
-        bolusingEvent.setT(t);
-        bolusingEvent.setPercent(Math.min((int) (done / amount * 100), 100));
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Bolus remaining: " + progress + " delivered: " + done);
-        }
-
-        RxBus.INSTANCE.send(bolusingEvent);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
new file mode 100644
index 0000000000..b83da483fe
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlin.math.min
+
+class MsgBolusProgress(
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBusWrapper,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0202)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val deliveredInsulin = danaRPump.bolusAmountToBeDelivered - intFromBuff(bytes, 0, 2) / 100.0
+        danaRPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
+        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.t = danaRPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
+        rxBus.send(bolusingEvent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
deleted file mode 100644
index 4b7cd2ff41..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-
-public class MsgBolusStart extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public static int errorCode;
-
-    public MsgBolusStart() {
-        SetCommand(0x0102);
-    }
-
-    public MsgBolusStart(double amount) {
-        this();
-
-        // HARDCODED LIMIT
-        amount = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-
-        AddParamInt((int) (amount * 100));
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Bolus start : " + amount);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        errorCode = intFromBuff(bytes, 0, 1);
-        if (errorCode != 2) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Messsage response: " + errorCode + " FAILED!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Messsage response: " + errorCode + " OK");
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
new file mode 100644
index 0000000000..695c3f1ec0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgBolusStart(
+    private val aapsLogger: AAPSLogger,
+    constraintChecker: ConstraintChecker,
+    private val danaRPump: DanaRPump,
+    private var amount: Double
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0102)
+        // HARDCODED LIMIT
+        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        AddParamInt((amount * 100).toInt())
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val errorCode = intFromBuff(bytes, 0, 1)
+        if (errorCode != 2) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode FAILED!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
+        }
+        danaRPump.messageStartErrorCode = errorCode
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
deleted file mode 100644
index 0c174807b3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-
-public class MsgBolusStartWithSpeed extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public static int errorCode;
-
-    public MsgBolusStartWithSpeed() {
-        SetCommand(0x0104);
-    }
-
-    public MsgBolusStartWithSpeed(double amount, int speed) {
-        this();
-
-        // HARDCODED LIMIT
-        amount = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-
-        AddParamInt((int) (amount * 100));
-        AddParamByte((byte) speed);
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Bolus start : " + amount + " speed: " + speed);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        errorCode = intFromBuff(bytes, 0, 1);
-        if (errorCode != 2) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Messsage response: " + errorCode + " FAILED!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Messsage response: " + errorCode + " OK");
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
new file mode 100644
index 0000000000..3ea3eed8f1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgBolusStartWithSpeed(
+    private val aapsLogger: AAPSLogger,
+    constraintChecker: ConstraintChecker,
+    private val danaRPump: DanaRPump,
+    private var amount: Double,
+    speed: Int
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0104)
+        // HARDCODED LIMIT
+        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        AddParamInt((amount * 100).toInt())
+        AddParamByte(speed.toByte())
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount speed: $speed")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val errorCode = intFromBuff(bytes, 0, 1)
+        if (errorCode != 2) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode FAILED!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
+        }
+        danaRPump.messageStartErrorCode = errorCode
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
deleted file mode 100644
index 2ea50297fb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-public class MsgBolusStop extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private static Treatment t;
-    private static Double amount;
-
-    public static boolean stopped = false;
-    public static boolean forced = false;
-
-    public MsgBolusStop() {
-        SetCommand(0x0101);
-        stopped = false;
-    }
-
-    public MsgBolusStop(Double amount, Treatment t) {
-        this();
-        this.t = t;
-        this.amount = amount;
-        forced = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Bolus stop: amount: " + amount + " treatment: " + t.toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Messsage received");
-        EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-        stopped = true;
-        if (!forced) {
-            t.insulin = amount;
-            bolusingEvent.setStatus(MainApp.gs(R.string.overview_bolusprogress_delivered));
-            bolusingEvent.setPercent(100);
-        } else {
-            bolusingEvent.setStatus(MainApp.gs(R.string.overview_bolusprogress_stoped));
-        }
-        RxBus.INSTANCE.send(bolusingEvent);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
new file mode 100644
index 0000000000..bdabef46da
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgBolusStop(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0101)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        aapsLogger.debug(LTag.PUMPCOMM, "Messsage received")
+        val bolusingEvent = EventOverviewBolusProgress
+        danaRPump.bolusStopped = true
+        if (!danaRPump.bolusStopForced) {
+            danaRPump.bolusingTreatment?.insulin = danaRPump.bolusAmountToBeDelivered
+            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
+            bolusingEvent.percent = 100
+        } else {
+            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_stoped)
+        }
+        rxBus.send(bolusingEvent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java
deleted file mode 100644
index 317fe9db81..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 30.06.2016.
- */
-public class MsgCheckValue extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgCheckValue() {
-        SetCommand(0xF0F1);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        pump.isNewPump = true;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New firmware confirmed");
-
-        pump.model = intFromBuff(bytes, 0, 1);
-        pump.protocol = intFromBuff(bytes, 1, 1);
-        pump.productCode = intFromBuff(bytes, 2, 1);
-        if (pump.model != DanaRPump.EXPORT_MODEL) {
-            DanaRPlugin.getPlugin().disconnect("Wrong Model");
-            log.debug("Wrong model selected");
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Model: " + String.format("%02X ", pump.model));
-            log.debug("Protocol: " + String.format("%02X ", pump.protocol));
-            log.debug("Product Code: " + String.format("%02X ", pump.productCode));
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
new file mode 100644
index 0000000000..abb6c34d8d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgCheckValue(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val danaRPlugin: DanaRPlugin
+) : MessageBase() {
+
+    init {
+        SetCommand(0xF0F1)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.isNewPump = true
+        aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
+        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.protocol = intFromBuff(bytes, 1, 1)
+        danaRPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaRPump.model != DanaRPump.EXPORT_MODEL) {
+            danaRPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
deleted file mode 100644
index a6fdaa8d0d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-
-public class MsgError extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgError() {
-        SetCommand(0x0601);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int errorCode = intFromBuff(bytes, 0, 1);
-        String errorString = "";
-
-        switch (errorCode) {
-            case 1:
-            case 2:
-            case 3: // Pump error
-                errorString = MainApp.gs(R.string.pumperror) + " " + errorCode;
-                break;
-            case 4: // Shutdown
-                errorString = MainApp.gs(R.string.pumpshutdown);
-                break;
-            case 5: // Occlusion
-                errorString = MainApp.gs(R.string.occlusion);
-                break;
-            case 7: // Low Battery
-                errorString = MainApp.gs(R.string.lowbattery);
-                break;
-            case 8: // Battery 0%
-                errorString = MainApp.gs(R.string.batterydischarged);
-                break;
-        }
-
-        if (errorCode < 8) { // bolus delivering stopped
-            EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-            MsgBolusStop.stopped = true;
-            bolusingEvent.setStatus(errorString);
-            RxBus.INSTANCE.send(bolusingEvent);
-            failed=true;
-        }
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Error detected: " + errorString);
-        NSUpload.uploadError(errorString);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
new file mode 100644
index 0000000000..6069520870
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgError(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0601)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val errorCode = intFromBuff(bytes, 0, 1)
+        var errorString = ""
+        when (errorCode) {
+            1, 2, 3 -> errorString = resourceHelper.gs(R.string.pumperror) + " " + errorCode
+            4       -> errorString = resourceHelper.gs(R.string.pumpshutdown)
+            5       -> errorString = resourceHelper.gs(R.string.occlusion)
+            7       -> errorString = resourceHelper.gs(R.string.lowbattery)
+            8       -> errorString = resourceHelper.gs(R.string.batterydischarged)
+        }
+        if (errorCode < 8) { // bolus delivering stopped
+            val bolusingEvent = EventOverviewBolusProgress
+            danaRPump.bolusStopped = true
+            bolusingEvent.status = errorString
+            rxBus.send(bolusingEvent)
+            failed = true
+        } else {
+            failed = false
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Error detected: $errorString")
+        NSUpload.uploadError(errorString)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
deleted file mode 100644
index 8abbf55c31..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryAlarm extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public MsgHistoryAlarm() {
-        SetCommand(0x3105);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
new file mode 100644
index 0000000000..142d0fea04
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryAlarm(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3105)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
deleted file mode 100644
index 955d7fc090..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.DanaRHistoryRecord;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgHistoryAll extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryAll() {
-        SetCommand(0x41F2);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        byte recordCode = (byte) intFromBuff(bytes, 0, 1);
-        long date = dateFromBuff(bytes, 1);                     // 3 bytes
-        long datetime = dateTimeFromBuff(bytes, 1);             // 5 bytes
-        long datetimewihtsec = dateTimeSecFromBuff(bytes, 1);   // 6 bytes
-
-        double dailyBasal = intFromBuff(bytes, 4, 2) * 0.01d;
-        double dailyBolus = intFromBuff(bytes, 6, 2) * 0.01d;
-        byte paramByte5 = (byte) intFromBuff(bytes, 4, 1);
-        byte paramByte6 = (byte) intFromBuff(bytes, 5, 1);
-        byte paramByte7 = (byte) intFromBuff(bytes, 6, 1);
-        byte paramByte8 = (byte) intFromBuff(bytes, 7, 1);
-        double value = (double) intFromBuff(bytes, 8, 2);
-
-        DanaRHistoryRecord danaRHistoryRecord = new DanaRHistoryRecord();
-
-        danaRHistoryRecord.recordCode = recordCode;
-        danaRHistoryRecord.setBytes(bytes);
-
-        String messageType = "";
-
-        switch (recordCode) {
-            case RecordTypes.RECORD_TYPE_BOLUS:
-                danaRHistoryRecord.recordDate = datetime;
-                switch (0xF0 & paramByte8) {
-                    case 0xA0:
-                        danaRHistoryRecord.bolusType = "DS";
-                        messageType += "DS bolus";
-                        break;
-                    case 0xC0:
-                        danaRHistoryRecord.bolusType = "E";
-                        messageType += "E bolus";
-                        break;
-                    case 0x80:
-                        danaRHistoryRecord.bolusType = "S";
-                        messageType += "S bolus";
-                        break;
-                    case 0x90:
-                        danaRHistoryRecord.bolusType = "DE";
-                        messageType += "DE bolus";
-                        break;
-                    default:
-                        danaRHistoryRecord.bolusType = "None";
-                        break;
-                }
-                danaRHistoryRecord.recordDuration = ((int) paramByte8 & 0x0F) * 60 + (int) paramByte7;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_DAILY:
-                messageType += "dailyinsulin";
-                danaRHistoryRecord.recordDate = date;
-                danaRHistoryRecord.recordDailyBasal = dailyBasal;
-                danaRHistoryRecord.recordDailyBolus = dailyBolus;
-                break;
-            case RecordTypes.RECORD_TYPE_PRIME:
-                messageType += "prime";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_ERROR:
-                messageType += "error";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_REFILL:
-                messageType += "refill";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_BASALHOUR:
-                messageType += "basal hour";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_TB:
-                messageType += "tb";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_GLUCOSE:
-                messageType += "glucose";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value;
-                break;
-            case RecordTypes.RECORD_TYPE_CARBO:
-                messageType += "carbo";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                danaRHistoryRecord.recordValue = value;
-                break;
-            case RecordTypes.RECORD_TYPE_ALARM:
-                messageType += "alarm";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                String strAlarm = "None";
-                switch ((int) paramByte8) {
-                    case 67:
-                        strAlarm = "Check";
-                        break;
-                    case 79:
-                        strAlarm = "Occlusion";
-                        break;
-                    case 66:
-                        strAlarm = "Low Battery";
-                        break;
-                    case 83:
-                        strAlarm = "Shutdown";
-                        break;
-                }
-                danaRHistoryRecord.recordAlarm = strAlarm;
-                danaRHistoryRecord.recordValue = value * 0.01;
-                break;
-            case RecordTypes.RECORD_TYPE_SUSPEND:
-                messageType += "suspend";
-                danaRHistoryRecord.recordDate = datetimewihtsec;
-                String strRecordValue = "Off";
-                if ((int) paramByte8 == 79)
-                    strRecordValue = "On";
-                danaRHistoryRecord.stringRecordValue = strRecordValue;
-                break;
-            case 17:
-                failed = true;
-                break;
-        }
-
-        MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord);
-        RxBus.INSTANCE.send(new EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
new file mode 100644
index 0000000000..8c50099756
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -0,0 +1,143 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
+import info.nightscout.androidaps.utils.DateUtil
+
+open class MsgHistoryAll(
+    val aapsLogger: AAPSLogger,
+    val rxBus: RxBusWrapper
+) : MessageBase() {
+
+    init {
+        SetCommand(0x41F2)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val recordCode = intFromBuff(bytes, 0, 1).toByte()
+        val date = dateFromBuff(bytes, 1) // 3 bytes
+        val datetime = dateTimeFromBuff(bytes, 1) // 5 bytes
+        val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
+        val dailyBasal = intFromBuff(bytes, 4, 2) * 0.01
+        val dailyBolus = intFromBuff(bytes, 6, 2) * 0.01
+        val paramByte5 = intFromBuff(bytes, 4, 1).toByte()
+        val paramByte6 = intFromBuff(bytes, 5, 1).toByte()
+        val paramByte7 = intFromBuff(bytes, 6, 1).toByte()
+        val paramByte8 = intFromBuff(bytes, 7, 1).toByte()
+        val value = intFromBuff(bytes, 8, 2).toDouble()
+        val danaRHistoryRecord = DanaRHistoryRecord()
+        danaRHistoryRecord.recordCode = recordCode
+        danaRHistoryRecord.setBytes(bytes)
+        var messageType = ""
+        when (recordCode) {
+            RecordTypes.RECORD_TYPE_BOLUS     -> {
+                danaRHistoryRecord.recordDate = datetime
+                when (0xF0 and paramByte8.toInt()) {
+                    0xA0 -> {
+                        danaRHistoryRecord.bolusType = "DS"
+                        messageType += "DS bolus"
+                    }
+
+                    0xC0 -> {
+                        danaRHistoryRecord.bolusType = "E"
+                        messageType += "E bolus"
+                    }
+
+                    0x80 -> {
+                        danaRHistoryRecord.bolusType = "S"
+                        messageType += "S bolus"
+                    }
+
+                    0x90 -> {
+                        danaRHistoryRecord.bolusType = "DE"
+                        messageType += "DE bolus"
+                    }
+
+                    else -> danaRHistoryRecord.bolusType = "None"
+                }
+                danaRHistoryRecord.recordDuration = (paramByte8.toInt() and 0x0F) * 60 + paramByte7.toInt()
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_DAILY     -> {
+                messageType += "dailyinsulin"
+                danaRHistoryRecord.recordDate = date
+                danaRHistoryRecord.recordDailyBasal = dailyBasal
+                danaRHistoryRecord.recordDailyBolus = dailyBolus
+            }
+
+            RecordTypes.RECORD_TYPE_PRIME     -> {
+                messageType += "prime"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_ERROR     -> {
+                messageType += "error"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_REFILL    -> {
+                messageType += "refill"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_BASALHOUR -> {
+                messageType += "basal hour"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_TB        -> {
+                messageType += "tb"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_GLUCOSE   -> {
+                messageType += "glucose"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value
+            }
+
+            RecordTypes.RECORD_TYPE_CARBO     -> {
+                messageType += "carbo"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                danaRHistoryRecord.recordValue = value
+            }
+
+            RecordTypes.RECORD_TYPE_ALARM     -> {
+                messageType += "alarm"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                var strAlarm = "None"
+                when (paramByte8.toInt()) {
+                    67 -> strAlarm = "Check"
+                    79 -> strAlarm = "Occlusion"
+                    66 -> strAlarm = "Low Battery"
+                    83 -> strAlarm = "Shutdown"
+                }
+                danaRHistoryRecord.recordAlarm = strAlarm
+                danaRHistoryRecord.recordValue = value * 0.01
+            }
+
+            RecordTypes.RECORD_TYPE_SUSPEND   -> {
+                messageType += "suspend"
+                danaRHistoryRecord.recordDate = datetimewihtsec
+                var strRecordValue = "Off"
+                if (paramByte8.toInt() == 79) strRecordValue = "On"
+                danaRHistoryRecord.stringRecordValue = strRecordValue
+            }
+
+            17.toByte()                       -> failed = true
+        }
+        MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
+        rxBus.send(EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
deleted file mode 100644
index 7b110dd45f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgHistoryAllDone extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public static boolean received = false;
-
-    public MsgHistoryAllDone() {
-        SetCommand(0x41F1);
-        received = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        received = true;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("History all done received");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
new file mode 100644
index 0000000000..bd5d634423
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgHistoryAllDone(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x41F1)
+        danaRPump.historyDoneReceived = false
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.historyDoneReceived = true
+        aapsLogger.debug(LTag.PUMPCOMM, "History all done received")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
deleted file mode 100644
index 2599cc7434..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryBasalHour extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public MsgHistoryBasalHour() {
-        SetCommand(0x310A);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
new file mode 100644
index 0000000000..2f235f38d1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryBasalHour(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x310A)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
deleted file mode 100644
index 88978be98c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryBolus extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryBolus() {
-        SetCommand(0x3101);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
new file mode 100644
index 0000000000..26e1506eac
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryBolus(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3101)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
deleted file mode 100644
index 5682c3c85f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryCarbo extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public MsgHistoryCarbo() {
-        SetCommand(0x3107);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
new file mode 100644
index 0000000000..8650e251a8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryCarbo(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3107)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
deleted file mode 100644
index 2bed9419dd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryDailyInsulin extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public MsgHistoryDailyInsulin() {
-        SetCommand(0x3102);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
new file mode 100644
index 0000000000..60c1fffd14
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryDailyInsulin(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3102)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
deleted file mode 100644
index eeaffd33a2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryDone extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public static boolean received = false;
-
-    public MsgHistoryDone() {
-        SetCommand(0x31F1);
-        received = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        received = true;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("History done received");
-
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
new file mode 100644
index 0000000000..203b5f71d7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgHistoryDone(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x31F1)
+        danaRPump.historyDoneReceived = false
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.historyDoneReceived = true
+        aapsLogger.debug(LTag.PUMPCOMM, "History done received")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
deleted file mode 100644
index 0666e8915a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryError extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryError() {
-        SetCommand(0x3106);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
new file mode 100644
index 0000000000..50d6cb9051
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryError(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3106)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
deleted file mode 100644
index 114d392f40..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryGlucose extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryGlucose() {
-        SetCommand(0x3104);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
new file mode 100644
index 0000000000..07e2354f18
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryGlucose(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3104)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
deleted file mode 100644
index e93c440fac..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryNew extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryNew() {
-        SetCommand(0x42F2);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
new file mode 100644
index 0000000000..0bf49cc612
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryNew(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x42F2)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
deleted file mode 100644
index c58f55f2cf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryNewDone extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public static boolean received = false;
-
-    public MsgHistoryNewDone() {
-        SetCommand(0x42F1);
-        received = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        received = true;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("History new done received");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
new file mode 100644
index 0000000000..e6d292d54e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgHistoryNewDone(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x42F1)
+        danaRPump.historyDoneReceived = false
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.historyDoneReceived = true
+        aapsLogger.debug(LTag.PUMPCOMM, "History new done received")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
deleted file mode 100644
index 1ccae856af..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistoryRefill extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistoryRefill() {
-        SetCommand(0x3108);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-   }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
new file mode 100644
index 0000000000..d77d0fbca7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistoryRefill(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3108)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
deleted file mode 100644
index 1dac016f4d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 20.07.2016.
- */
-public class MsgHistorySuspend extends MsgHistoryAll {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgHistorySuspend() {
-        SetCommand(0x3109);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-    // Handle message taken from MsgHistoryAll
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
new file mode 100644
index 0000000000..d3f947f77d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class MsgHistorySuspend(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper
+) : MsgHistoryAll(aapsLogger, rxBus) {
+
+    init {
+        SetCommand(0x3109)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    // Handle message taken from MsgHistoryAll
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java
deleted file mode 100644
index 9b7d7feaed..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class MsgInitConnStatusBasic extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusBasic() {
-        SetCommand(0x0303);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length - 10 < 21) {
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1;
-        pump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1;
-        pump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750d;
-        pump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100;
-        pump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750d;
-        pump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1;
-        pump.currentBasal = intFromBuff(bytes, 11, 2) / 100d;
-        pump.tempBasalPercent = intFromBuff(bytes, 13, 1);
-        pump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1;
-        pump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1;
-        int statusBasalUDOption = intFromBuff(bytes, 16, 1);
-        pump.isDualBolusInProgress = intFromBuff(bytes, 17, 1) == 1;
-        double extendedBolusRate = intFromBuff(bytes, 18, 2) / 100d;
-        pump.batteryRemaining = intFromBuff(bytes, 20, 1);
-        try {
-            int bolusConfig = intFromBuff(bytes, 21, 1);
-            boolean deliveryPrime = (bolusConfig & DanaRPump.DELIVERY_PRIME) != 0;
-            boolean deliveryStepBolus = (bolusConfig & DanaRPump.DELIVERY_STEP_BOLUS) != 0;
-            boolean deliveryBasal = (bolusConfig & DanaRPump.DELIVERY_BASAL) != 0;
-            boolean deliveryExtBolus = (bolusConfig & DanaRPump.DELIVERY_EXT_BOLUS) != 0;
-            if (L.isEnabled(L.PUMPCOMM)) {
-                log.debug("Delivery prime: " + deliveryPrime);
-                log.debug("Delivery step bolus: " + deliveryStepBolus);
-                log.debug("Delivery basal: " + deliveryBasal);
-                log.debug("Delivery ext bolus: " + deliveryExtBolus);
-            }
-        } catch (Exception e) {
-            log.error("Unhadled exception", e);
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump suspended: " + pump.pumpSuspended);
-            log.debug("Calculator enabled: " + pump.calculatorEnabled);
-            log.debug("Daily total units: " + pump.dailyTotalUnits);
-            log.debug("Max daily total units: " + pump.maxDailyTotalUnits);
-            log.debug("Reservoir remaining units: " + pump.reservoirRemainingUnits);
-            log.debug("Bolus blocked: " + pump.bolusBlocked);
-            log.debug("Current basal: " + pump.currentBasal);
-            log.debug("Current temp basal percent: " + pump.tempBasalPercent);
-            log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-            log.debug("statusBasalUDOption: " + statusBasalUDOption);
-            log.debug("Is dual bolus running: " + pump.isDualBolusInProgress);
-            log.debug("Extended bolus rate: " + extendedBolusRate);
-            log.debug("Battery remaining: " + pump.batteryRemaining);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
new file mode 100644
index 0000000000..f91042282e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgInitConnStatusBasic(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0303)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 < 21) {
+            return
+        }
+        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        danaRPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
+        danaRPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
+        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
+        danaRPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
+        danaRPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
+        danaRPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
+        danaRPump.tempBasalPercent = intFromBuff(bytes, 13, 1)
+        danaRPump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1
+        danaRPump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1
+        val statusBasalUDOption = intFromBuff(bytes, 16, 1)
+        danaRPump.isDualBolusInProgress = intFromBuff(bytes, 17, 1) == 1
+        val extendedBolusRate = intFromBuff(bytes, 18, 2) / 100.0
+        danaRPump.batteryRemaining = intFromBuff(bytes, 20, 1)
+        val bolusConfig = intFromBuff(bytes, 21, 1)
+        val deliveryPrime = bolusConfig and DanaRPump.DELIVERY_PRIME != 0
+        val deliveryStepBolus = bolusConfig and DanaRPump.DELIVERY_STEP_BOLUS != 0
+        val deliveryBasal = bolusConfig and DanaRPump.DELIVERY_BASAL != 0
+        val deliveryExtBolus = bolusConfig and DanaRPump.DELIVERY_EXT_BOLUS != 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivery prime: $deliveryPrime")
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivery step bolus: $deliveryStepBolus")
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivery basal: $deliveryBasal")
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivery ext bolus: $deliveryExtBolus")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaRPump.calculatorEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaRPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaRPump.bolusBlocked)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaRPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "statusBasalUDOption: $statusBasalUDOption")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is dual bolus running: " + danaRPump.isDualBolusInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus rate: $extendedBolusRate")
+        aapsLogger.debug(LTag.PUMPCOMM, "Battery remaining: " + danaRPump.batteryRemaining)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java
deleted file mode 100644
index 79fac775a5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MsgInitConnStatusBolus extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusBolus() {
-        SetCommand(0x0302);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length - 10 > 12) {
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-        int bolusConfig = intFromBuff(bytes, 0, 1);
-        pump.isExtendedBolusEnabled = (bolusConfig & 0x01) != 0;
-
-        pump.bolusStep = intFromBuff(bytes, 1, 1) / 100d;
-        pump.maxBolus = intFromBuff(bytes, 2, 2) / 100d;
-        //int bolusRate = intFromBuff(bytes, 4, 8);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is Extended bolus enabled: " + pump.isExtendedBolusEnabled);
-            log.debug("Bolus increment: " + pump.bolusStep);
-            log.debug("Bolus max: " + pump.maxBolus);
-        }
-
-        if (!pump.isExtendedBolusEnabled) {
-            Notification notification = new Notification(Notification.EXTENDED_BOLUS_DISABLED, MainApp.gs(R.string.danar_enableextendedbolus), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED));
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
new file mode 100644
index 0000000000..580df8e133
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusBolus(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0302)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 > 12) {
+            failed = true
+            return
+        }
+        failed = false
+        val bolusConfig = intFromBuff(bytes, 0, 1)
+        danaRPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
+        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        danaRPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
+        //int bolusRate = intFromBuff(bytes, 4, 8);
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaRPump.bolusStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaRPump.maxBolus)
+        if (!danaRPump.isExtendedBolusEnabled) {
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java
deleted file mode 100644
index f615b4d559..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MsgInitConnStatusOption extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusOption() {
-        SetCommand(0x0304);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int status1224Clock = intFromBuff(bytes, 0, 1);
-        int isStatusButtonScroll = intFromBuff(bytes, 1, 1);
-        int soundVibration = intFromBuff(bytes, 2, 1);
-        int glucoseUnit = intFromBuff(bytes, 3, 1);
-        int lcdTimeout = intFromBuff(bytes, 4, 1);
-        int backlightgTimeout = intFromBuff(bytes, 5, 1);
-        int languageOption = intFromBuff(bytes, 6, 1);
-        int lowReservoirAlarmBoundary = intFromBuff(bytes, 7, 1);
-        //int none = intFromBuff(bytes, 8, 1);
-        if (bytes.length >= 21) {
-            DanaRPump.getInstance().password = intFromBuff(bytes, 9, 2) ^ 0x3463;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Pump password: " + DanaRPump.getInstance().password);
-        } else {
-            failed = true;
-        }
-
-        if (!DanaRPump.getInstance().isPasswordOK()) {
-            Notification notification = new Notification(Notification.WRONG_PUMP_PASSWORD, MainApp.gs(R.string.wrongpumppassword), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.WRONG_PUMP_PASSWORD));
-        }
-
-        // This is last message of initial sequence
-        if (ConfigBuilderPlugin.getPlugin().getActivePump() != null)
-            ConfigBuilderPlugin.getPlugin().getActivePump().finishHandshaking();
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
new file mode 100644
index 0000000000..ee1d26ce3f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusOption(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val activePlugin: ActivePluginProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0304)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        //val status1224Clock = intFromBuff(bytes, 0, 1)
+        //val isStatusButtonScroll = intFromBuff(bytes, 1, 1)
+        //val soundVibration = intFromBuff(bytes, 2, 1)
+        //val glucoseUnit = intFromBuff(bytes, 3, 1)
+        //val lcdTimeout = intFromBuff(bytes, 4, 1)
+        //val backlightgTimeout = intFromBuff(bytes, 5, 1)
+        //val languageOption = intFromBuff(bytes, 6, 1)
+        //val lowReservoirAlarmBoundary = intFromBuff(bytes, 7, 1)
+        //int none = intFromBuff(bytes, 8, 1);
+        if (bytes.size >= 21) {
+            failed = false
+            danaRPump.password = intFromBuff(bytes, 9, 2) xor 0x3463
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.password)
+        } else {
+            failed = true
+        }
+        if (!danaRPump.isPasswordOK) {
+            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.WRONG_PUMP_PASSWORD))
+        }
+        // This is last message of initial sequence
+        activePlugin.activePump.finishHandshaking()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java
deleted file mode 100644
index 974e63fe80..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-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.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgInitConnStatusTime extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusTime() {
-        SetCommand(0x0301);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length - 10 > 7) {
-            Notification notification = new Notification(Notification.WRONG_DRIVER, MainApp.gs(R.string.pumpdrivercorrected), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            DanaRPlugin.getPlugin().disconnect("Wrong Model");
-            log.error("Wrong model selected. Switching to Korean DanaR");
-            DanaRKoreanPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, true);
-            DanaRKoreanPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, true);
-            DanaRPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, false);
-            DanaRPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, false);
-
-            DanaRPump.reset(); // mark not initialized
-
-            //If profile coming from pump, switch it as well
-            if (DanaRPlugin.getPlugin().isEnabled(PluginType.PROFILE)) {
-                (DanaRPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, false);
-                (DanaRKoreanPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, true);
-            }
-
-            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaDriver");
-            RxBus.INSTANCE.send(new EventRebuildTabs());
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
-            failed = false;
-            return;
-        } else {
-            failed = true;
-        }
-
-        long time = dateTimeSecFromBuff(bytes, 0);
-        int versionCode = intFromBuff(bytes, 6, 1);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump time: " + DateUtil.dateAndTimeFullString(time));
-            log.debug("Version code: " + versionCode);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
new file mode 100644
index 0000000000..1ff8eb0e9b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventRebuildTabs
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+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.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusTime(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val danaRPlugin: DanaRPlugin,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin,
+    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val commandQueue: CommandQueueProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0301)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 > 7) {
+            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+            danaRPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to Korean DanaR")
+            danaRKoreanPlugin.setPluginEnabled(PluginType.PUMP, true)
+            danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, true)
+            danaRPlugin.setPluginEnabled(PluginType.PUMP, false)
+            danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
+            danaRPump.reset() // mark not initialized
+            //If profile coming from pump, switch it as well
+            configBuilderPlugin.storeSettings("ChangingDanaDriver")
+            rxBus.send(EventRebuildTabs())
+            commandQueue.readStatus("PumpDriverChange", null) // force new connection
+            failed = false
+            return
+        } else {
+            failed = true
+        }
+        val time = dateTimeSecFromBuff(bytes, 0)
+        val versionCode = intFromBuff(bytes, 6, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Version code: $versionCode")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
deleted file mode 100644
index 3d2084371c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgPCCommStart extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgPCCommStart() {
-        SetCommand(0x3001);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("PC comm start received");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt
new file mode 100644
index 0000000000..35e5f2391a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class MsgPCCommStart constructor(
+    private val aapsLogger: AAPSLogger
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3001)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        aapsLogger.debug(LTag.PUMPCOMM, "PC comm start received")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
deleted file mode 100644
index e942f6b6e8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgPCCommStop extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public MsgPCCommStop() {
-        SetCommand(0x3002);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("PC comm stop received");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt
new file mode 100644
index 0000000000..c6d6ac4ae7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class MsgPCCommStop(
+    private val aapsLogger: AAPSLogger
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3002)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        aapsLogger.debug(LTag.PUMPCOMM, "PC comm stop received")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
deleted file mode 100644
index 22f962713b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetActivateBasalProfile extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetActivateBasalProfile() {
-        SetCommand(0x330C);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    // index 0-3
-    public MsgSetActivateBasalProfile(byte index) {
-        this();
-        AddParamByte(index);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Activate basal profile: " + index);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Activate basal profile result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Activate basal profile result: " + result);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt
new file mode 100644
index 0000000000..6343002f99
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class MsgSetActivateBasalProfile(
+    private val aapsLogger: AAPSLogger,
+    index: Byte
+) : MessageBase() {
+
+    // index 0-3
+    init {
+        SetCommand(0x330C)
+        AddParamByte(index)
+        aapsLogger.debug(LTag.PUMPCOMM, "Activate basal profile: $index")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Activate basal profile result: $result FAILED!!!")
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "Activate basal profile result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
deleted file mode 100644
index 89cd1c95f4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-
-public class MsgSetBasalProfile extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetBasalProfile() {
-        SetCommand(0x3306);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    // index 0-3
-    public MsgSetBasalProfile(byte index, double[] values) {
-        this();
-        AddParamByte(index);
-        for (Integer i = 0; i < 24; i++) {
-            AddParamInt((int) (values[i] * 100));
-        }
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Set basal profile: " + index);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set basal profile result: " + result + " FAILED!!!");
-            Notification reportFail = new Notification(Notification.PROFILE_SET_FAILED, MainApp.gs(R.string.profile_set_failed), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set basal profile result: " + result);
-            Notification reportOK = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(reportOK));
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt
new file mode 100644
index 0000000000..1af0c71832
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgSetBasalProfile(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    index: Byte,
+    values: Array<Double>
+) : MessageBase() {
+
+    // index 0-3
+    init {
+        SetCommand(0x3306)
+        AddParamByte(index)
+        for (i in 0..23) {
+            AddParamInt((values[i] * 100).toInt())
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile: $index")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result FAILED!!!")
+            val reportFail = Notification(Notification.PROFILE_SET_FAILED, resourceHelper.gs(R.string.profile_set_failed), Notification.URGENT)
+            rxBus.send(EventNewNotification(reportFail))
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result")
+            val reportOK = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            rxBus.send(EventNewNotification(reportOK))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
deleted file mode 100644
index a00b5bfd72..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetCarbsEntry extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetCarbsEntry() {
-        SetCommand(0x0402);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public MsgSetCarbsEntry(long time, int amount) {
-        this();
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(time);
-        AddParamByte((byte) RecordTypes.RECORD_TYPE_CARBO);
-        AddParamByte((byte) (calendar.get(Calendar.YEAR) % 100));
-        AddParamByte((byte) (calendar.get(Calendar.MONTH) + 1));
-        AddParamByte((byte) (calendar.get(Calendar.DAY_OF_MONTH)));
-        AddParamByte((byte) (calendar.get(Calendar.HOUR_OF_DAY)));
-        AddParamByte((byte) (calendar.get(Calendar.MINUTE)));
-        AddParamByte((byte) (calendar.get(Calendar.SECOND)));
-        AddParamByte((byte) 0x43); //??
-        AddParamInt(amount);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Set carb entry: " + amount + " date " + calendar.getTime().toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set carb entry result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set carb entry result: " + result);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
new file mode 100644
index 0000000000..0e62c0d625
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import java.util.*
+
+class MsgSetCarbsEntry(
+    private val aapsLogger: AAPSLogger,
+    val time: Long,
+    val amount: Int
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0402)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = time
+        AddParamByte(RecordTypes.RECORD_TYPE_CARBO)
+        AddParamByte((calendar[Calendar.YEAR] % 100).toByte())
+        AddParamByte((calendar[Calendar.MONTH] + 1).toByte())
+        AddParamByte(calendar[Calendar.DAY_OF_MONTH].toByte())
+        AddParamByte(calendar[Calendar.HOUR_OF_DAY].toByte())
+        AddParamByte(calendar[Calendar.MINUTE].toByte())
+        AddParamByte(calendar[Calendar.SECOND].toByte())
+        AddParamByte(0x43.toByte()) //??
+        AddParamInt(amount)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Set carb entry: " + amount + " date " + calendar.time.toString())
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set carb entry result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set carb entry result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
deleted file mode 100644
index dad437ac72..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetExtendedBolusStart extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetExtendedBolusStart() {
-        SetCommand(0x0407);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public MsgSetExtendedBolusStart(double amount, byte halfhours) {
-        this();
-
-        // HARDCODED LIMITS
-        if (halfhours < 1) halfhours = 1;
-        if (halfhours > 16) halfhours = 16;
-        Constraint<Double> constrainedAmount = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount));
-        if (constrainedAmount != null) {
-            AddParamInt((int) (constrainedAmount.value() * 100));
-        } else {
-            log.error("constrainedAmount of insulin is null!!");
-            AddParamInt(0);
-        }
-        AddParamByte(halfhours);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Set extended bolus start: " + (((int) (amount * 100)) / 100d) + "U halfhours: " + (int) halfhours);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set extended bolus start result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set extended bolus start result: " + result);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt
new file mode 100644
index 0000000000..23da6ede84
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+
+class MsgSetExtendedBolusStart(
+    private val aapsLogger: AAPSLogger,
+    constraintChecker: ConstraintChecker,
+    private var amount: Double,
+    private var halfhours: Byte
+
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0407)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
+        // HARDCODED LIMITS
+        if (halfhours < 1) halfhours = 1
+        if (halfhours > 16) halfhours = 16
+        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        AddParamInt((amount * 100).toInt())
+        AddParamByte(halfhours)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start: " + (amount * 100).toInt() / 100.0 + "U halfhours: " + halfhours.toInt())
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start result: $result FAILED!!!")
+        } else {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
deleted file mode 100644
index a19efe7488..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetExtendedBolusStop extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetExtendedBolusStop() {
-        SetCommand(0x0406);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set extended bolus stop result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set extended bolus stop result: " + result);
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt
new file mode 100644
index 0000000000..887f6c0cdb
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class MsgSetExtendedBolusStop(
+    private val aapsLogger: AAPSLogger
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0406)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus stop result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus stop result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
deleted file mode 100644
index 8888f17b1c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-
-public class MsgSetSingleBasalProfile extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetSingleBasalProfile() {
-        SetCommand(0x3302);
-    }
-
-    // index 0-3
-    public MsgSetSingleBasalProfile(double[] values) {
-        this();
-        for (Integer i = 0; i < 24; i++) {
-            AddParamInt((int) (values[i] * 100));
-        }
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set basal profile result: " + result + " FAILED!!!");
-            Notification reportFail = new Notification(Notification.PROFILE_SET_FAILED, MainApp.gs(R.string.profile_set_failed), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set basal profile result: " + result);
-            Notification reportOK = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(reportOK));
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt
new file mode 100644
index 0000000000..2997a8478f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgSetSingleBasalProfile(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    values: Array<Double>
+) : MessageBase() {
+
+    // index 0-3
+    init {
+        SetCommand(0x3302)
+        for (i in 0..23) {
+            AddParamInt((values[i] * 100).toInt())
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result FAILED!!!")
+            val reportFail = Notification(Notification.PROFILE_SET_FAILED, resourceHelper.gs(R.string.profile_set_failed), Notification.URGENT)
+            rxBus.send(EventNewNotification(reportFail))
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result")
+            val reportOK = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            rxBus.send(EventNewNotification(reportOK))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
deleted file mode 100644
index adc6a0b4da..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetTempBasalStart extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetTempBasalStart() {
-        SetCommand(0x0401);
-    }
-
-    public MsgSetTempBasalStart(int percent, int durationInHours) {
-        this();
-
-        //HARDCODED LIMITS
-        if (percent < 0) percent = 0;
-        if (percent > 200) percent = 200;
-        if (durationInHours < 1) durationInHours = 1;
-        if (durationInHours > 24) durationInHours = 24;
-
-        AddParamByte((byte) (percent & 255));
-        AddParamByte((byte) (durationInHours & 255));
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Temp basal start percent: " + percent + " duration hours: " + durationInHours);
-    }
-
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set temp basal start result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set temp basal start result: " + result);
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt
new file mode 100644
index 0000000000..abdf6b9d1b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class MsgSetTempBasalStart(
+    private val aapsLogger: AAPSLogger,
+    private var percent: Int,
+    private var durationInHours: Int
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0401)
+
+        //HARDCODED LIMITS
+        if (percent < 0) percent = 0
+        if (percent > 200) percent = 200
+        if (durationInHours < 1) durationInHours = 1
+        if (durationInHours > 24) durationInHours = 24
+        AddParamByte((percent and 255).toByte())
+        AddParamByte((durationInHours and 255).toByte())
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal start percent: $percent duration hours: $durationInHours")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set temp basal start result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set temp basal start result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
deleted file mode 100644
index 19427ee965..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class MsgSetTempBasalStop extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetTempBasalStop() {
-        SetCommand(0x0403);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Temp basal stop");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set temp basal stop result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set temp basal stop result: " + result);
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt
new file mode 100644
index 0000000000..b728b9e2ee
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.L.isEnabled
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper.Companion.getLogger
+import org.slf4j.Logger
+
+class MsgSetTempBasalStop(
+    private val aapsLogger: AAPSLogger
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0403)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Temp basal stop")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set temp basal stop result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Set temp basal stop result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
deleted file mode 100644
index 2840ff3faa..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-
-/**
- * Created by mike on 09.12.2016.
- */
-
-public class MsgSetTime extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private static Date time;
-
-    public MsgSetTime(Date time) {
-        SetCommand(0x330a);
-        this.time = time;
-        AddParamDateTime(time);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: time:" + DateUtil.dateAndTimeString(time));
-    }
-
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-        }
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Result of setting time: " + time + " is " + result);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
new file mode 100644
index 0000000000..70971c431e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class MsgSetTime(
+    private val aapsLogger: AAPSLogger,
+    time: Date
+) : MessageBase() {
+
+    init {
+        SetCommand(0x330a)
+        AddParamDateTime(time)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + DateUtil.dateAndTimeString(time))
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        failed = result != 1
+        aapsLogger.debug(LTag.PUMPCOMM, "Result of setting time: $result")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java
deleted file mode 100644
index 07e4ff669d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSetUserOptions extends MessageBase {
-
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public boolean done;
-
-    public MsgSetUserOptions() {
-        SetCommand(0x330B);
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.userOptionsFrompump == null) {
-            // No options set -> Exitting
-            log.error("NO USER OPTIONS LOADED EXITTING!");
-            return;
-        }
-        pump.userOptionsFrompump[0] = (byte) (pump.timeDisplayType == 1 ? 0 : 1);
-        pump.userOptionsFrompump[1] = (byte) pump.buttonScrollOnOff;
-        pump.userOptionsFrompump[2] = (byte) pump.beepAndAlarm;
-        pump.userOptionsFrompump[3] = (byte) pump.lcdOnTimeSec;
-        pump.userOptionsFrompump[4] = (byte) pump.backlightOnTimeSec;
-        pump.userOptionsFrompump[5] = (byte) pump.selectedLanguage;
-        pump.userOptionsFrompump[8] = (byte) pump.units;
-        pump.userOptionsFrompump[9] = (byte) pump.shutdownHour;
-        pump.userOptionsFrompump[27] = (byte) pump.lowReservoirRate;
-        for (int i = 0; i < pump.userOptionsFrompump.length; i++) {
-            AddParamByte(pump.userOptionsFrompump[i]);
-        }
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Setting user options: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Setting user options: " + result);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
new file mode 100644
index 0000000000..f2a579fd72
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSetUserOptions(
+    private val aapsLogger: AAPSLogger,
+    danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x330B)
+        if (danaRPump.userOptionsFrompump == null) {
+            // No options set -> Exiting
+            aapsLogger.debug(LTag.PUMPCOMM, "NO USER OPTIONS LOADED EXITING!")
+        } else {
+            danaRPump.userOptionsFrompump!![0] = (if (danaRPump.timeDisplayType == 1) 0 else 1).toByte()
+            danaRPump.userOptionsFrompump!![1] = danaRPump.buttonScrollOnOff.toByte()
+            danaRPump.userOptionsFrompump!![2] = danaRPump.beepAndAlarm.toByte()
+            danaRPump.userOptionsFrompump!![3] = danaRPump.lcdOnTimeSec.toByte()
+            danaRPump.userOptionsFrompump!![4] = danaRPump.backlightOnTimeSec.toByte()
+            danaRPump.userOptionsFrompump!![5] = danaRPump.selectedLanguage.toByte()
+            danaRPump.userOptionsFrompump!![8] = danaRPump.units.toByte()
+            danaRPump.userOptionsFrompump!![9] = danaRPump.shutdownHour.toByte()
+            danaRPump.userOptionsFrompump!![27] = danaRPump.lowReservoirRate.toByte()
+            for (element in danaRPump.userOptionsFrompump!!) {
+                AddParamByte(element)
+            }
+            aapsLogger.debug(LTag.PUMPCOMM, "New message")
+        }
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Setting user options: $result FAILED!!!")
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "Setting user options: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java
deleted file mode 100644
index 1776c48a20..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingActiveProfile extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingActiveProfile() {
-        SetCommand(0x320C);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump.getInstance().activeProfile = intFromBuff(bytes, 0, 1);
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Active profile number: " + DanaRPump.getInstance().activeProfile);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
new file mode 100644
index 0000000000..4da6770031
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSettingActiveProfile(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x320C)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.activeProfile = intFromBuff(bytes, 0, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Active profile number: " + danaRPump.activeProfile)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java
deleted file mode 100644
index 68dcf089c0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingBasal extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingBasal() {
-        SetCommand(0x3202);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.pumpProfiles == null) pump.pumpProfiles = new double[4][];
-        pump.pumpProfiles[pump.activeProfile] = new double[24];
-        for (int index = 0; index < 24; index++) {
-            int basal = intFromBuff(bytes, 2 * index, 2);
-            if (basal < DanaRPlugin.getPlugin().pumpDescription.basalMinimumRate) basal = 0;
-            pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
-        }
-
-        if (L.isEnabled(L.PUMPCOMM))
-            for (int index = 0; index < 24; index++) {
-                log.debug("Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[pump.activeProfile][index]);
-            }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
new file mode 100644
index 0000000000..256063ced1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import java.util.*
+
+class MsgSettingBasal(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val danaRPlugin: DanaRPlugin
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3202)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        for (index in 0..23) {
+            var basal = intFromBuff(bytes, 2 * index, 2)
+            if (basal < danaRPlugin.pumpDescription.basalMinimumRate) basal = 0
+            danaRPump.pumpProfiles!![danaRPump.activeProfile][index] = basal / 100.0
+        }
+        for (index in 0..23) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java
deleted file mode 100644
index 9c471a3a00..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-
-/**
- * Created by mike on 05.07.2016.
- * <p/>
- * <p/>
- * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
- */
-public class MsgSettingBasalProfileAll extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingBasalProfileAll() {
-        SetCommand(0x3206);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.basal48Enable) {
-            pump.pumpProfiles = new double[4][];
-            for (int profile = 0; profile < 4; profile++) {
-                int position = intFromBuff(bytes, 107 * profile, 1);
-                pump.pumpProfiles[position] = new double[48];
-                for (int index = 0; index < 48; index++) {
-                    int basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2);
-                    if (basal < 10) basal = 0;
-                    pump.pumpProfiles[position][index] = basal / 100d;
-                }
-            }
-        } else {
-            pump.pumpProfiles = new double[4][];
-            for (int profile = 0; profile < 4; profile++) {
-                int position = intFromBuff(bytes, 49 * profile, 1);
-                pump.pumpProfiles[position] = new double[24];
-                for (int index = 0; index < 24; index++) {
-                    int basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2);
-                    if (basal < 10) basal = 0;
-                    if (L.isEnabled(L.PUMPCOMM))
-                        log.debug("position " + position + " index " + index);
-                    pump.pumpProfiles[position][index] = basal / 100d;
-                }
-            }
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (pump.basal48Enable) {
-                for (int profile = 0; profile < 4; profile++) {
-                    for (int index = 0; index < 48; index++) {
-                        try {
-                            log.debug("Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[profile][index]);
-                        } catch (Exception e){
-                            log.error("Unhandled exception" , e);
-                        }
-                    }
-                }
-            } else {
-                for (int profile = 0; profile < 4; profile++) {
-                    for (int index = 0; index < 24; index++) {
-                        //this is absurd  pump.pumpProfiles[profile][index] returns nullPointerException
-                        try {
-                            log.debug("Basal profile " + profile + ": " +
-                                    String.format(Locale.ENGLISH, "%02d", (index / 2)) +
-                                    ":" + String.format(Locale.ENGLISH, "%02d", (index % 2) * 30) + " : " +
-                                    pump.pumpProfiles[profile][index]);
-                        } catch (Exception e){
-                            log.error("Unhandled exception" , e);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
new file mode 100644
index 0000000000..c0270a29dd
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import java.util.*
+
+/**
+ * Created by mike on 05.07.2016.
+ *
+ *
+ *
+ *
+ * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
+ */
+class MsgSettingBasalProfileAll(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        if (danaRPump.basal48Enable) {
+            for (profile in 0..3) {
+                val position = intFromBuff(bytes, 107 * profile, 1)
+                for (index in 0..47) {
+                    var basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2)
+                    if (basal < 10) basal = 0
+                    danaRPump.pumpProfiles!![position][index] = basal / 100.0
+                }
+            }
+        } else {
+            for (profile in 0..3) {
+                val position = intFromBuff(bytes, 49 * profile, 1)
+                for (index in 0..23) {
+                    var basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2)
+                    if (basal < 10) basal = 0
+                    aapsLogger.debug(LTag.PUMPCOMM, "position $position index $index")
+                    danaRPump.pumpProfiles!![position][index] = basal / 100.0
+                }
+            }
+        }
+        if (danaRPump.basal48Enable) {
+            for (profile in 0..3) {
+                for (index in 0..47) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profile][index])
+                }
+            }
+        } else {
+            for (profile in 0..3) {
+                for (index in 0..23) { //this is absurd  danaRPump.pumpProfiles[profile][index] returns nullPointerException
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index / 2) +
+                        ":" + String.format(Locale.ENGLISH, "%02d", index % 2 * 30) + " : " +
+                        danaRPump.pumpProfiles!![profile][index])
+                }
+            }
+        }
+    }
+
+    init {
+        SetCommand(0x3206)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java
deleted file mode 100644
index 70964a98b2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingGlucose extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingGlucose() {
-        SetCommand(0x3209);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = intFromBuff(bytes, 0, 1);
-        pump.easyBasalMode = intFromBuff(bytes, 1, 1);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump units: " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Easy basal mode: " + pump.easyBasalMode);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
new file mode 100644
index 0000000000..a4cad21293
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+/**
+ * Created by mike on 05.07.2016.
+ */
+class MsgSettingGlucose(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3209)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.units = intFromBuff(bytes, 0, 1)
+        danaRPump.easyBasalMode = intFromBuff(bytes, 1, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaRPump.easyBasalMode)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java
deleted file mode 100644
index 1eb3defb90..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingMaxValues extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingMaxValues() {
-        SetCommand(0x3205);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.maxBolus = intFromBuff(bytes, 0, 2) / 100d;
-        pump.maxBasal = intFromBuff(bytes, 2, 2) / 100d;
-        pump.maxDailyTotalUnits = intFromBuff(bytes, 4, 2) / 100;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Max bolus: " + pump.maxBolus);
-            log.debug("Max basal: " + pump.maxBasal);
-            log.debug("Total daily max units: " + pump.maxDailyTotalUnits);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
new file mode 100644
index 0000000000..437af793f8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSettingMaxValues(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3205)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.maxBolus = intFromBuff(bytes, 0, 2) / 100.0
+        danaRPump.maxBasal = intFromBuff(bytes, 2, 2) / 100.0
+        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 4, 2) / 100
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaRPump.maxBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Total daily max units: " + danaRPump.maxDailyTotalUnits)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java
deleted file mode 100644
index 6756d9d504..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-
-/**
- * Created by mike on 13.12.2016.
- */
-
-public class MsgSettingMeal extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingMeal() {
-        SetCommand(0x3203);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.basalStep = intFromBuff(bytes, 0, 1) / 100d;
-        pump.bolusStep = intFromBuff(bytes, 1, 1) / 100d;
-        boolean bolusEnabled = intFromBuff(bytes, 2, 1) == 1;
-        int melodyTime = intFromBuff(bytes, 3, 1);
-        int blockTime = intFromBuff(bytes, 4, 1);
-        pump.isConfigUD = intFromBuff(bytes, 5, 1) == 1;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Basal step: " + pump.basalStep);
-            log.debug("Bolus step: " + pump.bolusStep);
-            log.debug("Bolus enabled: " + bolusEnabled);
-            log.debug("Melody time: " + melodyTime);
-            log.debug("Block time: " + blockTime);
-            log.debug("Is Config U/d: " + pump.isConfigUD);
-        }
-
-        // DanaRKorean is not possible to set to 0.01 but it works when controlled from AAPS
-        if (DanaRKoreanPlugin.getPlugin().isEnabled(PluginType.PUMP)) {
-            pump.basalStep = 0.01d;
-        }
-
-        if (pump.basalStep != 0.01d) {
-            Notification notification = new Notification(Notification.WRONGBASALSTEP, MainApp.gs(R.string.danar_setbasalstep001), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.WRONGBASALSTEP));
-        }
-
-        if (pump.isConfigUD) {
-            Notification notification = new Notification(Notification.UD_MODE_ENABLED, MainApp.gs(R.string.danar_switchtouhmode), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.UD_MODE_ENABLED));
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
new file mode 100644
index 0000000000..df40a71cf1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgSettingMeal(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3203)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.basalStep = intFromBuff(bytes, 0, 1) / 100.0
+        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        val bolusEnabled = intFromBuff(bytes, 2, 1) == 1
+        val melodyTime = intFromBuff(bytes, 3, 1)
+        val blockTime = intFromBuff(bytes, 4, 1)
+        danaRPump.isConfigUD = intFromBuff(bytes, 5, 1) == 1
+        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaRPump.basalStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus enabled: $bolusEnabled")
+        aapsLogger.debug(LTag.PUMPCOMM, "Melody time: $melodyTime")
+        aapsLogger.debug(LTag.PUMPCOMM, "Block time: $blockTime")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Config U/d: " + danaRPump.isConfigUD)
+        // DanaRKorean is not possible to set to 0.01 but it works when controlled from AAPS
+        if (danaRKoreanPlugin.isEnabled(PluginType.PUMP)) {
+            danaRPump.basalStep = 0.01
+        }
+        if (danaRPump.basalStep != 0.01) {
+            val notification = Notification(Notification.WRONGBASALSTEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.WRONGBASALSTEP))
+        }
+        if (danaRPump.isConfigUD) {
+            val notification = Notification(Notification.UD_MODE_ENABLED, resourceHelper.gs(R.string.danar_switchtouhmode), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.UD_MODE_ENABLED))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java
deleted file mode 100644
index 17f18cb160..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingProfileRatios extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingProfileRatios() {
-        SetCommand(0x3204);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.units == DanaRPump.UNITS_MGDL) {
-            pump.currentCIR = intFromBuff(bytes, 0, 2);
-            pump.currentCF = intFromBuff(bytes, 2, 2);
-            pump.currentAI = intFromBuff(bytes, 4, 2) / 100d;
-            pump.currentTarget = intFromBuff(bytes, 6, 2);
-            pump.currentAIDR = intFromBuff(bytes, 8, 1);
-        } else {
-            pump.currentCIR = intFromBuff(bytes, 0, 2);
-            pump.currentCF = intFromBuff(bytes, 2, 2) / 100d;
-            pump.currentAI = intFromBuff(bytes, 4, 2) / 100d;
-            pump.currentTarget = intFromBuff(bytes, 6, 2) / 100d;
-            pump.currentAIDR = intFromBuff(bytes, 8, 1);
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump units (saved): " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Current pump CIR: " + pump.currentCIR);
-            log.debug("Current pump CF: " + pump.currentCF);
-            log.debug("Current pump AI: " + pump.currentAI);
-            log.debug("Current pump target: " + pump.currentTarget);
-            log.debug("Current pump AIDR: " + pump.currentAIDR);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
new file mode 100644
index 0000000000..6c29024677
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSettingProfileRatios(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3204)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaRPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
+            danaRPump.currentAIDR = intFromBuff(bytes, 8, 1)
+        } else {
+            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
+            danaRPump.currentAIDR = intFromBuff(bytes, 8, 1)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaRPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaRPump.currentAIDR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java
deleted file mode 100644
index becdf5a745..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingProfileRatiosAll extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingProfileRatiosAll() {
-        SetCommand(0x320D);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.units == DanaRPump.UNITS_MGDL) {
-            pump.morningCIR = intFromBuff(bytes, 0, 2);
-            pump.morningCF = intFromBuff(bytes, 2, 2);
-            pump.afternoonCIR = intFromBuff(bytes, 4, 2);
-            pump.afternoonCF = intFromBuff(bytes, 6, 2);
-            pump.eveningCIR = intFromBuff(bytes, 8, 2);
-            pump.eveningCF = intFromBuff(bytes, 10, 2);
-            pump.nightCIR = intFromBuff(bytes, 12, 2);
-            pump.nightCF = intFromBuff(bytes, 14, 2);
-        } else {
-            pump.morningCIR = intFromBuff(bytes, 0, 2);
-            pump.morningCF = intFromBuff(bytes, 2, 2) / 100d;
-            pump.afternoonCIR = intFromBuff(bytes, 4, 2);
-            pump.afternoonCF = intFromBuff(bytes, 6, 2) / 100d;
-            pump.eveningCIR = intFromBuff(bytes, 8, 2);
-            pump.eveningCF = intFromBuff(bytes, 10, 2) / 100d;
-            pump.nightCIR = intFromBuff(bytes, 12, 2);
-            pump.nightCF = intFromBuff(bytes, 14, 2) / 100d;
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump units: " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Current pump morning CIR: " + pump.morningCIR);
-            log.debug("Current pump morning CF: " + pump.morningCF);
-            log.debug("Current pump afternoon CIR: " + pump.afternoonCIR);
-            log.debug("Current pump afternoon CF: " + pump.afternoonCF);
-            log.debug("Current pump evening CIR: " + pump.eveningCIR);
-            log.debug("Current pump evening CF: " + pump.eveningCF);
-            log.debug("Current pump night CIR: " + pump.nightCIR);
-            log.debug("Current pump night CF: " + pump.nightCF);
-        }
-
-        pump.createConvertedProfile();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
new file mode 100644
index 0000000000..4f626e89df
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSettingProfileRatiosAll(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x320D)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+            danaRPump.morningCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaRPump.afternoonCIR = intFromBuff(bytes, 4, 2)
+            danaRPump.afternoonCF = intFromBuff(bytes, 6, 2).toDouble()
+            danaRPump.eveningCIR = intFromBuff(bytes, 8, 2)
+            danaRPump.eveningCF = intFromBuff(bytes, 10, 2).toDouble()
+            danaRPump.nightCIR = intFromBuff(bytes, 12, 2)
+            danaRPump.nightCF = intFromBuff(bytes, 14, 2).toDouble()
+        } else {
+            danaRPump.morningCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.morningCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaRPump.afternoonCIR = intFromBuff(bytes, 4, 2)
+            danaRPump.afternoonCF = intFromBuff(bytes, 6, 2) / 100.0
+            danaRPump.eveningCIR = intFromBuff(bytes, 8, 2)
+            danaRPump.eveningCF = intFromBuff(bytes, 10, 2) / 100.0
+            danaRPump.nightCIR = intFromBuff(bytes, 12, 2)
+            danaRPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaRPump.afternoonCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaRPump.eveningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaRPump.eveningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaRPump.nightCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaRPump.nightCF)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
deleted file mode 100644
index 23a6ba6f75..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgSettingPumpTime extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingPumpTime() {
-        SetCommand(0x320A);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        long time =
-                new Date(
-                        100 + intFromBuff(bytes, 5, 1),
-                        intFromBuff(bytes, 4, 1) - 1,
-                        intFromBuff(bytes, 3, 1),
-                        intFromBuff(bytes, 2, 1),
-                        intFromBuff(bytes, 1, 1),
-                        intFromBuff(bytes, 0, 1)
-                ).getTime();
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Pump time: " + DateUtil.dateAndTimeFullString(time) + " Phone time: " + new Date());
-
-        DanaRPump.getInstance().pumpTime = time;
-    }
-
-    @Override
-    public void handleMessageNotReceived() {
-        DanaRPump.getInstance().pumpTime = 0;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
new file mode 100644
index 0000000000..df356ca744
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class MsgSettingPumpTime(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x320A)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val time = Date(
+            100 + intFromBuff(bytes, 5, 1),
+            intFromBuff(bytes, 4, 1) - 1,
+            intFromBuff(bytes, 3, 1),
+            intFromBuff(bytes, 2, 1),
+            intFromBuff(bytes, 1, 1),
+            intFromBuff(bytes, 0, 1)
+        ).time
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time) + " Phone time: " + Date())
+        danaRPump.pumpTime = time
+    }
+
+    override fun handleMessageNotReceived() {
+        danaRPump.pumpTime = 0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java
deleted file mode 100644
index 7362ecfdb1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingShippingInfo extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingShippingInfo() {
-        SetCommand(0x3207);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.serialNumber = stringFromBuff(bytes, 0, 10);
-        pump.shippingDate = dateFromBuff(bytes, 10);
-        pump.shippingCountry = asciiStringFromBuff(bytes, 13, 3);
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Serial number: " + pump.serialNumber);
-            log.debug("Shipping date: " + pump.shippingDate);
-            log.debug("Shipping country: " + pump.shippingCountry);
-        }
-    }
-}
-
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
new file mode 100644
index 0000000000..7d442e00d6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgSettingShippingInfo(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3207)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.serialNumber = stringFromBuff(bytes, 0, 10)
+        danaRPump.shippingDate = dateFromBuff(bytes, 10)
+        danaRPump.shippingCountry = asciiStringFromBuff(bytes, 13, 3)
+        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaRPump.serialNumber)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + danaRPump.shippingDate)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaRPump.shippingCountry)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java
deleted file mode 100644
index 2dce2a6e1f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by Rumen Georgiev on 6/11/2018.
- */
-
-public class MsgSettingUserOptions extends MessageBase {
-
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingUserOptions() {
-        SetCommand(0x320B);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] packet) {
-        DanaRPump pump = DanaRPump.getInstance();
-        byte[] bytes = getDataBytes(packet, 0, packet.length - 10);
-        pump.userOptionsFrompump = Arrays.copyOf(bytes, bytes.length);// saving pumpDataBytes to use it in MsgSetUserOptions
-        for(int pos=0; pos < bytes.length; pos++) {
-            log.debug("[" + pos + "]" + bytes[pos]);
-        }
-        pump.timeDisplayType = bytes[0] == (byte) 1 ? 0 : 1; // 1 -> 24h 0 -> 12h
-        pump.buttonScrollOnOff = bytes[1] == (byte) 1 ? 1 : 0; // 1 -> ON, 0-> OFF
-        pump.beepAndAlarm = bytes[2]; // 1 -> Sound on alarm 2-> Vibrate on alarm 3-> Both on alarm 5-> Sound + beep 6-> vibrate + beep 7-> both + beep Beep adds 4
-        pump.lcdOnTimeSec = bytes[3] & 255;
-        pump.backlightOnTimeSec = bytes[4] & 255;
-        pump.selectedLanguage = bytes[5]; // on DanaRv2 is that needed ?
-        pump.units = bytes[8];
-        pump.shutdownHour = bytes[9];
-        pump.lowReservoirRate = bytes[32] & 255;
-        /* int selectableLanguage1 = bytes[10];
-        int selectableLanguage2 = bytes[11];
-        int selectableLanguage3 = bytes[12];
-        int selectableLanguage4 = bytes[13];
-        int selectableLanguage5 = bytes[14];
-        */
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-
-            log.debug("timeDisplayType: " + pump.timeDisplayType);
-            log.debug("Button scroll: " + pump.buttonScrollOnOff);
-            log.debug("BeepAndAlarm: " + pump.beepAndAlarm);
-            log.debug("screen timeout: " + pump.lcdOnTimeSec);
-            log.debug("Backlight: " + pump.backlightOnTimeSec);
-            log.debug("Selected language: " + pump.selectedLanguage);
-            log.debug("Units: " + pump.getUnits());
-            log.debug("Shutdown: " + pump.shutdownHour);
-            log.debug("Low reservoir: " + pump.lowReservoirRate);
-        }
-    }
-
-    public static byte[] getDataBytes(byte[] bytes, int start, int len) {
-        if (bytes == null) {
-            return null;
-        }
-        byte[] ret = new byte[len];
-        System.arraycopy(bytes, start + 6, ret, 0, len);
-        return ret;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
new file mode 100644
index 0000000000..3678424499
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import java.util.*
+
+class MsgSettingUserOptions(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+
+    init {
+        SetCommand(0x320B)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(packet: ByteArray) {
+        val bytes = getDataBytes(packet, packet.size - 10)
+        danaRPump.userOptionsFrompump = Arrays.copyOf(bytes, bytes!!.size) // saving pumpDataBytes to use it in MsgSetUserOptions
+        for (pos in bytes.indices) {
+            aapsLogger.debug(LTag.PUMPCOMM, "[" + pos + "]" + bytes[pos])
+        }
+        danaRPump.timeDisplayType = if (bytes[0] == 1.toByte()) 0 else 1 // 1 -> 24h 0 -> 12h
+        danaRPump.buttonScrollOnOff = if (bytes[1] == 1.toByte()) 1 else 0 // 1 -> ON, 0-> OFF
+        danaRPump.beepAndAlarm = bytes[2].toInt() // 1 -> Sound on alarm 2-> Vibrate on alarm 3-> Both on alarm 5-> Sound + beep 6-> vibrate + beep 7-> both + beep Beep adds 4
+        danaRPump.lcdOnTimeSec = bytes[3].toInt() and 255
+        danaRPump.backlightOnTimeSec = bytes[4].toInt() and 255
+        danaRPump.selectedLanguage = bytes[5].toInt() // on DanaRv2 is that needed ?
+        danaRPump.units = bytes[8].toInt()
+        danaRPump.shutdownHour = bytes[9].toInt()
+        danaRPump.lowReservoirRate = bytes[32].toInt() and 255
+        /* int selectableLanguage1 = bytes[10];
+        int selectableLanguage2 = bytes[11];
+        int selectableLanguage3 = bytes[12];
+        int selectableLanguage4 = bytes[13];
+        int selectableLanguage5 = bytes[14];
+        */
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaRPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "Button scroll: " + danaRPump.buttonScrollOnOff)
+        aapsLogger.debug(LTag.PUMPCOMM, "BeepAndAlarm: " + danaRPump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "screen timeout: " + danaRPump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "BackLight: " + danaRPump.backlightOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "Selected language: " + danaRPump.selectedLanguage)
+        aapsLogger.debug(LTag.PUMPCOMM, "Units: " + danaRPump.getUnits())
+        aapsLogger.debug(LTag.PUMPCOMM, "Shutdown: " + danaRPump.shutdownHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "Low reservoir: " + danaRPump.lowReservoirRate)
+    }
+
+    private fun getDataBytes(bytes: ByteArray?, len: Int): ByteArray? {
+        if (bytes == null) {
+            return null
+        }
+        val ret = ByteArray(len)
+        System.arraycopy(bytes, 6, ret, 0, len)
+        return ret
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java
deleted file mode 100644
index 70c0d3b944..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class MsgStatus extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatus() {
-        SetCommand(0x020B);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750d;
-        pump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1;
-        pump.extendedBolusMinutes = intFromBuff(bytes, 4, 2);
-        pump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100d;
-        Double lastBolusAmount = intFromBuff(bytes, 13, 2) / 100d;
-        if (lastBolusAmount != 0d) {
-            pump.lastBolusTime = dateTimeFromBuff(bytes, 8);
-            pump.lastBolusAmount = lastBolusAmount;
-        }
-        pump.iob = intFromBuff(bytes, 15, 2) / 100d;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Daily total: " + pump.dailyTotalUnits);
-            log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-            log.debug("Extended bolus min: " + pump.extendedBolusMinutes);
-            log.debug("Extended bolus amount: " + pump.extendedBolusAmount);
-            log.debug("Last bolus time: " + pump.lastBolusTime);
-            log.debug("Last bolus amount: " + pump.lastBolusAmount);
-            log.debug("IOB: " + pump.iob);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
new file mode 100644
index 0000000000..e37ad1ebb6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgStatus(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+
+) : MessageBase() {
+
+    init {
+        SetCommand(0x020B)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
+        danaRPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
+        danaRPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
+        danaRPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
+        val lastBolusAmount = intFromBuff(bytes, 13, 2) / 100.0
+        if (lastBolusAmount != 0.0) {
+            danaRPump.lastBolusTime = dateTimeFromBuff(bytes, 8)
+            danaRPump.lastBolusAmount = lastBolusAmount
+        }
+        danaRPump.iob = intFromBuff(bytes, 15, 2) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaRPump.extendedBolusMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaRPump.extendedBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + danaRPump.lastBolusTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaRPump.iob)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java
deleted file mode 100644
index 6a0635c378..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-
-public class MsgStatusBasic extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusBasic() {
-        SetCommand(0x020A);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        pump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1;
-        pump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1;
-        pump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750d;
-        pump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100;
-        pump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750d;
-        pump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1;
-        pump.currentBasal = intFromBuff(bytes, 11, 2) / 100d;
-        // removed. info taken from tempstatus message
-        //pump.tempBasalPercent = intFromBuff(bytes, 13, 1);
-        //pump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1;
-        //pump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1;
-        pump.batteryRemaining = intFromBuff(bytes, 20, 1);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump suspended: " + pump.pumpSuspended);
-            log.debug("Calculator enabled: " + pump.calculatorEnabled);
-            log.debug("Daily total units: " + pump.dailyTotalUnits);
-            log.debug("Max daily total units: " + pump.maxDailyTotalUnits);
-            log.debug("Reservoir remaining units: " + pump.reservoirRemainingUnits);
-            log.debug("Bolus blocked: " + pump.bolusBlocked);
-            log.debug("Current basal: " + pump.currentBasal);
-            //log.debug("Current temp basal percent: " + pump.tempBasalPercent);
-            //log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-            //log.debug("Is temp basal running: " + pump.isTempBasalInProgress);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
new file mode 100644
index 0000000000..97b485eead
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgStatusBasic(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x020A)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        danaRPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
+        danaRPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
+        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
+        danaRPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
+        danaRPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
+        danaRPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
+        // removed. info taken from tempstatus message
+        //pump.tempBasalPercent = intFromBuff(bytes, 13, 1);
+        //pump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1;
+        //pump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1;
+        danaRPump.batteryRemaining = intFromBuff(bytes, 20, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaRPump.calculatorEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaRPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaRPump.bolusBlocked)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
+        //aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + pump.tempBasalPercent);
+        //aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + pump.isExtendedInProgress);
+        //aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: " + pump.isTempBasalInProgress);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
deleted file mode 100644
index aa272b546d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgStatusBolusExtended extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusBolusExtended() {
-        SetCommand(0x0207);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        boolean isExtendedInProgress = intFromBuff(bytes, 0, 1) == 1;
-        int extendedBolusHalfHours = intFromBuff(bytes, 1, 1);
-        int extendedBolusMinutes = extendedBolusHalfHours * 30;
-
-        double extendedBolusAmount = intFromBuff(bytes, 2, 2) / 100d;
-        int extendedBolusSoFarInSecs = intFromBuff(bytes, 4, 3);
-// This is available only on korean, but not needed now
-//        int extendedBolusDeliveryPulse = intFromBuff(bytes, 7, 2);
-//        int isEasyUIUserSleep = intFromBuff(bytes, 9, 1);
-
-        int extendedBolusSoFarInMinutes = extendedBolusSoFarInSecs / 60;
-        double extendedBolusAbsoluteRate = isExtendedInProgress ? extendedBolusAmount / extendedBolusMinutes * 60 : 0d;
-        long extendedBolusStart = isExtendedInProgress ? getDateFromSecAgo(extendedBolusSoFarInSecs) : 0;
-        int extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes;
-
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.isExtendedInProgress = isExtendedInProgress;
-        pump.extendedBolusMinutes = extendedBolusMinutes;
-        pump.extendedBolusAmount = extendedBolusAmount;
-        pump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes;
-        pump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate;
-        pump.extendedBolusStart = extendedBolusStart;
-        pump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes;
-        updateExtendedBolusInDB();
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is extended bolus running: " + isExtendedInProgress);
-            log.debug("Extended bolus min: " + extendedBolusMinutes);
-            log.debug("Extended bolus amount: " + extendedBolusAmount);
-            log.debug("Extended bolus so far in minutes: " + extendedBolusSoFarInMinutes);
-            log.debug("Extended bolus absolute rate: " + extendedBolusAbsoluteRate);
-            log.debug("Extended bolus start: " + DateUtil.dateAndTimeFullString(extendedBolusStart));
-            log.debug("Extended bolus remaining minutes: " + extendedBolusRemainingMinutes);
-        }
-    }
-
-    @NonNull
-    private long getDateFromSecAgo(int tempBasalAgoSecs) {
-        return (long) (Math.ceil(System.currentTimeMillis() / 1000d) - tempBasalAgoSecs) * 1000;
-    }
-
-    public static void updateExtendedBolusInDB() {
-        TreatmentsInterface treatmentsInterface = TreatmentsPlugin.getPlugin();
-        DanaRPump pump = DanaRPump.getInstance();
-        long now = System.currentTimeMillis();
-
-        ExtendedBolus extendedBolus = treatmentsInterface.getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (extendedBolus != null) {
-            if (pump.isExtendedInProgress) {
-                if (extendedBolus.absoluteRate() != pump.extendedBolusAbsoluteRate) {
-                    // Close current extended
-                    ExtendedBolus exStop = new ExtendedBolus(pump.extendedBolusStart - 1000);
-                    exStop.source = Source.USER;
-                    treatmentsInterface.addToHistoryExtendedBolus(exStop);
-                    // Create new
-                    ExtendedBolus newExtended = new ExtendedBolus()
-                            .date(pump.extendedBolusStart)
-                            .insulin(pump.extendedBolusAmount)
-                            .durationInMinutes(pump.extendedBolusMinutes)
-                            .source(Source.USER);
-                    treatmentsInterface.addToHistoryExtendedBolus(newExtended);
-                }
-            } else {
-                // Close curent temp basal
-                ExtendedBolus exStop = new ExtendedBolus(now)
-                        .source(Source.USER);
-                treatmentsInterface.addToHistoryExtendedBolus(exStop);
-            }
-        } else {
-            if (pump.isExtendedInProgress) {
-                // Create new
-                ExtendedBolus newExtended = new ExtendedBolus()
-                        .date(pump.extendedBolusStart)
-                        .insulin(pump.extendedBolusAmount)
-                        .durationInMinutes(pump.extendedBolusMinutes)
-                        .source(Source.USER);
-                treatmentsInterface.addToHistoryExtendedBolus(newExtended);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
new file mode 100644
index 0000000000..60055ad96e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.db.ExtendedBolus
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import kotlin.math.ceil
+
+class MsgStatusBolusExtended(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val activePlugin: ActivePluginProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0207)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val isExtendedInProgress = intFromBuff(bytes, 0, 1) == 1
+        val extendedBolusHalfHours = intFromBuff(bytes, 1, 1)
+        val extendedBolusMinutes = extendedBolusHalfHours * 30
+        val extendedBolusAmount = intFromBuff(bytes, 2, 2) / 100.0
+        val extendedBolusSoFarInSecs = intFromBuff(bytes, 4, 3)
+        // This is available only on korean, but not needed now
+//        int extendedBolusDeliveryPulse = intFromBuff(bytes, 7, 2);
+//        int isEasyUIUserSleep = intFromBuff(bytes, 9, 1);
+        val extendedBolusSoFarInMinutes = extendedBolusSoFarInSecs / 60
+        val extendedBolusAbsoluteRate = if (isExtendedInProgress) extendedBolusAmount / extendedBolusMinutes * 60 else 0.0
+        val extendedBolusStart = if (isExtendedInProgress) getDateFromSecAgo(extendedBolusSoFarInSecs) else 0
+        val extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes
+        danaRPump.isExtendedInProgress = isExtendedInProgress
+        danaRPump.extendedBolusMinutes = extendedBolusMinutes
+        danaRPump.extendedBolusAmount = extendedBolusAmount
+        danaRPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
+        danaRPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
+        danaRPump.extendedBolusStart = extendedBolusStart
+        danaRPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
+        updateExtendedBolusInDB()
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: $isExtendedInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: $extendedBolusMinutes")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: $extendedBolusAmount")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far in minutes: $extendedBolusSoFarInMinutes")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus absolute rate: $extendedBolusAbsoluteRate")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start: " + DateUtil.dateAndTimeString(extendedBolusStart))
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: $extendedBolusRemainingMinutes")
+    }
+
+    private fun getDateFromSecAgo(tempBasalAgoSecs: Int): Long {
+        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
+    }
+
+    private fun updateExtendedBolusInDB() {
+        val now = System.currentTimeMillis()
+        val extendedBolus = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
+        if (extendedBolus != null) {
+            if (danaRPump.isExtendedInProgress) {
+                if (extendedBolus.absoluteRate() != danaRPump.extendedBolusAbsoluteRate) { // Close current extended
+                    val exStop = ExtendedBolus(danaRPump.extendedBolusStart - 1000)
+                    exStop.source = Source.USER
+                    activePlugin.activeTreatments.addToHistoryExtendedBolus(exStop)
+                    // Create new
+                    val newExtended = ExtendedBolus()
+                        .date(danaRPump.extendedBolusStart)
+                        .insulin(danaRPump.extendedBolusAmount)
+                        .durationInMinutes(danaRPump.extendedBolusMinutes)
+                        .source(Source.USER)
+                    activePlugin.activeTreatments.addToHistoryExtendedBolus(newExtended)
+                }
+            } else {
+                // Close current temp basal
+                val exStop = ExtendedBolus(now)
+                    .source(Source.USER)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(exStop)
+            }
+        } else {
+            if (danaRPump.isExtendedInProgress) { // Create new
+                val newExtended = ExtendedBolus()
+                    .date(danaRPump.extendedBolusStart)
+                    .insulin(danaRPump.extendedBolusAmount)
+                    .durationInMinutes(danaRPump.extendedBolusMinutes)
+                    .source(Source.USER)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(newExtended)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java
deleted file mode 100644
index f4ee2be0a6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgStatusProfile extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusProfile() {
-        SetCommand(0x0204);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.units == DanaRPump.UNITS_MGDL) {
-            pump.currentCIR = intFromBuff(bytes, 0, 2);
-            pump.currentCF = intFromBuff(bytes, 2, 2);
-            pump.currentAI = intFromBuff(bytes, 4, 2) / 100d;
-            pump.currentTarget = intFromBuff(bytes, 6, 2);
-        } else {
-            pump.currentCIR = intFromBuff(bytes, 0, 2);
-            pump.currentCF = intFromBuff(bytes, 2, 2) / 100d;
-            pump.currentAI = intFromBuff(bytes, 4, 2) / 100d;
-            pump.currentTarget = intFromBuff(bytes, 6, 2) / 100d;
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump units (saved): " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Current pump CIR: " + pump.currentCIR);
-            log.debug("Current pump CF: " + pump.currentCF);
-            log.debug("Current pump AI: " + pump.currentAI);
-            log.debug("Current pump target: " + pump.currentTarget);
-            log.debug("Current pump AIDR: " + pump.currentAIDR);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
new file mode 100644
index 0000000000..e8bd43012b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class MsgStatusProfile(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0204)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaRPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
+        } else {
+            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaRPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaRPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaRPump.currentAIDR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
deleted file mode 100644
index 00b3bf5f69..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-
-public class MsgStatusTempBasal extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusTempBasal() {
-        SetCommand(0x0205);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        boolean isTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x01) == 0x01;
-        boolean isAPSTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x02) == 0x02;
-        int tempBasalPercent = intFromBuff(bytes, 1, 1);
-        if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10;
-        int tempBasalTotalSec;
-        if (intFromBuff(bytes, 2, 1) == 150) tempBasalTotalSec = 15 * 60;
-        else if (intFromBuff(bytes, 2, 1) == 160) tempBasalTotalSec = 30 * 60;
-        else tempBasalTotalSec = intFromBuff(bytes, 2, 1) * 60 * 60;
-        int tempBasalRunningSeconds = intFromBuff(bytes, 3, 3);
-        int tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60;
-        long tempBasalStart = isTempBasalInProgress ? getDateFromTempBasalSecAgo(tempBasalRunningSeconds) : 0;
-
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.isTempBasalInProgress = isTempBasalInProgress;
-        pump.tempBasalPercent = tempBasalPercent;
-        pump.tempBasalRemainingMin = tempBasalRemainingMin;
-        pump.tempBasalTotalSec = tempBasalTotalSec;
-        pump.tempBasalStart = tempBasalStart;
-
-        updateTempBasalInDB();
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is temp basal running: " + isTempBasalInProgress);
-            log.debug("Is APS temp basal running: " + isAPSTempBasalInProgress);
-            log.debug("Current temp basal percent: " + tempBasalPercent);
-            log.debug("Current temp basal remaining min: " + tempBasalRemainingMin);
-            log.debug("Current temp basal total sec: " + tempBasalTotalSec);
-            log.debug("Current temp basal start: " + tempBasalStart);
-        }
-    }
-
-    @NonNull
-    private long getDateFromTempBasalSecAgo(int tempBasalAgoSecs) {
-        return (long) (Math.ceil(System.currentTimeMillis() / 1000d) - tempBasalAgoSecs) * 1000;
-    }
-
-    public static void updateTempBasalInDB() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
-        long now = System.currentTimeMillis();
-
-        if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress()) {
-            TemporaryBasal tempBasal = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis());
-            if (danaRPump.isTempBasalInProgress) {
-                if (tempBasal.percentRate != danaRPump.tempBasalPercent) {
-                    // Close current temp basal
-                    TemporaryBasal tempStop = new TemporaryBasal().date(danaRPump.tempBasalStart - 1000).source(Source.USER);
-                    TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStop);
-                    // Create new
-                    TemporaryBasal newTempBasal = new TemporaryBasal()
-                            .date(danaRPump.tempBasalStart)
-                            .percent(danaRPump.tempBasalPercent)
-                            .duration(danaRPump.tempBasalTotalSec / 60)
-                            .source(Source.USER);
-                    TreatmentsPlugin.getPlugin().addToHistoryTempBasal(newTempBasal);
-                }
-            } else {
-                // Close current temp basal
-                TemporaryBasal tempStop = new TemporaryBasal().date(now).source(Source.USER);
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStop);
-            }
-        } else {
-            if (danaRPump.isTempBasalInProgress) {
-                // Create new
-                TemporaryBasal newTempBasal = new TemporaryBasal()
-                        .date(danaRPump.tempBasalStart)
-                        .percent(danaRPump.tempBasalPercent)
-                        .duration(danaRPump.tempBasalTotalSec / 60)
-                        .source(Source.USER);
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(newTempBasal);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
new file mode 100644
index 0000000000..452d911819
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
@@ -0,0 +1,80 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import kotlin.math.ceil
+
+class MsgStatusTempBasal(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val activePlugin: ActivePluginProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0205)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val isTempBasalInProgress = intFromBuff(bytes, 0, 1) and 0x01 == 0x01
+        val isAPSTempBasalInProgress = intFromBuff(bytes, 0, 1) and 0x02 == 0x02
+        var tempBasalPercent = intFromBuff(bytes, 1, 1)
+        if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10
+        val tempBasalTotalSec: Int = if (intFromBuff(bytes, 2, 1) == 150) 15 * 60 else if (intFromBuff(bytes, 2, 1) == 160) 30 * 60 else intFromBuff(bytes, 2, 1) * 60 * 60
+        val tempBasalRunningSeconds = intFromBuff(bytes, 3, 3)
+        val tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60
+        val tempBasalStart = if (isTempBasalInProgress) getDateFromTempBasalSecAgo(tempBasalRunningSeconds) else 0
+        danaRPump.isTempBasalInProgress = isTempBasalInProgress
+        danaRPump.tempBasalPercent = tempBasalPercent
+        danaRPump.tempBasalRemainingMin = tempBasalRemainingMin
+        danaRPump.tempBasalTotalSec = tempBasalTotalSec
+        danaRPump.tempBasalStart = tempBasalStart
+        updateTempBasalInDB()
+        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: $isTempBasalInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: $tempBasalPercent")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: $tempBasalTotalSec")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: $tempBasalStart")
+    }
+
+    private fun getDateFromTempBasalSecAgo(tempBasalAgoSecs: Int): Long {
+        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
+    }
+
+    private fun updateTempBasalInDB() {
+        val now = System.currentTimeMillis()
+        if (activePlugin.activeTreatments.isInHistoryRealTempBasalInProgress) {
+            val tempBasal = activePlugin.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())
+            if (danaRPump.isTempBasalInProgress) {
+                if (tempBasal.percentRate != danaRPump.tempBasalPercent) { // Close current temp basal
+                    val tempStop = TemporaryBasal().date(danaRPump.tempBasalStart - 1000).source(Source.USER)
+                    activePlugin.activeTreatments.addToHistoryTempBasal(tempStop)
+                    // Create new
+                    val newTempBasal = TemporaryBasal()
+                        .date(danaRPump.tempBasalStart)
+                        .percent(danaRPump.tempBasalPercent)
+                        .duration(danaRPump.tempBasalTotalSec / 60)
+                        .source(Source.USER)
+                    activePlugin.activeTreatments.addToHistoryTempBasal(newTempBasal)
+                }
+            } else { // Close current temp basal
+                val tempStop = TemporaryBasal().date(now).source(Source.USER)
+                activePlugin.activeTreatments.addToHistoryTempBasal(tempStop)
+            }
+        } else {
+            if (danaRPump.isTempBasalInProgress) { // Create new
+                val newTempBasal = TemporaryBasal()
+                    .date(danaRPump.tempBasalStart)
+                    .percent(danaRPump.tempBasalPercent)
+                    .duration(danaRPump.tempBasalTotalSec / 60)
+                    .source(Source.USER)
+                activePlugin.activeTreatments.addToHistoryTempBasal(newTempBasal)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java
deleted file mode 100644
index 36f3402cc7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class RecordTypes {
-    public static final byte RECORD_TYPE_BOLUS =      (byte) 0x01;
-    public static final byte RECORD_TYPE_DAILY =      (byte) 0x02;
-    public static final byte RECORD_TYPE_PRIME =      (byte) 0x03;
-    public static final byte RECORD_TYPE_ERROR =      (byte) 0x04;
-    public static final byte RECORD_TYPE_ALARM =      (byte) 0x05;
-    public static final byte RECORD_TYPE_GLUCOSE =    (byte) 0x06;
-    public static final byte RECORD_TYPE_CARBO =      (byte) 0x08;
-    public static final byte RECORD_TYPE_REFILL =     (byte) 0x09;
-    public static final byte RECORD_TYPE_SUSPEND =    (byte) 0x0B;
-    public static final byte RECORD_TYPE_BASALHOUR =  (byte) 0x0C;
-    public static final byte RECORD_TYPE_TB =         (byte) 0x0D;
-    public static final byte RECORD_TYPE_TEMP_BASAL = (byte) 0x14;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
new file mode 100644
index 0000000000..74d594dc71
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+object RecordTypes {
+    const val RECORD_TYPE_BOLUS = 0x01.toByte()
+    const val RECORD_TYPE_DAILY = 0x02.toByte()
+    const val RECORD_TYPE_PRIME = 0x03.toByte()
+    const val RECORD_TYPE_ERROR = 0x04.toByte()
+    const val RECORD_TYPE_ALARM = 0x05.toByte()
+    const val RECORD_TYPE_GLUCOSE = 0x06.toByte()
+    const val RECORD_TYPE_CARBO = 0x08.toByte()
+    const val RECORD_TYPE_REFILL = 0x09.toByte()
+    const val RECORD_TYPE_SUSPEND = 0x0B.toByte()
+    const val RECORD_TYPE_BASALHOUR = 0x0C.toByte()
+    const val RECORD_TYPE_TB = 0x0D.toByte()
+    const val RECORD_TYPE_TEMP_BASAL = 0x14.toByte()
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index 839debe9be..743b0109f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -1,29 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaR.services;
 
-import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.SystemClock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.util.Set;
 import java.util.UUID;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.DaggerService;
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.events.EventBTChange;
+import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryAlarm;
@@ -31,7 +34,6 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBasalHour;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBolus;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryCarbo;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryDailyInsulin;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryDone;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryError;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryGlucose;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryRefill;
@@ -41,15 +43,28 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by mike on 28.01.2018.
  */
 
-public abstract class AbstractDanaRExecutionService extends Service {
-    protected Logger log = LoggerFactory.getLogger(L.PUMP);
+public abstract class AbstractDanaRExecutionService extends DaggerService {
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject SP sp;
+    @Inject Context context;
+    @Inject ResourceHelper resourceHelper;
+    @Inject DanaRPump danaRPump;
+    @Inject FabricPrivacy fabricPrivacy;
+
+    private CompositeDisposable disposable = new CompositeDisposable();
 
     protected String mDevName;
 
@@ -80,7 +95,7 @@ public abstract class AbstractDanaRExecutionService extends Service {
 
     public abstract boolean bolus(double amount, int carbs, long carbtime, final Treatment t);
 
-    public abstract boolean highTempBasal(int percent); // Rv2 only
+    public abstract boolean highTempBasal(int percent, int durationInMinutes); // Rv2 only
 
     public abstract boolean tempBasalShortDuration(int percent, int durationInMinutes); // Rv2 only
 
@@ -94,23 +109,41 @@ public abstract class AbstractDanaRExecutionService extends Service {
 
     public abstract PumpEnactResult setUserOptions();
 
-    protected BroadcastReceiver receiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            String action = intent.getAction();
-            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Device was disconnected " + device.getName());//Device was disconnected
-                if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(device.getName())) {
-                    if (mSerialIOThread != null) {
-                        mSerialIOThread.disconnect("BT disconnection broadcast");
+    @Override public void onCreate() {
+        super.onCreate();
+        disposable.add(rxBus
+                .toObservable(EventBTChange.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> {
+                    if (event.getState() == EventBTChange.Change.DISCONNECT) {
+                        aapsLogger.debug(LTag.PUMP, "Device was disconnected " + event.getDeviceName());//Device was disconnected
+                        if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(event.getDeviceName())) {
+                            if (mSerialIOThread != null) {
+                                mSerialIOThread.disconnect("BT disconnection broadcast");
+                            }
+                            rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
+                        }
                     }
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
-                }
-            }
-        }
-    };
+                }, fabricPrivacy::logException)
+        );
+        disposable.add(rxBus
+                .toObservable(EventAppExit.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> {
+                    aapsLogger.debug(LTag.PUMP, "EventAppExit received");
+                    if (mSerialIOThread != null)
+                        mSerialIOThread.disconnect("Application exit");
+                    stopSelf();
+                }, fabricPrivacy::logException)
+        );
+
+    }
+
+    @Override
+    public void onDestroy() {
+        disposable.clear();
+        super.onDestroy();
+    }
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -136,7 +169,7 @@ public abstract class AbstractDanaRExecutionService extends Service {
 
     public void finishHandshaking() {
         mHandshakeInProgress = false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED, 0));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED, 0));
     }
 
     public void disconnect(String from) {
@@ -150,7 +183,7 @@ public abstract class AbstractDanaRExecutionService extends Service {
     }
 
     protected void getBTSocketForSelectedPump() {
-        mDevName = SP.getString(MainApp.gs(R.string.key_danar_bt_name), "");
+        mDevName = sp.getString(resourceHelper.gs(R.string.key_danar_bt_name), "");
         BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
         if (bluetoothAdapter != null) {
@@ -162,77 +195,76 @@ public abstract class AbstractDanaRExecutionService extends Service {
                     try {
                         mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
                     } catch (IOException e) {
-                        log.error("Error creating socket: ", e);
+                        aapsLogger.error("Error creating socket: ", e);
                     }
                     break;
                 }
             }
         } else {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.nobtadapter));
+            ToastUtils.showToastInUiThread(context.getApplicationContext(), resourceHelper.gs(R.string.nobtadapter));
         }
         if (mBTDevice == null) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.devicenotfound));
+            ToastUtils.showToastInUiThread(context.getApplicationContext(), resourceHelper.gs(R.string.devicenotfound));
         }
     }
 
     public void bolusStop() {
-        if (L.isEnabled(L.PUMP))
-            log.debug("bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
-        MsgBolusStop stop = new MsgBolusStop();
-        stop.forced = true;
+        aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
+        MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump);
+        danaRPump.setBolusStopForced(true);
         if (isConnected()) {
             mSerialIOThread.sendMessage(stop);
-            while (!stop.stopped) {
+            while (!danaRPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(stop);
                 SystemClock.sleep(200);
             }
         } else {
-            stop.stopped = true;
+            danaRPump.setBolusStopped(true);
         }
     }
 
     public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(injector);
         if (!isConnected()) return result;
         MessageBase msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm();
+                msg = new MsgHistoryAlarm(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour();
+                msg = new MsgHistoryBasalHour(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus();
+                msg = new MsgHistoryBolus(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo();
+                msg = new MsgHistoryCarbo(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin();
+                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError();
+                msg = new MsgHistoryError(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose();
+                msg = new MsgHistoryGlucose(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill();
+                msg = new MsgHistoryRefill(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend();
+                msg = new MsgHistorySuspend(aapsLogger, rxBus);
                 break;
         }
-        MsgHistoryDone done = new MsgHistoryDone();
-        mSerialIOThread.sendMessage(new MsgPCCommStart());
+        danaRPump.setHistoryDoneReceived(false);
+        mSerialIOThread.sendMessage(new MsgPCCommStart(aapsLogger));
         SystemClock.sleep(400);
         mSerialIOThread.sendMessage(msg);
-        while (!done.received && mRfcommSocket.isConnected()) {
+        while (!danaRPump.getHistoryDoneReceived() && mRfcommSocket.isConnected()) {
             SystemClock.sleep(100);
         }
         SystemClock.sleep(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop());
+        mSerialIOThread.sendMessage(new MsgPCCommStop(aapsLogger));
         result.success = true;
         result.comment = "OK";
         return result;
@@ -244,7 +276,7 @@ public abstract class AbstractDanaRExecutionService extends Service {
             long timeToWholeMinute = (60000 - time % 60000);
             if (timeToWholeMinute > 59800 || timeToWholeMinute < 3000)
                 break;
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
             SystemClock.sleep(Math.min(timeToWholeMinute, 100));
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 848abd9b52..1a677f60e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.services;
 
 import android.bluetooth.BluetoothDevice;
+import android.content.Context;
 import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.SystemClock;
@@ -8,34 +9,37 @@ import android.os.SystemClock;
 import java.io.IOException;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableR;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgCheckValue;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
@@ -61,54 +65,40 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 public class DanaRExecutionService extends AbstractDanaRExecutionService {
-    private CompositeDisposable disposable = new CompositeDisposable();
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject DanaRPump danaRPump;
+    @Inject DanaRPlugin danaRPlugin;
+    @Inject DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject CommandQueueProvider commandQueue;
+    @Inject Context context;
+    @Inject MessageHashTableR messageHashTableR;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject ProfileFunction profileFunction;
+    @Inject SP sp;
 
     public DanaRExecutionService() {
-        mBinder = new LocalBinder();
-
-        MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
-     }
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("EventPreferenceChange");
-                }, FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("EventAppExit received");
-
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("Application exit");
-                    MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
-                    stopSelf();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        disposable.clear();
-        super.onDestroy();
+        mBinder = new LocalBinder();
     }
 
     public class LocalBinder extends Binder {
@@ -135,7 +125,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             } catch (IOException e) {
                 //log.error("Unhandled exception", e);
                 if (e.getMessage().contains("socket closed")) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error("Unhandled exception", e);
                 }
             }
 
@@ -143,9 +133,9 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableR.INSTANCE);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableR, danaRPump);
                 mHandshakeInProgress = true;
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
+                rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
 
             mConnectionInProgress = false;
@@ -153,16 +143,15 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus();
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic();
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal();
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
-            MsgCheckValue checkValue = new MsgCheckValue();
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
+            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin);
+            MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaRPump, danaRPlugin);
 
-            if (danaRPump.isNewPump) {
+            if (danaRPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -171,119 +160,114 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
             mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            danaRPump.lastConnection = now;
+            danaRPump.setLastConnection(now);
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
-                    RxBus.INSTANCE.send(new EventProfileNeedsUpdate());
+            Profile profile = profileFunction.getProfile();
+            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().basalStep) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                if (!danaRPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
-                mSerialIOThread.sendMessage(new MsgSettingMeal());
-                mSerialIOThread.sendMessage(new MsgSettingBasal());
+            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues());
-                mSerialIOThread.sendMessage(new MsgSettingGlucose());
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll());
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions());
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                if (danaRPump.pumpTime == 0) {
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaRPump));
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.lastConnection = 0;
-                    danaRPump.lastSettingsRead = 0;
-                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                    RxBus.INSTANCE.send(new EventInitializationChanged());
+                    danaRPump.setLastConnection(0);
+                    danaRPump.setLastSettingsRead(0);
+                    rxBus.send(new EventDanaRNewStatus());
+                    rxBus.send(new EventInitializationChanged());
                     return;
                 }
-                long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Pump time difference: " + timeDiff + " seconds");
+                long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
-                    mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Pump time difference: " + timeDiff + " seconds");
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.lastSettingsRead = now;
+                danaRPump.setLastSettingsRead(now);
             }
 
-            RxBus.INSTANCE.send(new EventDanaRNewStatus());
-            RxBus.INSTANCE.send(new EventInitializationChanged());
-            NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            rxBus.send(new EventDanaRNewStatus());
+            rxBus.send(new EventInitializationChanged());
+            //NSUpload.uploadDeviceStatus();
+            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
-                    RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    rxBus.send(new EventNewNotification(reportFail));
+                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop());
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
@@ -293,40 +277,40 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean bolus(double amount, int carbs, long carbtime, final Treatment t) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
         mBolusingTreatment = t;
-        int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
+        int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(amount);
+            start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
         else
-            start = new MsgBolusStartWithSpeed(amount, preferencesSpeed);
-        MsgBolusStop stop = new MsgBolusStop(amount, t);
+            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, amount, preferencesSpeed);
+        danaRPump.setBolusStopped(false);
+        danaRPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
         }
 
         if (amount > 0) {
-            MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
+            danaRPump.setBolusingTreatment(t);
+            danaRPump.setBolusAmountToBeDelivered(amount);
             long bolusStart = System.currentTimeMillis();
 
-            if (!stop.stopped) {
+            if (!danaRPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!stop.stopped && !start.failed) {
+            while (!danaRPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    stop.stopped = true;
-                    stop.forced = true;
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Communication stopped");
+                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaRPump.setBolusStopped(true);
+                    danaRPump.setBolusStopForced(true);
+                    aapsLogger.debug(LTag.PUMP, "Communication stopped");
                 }
             }
             SystemClock.sleep(300);
@@ -357,23 +341,21 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
                 while (System.currentTimeMillis() < expectedEnd) {
                     long waitTime = expectedEnd - System.currentTimeMillis();
-                    bolusingEvent.setStatus(String.format(MainApp.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
-                    RxBus.INSTANCE.send(bolusingEvent);
+                    bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
+                    rxBus.send(bolusingEvent);
                     SystemClock.sleep(1000);
                 }
 
                 final Object o = new Object();
                 synchronized (o) {
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().independentConnect("bolusingInterrupted", new Callback() {
+                    commandQueue.independentConnect("bolusingInterrupted", new Callback() {
                         @Override
                         public void run() {
-                            if (danaRPump.lastBolusTime > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
-                                t.insulin = danaRPump.lastBolusAmount;
-                                if (L.isEnabled(L.PUMP))
-                                    log.debug("Used bolus amount from history: " + danaRPump.lastBolusAmount);
+                            if (danaRPump.getLastBolusTime() > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
+                                t.insulin = danaRPump.getLastBolusAmount();
+                                aapsLogger.debug(LTag.PUMP, "Used bolus amount from history: " + danaRPump.getLastBolusAmount());
                             } else {
-                                if (L.isEnabled(L.PUMP))
-                                    log.debug("Bolus amount in history too old: " + DateUtil.dateAndTimeFullString(danaRPump.lastBolusTime));
+                                aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + DateUtil.dateAndTimeString(danaRPump.getLastBolusTime()));
                             }
                             synchronized (o) {
                                 o.notify();
@@ -383,11 +365,11 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                     try {
                         o.wait();
                     } catch (InterruptedException e) {
-                        log.error("Unhandled exception", e);
+                        aapsLogger.error("Unhandled exception", e);
                     }
                 }
             } else {
-                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("bolusOK", null);
+                commandQueue.readStatus("bolusOK", null);
             }
         }
         return !start.failed;
@@ -395,13 +377,13 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
 
     @Override
-    public boolean highTempBasal(int percent) {
+    public boolean highTempBasal(int percent, int durationInMinutes) {
         return false;
     }
 
@@ -411,27 +393,26 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
-        double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile((byte) 0, basal);
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public PumpEnactResult setUserOptions() {
         if (!isConnected())
-            return new PumpEnactResult().success(false);
+            return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions();
+        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaRPump);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
-        return new PumpEnactResult().success(!msg.failed);
+        return new PumpEnactResult(injector).success(!msg.failed);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 2645e25ade..809cf77e6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -6,7 +6,12 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 
-import info.nightscout.androidaps.MainApp;
+import androidx.annotation.NonNull;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
@@ -15,78 +20,89 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static DanaRKoreanPlugin plugin = null;
+    private final AAPSLogger aapsLogger;
+    private final Context context;
+    private final ResourceHelper resourceHelper;
+    private final ConstraintChecker constraintChecker;
 
-    public static DanaRKoreanPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new DanaRKoreanPlugin();
-        return plugin;
-    }
+    @Inject
+    public DanaRKoreanPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            DanaRPump danaRPump,
+            Context context,
+            ResourceHelper resourceHelper,
+            ConstraintChecker constraintChecker,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue
 
-    public DanaRKoreanPlugin() {
-        pluginDescription.description(R.string.description_pump_dana_r_korean);
+    ) {
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        this.aapsLogger = aapsLogger;
+        this.context = context;
+        this.resourceHelper = resourceHelper;
+        this.constraintChecker = constraintChecker;
+        getPluginDescription().description(R.string.description_pump_dana_r_korean);
 
-        useExtendedBoluses = SP.getBoolean(R.string.key_danar_useextended, false);
+        useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
         pumpDescription.setPumpDescription(PumpType.DanaRKorean);
     }
 
     @Override
     protected void onStart() {
-        Context context = MainApp.instance().getApplicationContext();
         Intent intent = new Intent(context, DanaRKoreanExecutionService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     if (isEnabled(PluginType.PUMP)) {
                         boolean previousValue = useExtendedBoluses;
-                        useExtendedBoluses = SP.getBoolean(R.string.key_danar_useextended, false);
+                        useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
 
-                        if (useExtendedBoluses != previousValue && TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress()) {
+                        if (useExtendedBoluses != previousValue && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
                             sExecutionService.extendedBolusStop();
                         }
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    MainApp.instance().getApplicationContext().unbindService(mConnection);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         super.onStart();
     }
 
     @Override
     protected void onStop() {
-        Context context = MainApp.instance().getApplicationContext();
         context.unbindService(mConnection);
-
         disposable.clear();
         super.onStop();
     }
@@ -94,23 +110,22 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is disconnected");
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
             sExecutionService = null;
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is connected");
+            aapsLogger.debug(LTag.PUMP, "Service is connected");
             DanaRKoreanExecutionService.LocalBinder mLocalBinder = (DanaRKoreanExecutionService.LocalBinder) service;
             sExecutionService = mLocalBinder.getServiceInstance();
         }
     };
 
     // Plugin base interface
+    @NonNull
     @Override
     public String getName() {
-        return MainApp.gs(R.string.danarkoreanpump);
+        return resourceHelper.gs(R.string.danarkoreanpump);
     }
 
     @Override
@@ -126,8 +141,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        DanaRPump pump = DanaRPump.getInstance();
-        return pump.lastConnection > 0 && pump.maxBasal > 0 && !pump.isConfigUD && !pump.isEasyModeEnabled && pump.isExtendedBolusEnabled && pump.isPasswordOK();
+        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0 && !danaRPump.isConfigUD() && !danaRPump.isEasyModeEnabled() && danaRPump.isExtendedBolusEnabled() && danaRPump.isPasswordOK();
     }
 
     @Override
@@ -140,53 +154,50 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
         sExecutionService.finishHandshaking();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             Treatment t = new Treatment();
             t.isSMB = detailedBolusInfo.isSMB;
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0)
                 connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, detailedBolusInfo.carbTime, t);
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, MsgBolusStart.errorCode);
+                result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
             else
-                result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
+                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             detailedBolusInfo.insulin = t.insulin;
             detailedBolusInfo.date = System.currentTimeMillis();
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
+            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
             return result;
         } else {
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("deliverTreatment: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
     }
 
     // This is called from APS
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
         // Recheck pump status if older than 30 min
         //This should not be needed while using queue because connection should be done before calling this
         //if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
         //    connect("setTempBasalAbsolute old data");
         //}
-        DanaRPump pump = DanaRPump.getInstance();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        PumpEnactResult result = new PumpEnactResult();
-
-        absoluteRate = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
         final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate();
@@ -194,20 +205,18 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(now);
-        ExtendedBolus activeExtended = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
+        ExtendedBolus activeExtended = treatmentsPlugin.getExtendedBolusFromHistory(now);
 
         if (doTempOff) {
             // If extended in progress
             if (activeExtended != null && useExtendedBoluses) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping extended bolus (doTempOff)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doTempOff)");
                 return cancelExtendedBolus();
             }
             // If temp in progress
             if (activeTemp != null) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doTempOff)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
                 return cancelRealTempBasal();
             }
             result.success = true;
@@ -215,8 +224,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             result.percent = 100;
             result.isPercent = true;
             result.isTempCancel = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: doTempOff OK");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK");
             return result;
         }
 
@@ -227,24 +235,21 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             if (percentRate > getPumpDescription().maxTempPercent) {
                 percentRate = getPumpDescription().maxTempPercent;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Calculated percent rate: " + percentRate);
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: " + percentRate);
 
             // If extended in progress
             if (activeExtended != null && useExtendedBoluses) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)");
                 result = cancelExtendedBolus();
                 if (!result.success) {
-                    log.error("setTempBasalAbsolute: Failed to stop previous extended bolus (doLowTemp || doHighTemp)");
+                    aapsLogger.error("setTempBasalAbsolute: Failed to stop previous extended bolus (doLowTemp || doHighTemp)");
                     return result;
                 }
             }
             // Check if some temp is already in progress
             if (activeTemp != null) {
                 // Correct basal already set ?
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: currently running: " + activeTemp.toString());
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running: " + activeTemp.toString());
                 if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
                     if (enforceNew) {
                         cancelTempBasal(true);
@@ -255,119 +260,110 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
                         result.duration = activeTemp.getPlannedRemainingMinutes();
                         result.isPercent = true;
                         result.isTempCancel = false;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
                         return result;
                     }
                 }
             }
             // Convert duration from minutes to hours
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
             return setTempBasalPercent(percentRate, durationInMinutes, profile, false);
         }
         if (doExtendedTemp) {
             // Check if some temp is already in progress
             if (activeTemp != null) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doExtendedTemp)");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doExtendedTemp)");
                 result = cancelRealTempBasal();
                 // Check for proper result
                 if (!result.success) {
-                    log.error("setTempBasalAbsolute: Failed to stop previous temp basal (doExtendedTemp)");
+                    aapsLogger.error("setTempBasalAbsolute: Failed to stop previous temp basal (doExtendedTemp)");
                     return result;
                 }
             }
 
             // Calculate # of halfHours from minutes
-            Integer durationInHalfHours = Math.max(durationInMinutes / 30, 1);
+            int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
             // We keep current basal running so need to sub current basal
             Double extendedRateToSet = absoluteRate - getBaseBasalRate();
-            extendedRateToSet = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(extendedRateToSet), profile).value();
+            extendedRateToSet = constraintChecker.applyBasalConstraints(new Constraint<>(extendedRateToSet), profile).value();
             // needs to be rounded to 0.1
             extendedRateToSet = Round.roundTo(extendedRateToSet, pumpDescription.extendedBolusStep * 2); // *2 because of halfhours
 
             // What is current rate of extended bolusing in u/h?
-            if (L.isEnabled(L.PUMP)) {
-                log.debug("setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + pump.extendedBolusAbsoluteRate + "U/h duration remaining: " + pump.extendedBolusRemainingMinutes + "min");
-                log.debug("setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
-            }
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaRPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaRPump.getExtendedBolusRemainingMinutes() + "min");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
 
             // Compare with extended rate in progress
-            if (activeExtended != null && Math.abs(pump.extendedBolusAbsoluteRate - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
+            if (activeExtended != null && Math.abs(danaRPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
                 // correct extended already set
                 result.success = true;
-                result.absolute = pump.extendedBolusAbsoluteRate;
+                result.absolute = danaRPump.getExtendedBolusAbsoluteRate();
                 result.enacted = false;
-                result.duration = pump.extendedBolusRemainingMinutes;
+                result.duration = danaRPump.getExtendedBolusRemainingMinutes();
                 result.isPercent = false;
                 result.isTempCancel = false;
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Correct extended already set");
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct extended already set");
                 return result;
             }
 
             // Now set new extended, no need to to stop previous (if running) because it's replaced
             Double extendedAmount = extendedRateToSet / 2 * durationInHalfHours;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting extended: " + extendedAmount + "U  halfhours: " + durationInHalfHours);
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting extended: " + extendedAmount + "U  halfhours: " + durationInHalfHours);
             result = setExtendedBolus(extendedAmount, durationInMinutes);
             if (!result.success) {
-                log.error("setTempBasalAbsolute: Failed to set extended bolus");
+                aapsLogger.error("setTempBasalAbsolute: Failed to set extended bolus");
                 return result;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Extended bolus set ok");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus set ok");
             result.absolute = result.absolute + getBaseBasalRate();
             return result;
         }
         // We should never end here
-        log.error("setTempBasalAbsolute: Internal error");
+        aapsLogger.error("setTempBasalAbsolute: Internal error");
         result.success = false;
         result.comment = "Internal error";
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress())
+        if (treatmentsPlugin.isInHistoryRealTempBasalInProgress())
             return cancelRealTempBasal();
-        if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
+        if (treatmentsPlugin.isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
             return cancelExtendedBolus();
         }
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         result.enacted = false;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         result.isTempCancel = true;
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.DanaRKorean;
     }
 
     private PumpEnactResult cancelRealTempBasal() {
-        PumpEnactResult result = new PumpEnactResult();
-        TemporaryBasal runningTB = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isTempBasalInProgress) {
+        if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelRealTempBasal: OK");
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
             result.isTempCancel = true;
-            log.error("cancelRealTempBasal: Failed to cancel temp basal");
+            aapsLogger.error("cancelRealTempBasal: Failed to cancel temp basal");
             return result;
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
new file mode 100644
index 0000000000..07491b0721
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.*
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageHashTableRKorean @Inject constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    constraintChecker: ConstraintChecker,
+    danaRPump: DanaRPump,
+    danaRPlugin: DanaRPlugin,
+    danaRKoreanPlugin: DanaRKoreanPlugin,
+    configBuilderPlugin: ConfigBuilderPlugin,
+    commandQueue: CommandQueueProvider,
+    activePlugin: ActivePluginProvider
+) : MessageHashTableBase {
+
+    var messages: HashMap<Int, MessageBase> = HashMap()
+
+    init {
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic_k(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus_k(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll_k(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+    }
+
+    override fun put(message: MessageBase) {
+        messages[message.command] = message
+    }
+
+    override fun findMessage(command: Int): MessageBase {
+        return messages[command] ?: MessageBase()
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt
deleted file mode 100644
index ffdf9d14c5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
-
-import info.nightscout.androidaps.plugins.pump.danaR.comm.*
-import java.util.*
-
-object MessageHashTableRkorean : MessageHashTableBase {
-    var messages: HashMap<Int, MessageBase> = HashMap()
-
-    init {
-        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal())           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended())       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic_k())               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus_k())                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime_k())        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus_k())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic_k())       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgSettingBasal_k())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll_k())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_k())                // 0xF0F1 CMD_PUMP_CHECK_VALUE
-    }
-
-    override fun put(message: MessageBase) {
-        messages[message.command] = message
-    }
-
-    override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java
deleted file mode 100644
index 731c25d4d1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-
-/**
- * Created by mike on 30.06.2016.
- */
-public class MsgCheckValue_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgCheckValue_k() {
-        SetCommand(0xF0F1);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        pump.isNewPump = true;
-        if (L.isEnabled(L.PUMP))
-            log.debug("New firmware confirmed");
-
-        pump.model = intFromBuff(bytes, 0, 1);
-        pump.protocol = intFromBuff(bytes, 1, 1);
-        pump.productCode = intFromBuff(bytes, 2, 1);
-        if (pump.model != DanaRPump.DOMESTIC_MODEL) {
-            DanaRKoreanPlugin.getPlugin().disconnect("Wrong Model");
-            log.error("Wrong model selected");
-        }
-
-        if (L.isEnabled(L.PUMP)) {
-            log.debug("Model: " + String.format("%02X ", pump.model));
-            log.debug("Protocol: " + String.format("%02X ", pump.protocol));
-            log.debug("Product Code: " + String.format("%02X ", pump.productCode));
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
new file mode 100644
index 0000000000..16ae6967a2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+
+class MsgCheckValue_k(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin
+
+) : MessageBase() {
+
+    init {
+        SetCommand(0xF0F1)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.isNewPump = true
+        aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
+        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.protocol = intFromBuff(bytes, 1, 1)
+        danaRPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaRPump.model != DanaRPump.DOMESTIC_MODEL) {
+            danaRKoreanPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java
deleted file mode 100644
index 8f62ccd58f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgInitConnStatusBasic_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusBasic_k() {
-        SetCommand(0x0303);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length - 10 > 6) {
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1;
-        int isUtilityEnable = intFromBuff(bytes, 1, 1);
-        pump.isEasyModeEnabled = intFromBuff(bytes, 2, 1) == 1;
-        int easyUIMode = intFromBuff(bytes, 3, 1);
-        pump.password = intFromBuff(bytes, 4, 2) ^ 0x3463;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("isStatusSuspendOn: " + pump.pumpSuspended);
-            log.debug("isUtilityEnable: " + isUtilityEnable);
-            log.debug("Is EasyUI Enabled: " + pump.isEasyModeEnabled);
-            log.debug("easyUIMode: " + easyUIMode);
-            log.debug("Pump password: " + pump.password);
-        }
-
-        if (pump.isEasyModeEnabled) {
-            Notification notification = new Notification(Notification.EASYMODE_ENABLED, MainApp.gs(R.string.danar_disableeasymode), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.EASYMODE_ENABLED));
-        }
-
-        if (!DanaRPump.getInstance().isPasswordOK()) {
-            Notification notification = new Notification(Notification.WRONG_PUMP_PASSWORD, MainApp.gs(R.string.wrongpumppassword), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.WRONG_PUMP_PASSWORD));
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
new file mode 100644
index 0000000000..89a083f34a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusBasic_k(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0303)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 > 6) {
+            return
+        }
+        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        val isUtilityEnable = intFromBuff(bytes, 1, 1)
+        danaRPump.isEasyModeEnabled = intFromBuff(bytes, 2, 1) == 1
+        val easyUIMode = intFromBuff(bytes, 3, 1)
+        danaRPump.password = intFromBuff(bytes, 4, 2) xor 0x3463
+        aapsLogger.debug(LTag.PUMPCOMM, "isStatusSuspendOn: " + danaRPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "isUtilityEnable: $isUtilityEnable")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is EasyUI Enabled: " + danaRPump.isEasyModeEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "easyUIMode: $easyUIMode")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.password)
+        if (danaRPump.isEasyModeEnabled) {
+            val notification = Notification(Notification.EASYMODE_ENABLED, resourceHelper.gs(R.string.danar_disableeasymode), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.EASYMODE_ENABLED))
+        }
+        if (!danaRPump.isPasswordOK) {
+            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.WRONG_PUMP_PASSWORD))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java
deleted file mode 100644
index 0df308369f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MsgInitConnStatusBolus_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusBolus_k() {
-        SetCommand(0x0302);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length - 10 < 13) {
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-        int bolusConfig = intFromBuff(bytes, 0, 1);
-        pump.isExtendedBolusEnabled = (bolusConfig & 0x01) != 0;
-
-        pump.bolusStep = intFromBuff(bytes, 1, 1) / 100d;
-        pump.maxBolus = intFromBuff(bytes, 2, 2) / 100d;
-        //int bolusRate = intFromBuff(bytes, 4, 8);
-        int deliveryStatus = intFromBuff(bytes, 12, 1);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is Extended bolus enabled: " + pump.isExtendedBolusEnabled);
-            log.debug("Bolus increment: " + pump.bolusStep);
-            log.debug("Bolus max: " + pump.maxBolus);
-            log.debug("Delivery status: " + deliveryStatus);
-        }
-
-        if (!pump.isExtendedBolusEnabled) {
-            Notification notification = new Notification(Notification.EXTENDED_BOLUS_DISABLED, MainApp.gs(R.string.danar_enableextendedbolus), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED));
-        }
-
-        // This is last message of initial sequence
-        if (ConfigBuilderPlugin.getPlugin().getActivePump() != null)
-            ConfigBuilderPlugin.getPlugin().getActivePump().finishHandshaking();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
new file mode 100644
index 0000000000..f59778fa8f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusBolus_k(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val activePlugin: ActivePluginProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0302)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 < 13) {
+            return
+        }
+        val bolusConfig = intFromBuff(bytes, 0, 1)
+        danaRPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
+        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        danaRPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
+        //int bolusRate = intFromBuff(bytes, 4, 8);
+        val deliveryStatus = intFromBuff(bytes, 12, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaRPump.bolusStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaRPump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivery status: $deliveryStatus")
+        if (!danaRPump.isExtendedBolusEnabled) {
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
+        }
+        // This is last message of initial sequence
+        activePlugin.activePump.finishHandshaking()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java
deleted file mode 100644
index 8a642a89f8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-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.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgInitConnStatusTime_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgInitConnStatusTime_k() {
-        SetCommand(0x0301);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-
-        if (bytes.length - 10 < 10) {
-            Notification notification = new Notification(Notification.WRONG_DRIVER, MainApp.gs(R.string.pumpdrivercorrected), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            DanaRKoreanPlugin.getPlugin().disconnect("Wrong Model");
-            log.error("Wrong model selected. Switching to export DanaR");
-            DanaRKoreanPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, false);
-            DanaRKoreanPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, false);
-            DanaRPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, true);
-            DanaRPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, true);
-
-            DanaRPump.reset(); // mark not initialized
-
-            //If profile coming from pump, switch it as well
-            if (DanaRKoreanPlugin.getPlugin().isEnabled(PluginType.PROFILE)) {
-                (DanaRKoreanPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, false);
-                (DanaRPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, true);
-            }
-
-            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingKoreanDanaDriver");
-            RxBus.INSTANCE.send(new EventRebuildTabs());
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
-            return;
-        }
-
-        long time = dateTimeSecFromBuff(bytes, 0);
-        int versionCode1 = intFromBuff(bytes, 6, 1);
-        int versionCode2 = intFromBuff(bytes, 7, 1);
-        int versionCode3 = intFromBuff(bytes, 8, 1);
-        int versionCode4 = intFromBuff(bytes, 9, 1);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump time: " + DateUtil.dateAndTimeFullString(time));
-            log.debug("Version code1: " + versionCode1);
-            log.debug("Version code2: " + versionCode2);
-            log.debug("Version code3: " + versionCode3);
-            log.debug("Version code4: " + versionCode4);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
new file mode 100644
index 0000000000..77402e0389
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventRebuildTabs
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+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.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgInitConnStatusTime_k(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val danaRPlugin: DanaRPlugin,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin,
+    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val commandQueue: CommandQueueProvider
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0301)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        if (bytes.size - 10 < 10) {
+            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+            danaRKoreanPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to export DanaR")
+            danaRKoreanPlugin.setPluginEnabled(PluginType.PUMP, false)
+            danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, false)
+            danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+            danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
+            danaRPump.reset() // mark not initialized
+            //If profile coming from pump, switch it as well
+            configBuilderPlugin.storeSettings("ChangingKoreanDanaDriver")
+            rxBus.send(EventRebuildTabs())
+            commandQueue.readStatus("PumpDriverChange", null) // force new connection
+            return
+        }
+        val time = dateTimeSecFromBuff(bytes, 0)
+        val versionCode1 = intFromBuff(bytes, 6, 1)
+        val versionCode2 = intFromBuff(bytes, 7, 1)
+        val versionCode3 = intFromBuff(bytes, 8, 1)
+        val versionCode4 = intFromBuff(bytes, 9, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Version code1: $versionCode1")
+        aapsLogger.debug(LTag.PUMPCOMM, "Version code2: $versionCode2")
+        aapsLogger.debug(LTag.PUMPCOMM, "Version code3: $versionCode3")
+        aapsLogger.debug(LTag.PUMPCOMM, "Version code4: $versionCode4")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java
deleted file mode 100644
index 85591d4655..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-
-/**
- * Created by mike on 05.07.2016.
- * <p/>
- * <p/>
- * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
- */
-public class MsgSettingBasalProfileAll_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingBasalProfileAll_k() {
-        SetCommand(0x3206);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.basal48Enable) {
-            pump.pumpProfiles = new double[4][];
-            for (int profile = 0; profile < 4; profile++) {
-                int position = intFromBuff(bytes, 107 * profile, 1);
-                pump.pumpProfiles[position] = new double[48];
-                for (int index = 0; index < 48; index++) {
-                    int basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2);
-                    if (basal < 10) basal = 0;
-                    pump.pumpProfiles[position][index] = basal / 100 / 24d; // in units/day
-                }
-            }
-        } else {
-            pump.pumpProfiles = new double[4][];
-            for (int profile = 0; profile < 4; profile++) {
-                int position = intFromBuff(bytes, 49 * profile, 1);
-                log.debug("position " + position);
-                pump.pumpProfiles[position] = new double[24];
-                for (int index = 0; index < 24; index++) {
-                    int basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2);
-                    if (basal < 10) basal = 0;
-                    log.debug("position " + position + " index " + index);
-                    pump.pumpProfiles[position][index] = basal / 100 / 24d; // in units/day
-                }
-            }
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (pump.basal48Enable) {
-                for (int profile = 0; profile < 4; profile++) {
-                    for (int index = 0; index < 24; index++) {
-                        log.debug("Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[profile][index]);
-                    }
-                }
-            } else {
-                for (int profile = 0; profile < 4; profile++) {
-                    for (int index = 0; index < 48; index++) {
-                        log.debug("Basal profile " + profile + ": " +
-                                String.format(Locale.ENGLISH, "%02d", (index / 2)) +
-                                ":" + String.format(Locale.ENGLISH, "%02d", (index % 2) * 30) + " : " +
-                                pump.pumpProfiles[profile][index]);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
new file mode 100644
index 0000000000..9f33c81dbe
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import java.util.*
+
+/**
+ * Created by mike on 05.07.2016.
+ *
+ *
+ *
+ *
+ * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
+ */
+class MsgSettingBasalProfileAll_k(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3206)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        if (danaRPump.basal48Enable) {
+            for (profile in 0..3) {
+                val position = intFromBuff(bytes, 107 * profile, 1)
+                for (index in 0..47) {
+                    var basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2)
+                    if (basal < 10) basal = 0
+                    danaRPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
+                }
+            }
+        } else {
+            for (profile in 0..3) {
+                val position = intFromBuff(bytes, 49 * profile, 1)
+                aapsLogger.debug(LTag.PUMPCOMM, "position $position")
+                for (index in 0..23) {
+                    var basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2)
+                    if (basal < 10) basal = 0
+                    aapsLogger.debug(LTag.PUMPCOMM, "position $position index $index")
+                    danaRPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
+                }
+            }
+        }
+        if (danaRPump.basal48Enable) {
+            for (profile in 0..3) {
+                for (index in 0..23) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profile][index])
+                }
+            }
+        } else {
+            for (profile in 0..3) {
+                for (index in 0..47) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index / 2) +
+                        ":" + String.format(Locale.ENGLISH, "%02d", index % 2 * 30) + " : " +
+                        danaRPump.pumpProfiles!![profile][index])
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java
deleted file mode 100644
index b3ba918a4a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-
-/**
- * Created by mike on 05.07.2016.
- */
-public class MsgSettingBasal_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSettingBasal_k() {
-        SetCommand(0x3202);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.pumpProfiles == null) pump.pumpProfiles = new double[4][];
-        pump.pumpProfiles[pump.activeProfile] = new double[24];
-        for (int index = 0; index < 24; index++) {
-            int basal = intFromBuff(bytes, 2 * index, 2);
-            if (basal < DanaRKoreanPlugin.getPlugin().pumpDescription.basalMinimumRate) basal = 0;
-            pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
-        }
-
-        if (L.isEnabled(L.PUMPCOMM))
-            for (int index = 0; index < 24; index++) {
-                log.debug("Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[pump.activeProfile][index]);
-            }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
new file mode 100644
index 0000000000..13b29aba9c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import java.util.*
+
+class MsgSettingBasal_k(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin
+) : MessageBase() {
+
+    init {
+        SetCommand(0x3202)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        for (index in 0..23) {
+            var basal = intFromBuff(bytes, 2 * index, 2)
+            if (basal < danaRKoreanPlugin.pumpDescription.basalMinimumRate) basal = 0
+            danaRPump.pumpProfiles!![danaRPump.activeProfile][index] = basal / 100.0
+        }
+        for (index in 0..23)
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java
deleted file mode 100644
index e7752cfb8f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-
-public class MsgStatusBasic_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusBasic_k() {
-        SetCommand(0x020A);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        double currentBasal = intFromBuff(bytes, 0, 2) / 100d;
-        int batteryRemaining = intFromBuff(bytes, 2, 1);
-        double reservoirRemainingUnits = intFromBuff(bytes, 3, 3) / 750d;
-        double dailyTotalUnits = intFromBuff(bytes, 6, 3) / 750d;
-        int maxDailyTotalUnits = intFromBuff(bytes, 9, 2) / 100;
-
-        pump.dailyTotalUnits = dailyTotalUnits;
-        pump.maxDailyTotalUnits = maxDailyTotalUnits;
-        pump.reservoirRemainingUnits = reservoirRemainingUnits;
-        pump.currentBasal = currentBasal;
-        pump.batteryRemaining = batteryRemaining;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Daily total units: " + dailyTotalUnits);
-            log.debug("Max daily total units: " + maxDailyTotalUnits);
-            log.debug("Reservoir remaining units: " + reservoirRemainingUnits);
-            log.debug("Current basal: " + currentBasal);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
new file mode 100644
index 0000000000..8f08587c5c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+
+class MsgStatusBasic_k(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x020A)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val currentBasal = intFromBuff(bytes, 0, 2) / 100.0
+        val batteryRemaining = intFromBuff(bytes, 2, 1)
+        val reservoirRemainingUnits = intFromBuff(bytes, 3, 3) / 750.0
+        val dailyTotalUnits = intFromBuff(bytes, 6, 3) / 750.0
+        val maxDailyTotalUnits = intFromBuff(bytes, 9, 2) / 100
+        danaRPump.dailyTotalUnits = dailyTotalUnits
+        danaRPump.maxDailyTotalUnits = maxDailyTotalUnits
+        danaRPump.reservoirRemainingUnits = reservoirRemainingUnits
+        danaRPump.currentBasal = currentBasal
+        danaRPump.batteryRemaining = batteryRemaining
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: $dailyTotalUnits")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: $maxDailyTotalUnits")
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: $reservoirRemainingUnits")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: $currentBasal")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java
deleted file mode 100644
index 4ef29247b2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgStatus_k extends MessageBase {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatus_k() {
-        SetCommand(0x020B);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750d;
-        pump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1;
-        pump.extendedBolusMinutes = intFromBuff(bytes, 4, 2);
-        pump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100d;
-        double lastBolusAmount = intFromBuff(bytes, 13, 2) / 100d;
-//        if (lastBolusAmount != 0d) {
-//            pump.lastBolusTime = dateTimeFromBuff(bytes, 8);
-//            pump.lastBolusAmount = lastBolusAmount;
-//        }
-        pump.iob = intFromBuff(bytes, 15, 2) / 100d;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Daily total: " + pump.dailyTotalUnits);
-            log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-            log.debug("Extended bolus min: " + pump.extendedBolusMinutes);
-            log.debug("Extended bolus amount: " + pump.extendedBolusAmount);
-//            log.debug("Last bolus time: " + pump.lastBolusTime);
-//            log.debug("Last bolus amount: " + pump.lastBolusAmount);
-            log.debug("IOB: " + pump.iob);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
new file mode 100644
index 0000000000..bef2e8a926
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+
+class MsgStatus_k(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x020B)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
+        danaRPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
+        danaRPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
+        danaRPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
+        //val lastBolusAmount = intFromBuff(bytes, 13, 2) / 100.0
+        //if (lastBolusAmount != 0d) {
+        //  pump.lastBolusTime = dateTimeFromBuff(bytes, 8);
+        //  pump.lastBolusAmount = lastBolusAmount;
+        //}
+        danaRPump.iob = intFromBuff(bytes, 15, 2) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaRPump.extendedBolusMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaRPump.extendedBolusAmount)
+        //aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + pump.lastBolusTime);
+        //aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + pump.lastBolusAmount);
+        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaRPump.iob)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index 0032a7e5e0..a0b11102b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.services;
 
 import android.bluetooth.BluetoothDevice;
+import android.content.Context;
 import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.SystemClock;
@@ -8,30 +9,33 @@ import android.os.SystemClock;
 import java.io.IOException;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
@@ -50,7 +54,8 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTableRkorean;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTableRKorean;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
@@ -59,48 +64,32 @@ import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
-    private CompositeDisposable disposable = new CompositeDisposable();
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject DanaRPump danaRPump;
+    @Inject DanaRPlugin danaRPlugin;
+    @Inject DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject CommandQueueProvider commandQueue;
+    @Inject Context context;
+    @Inject MessageHashTableRKorean messageHashTableRKorean;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject ProfileFunction profileFunction;
 
     public DanaRKoreanExecutionService() {
-        mBinder = new LocalBinder();
-
-        MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("EventPreferenceChange");
-                }, FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("EventAppExit received");
-
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("Application exit");
-                    MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
-                    stopSelf();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        disposable.clear();
-        super.onDestroy();
+        mBinder = new LocalBinder();
     }
 
     public class LocalBinder extends Binder {
@@ -127,7 +116,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             } catch (IOException e) {
                 //log.error("Unhandled exception", e);
                 if (e.getMessage().contains("socket closed")) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error("Unhandled exception", e);
                 }
             }
 
@@ -135,9 +124,9 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableRkorean.INSTANCE);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableRKorean, danaRPump);
                 mHandshakeInProgress = true;
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
+                rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
 
             mConnectionInProgress = false;
@@ -145,16 +134,15 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
-            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k();
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal();
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
-            MsgCheckValue_k checkValue = new MsgCheckValue_k();
+            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaRPump);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin);
+            MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin);
 
-            if (danaRPump.isNewPump) {
+            if (danaRPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -163,117 +151,112 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
             //mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            danaRPump.lastConnection = now;
+            danaRPump.setLastConnection(now);
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
-                    RxBus.INSTANCE.send(new EventProfileNeedsUpdate());
+            Profile profile = profileFunction.getProfile();
+            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().basalStep) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                if (!danaRKoreanPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
-                mSerialIOThread.sendMessage(new MsgSettingMeal());
-                mSerialIOThread.sendMessage(new MsgSettingBasal_k());
+            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues());
-                mSerialIOThread.sendMessage(new MsgSettingGlucose());
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                if (danaRPump.pumpTime == 0) {
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.lastConnection = 0;
-                    danaRPump.lastSettingsRead = 0;
-                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                    RxBus.INSTANCE.send(new EventInitializationChanged());
+                    danaRPump.setLastConnection(0);
+                    danaRPump.setLastSettingsRead(0);
+                    rxBus.send(new EventDanaRNewStatus());
+                    rxBus.send(new EventInitializationChanged());
                     return;
                 }
-                long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Pump time difference: " + timeDiff + " seconds");
+                long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Pump time difference: " + timeDiff + " seconds");
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date(DateUtil.now() + T.secs(10).msecs())));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.lastSettingsRead = now;
+                danaRPump.setLastSettingsRead(now);
             }
 
-            RxBus.INSTANCE.send(new EventDanaRNewStatus());
-            RxBus.INSTANCE.send(new EventInitializationChanged());
-            NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            rxBus.send(new EventDanaRNewStatus());
+            rxBus.send(new EventInitializationChanged());
+            //NSUpload.uploadDeviceStatus();
+            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
-                    RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    rxBus.send(new EventNewNotification(reportFail));
+                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop());
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended());
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
@@ -287,35 +270,36 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (BolusProgressDialog.stopPressed) return false;
 
         mBolusingTreatment = t;
-        MsgBolusStart start = new MsgBolusStart(amount);
-        MsgBolusStop stop = new MsgBolusStop(amount, t);
+        MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
+        danaRPump.setBolusStopped(false);
+        danaRPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
         }
 
         if (amount > 0) {
-            MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
+            danaRPump.setBolusingTreatment(t);
+            danaRPump.setBolusAmountToBeDelivered(amount);
 
-            if (!stop.stopped) {
+            if (!danaRPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!stop.stopped && !start.failed) {
+            while (!danaRPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    stop.stopped = true;
-                    stop.forced = true;
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Communication stopped");
+                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaRPump.setBolusStopped(true);
+                    danaRPump.setBolusStopForced(true);
+                    aapsLogger.debug(LTag.PUMP, "Communication stopped");
                 }
             }
             SystemClock.sleep(300);
 
             mBolusingTreatment = null;
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("bolusOK", null);
+            commandQueue.readStatus("bolusOK", null);
         }
 
         return !start.failed;
@@ -323,13 +307,13 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
 
     @Override
-    public boolean highTempBasal(int percent) {
+    public boolean highTempBasal(int percent, int durationInMinutes) {
         return false;
     }
 
@@ -339,15 +323,14 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
-        double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
-        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(basal);
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, basal);
         mSerialIOThread.sendMessage(msgSet);
-        danaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 8c8780d021..13c41933f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -5,53 +5,53 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.preference.Preference;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
 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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
 import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
@@ -60,26 +60,26 @@ import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 03.09.2017.
- */
-
-public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
-    private Logger log = LoggerFactory.getLogger(L.PUMP);
+@Singleton
+public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static DanaRSPlugin plugin = null;
-
-    public static DanaRSPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new DanaRSPlugin();
-        return plugin;
-    }
+    private final Context context;
+    private final ResourceHelper resourceHelper;
+    private final ConstraintChecker constraintChecker;
+    private final ProfileFunction profileFunction;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final SP sp;
+    private final RxBusWrapper rxBus;
+    private final CommandQueueProvider commandQueue;
+    private final DanaRPump danaRPump;
+    private final DetailedBolusInfoStorage detailedBolusInfoStorage;
 
     private static DanaRSService danaRSService;
 
@@ -88,56 +88,77 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     public static PumpDescription pumpDescription = new PumpDescription();
 
-    private DanaRSPlugin() {
+    // Bolus & history handling
+    public int bolusStartErrorCode; // from start message
+    public Treatment bolusingTreatment; // actually delivered treatment
+    public double bolusAmountToBeDelivered = 0.0; // amount to be delivered
+    public boolean bolusStopped = false; // bolus finished
+    public boolean bolusStopForced = false; // bolus forced to stop by user
+    public boolean bolusDone = false; // success end
+    public long bolusProgressLastTimeStamp = 0; // timestamp of last bolus progress message
+    public boolean apsHistoryDone = false; // true when last history message is received
+    public long lastEventTimeLoaded = 0; // timestamp of last received event
+
+    @Inject
+    public DanaRSPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            Context context,
+            ResourceHelper resourceHelper,
+            ConstraintChecker constraintChecker,
+            ProfileFunction profileFunction,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            DanaRPump danaRPump,
+            DetailedBolusInfoStorage detailedBolusInfoStorage
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.PUMP)
-                .fragmentClass(DanaRFragment.class.getName())
-                .pluginName(R.string.danarspump)
-                .shortName(R.string.danarspump_shortname)
-                .preferencesId(R.xml.pref_danars)
-                .description(R.string.description_pump_dana_rs)
+                        .mainType(PluginType.PUMP)
+                        .fragmentClass(DanaRFragment.class.getName())
+                        .pluginName(R.string.danarspump)
+                        .shortName(R.string.danarspump_shortname)
+                        .preferencesId(R.xml.pref_danars)
+                        .description(R.string.description_pump_dana_rs),
+                injector, aapsLogger, resourceHelper, commandQueue
         );
+        this.context = context;
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.constraintChecker = constraintChecker;
+        this.profileFunction = profileFunction;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.sp = sp;
+        this.commandQueue = commandQueue;
+        this.danaRPump = danaRPump;
+        this.detailedBolusInfoStorage = detailedBolusInfoStorage;
 
         pumpDescription.setPumpDescription(PumpType.DanaRS);
     }
 
-    @Override
-    public void onStateChange(PluginType type, State oldState, State newState) {
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginType.PUMP && newState == State.DISABLED && isProfileInterfaceEnabled) {
-            setPluginEnabled(PluginType.PROFILE, false);
-            NSProfilePlugin.getPlugin().setPluginEnabled(PluginType.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginType.PROFILE, true);
-        }
-    }
-
     @Override
     public void updatePreferenceSummary(@NotNull Preference pref) {
         super.updatePreferenceSummary(pref);
 
-        if (pref.getKey().equals(MainApp.gs(R.string.key_danars_name)))
-            pref.setSummary(SP.getString(R.string.key_danars_name, ""));
+        if (pref.getKey().equals(resourceHelper.gs(R.string.key_danars_name)))
+            pref.setSummary(sp.getString(R.string.key_danars_name, ""));
     }
 
     @Override
     protected void onStart() {
-        Context context = MainApp.instance().getApplicationContext();
         Intent intent = new Intent(context, DanaRSService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
 
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    MainApp.instance().getApplicationContext().unbindService(mConnection);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
         );
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventDanaRSDeviceChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    loadAddress();
-                }, FabricPrivacy::logException)
+                .subscribe(event -> loadAddress(), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         loadAddress(); // load device name
         super.onStart();
@@ -145,43 +166,34 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     @Override
     protected void onStop() {
-        Context context = MainApp.instance().getApplicationContext();
         context.unbindService(mConnection);
 
         disposable.clear();
         super.onStop();
     }
 
-    @Override
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        confirmPumpPluginActivation(newState, activity, type);
-    }
-
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is disconnected");
+            getAapsLogger().debug(LTag.PUMP, "Service is disconnected");
             danaRSService = null;
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is connected");
+            getAapsLogger().debug(LTag.PUMP, "Service is connected");
             DanaRSService.LocalBinder mLocalBinder = (DanaRSService.LocalBinder) service;
             danaRSService = mLocalBinder.getServiceInstance();
         }
     };
 
     private void loadAddress() {
-        mDeviceAddress = SP.getString(R.string.key_danars_address, "");
-        mDeviceName = SP.getString(R.string.key_danars_name, "");
+        mDeviceAddress = sp.getString(R.string.key_danars_address, "");
+        mDeviceName = sp.getString(R.string.key_danars_name, "");
     }
 
     @Override
     public void connect(String from) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("RS connect from: " + from);
+        getAapsLogger().debug(LTag.PUMP, "RS connect from: " + from);
         if (danaRSService != null && !mDeviceAddress.equals("") && !mDeviceName.equals("")) {
             final Object o = new Object();
 
@@ -210,8 +222,7 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     @Override
     public void disconnect(String from) {
-        if (L.isEnabled(L.PUMP))
-            log.debug("RS disconnect from: " + from);
+        getAapsLogger().debug(LTag.PUMP, "RS disconnect from: " + from);
         if (danaRSService != null) danaRSService.disconnect(from);
     }
 
@@ -224,8 +235,8 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
     public void getPumpStatus() {
         if (danaRSService != null) {
             danaRSService.getPumpStatus();
-            pumpDescription.basalStep = DanaRPump.getInstance().basalStep;
-            pumpDescription.bolusStep = DanaRPump.getInstance().bolusStep;
+            pumpDescription.basalStep = danaRPump.getBasalStep();
+            pumpDescription.bolusStep = danaRPump.getBolusStep();
         }
     }
 
@@ -248,29 +259,33 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     // Constraints interface
 
+    @NonNull
     @Override
-    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
-        absoluteRate.setIfSmaller(DanaRPump.getInstance().maxBasal, String.format(MainApp.gs(R.string.limitingbasalratio), DanaRPump.getInstance().maxBasal, MainApp.gs(R.string.pumplimit)), this);
+    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
+        absoluteRate.setIfSmaller(getAapsLogger(), danaRPump.getMaxBasal(), resourceHelper.gs(R.string.limitingbasalratio, danaRPump.getMaxBasal(), resourceHelper.gs(R.string.pumplimit)), this);
         return absoluteRate;
     }
 
+    @NonNull
     @Override
-    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
-        percentRate.setIfGreater(0, String.format(MainApp.gs(R.string.limitingpercentrate), 0, MainApp.gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getPumpDescription().maxTempPercent, String.format(MainApp.gs(R.string.limitingpercentrate), getPumpDescription().maxTempPercent, MainApp.gs(R.string.pumplimit)), this);
+    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
+        percentRate.setIfGreater(getAapsLogger(), 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, getPumpDescription().maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this);
 
         return percentRate;
     }
 
 
+    @NonNull
     @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(DanaRPump.getInstance().maxBolus, String.format(MainApp.gs(R.string.limitingbolus), DanaRPump.getInstance().maxBolus, MainApp.gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), danaRPump.getMaxBolus(), resourceHelper.gs(R.string.limitingbolus, danaRPump.getMaxBolus(), resourceHelper.gs(R.string.pumplimit)), this);
         return insulin;
     }
 
+    @NonNull
     @Override
-    public Constraint<Double> applyExtendedBolusConstraints(Constraint<Double> insulin) {
+    public Constraint<Double> applyExtendedBolusConstraints(@NonNull Constraint<Double> insulin) {
         return applyBolusConstraints(insulin);
     }
 
@@ -278,12 +293,12 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     @Override
     public boolean isInitialized() {
-        return DanaRPump.getInstance().lastConnection > 0 && DanaRPump.getInstance().maxBasal > 0;
+        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0;
     }
 
     @Override
     public boolean isSuspended() {
-        return DanaRPump.getInstance().pumpSuspended;
+        return danaRPump.getPumpSuspended();
     }
 
     @Override
@@ -292,34 +307,34 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         return danaRSService.isConnected() || danaRSService.isConnecting();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
         if (danaRSService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
+            getAapsLogger().error("setNewBasalProfile sExecutionService is null");
             result.comment = "setNewBasalProfile sExecutionService is null";
             return result;
         }
         if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = MainApp.gs(R.string.pumpNotInitializedProfileNotSet);
+            getAapsLogger().error("setNewBasalProfile not initialized");
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet);
             return result;
         } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
         }
         if (!danaRSService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = MainApp.gs(R.string.failedupdatebasalprofile);
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile);
             return result;
         } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60);
+            rxBus.send(new EventNewNotification(notification));
             result.success = true;
             result.enacted = true;
             result.comment = "OK";
@@ -331,17 +346,15 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
     public boolean isThisProfileSet(Profile profile) {
         if (!isInitialized())
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        DanaRPump pump = DanaRPump.getInstance();
-        if (pump.pumpProfiles == null)
+        if (danaRPump.getPumpProfiles() == null)
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
+        int basalValues = danaRPump.getBasal48Enable() ? 48 : 24;
+        int basalIncrement = danaRPump.getBasal48Enable() ? 30 * 60 : 60 * 60;
         for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
+            Double pumpValue = danaRPump.getPumpProfiles()[danaRPump.getActiveProfile()][h];
             Double profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement);
             if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
+                getAapsLogger().debug(LTag.PUMP, "Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
                 return false;
             }
         }
@@ -350,29 +363,29 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
     @Override
     public long lastDataTime() {
-        return DanaRPump.getInstance().lastConnection;
+        return danaRPump.getLastConnection();
     }
 
     @Override
     public double getBaseBasalRate() {
-        return DanaRPump.getInstance().currentBasal;
+        return danaRPump.getCurrentBasal();
     }
 
     @Override
     public double getReservoirLevel() {
-        return DanaRPump.getInstance().reservoirRemainingUnits;
+        return danaRPump.getReservoirRemainingUnits();
     }
 
     @Override
     public int getBatteryLevel() {
-        return DanaRPump.getInstance().batteryRemaining;
+        return danaRPump.getBatteryRemaining();
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
-            int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
+            int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
             int speed = 12;
             switch (preferencesSpeed) {
                 case 0:
@@ -396,47 +409,46 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             if (carbTime == 0) carbTime--; // better set 1 min back to prevents clash with insulin
             detailedBolusInfo.carbTime = 0;
 
-            DetailedBolusInfoStorage.INSTANCE.add(detailedBolusInfo); // will be picked up on reading history
+            detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
 
             Treatment t = new Treatment();
             t.isSMB = detailedBolusInfo.isSMB;
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || carbs > 0)
                 connectionOK = danaRSService.bolus(detailedBolusInfo.insulin, (int) carbs, DateUtil.now() + T.mins(carbTime).msecs(), t);
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success) {
-                String error = "" + DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode;
-                switch (DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode) {
+                String error = "" + bolusStartErrorCode;
+                switch (bolusStartErrorCode) {
                     // 4 reported as max bolus violation. Check later
                     case 0x10:
-                        error = MainApp.gs(R.string.maxbolusviolation);
+                        error = resourceHelper.gs(R.string.maxbolusviolation);
                         break;
                     case 0x20:
-                        error = MainApp.gs(R.string.commanderror);
+                        error = resourceHelper.gs(R.string.commanderror);
                         break;
                     case 0x40:
-                        error = MainApp.gs(R.string.speederror);
+                        error = resourceHelper.gs(R.string.speederror);
                         break;
                     case 0x80:
-                        error = MainApp.gs(R.string.insulinlimitviolation);
+                        error = resourceHelper.gs(R.string.insulinlimitviolation);
                         break;
                 }
-                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error);
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error);
             } else
-                result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
+                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            getAapsLogger().debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             return result;
         } else {
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("deliverTreatment: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            getAapsLogger().error("deliverTreatment: Invalid input");
             return result;
         }
     }
@@ -444,14 +456,14 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
     @Override
     public void stopBolusDelivering() {
         if (danaRSService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
+            getAapsLogger().error("stopBolusDelivering sExecutionService is null");
             return;
         }
         danaRSService.bolusStop();
     }
 
     // This is called from APS
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
         // Recheck pump status if older than 30 min
 
@@ -460,9 +472,9 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         //    connect("setTempBasalAbsolute old data");
         //}
 
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        absoluteRate = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
         final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate();
@@ -470,9 +482,8 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
 
         if (doTempOff) {
             // If temp in progress
-            if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doTempOff)");
+            if (treatmentsPlugin.isTempBasalInProgress()) {
+                getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
                 return cancelTempBasal(false);
             }
             result.success = true;
@@ -480,8 +491,7 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             result.percent = 100;
             result.isPercent = true;
             result.isTempCancel = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: doTempOff OK");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK");
             return result;
         }
 
@@ -492,10 +502,9 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             if (percentRate > 500) // Special high temp 500/15min
                 percentRate = 500;
             // Check if some temp is already in progress
-            TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+            TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
             if (activeTemp != null) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: currently running: " + activeTemp.toString());
+                getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: currently running: " + activeTemp.toString());
                 // Correct basal already set ?
                 if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
                     if (!enforceNew) {
@@ -505,15 +514,13 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
                         result.duration = activeTemp.getPlannedRemainingMinutes();
                         result.isPercent = true;
                         result.isTempCancel = false;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
+                        getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
                         return result;
                     }
                 }
             }
             // Convert duration from minutes to hours
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
             if (percentRate == 0 && durationInMinutes > 30) {
                 result = setTempBasalPercent(percentRate, durationInMinutes, profile, enforceNew);
             } else {
@@ -521,47 +528,45 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
                 result = setHighTempBasalPercent(percentRate);
             }
             if (!result.success) {
-                log.error("setTempBasalAbsolute: Failed to set hightemp basal");
+                getAapsLogger().error("setTempBasalAbsolute: Failed to set hightemp basal");
                 return result;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: hightemp basal set ok");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: hightemp basal set ok");
             return result;
         }
         // We should never end here
-        log.error("setTempBasalAbsolute: Internal error");
+        getAapsLogger().error("setTempBasalAbsolute: Internal error");
         result.success = false;
         result.comment = "Internal error";
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = DanaRPump.getInstance();
-        PumpEnactResult result = new PumpEnactResult();
-        percent = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
+        DanaRPump pump = danaRPump;
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
             result.isTempCancel = false;
             result.enacted = false;
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            getAapsLogger().error("setTempBasalPercent: Invalid input");
             return result;
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(now);
         if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: Correct value already set");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
             return result;
         }
         boolean connectionOK;
@@ -571,166 +576,159 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             int durationInHours = Math.max(durationInMinutes / 60, 1);
             connectionOK = danaRSService.tempBasal(percent, durationInHours);
         }
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: OK");
+            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.tempbasaldeliveryerror);
-        log.error("setTempBasalPercent: Failed to set temp basal");
+        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror);
+        getAapsLogger().error("setTempBasalPercent: Failed to set temp basal");
         return result;
     }
 
     private synchronized PumpEnactResult setHighTempBasalPercent(Integer percent) {
-        DanaRPump pump = DanaRPump.getInstance();
-        PumpEnactResult result = new PumpEnactResult();
+        DanaRPump pump = danaRPump;
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         boolean connectionOK = danaRSService.highTempBasal(percent);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setHighTempBasalPercent: OK");
+            getAapsLogger().debug(LTag.PUMP, "setHighTempBasalPercent: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-        log.error("setHighTempBasalPercent: Failed to set temp basal");
+        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
+        getAapsLogger().error("setHighTempBasalPercent: Failed to set temp basal");
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        DanaRPump pump = DanaRPump.getInstance();
-        insulin = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
+        DanaRPump pump = danaRPump;
+        insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
         // needs to be rounded
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.duration = pump.getExtendedBolusRemainingMinutes();
+            result.absolute = pump.getExtendedBolusAbsoluteRate();
             result.isPercent = false;
             result.isTempCancel = false;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
+            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + pump.getExtendedBolusAmount() + " Asked: " + insulin);
             return result;
         }
         boolean connectionOK = danaRSService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAbsoluteRate - insulin) < getPumpDescription().extendedBolusStep) {
+        if (connectionOK && pump.isExtendedInProgress() && Math.abs(pump.getExtendedBolusAbsoluteRate() - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.bolusDelivered = pump.extendedBolusAmount;
+            result.duration = pump.getExtendedBolusRemainingMinutes();
+            result.absolute = pump.getExtendedBolusAbsoluteRate();
+            result.bolusDelivered = pump.getExtendedBolusAmount();
             result.isPercent = false;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setExtendedBolus: OK");
+            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
+        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
+        getAapsLogger().error("setExtendedBolus: Failed to extended bolus");
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = new PumpEnactResult();
-        TemporaryBasal runningTB = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             danaRSService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isTempBasalInProgress) {
+        if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelRealTempBasal: OK");
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            getAapsLogger().debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
             result.isTempCancel = true;
-            log.error("cancelRealTempBasal: Failed to cancel temp basal");
+            getAapsLogger().error("cancelRealTempBasal: Failed to cancel temp basal");
             return result;
         }
     }
 
-    @Override
+    @NonNull @Override
     public synchronized PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null) {
             danaRSService.extendedBolusStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isExtendedInProgress) {
+        if (!danaRPump.isExtendedInProgress()) {
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelExtendedBolus: OK");
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
+            getAapsLogger().error("cancelExtendedBolus: Failed to cancel extended bolus");
             return result;
         }
     }
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
-        DanaRPump pump = DanaRPump.getInstance();
+        DanaRPump pump = danaRPump;
         long now = System.currentTimeMillis();
-        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
+        if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
+            return new JSONObject();
         }
         JSONObject pumpjson = new JSONObject();
         JSONObject battery = new JSONObject();
         JSONObject status = new JSONObject();
         JSONObject extended = new JSONObject();
         try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
+            battery.put("percent", pump.getBatteryRemaining());
+            status.put("status", pump.getPumpSuspended() ? "suspended" : "normal");
+            status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime != 0) {
-                extended.put("LastBolus", DateUtil.dateAndTimeFullString(pump.lastBolusTime));
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
+            if (pump.getLastBolusTime() != 0) {
+                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.getLastBolusTime()));
+                extended.put("LastBolusAmount", pump.getLastBolusAmount());
             }
-            TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+            TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
                 extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
-            ExtendedBolus eb = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
+            ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
                 extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
@@ -738,66 +736,67 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             }
             extended.put("BaseBasalRate", getBaseBasalRate());
             try {
-                extended.put("ActiveProfile", ProfileFunctions.getInstance().getProfileName());
+                extended.put("ActiveProfile", profileFunction.getProfileName());
             } catch (Exception e) {
+                getAapsLogger().error("Unhandled exception", e);
             }
 
             pumpjson.put("battery", battery);
             pumpjson.put("status", status);
             pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
+            pumpjson.put("reservoir", (int) pump.getReservoirRemainingUnits());
             pumpjson.put("clock", DateUtil.toISOString(now));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            getAapsLogger().error("Unhandled exception", e);
         }
         return pumpjson;
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return ManufacturerType.Sooil;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.DanaRS;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
-        return DanaRPump.getInstance().serialNumber;
+        return danaRPump.getSerialNumber();
     }
 
-    @Override
+    @NonNull @Override
     public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
 
-    @Override
+    @NonNull @Override
     public String shortStatus(boolean veryShort) {
-        DanaRPump pump = DanaRPump.getInstance();
+        DanaRPump pump = danaRPump;
         String ret = "";
-        if (pump.lastConnection != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
+        if (pump.getLastConnection() != 0) {
+            long agoMsec = System.currentTimeMillis() - pump.getLastConnection();
             int agoMin = (int) (agoMsec / 60d / 1000d);
             ret += "LastConn: " + agoMin + " minago\n";
         }
-        if (pump.lastBolusTime != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
+        if (pump.getLastBolusTime() != 0) {
+            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.getLastBolusAmount()) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.getLastBolusTime()) + "\n";
         }
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             ret += "Temp: " + activeTemp.toStringFull() + "\n";
         }
-        ExtendedBolus activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
+        ExtendedBolus activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
         if (activeExtendedBolus != null) {
             ret += "Extended: " + activeExtendedBolus.toString() + "\n";
         }
         if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
+            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.getDailyTotalUnits()) + " / " + pump.getMaxDailyTotalUnits() + " U\n";
         }
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
+        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.getReservoirRemainingUnits()) + "U\n";
+        ret += "Batt: " + pump.getBatteryRemaining() + "\n";
         return ret;
     }
 
@@ -806,7 +805,7 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         return false;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
         return loadHistory(RecordTypes.RECORD_TYPE_DAILY);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
index 87c904212c..89f794259e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
@@ -152,7 +152,7 @@ public class BLEScanActivity extends NoSplashAppCompatActivity {
                 SP.putString(R.string.key_danars_address, item.device.getAddress());
                 SP.putString(R.string.key_danars_name, mName.getText().toString());
                 item.device.createBond();
-                RxBus.INSTANCE.send(new EventDanaRSDeviceChange());
+                RxBus.Companion.getINSTANCE().send(new EventDanaRSDeviceChange());
                 finish();
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java
deleted file mode 100644
index a81aa3c9bc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import java.util.HashMap;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class DanaRSMessageHashTable {
-    public static HashMap<Integer, DanaRS_Packet> messages = null;
-
-    static {
-        if (messages == null) {
-            messages = new HashMap<>();
-            put(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal());
-            put(new DanaRS_Packet_Basal_Get_Basal_Rate());
-            put(new DanaRS_Packet_Basal_Get_Profile_Basal_Rate());
-            put(new DanaRS_Packet_Basal_Get_Profile_Number());
-            put(new DanaRS_Packet_Basal_Set_Basal_Rate());
-            put(new DanaRS_Packet_Basal_Set_Profile_Basal_Rate());
-            put(new DanaRS_Packet_Basal_Set_Profile_Number());
-            put(new DanaRS_Packet_Basal_Set_Suspend_Off());
-            put(new DanaRS_Packet_Basal_Set_Suspend_On());
-            put(new DanaRS_Packet_Basal_Set_Temporary_Basal());
-            put(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
-            put(new DanaRS_Packet_Bolus_Get_Bolus_Option());
-            put(new DanaRS_Packet_Bolus_Get_Initial_Bolus());
-            put(new DanaRS_Packet_Bolus_Get_Calculation_Information());
-            put(new DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information());
-            put(new DanaRS_Packet_Bolus_Get_CIR_CF_Array());
-            put(new DanaRS_Packet_Bolus_Get_Dual_Bolus());
-            put(new DanaRS_Packet_Bolus_Get_Extended_Bolus());
-            put(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State());
-            put(new DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State());
-            put(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information());
-            put(new DanaRS_Packet_Bolus_Set_Bolus_Option());
-            put(new DanaRS_Packet_Bolus_Set_Initial_Bolus());
-            put(new DanaRS_Packet_Bolus_Set_CIR_CF_Array());
-            put(new DanaRS_Packet_Bolus_Set_Dual_Bolus());
-            put(new DanaRS_Packet_Bolus_Set_Extended_Bolus());
-            put(new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel());
-            put(new DanaRS_Packet_Bolus_Set_Step_Bolus_Start());
-            put(new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop());
-            put(new DanaRS_Packet_Etc_Keep_Connection());
-            put(new DanaRS_Packet_Etc_Set_History_Save());
-            put(new DanaRS_Packet_General_Delivery_Status());
-            put(new DanaRS_Packet_General_Get_Password());
-            put(new DanaRS_Packet_General_Initial_Screen_Information());
-            put(new DanaRS_Packet_Notify_Alarm());
-            put(new DanaRS_Packet_Notify_Delivery_Complete());
-            put(new DanaRS_Packet_Notify_Delivery_Rate_Display());
-            put(new DanaRS_Packet_Notify_Missed_Bolus_Alarm());
-            put(new DanaRS_Packet_Option_Get_Pump_Time());
-            put(new DanaRS_Packet_Option_Get_User_Option());
-            put(new DanaRS_Packet_Option_Set_Pump_Time());
-            put(new DanaRS_Packet_Option_Set_User_Option());
-            //put(new DanaRS_Packet_History_());
-            put(new DanaRS_Packet_History_Alarm());
-            put(new DanaRS_Packet_History_All_History());
-            put(new DanaRS_Packet_History_Basal());
-            put(new DanaRS_Packet_History_Blood_Glucose());
-            put(new DanaRS_Packet_History_Bolus());
-            put(new DanaRS_Packet_Review_Bolus_Avg());
-            put(new DanaRS_Packet_History_Carbohydrate());
-            put(new DanaRS_Packet_History_Daily());
-            put(new DanaRS_Packet_General_Get_More_Information());
-            put(new DanaRS_Packet_General_Get_Pump_Check());
-            put(new DanaRS_Packet_General_Get_Shipping_Information());
-            put(new DanaRS_Packet_General_Get_Today_Delivery_Total());
-            put(new DanaRS_Packet_General_Get_User_Time_Change_Flag());
-            put(new DanaRS_Packet_History_Prime());
-            put(new DanaRS_Packet_History_Refill());
-            put(new DanaRS_Packet_General_Set_History_Upload_Mode());
-            put(new DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear());
-            put(new DanaRS_Packet_History_Suspend());
-            put(new DanaRS_Packet_History_Temporary());
-
-            // APS
-            put(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal());
-            put(new DanaRS_Packet_APS_History_Events());
-            put(new DanaRS_Packet_APS_Set_Event_History());
-
-        }
-    }
-
-    public static void put(DanaRS_Packet message) {
-        int command = message.getCommand();
-        messages.put(command, message);
-    }
-
-    public static DanaRS_Packet findMessage(Integer command) {
-        if (messages.containsKey(command)) {
-            return messages.get(command);
-        } else {
-            return new DanaRS_Packet();
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
new file mode 100644
index 0000000000..c589bbe633
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -0,0 +1,105 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DanaRSMessageHashTable @Inject constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    danaRPump: DanaRPump,
+    danaRSPlugin: DanaRSPlugin,
+    activePlugin: ActivePluginProvider,
+    constraintChecker: ConstraintChecker,
+    detailedBolusInfoStorage: DetailedBolusInfoStorage
+) {
+
+    var messages: HashMap<Int, DanaRS_Packet> = HashMap()
+
+    fun put(message: DanaRS_Packet) {
+        messages[message.command] = message
+    }
+
+    fun findMessage(command: Int): DanaRS_Packet {
+        return messages[command] ?: DanaRS_Packet()
+    }
+
+    init {
+        put(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+        put(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump))
+        put(DanaRS_Packet_Basal_Get_Profile_Basal_Rate(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Basal_Set_Basal_Rate(aapsLogger, arrayOf()))
+        put(DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, arrayOf()))
+        put(DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger))
+        put(DanaRS_Packet_Basal_Set_Suspend_Off(aapsLogger))
+        put(DanaRS_Packet_Basal_Set_Suspend_On(aapsLogger))
+        put(DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger))
+        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger))
+        put(DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Dual_Bolus(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
+        put(DanaRS_Packet_Etc_Keep_Connection(aapsLogger))
+        put(DanaRS_Packet_Etc_Set_History_Save(aapsLogger))
+        put(DanaRS_Packet_General_Delivery_Status(aapsLogger))
+        put(DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper))
+        put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
+        put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
+        put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger))
+        put(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger))
+        put(DanaRS_Packet_Option_Set_User_Option(aapsLogger, danaRPump))
+        //put(new DanaRS_Packet_History_());
+        put(DanaRS_Packet_History_Alarm(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_All_History(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Basal(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Bolus(aapsLogger, rxBus))
+        put(DanaRS_Packet_Review_Bolus_Avg(aapsLogger))
+        put(DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Daily(aapsLogger, rxBus))
+        put(DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper))
+        put(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger))
+        put(DanaRS_Packet_History_Prime(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Refill(aapsLogger, rxBus))
+        put(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger))
+        put(DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(aapsLogger))
+        put(DanaRS_Packet_History_Suspend(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
+        // APS
+        put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
+        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, 0))
+        put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 55a2e0c51e..0e77d7588b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -10,15 +10,17 @@ import org.slf4j.LoggerFactory;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
 public class DanaRS_Packet {
-    private static final Logger log = LoggerFactory.getLogger(DanaRS_Packet.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(DanaRS_Packet.class);
 
     protected static final int TYPE_START = 0;
     protected static final int OPCODE_START = 1;
-    protected static final int DATA_START = 2;
+    public static final int DATA_START = 2;
 
     private boolean received;
-    protected boolean failed;
+    public boolean failed;
     protected int type = BleCommandUtil.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
     protected int opCode;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
deleted file mode 100644
index c850eace0a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_APS_Basal_Set_Temporary_Basal extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    int temporaryBasalRatio;
-    int temporaryBasalDuration;
-    public int error;
-
-    final int PARAM30MIN = 160;
-    final int PARAM15MIN = 150;
-
-    DanaRS_Packet_APS_Basal_Set_Temporary_Basal() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__APS_SET_TEMPORARY_BASAL;
-    }
-
-    public DanaRS_Packet_APS_Basal_Set_Temporary_Basal(int percent) {
-        this();
-        setParams(percent);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: percent: " + percent);
-    }
-
-    protected void setParams(int percent) {
-        //HARDCODED LIMITS
-        if (percent < 0) percent = 0;
-        if (percent > 500) percent = 500;
-
-        temporaryBasalRatio = percent;
-        if (percent < 100) {
-            temporaryBasalDuration = PARAM30MIN;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 30 min");
-        } else {
-            temporaryBasalDuration = PARAM15MIN;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 15 min");
-        }
-    }
-
-    public DanaRS_Packet_APS_Basal_Set_Temporary_Basal(int percent, boolean fifteenMinutes, boolean thirtyMinutes) {
-        this();
-        setParams(percent, fifteenMinutes, thirtyMinutes);
-    }
-
-    protected void setParams(int percent, boolean fifteenMinutes, boolean thirtyMinutes) {
-        //HARDCODED LIMITS
-        if (percent < 0) percent = 0;
-        if (percent > 500) percent = 500;
-
-        temporaryBasalRatio = percent;
-        if (thirtyMinutes && percent <= 200) { // 30 min is allowed up to 200%
-            temporaryBasalDuration = PARAM30MIN;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 30 min");
-        } else {
-            temporaryBasalDuration = PARAM15MIN;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 15 min");
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[3];
-        request[0] = (byte) (temporaryBasalRatio & 0xff);
-        request[1] = (byte) ((temporaryBasalRatio >>> 8) & 0xff);
-        request[2] = (byte) (temporaryBasalDuration & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = byteArrayToInt(getBytes(data, DATA_START, 1));
-        if (result != 0) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set APS temp basal start result: " + result + " FAILED!!!");
-        } else {
-            failed = false;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set APS temp basal start result: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__APS_SET_TEMPORARY_BASAL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
new file mode 100644
index 0000000000..d223641bba
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
+    private val aapsLogger: AAPSLogger,
+    private var percent: Int
+) : DanaRS_Packet() {
+
+    var temporaryBasalRatio = 0
+    var temporaryBasalDuration = 0
+    var error = 0
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__APS_SET_TEMPORARY_BASAL
+        aapsLogger.debug(LTag.PUMPCOMM, "New message: percent: $percent")
+
+        if (percent < 0) percent = 0
+        if (percent > 500) percent = 500
+        temporaryBasalRatio = percent
+        if (percent < 100) {
+            temporaryBasalDuration = PARAM30MIN
+            aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 30 min")
+        } else {
+            temporaryBasalDuration = PARAM15MIN
+            aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 15 min")
+        }
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(3)
+        request[0] = (temporaryBasalRatio and 0xff).toByte()
+        request[1] = (temporaryBasalRatio ushr 8 and 0xff).toByte()
+        request[2] = (temporaryBasalDuration and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = byteArrayToInt(getBytes(data, DATA_START, 1))
+        if (result != 0) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set APS temp basal start result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set APS temp basal start result: $result")
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__APS_SET_TEMPORARY_BASAL"
+    }
+
+    companion object {
+        const val PARAM30MIN = 160
+        const val PARAM15MIN = 150
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java
deleted file mode 100644
index fde34c58e0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet_APS_History_Events extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int year = 0;
-    private int month = 0;
-    private int day = 0;
-    private int hour = 0;
-    private int min = 0;
-    private int sec = 0;
-
-    public static boolean done;
-
-    public static long lastEventTimeLoaded = 0;
-
-    DanaRS_Packet_APS_History_Events() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS;
-        done = false;
-    }
-
-    public DanaRS_Packet_APS_History_Events(long from) {
-        this();
-        GregorianCalendar cal = new GregorianCalendar();
-
-        if (from > DateUtil.now()) {
-            log.debug("Asked to load from the future");
-            from = 0;
-        }
-
-        if (from != 0)
-            cal.setTimeInMillis(from);
-        else
-            cal.set(2000, 0, 1, 0, 0, 0);
-        year = cal.get(Calendar.YEAR) - 1900 - 100;
-        month = cal.get(Calendar.MONTH) + 1;
-        day = cal.get(Calendar.DAY_OF_MONTH);
-        hour = cal.get(Calendar.HOUR_OF_DAY);
-        min = cal.get(Calendar.MINUTE);
-        sec = cal.get(Calendar.SECOND);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Loading event history from: " + new Date(cal.getTimeInMillis()).toLocaleString());
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[6];
-        request[0] = (byte) (year & 0xff);
-        request[1] = (byte) (month & 0xff);
-        request[2] = (byte) (day & 0xff);
-        request[3] = (byte) (hour & 0xff);
-        request[4] = (byte) (min & 0xff);
-        request[5] = (byte) (sec & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        byte recordCode = (byte) intFromBuff(data, 0, 1);
-
-        // Last record
-        if (recordCode == (byte) 0xFF) {
-            done = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Last record received");
-            return;
-        }
-
-        long datetime = dateTimeSecFromBuff(data, 1);             // 6 bytes
-        int param1 = ((intFromBuff(data, 7, 1) << 8) & 0xFF00) + (intFromBuff(data, 8, 1) & 0xFF);
-        int param2 = ((intFromBuff(data, 9, 1) << 8) & 0xFF00) + (intFromBuff(data, 10, 1) & 0xFF);
-
-        TemporaryBasal temporaryBasal = new TemporaryBasal().date(datetime).source(Source.PUMP).pumpId(datetime);
-
-        ExtendedBolus extendedBolus = new ExtendedBolus().date(datetime).source(Source.PUMP).pumpId(datetime);
-
-        String status;
-
-        switch (recordCode) {
-            case DanaRPump.TEMPSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min");
-                temporaryBasal.percentRate = param1;
-                temporaryBasal.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
-                status = "TEMPSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.TEMPSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime));
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
-                status = "TEMPSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.EXTENDEDSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                extendedBolus.insulin = param1 / 100d;
-                extendedBolus.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "EXTENDEDSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.EXTENDEDSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Delivered: " + (param1 / 100d) + "U RealDuration: " + param2 + "min");
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.BOLUS:
-                DetailedBolusInfo detailedBolusInfo = DetailedBolusInfoStorage.INSTANCE.findDetailedBolusInfo(datetime, param1 / 100d);
-                if (detailedBolusInfo == null) {
-                    detailedBolusInfo = new DetailedBolusInfo();
-                }
-                detailedBolusInfo.date = datetime;
-                detailedBolusInfo.source = Source.PUMP;
-                detailedBolusInfo.pumpId = datetime;
-
-                detailedBolusInfo.insulin = param1 / 100d;
-                boolean newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                status = "BOLUS " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALBOLUS:
-                detailedBolusInfo = DetailedBolusInfoStorage.INSTANCE.findDetailedBolusInfo(datetime, param1 / 100d);
-                if (detailedBolusInfo == null) {
-                    detailedBolusInfo = new DetailedBolusInfo();
-                }
-                detailedBolusInfo.date = datetime;
-                detailedBolusInfo.source = Source.PUMP;
-                detailedBolusInfo.pumpId = datetime;
-
-                detailedBolusInfo.insulin = param1 / 100d;
-                newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                status = "DUALBOLUS " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALEXTENDEDSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                extendedBolus.insulin = param1 / 100d;
-                extendedBolus.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALEXTENDEDSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Delivered: " + (param1 / 100d) + "U RealDuration: " + param2 + "min");
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.SUSPENDON:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")");
-                status = "SUSPENDON " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.SUSPENDOFF:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")");
-                status = "SUSPENDOFF " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.REFILL:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100d + "U");
-                status = "REFILL " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.PRIME:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100d + "U");
-                status = "PRIME " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.PROFILECHANGE:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + (param2 / 100d) + "U/h");
-                status = "PROFILECHANGE " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.CARBS:
-                DetailedBolusInfo emptyCarbsInfo = new DetailedBolusInfo();
-                emptyCarbsInfo.carbs = param1;
-                emptyCarbsInfo.date = datetime;
-                emptyCarbsInfo.source = Source.PUMP;
-                emptyCarbsInfo.pumpId = datetime;
-                newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(emptyCarbsInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g");
-                status = "CARBS " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.PRIMECANNULA:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT PRIMECANNULA(" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100d + "U");
-                status = "PRIMECANNULA " + DateUtil.timeString(datetime);
-                break;
-            default:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("Event: " + recordCode + " " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2);
-                status = "UNKNOWN " + DateUtil.timeString(datetime);
-                break;
-        }
-
-        if (datetime > lastEventTimeLoaded)
-            lastEventTimeLoaded = datetime;
-
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.processinghistory) + ": " + status));
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "APS_HISTORY_EVENTS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
new file mode 100644
index 0000000000..08b4502daa
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -0,0 +1,201 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.db.ExtendedBolus
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+
+open class DanaRS_Packet_APS_History_Events(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePluginProvider,
+    private val danaRSPlugin: DanaRSPlugin,
+    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    private var from: Long
+) : DanaRS_Packet() {
+
+    private var year = 0
+    private var month = 0
+    private var day = 0
+    private var hour = 0
+    private var min = 0
+    private var sec = 0
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS
+        val cal = GregorianCalendar()
+        if (from > DateUtil.now()) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Asked to load from the future")
+            from = 0
+        }
+        if (from != 0L) cal.timeInMillis = from else cal[2000, 0, 1, 0, 0] = 0
+        year = cal[Calendar.YEAR] - 1900 - 100
+        month = cal[Calendar.MONTH] + 1
+        day = cal[Calendar.DAY_OF_MONTH]
+        hour = cal[Calendar.HOUR_OF_DAY]
+        min = cal[Calendar.MINUTE]
+        sec = cal[Calendar.SECOND]
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(cal.timeInMillis))
+        danaRSPlugin.apsHistoryDone = false
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(6)
+        request[0] = (year and 0xff).toByte()
+        request[1] = (month and 0xff).toByte()
+        request[2] = (day and 0xff).toByte()
+        request[3] = (hour and 0xff).toByte()
+        request[4] = (min and 0xff).toByte()
+        request[5] = (sec and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val recordCode = intFromBuff(data, 0, 1).toByte()
+        // Last record
+        if (recordCode == 0xFF.toByte()) {
+            danaRSPlugin.apsHistoryDone = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
+            return
+        }
+        val datetime = dateTimeSecFromBuff(data, 1) // 6 bytes
+        val param1 = (intFromBuff(data, 7, 1) shl 8 and 0xFF00) + (intFromBuff(data, 8, 1) and 0xFF)
+        val param2 = (intFromBuff(data, 9, 1) shl 8 and 0xFF00) + (intFromBuff(data, 10, 1) and 0xFF)
+        val temporaryBasal = TemporaryBasal().date(datetime).source(Source.PUMP).pumpId(datetime)
+        val extendedBolus = ExtendedBolus().date(datetime).source(Source.PUMP).pumpId(datetime)
+        val status: String
+        when (recordCode.toInt()) {
+            DanaRPump.TEMPSTART         -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                temporaryBasal.percentRate = param1
+                temporaryBasal.durationInMinutes = param2
+                activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
+                status = "TEMPSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.TEMPSTOP          -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
+                activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
+                status = "TEMPSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.EXTENDEDSTART     -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                extendedBolus.insulin = param1 / 100.0
+                extendedBolus.durationInMinutes = param2
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
+                status = "EXTENDEDSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.EXTENDEDSTOP      -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
+                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.BOLUS             -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                    ?: DetailedBolusInfo()
+                detailedBolusInfo.date = datetime
+                detailedBolusInfo.source = Source.PUMP
+                detailedBolusInfo.pumpId = datetime
+                detailedBolusInfo.insulin = param1 / 100.0
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                status = "BOLUS " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALBOLUS         -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                    ?: DetailedBolusInfo()
+                detailedBolusInfo.date = datetime
+                detailedBolusInfo.source = Source.PUMP
+                detailedBolusInfo.pumpId = datetime
+                detailedBolusInfo.insulin = param1 / 100.0
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                status = "DUALBOLUS " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALEXTENDEDSTART -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                extendedBolus.insulin = param1 / 100.0
+                extendedBolus.durationInMinutes = param2
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
+                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALEXTENDEDSTOP  -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
+                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.SUSPENDON         -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                status = "SUSPENDON " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.SUSPENDOFF        -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                status = "SUSPENDOFF " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.REFILL            -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                status = "REFILL " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.PRIME             -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                status = "PRIME " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.PROFILECHANGE     -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                status = "PROFILECHANGE " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.CARBS             -> {
+                val emptyCarbsInfo = DetailedBolusInfo()
+                emptyCarbsInfo.carbs = param1.toDouble()
+                emptyCarbsInfo.date = datetime
+                emptyCarbsInfo.source = Source.PUMP
+                emptyCarbsInfo.pumpId = datetime
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(emptyCarbsInfo, false)
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                status = "CARBS " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.PRIMECANNULA      -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                status = "PRIMECANNULA " + DateUtil.timeString(datetime)
+            }
+
+            else                        -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+                status = "UNKNOWN " + DateUtil.timeString(datetime)
+            }
+        }
+        if (datetime > danaRSPlugin.lastEventTimeLoaded) danaRSPlugin.lastEventTimeLoaded = datetime
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+    }
+
+    override fun getFriendlyName(): String {
+        return "APS_HISTORY_EVENTS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
deleted file mode 100644
index fda5f33959..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int type;
-    private long time;
-    private int param1;
-    private int param2;
-
-    public DanaRS_Packet_APS_Set_Event_History() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY;
-    }
-
-    public DanaRS_Packet_APS_Set_Event_History(int type, long time, int param1, int param2) {
-        this();
-
-        this.type = type;
-        this.time = time;
-        this.param1 = param1;
-        this.param2 = param2;
-        if ((type == DanaRPump.CARBS || type == DanaRPump.BOLUS) && param1 <= 0)
-            this.param1 = 0;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Set history entry: " + DateUtil.dateAndTimeString(time) + " type: " + type + " param1: " + param1 + " param2: " + param2);
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        GregorianCalendar cal = new GregorianCalendar();
-        cal.setTimeInMillis(time);
-        int year = cal.get(Calendar.YEAR) - 1900 - 100;
-        int month = cal.get(Calendar.MONTH) + 1;
-        int day = cal.get(Calendar.DAY_OF_MONTH);
-        int hour = cal.get(Calendar.HOUR_OF_DAY);
-        int min = cal.get(Calendar.MINUTE);
-        int sec = cal.get(Calendar.SECOND);
-
-        byte[] request = new byte[11];
-        request[0] = (byte) (type & 0xff);
-        request[1] = (byte) (year & 0xff);
-        request[2] = (byte) (month & 0xff);
-        request[3] = (byte) (day & 0xff);
-        request[4] = (byte) (hour & 0xff);
-        request[5] = (byte) (min & 0xff);
-        request[6] = (byte) (sec & 0xff);
-        request[7] = (byte) ((param1 >>> 8) & 0xff);
-        request[8] = (byte) (param1 & 0xff);
-        request[9] = (byte) ((param2 >>> 8) & 0xff);
-        request[10] = (byte) (param2 & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.error("Set history entry result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set history entry result: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "APS_SET_EVENT_HISTORY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
new file mode 100644
index 0000000000..266554d3be
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class DanaRS_Packet_APS_Set_Event_History(
+    private val aapsLogger: AAPSLogger,
+    private var packetType: Int,
+    private var time: Long,
+    private var param1: Int,
+    private var param2: Int
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
+        if ((packetType == DanaRPump.CARBS || packetType == DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + DateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val cal = GregorianCalendar()
+        cal.timeInMillis = time
+        val year = cal[Calendar.YEAR] - 1900 - 100
+        val month = cal[Calendar.MONTH] + 1
+        val day = cal[Calendar.DAY_OF_MONTH]
+        val hour = cal[Calendar.HOUR_OF_DAY]
+        val min = cal[Calendar.MINUTE]
+        val sec = cal[Calendar.SECOND]
+        val request = ByteArray(11)
+        request[0] = (packetType and 0xff).toByte()
+        request[1] = (year and 0xff).toByte()
+        request[2] = (month and 0xff).toByte()
+        request[3] = (day and 0xff).toByte()
+        request[4] = (hour and 0xff).toByte()
+        request[5] = (min and 0xff).toByte()
+        request[6] = (sec and 0xff).toByte()
+        request[7] = (param1 ushr 8 and 0xff).toByte()
+        request[8] = (param1 and 0xff).toByte()
+        request[9] = (param2 ushr 8 and 0xff).toByte()
+        request[10] = (param2 and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result != 0) {
+            failed = true
+            aapsLogger.error(LTag.PUMPCOMM, "Set history entry result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set history entry result: $result")
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "APS_SET_EVENT_HISTORY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
deleted file mode 100644
index 830aca2d02..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Basal_Get_Basal_Rate extends DanaRS_Packet {
-	private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-
-    public DanaRS_Packet_Basal_Get_Basal_Rate() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting basal rates");
-        }
-    }
-
-	@Override
-	public void handleMessage(byte[] data) {
-		DanaRPump pump = DanaRPump.getInstance();
-
-		int dataIndex = DATA_START;
-		int dataSize = 2;
-		pump.maxBasal = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-		dataIndex += dataSize;
-		dataSize = 1;
-		pump.basalStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-		if (pump.pumpProfiles == null) pump.pumpProfiles = new double[4][];
-		pump.pumpProfiles[pump.activeProfile] = new double[24];
-		for (int i = 0, size = 24; i < size; i++) {
-			dataIndex += dataSize;
-			dataSize = 2;
-			pump.pumpProfiles[pump.activeProfile][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-		}
-		if (L.isEnabled(L.PUMPCOMM)) {
-			log.debug("Max basal: " + pump.maxBasal + " U");
-			log.debug("Basal step: " + pump.basalStep + " U");
-			for (int index = 0; index < 24; index++)
-				log.debug("Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[pump.activeProfile][index]);
-		}
-
-		if (pump.basalStep != 0.01d) {
-		    failed = true;
-			Notification notification = new Notification(Notification.WRONGBASALSTEP, MainApp.gs(R.string.danar_setbasalstep001), Notification.URGENT);
-			RxBus.INSTANCE.send(new EventNewNotification(notification));
-		} else {
-			RxBus.INSTANCE.send(new EventDismissNotification(Notification.WRONGBASALSTEP));
-		}
-
-	}
-
-	@Override
-	public String getFriendlyName() {
-		return "BASAL__GET_BASAL_RATE";
-	}
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
new file mode 100644
index 0000000000..aa0a74e97c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+
+class DanaRS_Packet_Basal_Get_Basal_Rate(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting basal rates")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 2
+        danaRPump.maxBasal = byteArrayToInt(getBytes(data, DATA_START, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.basalStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        var i = 0
+        val size = 24
+        while (i < size) {
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.pumpProfiles!![danaRPump.activeProfile][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            i++
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaRPump.maxBasal + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaRPump.basalStep + " U")
+        for (index in 0..23)
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
+        if (danaRPump.basalStep != 0.01) {
+            failed = true
+            val notification = Notification(Notification.WRONGBASALSTEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        } else {
+            rxBus.send(EventDismissNotification(Notification.WRONGBASALSTEP))
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__GET_BASAL_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
deleted file mode 100644
index 778b794b2a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Basal_Get_Profile_Basal_Rate extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int profileNumber;
-
-    DanaRPump pump = DanaRPump.getInstance();
-
-    public DanaRS_Packet_Basal_Get_Profile_Basal_Rate() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE;
-    }
-
-    // 0 - 4
-    public DanaRS_Packet_Basal_Get_Profile_Basal_Rate(int profileNumber) {
-        this();
-        this.profileNumber = profileNumber;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting basal rates for profile " + profileNumber);
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[1];
-        request[0] = (byte) (profileNumber & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-
-        int dataIndex = DATA_START;
-        int dataSize = 2;
-
-        if (pump.pumpProfiles == null) pump.pumpProfiles = new double[4][];
-        pump.pumpProfiles[profileNumber] = new double[24];
-        for (int i = 0, size = 24; i < size; i++) {
-            pump.pumpProfiles[profileNumber][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-            dataIndex += dataSize;
-            dataSize = 2;
-        }
-        if (L.isEnabled(L.PUMPCOMM)) {
-            for (int index = 0; index < 24; index++)
-                log.debug("Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + pump.pumpProfiles[profileNumber][index]);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__GET_PROFILE_BASAL_RATE";
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
new file mode 100644
index 0000000000..54793b555d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import java.util.*
+
+open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val profileNumber: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting basal rates for profile $profileNumber")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(1)
+        request[0] = (profileNumber and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 2
+        danaRPump.pumpProfiles = Array(4) {Array(48) {0.0} }
+        var i = 0
+        val size = 24
+        while (i < size) {
+            danaRPump.pumpProfiles!![profileNumber][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            i++
+        }
+        for (index in 0..23)
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profileNumber][index])
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__GET_PROFILE_BASAL_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
deleted file mode 100644
index 6da58c7a43..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Basal_Get_Profile_Number extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Basal_Get_Profile_Number() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting active profile");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        pump.activeProfile = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Active profile: " + pump.activeProfile);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__GET_PROFILE_NUMBER";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
new file mode 100644
index 0000000000..c37242b740
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Basal_Get_Profile_Number(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting active profile")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        danaRPump.activeProfile = byteArrayToInt(getBytes(data, DATA_START, 1))
+        aapsLogger.debug(LTag.PUMPCOMM, "Active profile: " + danaRPump.activeProfile)
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__GET_PROFILE_NUMBER"
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
deleted file mode 100644
index 117baf23ff..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import androidx.annotation.NonNull;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet_Basal_Get_Temporary_Basal_State extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Basal_Get_Temporary_Basal_State() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting temporary basal status");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if (error == 1)
-            failed = true;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.isTempBasalInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01;
-        boolean isAPSTempBasalInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x02;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.tempBasalPercent = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (pump.tempBasalPercent > 200) pump.tempBasalPercent = (pump.tempBasalPercent - 200) * 10;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int durationHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (durationHour == 150) pump.tempBasalTotalSec = 15 * 60;
-        else if (durationHour == 160) pump.tempBasalTotalSec = 30 * 60;
-        else pump.tempBasalTotalSec = durationHour * 60 * 60;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int runningMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        int tempBasalRemainingMin = (pump.tempBasalTotalSec - runningMin * 60) / 60;
-        long tempBasalStart = pump.isTempBasalInProgress ? getDateFromTempBasalSecAgo(runningMin * 60) : 0;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Error code: " + error);
-            log.debug("Is temp basal running: " + pump.isTempBasalInProgress);
-            log.debug("Is APS temp basal running: " + isAPSTempBasalInProgress);
-            log.debug("Current temp basal percent: " + pump.tempBasalPercent);
-            log.debug("Current temp basal remaining min: " + tempBasalRemainingMin);
-            log.debug("Current temp basal total sec: " + pump.tempBasalTotalSec);
-            log.debug("Current temp basal start: " + DateUtil.dateAndTimeFullString(tempBasalStart));
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__TEMPORARY_BASAL_STATE";
-    }
-
-    @NonNull
-    private long getDateFromTempBasalSecAgo(int tempBasalAgoSecs) {
-        return (long) (Math.ceil(System.currentTimeMillis() / 1000d) - tempBasalAgoSecs) * 1000;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
new file mode 100644
index 0000000000..fdc5c16480
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import kotlin.math.ceil
+
+class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting temporary basal status")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val error = byteArrayToInt(getBytes(data, DATA_START, 1))
+        danaRPump.isTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x01
+        val isAPSTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x02
+        danaRPump.tempBasalPercent = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
+        if (danaRPump.tempBasalPercent > 200) danaRPump.tempBasalPercent = (danaRPump.tempBasalPercent - 200) * 10
+        val durationHour = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
+        if (durationHour == 150) danaRPump.tempBasalTotalSec = 15 * 60 else if (durationHour == 160) danaRPump.tempBasalTotalSec = 30 * 60 else danaRPump.tempBasalTotalSec = durationHour * 60 * 60
+        val runningMin = byteArrayToInt(getBytes(data, DATA_START + 4, 2))
+        if (error != 0) failed = true
+        val tempBasalRemainingMin = (danaRPump.tempBasalTotalSec - runningMin * 60) / 60
+        val tempBasalStart = if (danaRPump.isTempBasalInProgress) getDateFromTempBasalSecAgo(runningMin * 60) else 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Error code: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: " + danaRPump.isTempBasalInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaRPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: " + danaRPump.tempBasalTotalSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + DateUtil.dateAndTimeString(tempBasalStart))
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__TEMPORARY_BASAL_STATE"
+    }
+
+    private fun getDateFromTempBasalSecAgo(tempBasalAgoSecs: Int): Long {
+        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
deleted file mode 100644
index cef7c8ab92..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-public class DanaRS_Packet_Basal_Set_Basal_Rate extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private double[] profileBasalRate;
-
-    public DanaRS_Packet_Basal_Set_Basal_Rate() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_BASAL_RATE;
-    }
-
-    public DanaRS_Packet_Basal_Set_Basal_Rate(double[] profileBasalRate) {
-        this();
-        this.profileBasalRate = profileBasalRate;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting new basal rates");
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[48];
-        for (int i = 0, size = 24; i < size; i++) {
-            int rate = (int) (profileBasalRate[i] * 100d);
-            request[0 + (i * 2)] = (byte) (rate & 0xff);
-            request[1 + (i * 2)] = (byte) ((rate >>> 8) & 0xff);
-        }
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if(result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_BASAL_RATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
new file mode 100644
index 0000000000..ea5dd4ee29
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Basal_Rate(
+    private val aapsLogger: AAPSLogger,
+    private var profileBasalRate: Array<Double>
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_BASAL_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(48)
+        var i = 0
+        val size = 24
+        while (i < size) {
+            val rate = (profileBasalRate[i] * 100.0).toInt()
+            request[0 + i * 2] = (rate and 0xff).toByte()
+            request[1 + i * 2] = (rate ushr 8 and 0xff).toByte()
+            i++
+        }
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_BASAL_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
deleted file mode 100644
index 0020e3ffa1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Canceling temp basal");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else {
-                log.error("Result Error: " + result);
-                failed = true;
-            }
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__CANCEL_TEMPORARY_BASAL";
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
new file mode 100644
index 0000000000..1d67a20a89
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL
+        aapsLogger.debug(LTag.PUMPCOMM, "Canceling temp basal")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__CANCEL_TEMPORARY_BASAL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
deleted file mode 100644
index d6ae1c94a7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Profile_Basal_Rate extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int profileNumber; // 0 - 4
-    private double[] profileBasalRate;
-
-    public DanaRS_Packet_Basal_Set_Profile_Basal_Rate() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE;
-    }
-
-    public DanaRS_Packet_Basal_Set_Profile_Basal_Rate(int profileNumber, double[] profileBasalRate) {
-        this();
-        this.profileNumber = profileNumber;
-        this.profileBasalRate = profileBasalRate;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting new basal rates for profile " + profileNumber);
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[49];
-        request[0] = (byte) (profileNumber & 0xff);
-        for (int i = 0, size = 24; i < size; i++) {
-            int rate = (int) (profileBasalRate[i] * 100d);
-            request[1 + (i * 2)] = (byte) (rate & 0xff);
-            request[2 + (i * 2)] = (byte) ((rate >>> 8) & 0xff);
-        }
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_PROFILE_BASAL_RATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
new file mode 100644
index 0000000000..a65746f8e8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
+    private val aapsLogger: AAPSLogger,
+    private var profileNumber: Int,
+    private var profileBasalRate: Array<Double>
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates for profile $profileNumber")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(49)
+        request[0] = (profileNumber and 0xff).toByte()
+        var i = 0
+        val size = 24
+        while (i < size) {
+            val rate = (profileBasalRate[i] * 100.0).toInt()
+            request[1 + i * 2] = (rate and 0xff).toByte()
+            request[2 + i * 2] = (rate ushr 8 and 0xff).toByte()
+            i++
+        }
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_PROFILE_BASAL_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
deleted file mode 100644
index ab6f4174da..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Profile_Number extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private int profileNumber;
-
-    public DanaRS_Packet_Basal_Set_Profile_Number() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER;
-    }
-
-    public DanaRS_Packet_Basal_Set_Profile_Number(int profileNumber) {
-        this();
-        this.profileNumber = profileNumber;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting profile number " + profileNumber);
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[1];
-        request[0] = (byte) (profileNumber & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_PROFILE_NUMBER";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
new file mode 100644
index 0000000000..b61c046682
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Profile_Number(
+    private val aapsLogger: AAPSLogger,
+    private var profileNumber: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting profile number $profileNumber")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(1)
+        request[0] = (profileNumber and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_PROFILE_NUMBER"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
deleted file mode 100644
index 5fbda1d902..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Suspend_Off extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Basal_Set_Suspend_Off() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Turning off suspend");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else {
-                log.error("Result Error: " + result);
-                failed = true;
-            }
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_SUSPEND_OFF";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
new file mode 100644
index 0000000000..85e2f70456
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Suspend_Off(
+    private val aapsLogger: AAPSLogger
+    ) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF
+        aapsLogger.debug(LTag.PUMPCOMM, "Turning off suspend")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_SUSPEND_OFF"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
deleted file mode 100644
index 82c282adad..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Suspend_On extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Basal_Set_Suspend_On() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Turning on suspend");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if(result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                failed = true;
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_SUSPEND_ON";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
new file mode 100644
index 0000000000..c603549d91
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Basal_Set_Suspend_On(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON
+        aapsLogger.debug(LTag.PUMPCOMM, "Turning on suspend")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_SUSPEND_ON"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
deleted file mode 100644
index f2abcbc164..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Basal_Set_Temporary_Basal extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int temporaryBasalRatio;
-    private int temporaryBasalDuration;
-
-    public DanaRS_Packet_Basal_Set_Temporary_Basal() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL;
-    }
-
-    public DanaRS_Packet_Basal_Set_Temporary_Basal(int temporaryBasalRatio, int temporaryBasalDuration) {
-        this();
-        this.temporaryBasalRatio = temporaryBasalRatio;
-        this.temporaryBasalDuration = temporaryBasalDuration;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting temporary basal of " + temporaryBasalRatio + "% for " + temporaryBasalDuration + " hours");
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[2];
-        request[0] = (byte) (temporaryBasalRatio & 0xff);
-        request[1] = (byte) (temporaryBasalDuration & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BASAL__SET_TEMPORARY_BASAL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
new file mode 100644
index 0000000000..cde564fbc0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+open class DanaRS_Packet_Basal_Set_Temporary_Basal(
+    private val aapsLogger: AAPSLogger,
+    private var temporaryBasalRatio: Int = 0,
+    private var temporaryBasalDuration: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting temporary basal of $temporaryBasalRatio% for $temporaryBasalDuration hours")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(2)
+        request[0] = (temporaryBasalRatio and 0xff).toByte()
+        request[1] = (temporaryBasalDuration and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BASAL__SET_TEMPORARY_BASAL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
deleted file mode 100644
index c656de11cf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Bolus_Option extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Bolus_Option() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        pump.isExtendedBolusEnabled = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 1;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.bolusCalculationOption = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.missedBolusConfig = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus01StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus01StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus01EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus01EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus02StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus02StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus02EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus02EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus03StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus03StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus03EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus03EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus04StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus04StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus04EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int missedBolus04EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if (!pump.isExtendedBolusEnabled) {
-            Notification notification = new Notification(Notification.EXTENDED_BOLUS_DISABLED, MainApp.gs(R.string.danar_enableextendedbolus), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            failed = true;
-        } else {
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED));
-        }
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Extended bolus enabled: " + pump.isExtendedBolusEnabled);
-            log.debug("Missed bolus config: " + pump.missedBolusConfig);
-            log.debug("missedBolus01StartHour: " + missedBolus01StartHour);
-            log.debug("missedBolus01StartMin: " + missedBolus01StartMin);
-            log.debug("missedBolus01EndHour: " + missedBolus01EndHour);
-            log.debug("missedBolus01EndMin: " + missedBolus01EndMin);
-            log.debug("missedBolus02StartHour: " + missedBolus02StartHour);
-            log.debug("missedBolus02StartMin: " + missedBolus02StartMin);
-            log.debug("missedBolus02EndHour: " + missedBolus02EndHour);
-            log.debug("missedBolus02EndMin: " + missedBolus02EndMin);
-            log.debug("missedBolus03StartHour: " + missedBolus03StartHour);
-            log.debug("missedBolus03StartMin: " + missedBolus03StartMin);
-            log.debug("missedBolus03EndHour: " + missedBolus03EndHour);
-            log.debug("missedBolus03EndMin: " + missedBolus03EndMin);
-            log.debug("missedBolus04StartHour: " + missedBolus04StartHour);
-            log.debug("missedBolus04StartMin: " + missedBolus04StartMin);
-            log.debug("missedBolus04EndHour: " + missedBolus04EndHour);
-            log.debug("missedBolus04EndMin: " + missedBolus04EndMin);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_BOLUS_OPTION";
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
new file mode 100644
index 0000000000..36512ccec1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -0,0 +1,115 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class DanaRS_Packet_Bolus_Get_Bolus_Option(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump
+
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        danaRPump.isExtendedBolusEnabled = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 1
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.bolusCalculationOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.missedBolusConfig = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus01StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus01StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus01EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus01EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus02StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus02StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus02EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus02EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus03StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus03StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus03EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus03EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus04StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus04StartMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus04EndHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val missedBolus04EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        if (!danaRPump.isExtendedBolusEnabled) {
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            failed = true
+        } else {
+            rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Missed bolus config: " + danaRPump.missedBolusConfig)
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01StartHour: $missedBolus01StartHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01StartMin: $missedBolus01StartMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01EndHour: $missedBolus01EndHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01EndMin: $missedBolus01EndMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus02StartHour: $missedBolus02StartHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus02StartMin: $missedBolus02StartMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus02EndHour: $missedBolus02EndHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus02EndMin: $missedBolus02EndMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus03StartHour: $missedBolus03StartHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus03StartMin: $missedBolus03StartMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus03EndHour: $missedBolus03EndHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus03EndMin: $missedBolus03EndMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus04StartHour: $missedBolus04StartHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus04StartMin: $missedBolus04StartMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus04EndHour: $missedBolus04EndHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "missedBolus04EndMin: $missedBolus04EndMin")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_BOLUS_OPTION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
deleted file mode 100644
index 5dca32bdd3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_CIR_CF_Array extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_CIR_CF_Array() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int language = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.morningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int cir02 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.afternoonCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int cir04 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.eveningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int cir06 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.nightCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        double cf02, cf04, cf06;
-
-        if (pump.units == DanaRPump.UNITS_MGDL) {
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        } else {
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            pump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        }
-        if (pump.units < 0 || pump.units > 1)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Language: " + language);
-            log.debug("Pump units: " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Current pump morning CIR: " + pump.morningCIR);
-            log.debug("Current pump morning CF: " + pump.morningCF);
-            log.debug("Current pump afternoon CIR: " + pump.afternoonCIR);
-            log.debug("Current pump afternoon CF: " + pump.afternoonCF);
-            log.debug("Current pump evening CIR: " + pump.eveningCIR);
-            log.debug("Current pump evening CF: " + pump.eveningCF);
-            log.debug("Current pump night CIR: " + pump.nightCIR);
-            log.debug("Current pump night CF: " + pump.nightCF);
-            log.debug("cir02: " + cir02);
-            log.debug("cir04: " + cir04);
-            log.debug("cir06: " + cir06);
-            log.debug("cf02: " + cf02);
-            log.debug("cf04: " + cf04);
-            log.debug("cf06: " + cf06);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_CIR_CF_ARRAY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
new file mode 100644
index 0000000000..b157ad9978
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -0,0 +1,116 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val language = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.morningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        val cir02 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.afternoonCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        val cir04 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.eveningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        val cir06 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.nightCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        val cf02: Double
+        val cf04: Double
+        val cf06: Double
+        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        } else {
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            dataIndex += dataSize
+            dataSize = 2
+            danaRPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        }
+        if (danaRPump.units < 0 || danaRPump.units > 1) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Language: $language")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaRPump.afternoonCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaRPump.eveningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaRPump.eveningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaRPump.nightCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaRPump.nightCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "cir02: $cir02")
+        aapsLogger.debug(LTag.PUMPCOMM, "cir04: $cir04")
+        aapsLogger.debug(LTag.PUMPCOMM, "cir06: $cir06")
+        aapsLogger.debug(LTag.PUMPCOMM, "cf02: $cf02")
+        aapsLogger.debug(LTag.PUMPCOMM, "cf04: $cf04")
+        aapsLogger.debug(LTag.PUMPCOMM, "cf06: $cf06")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_CIR_CF_ARRAY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
deleted file mode 100644
index b024dd056c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Calculation_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Calculation_Information() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double currentBG = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int carbohydrate = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.currentTarget = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.currentCF = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if (pump.units == DanaRPump.UNITS_MMOL) {
-            pump.currentCF = pump.currentCF / 100d;
-            pump.currentTarget = pump.currentTarget / 100d;
-            currentBG = currentBG / 100d;
-        }
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("Pump units: " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("Current BG: " + currentBG);
-            log.debug("Carbs: " + carbohydrate);
-            log.debug("Current target: " + pump.currentTarget);
-            log.debug("Current CIR: " + pump.currentCIR);
-            log.debug("Current CF: " + pump.currentCF);
-            log.debug("Pump IOB: " + pump.iob);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_CALCULATION_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
new file mode 100644
index 0000000000..7dacd08599
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Calculation_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        var currentBG = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        dataIndex += dataSize
+        dataSize = 2
+        val carbohydrate = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.currentTarget = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.currentCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        if (danaRPump.units == DanaRPump.UNITS_MMOL) {
+            danaRPump.currentCF = danaRPump.currentCF / 100.0
+            danaRPump.currentTarget = danaRPump.currentTarget / 100.0
+            currentBG = currentBG / 100.0
+        }
+        if (error != 0) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current BG: $currentBG")
+        aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbohydrate")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaRPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaRPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CF: " + danaRPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump IOB: " + danaRPump.iob)
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_CALCULATION_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
deleted file mode 100644
index 60da3683ac..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        int carbs = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("Carbs: " + carbs);
-            log.debug("Current CIR: " + pump.currentCIR);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
new file mode 100644
index 0000000000..ba69221673
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        val carbs = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        if (error != 0) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbs")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaRPump.currentCIR)
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
deleted file mode 100644
index 5f1bbc5a39..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Dual_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Dual_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        double bolusIncrement = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("Bolus step: " + pump.bolusStep + " U");
-            log.debug("Extended bolus running: " + pump.extendedBolusAbsoluteRate + " U/h");
-            log.debug("Max bolus: " + pump.maxBolus + " U");
-            log.debug("bolusIncrement: " + bolusIncrement + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_DUAL_BOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
new file mode 100644
index 0000000000..2fbe624322
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Dual_Bolus(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val error = byteArrayToInt(getBytes(data, DATA_START, 1))
+        danaRPump.bolusStep = byteArrayToInt(getBytes(data, DATA_START + 1, 2)) / 100.0
+        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, DATA_START + 3, 2)) / 100.0
+        danaRPump.maxBolus = byteArrayToInt(getBytes(data, DATA_START + 5, 2)) / 100.0
+        val bolusIncrement = byteArrayToInt(getBytes(data, DATA_START + 7, 1)) / 100.0
+        failed = error != 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: ${danaRPump.bolusStep} U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: ${danaRPump.extendedBolusAbsoluteRate} U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusIncrement: $bolusIncrement U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_DUAL_BOLUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
deleted file mode 100644
index 2b857e3fc8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Extended_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Extended_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("Extended bolus running: " + pump.extendedBolusAbsoluteRate + " U/h");
-            log.debug("Max bolus: " + pump.maxBolus + " U");
-            log.debug("Bolus step: " + pump.bolusStep + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_EXTENDED_BOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
new file mode 100644
index 0000000000..3cd50febdb
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Extended_Bolus(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        failed = error != 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaRPump.extendedBolusAbsoluteRate + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_EXTENDED_BOLUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
deleted file mode 100644
index 15d2678451..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Extended_Bolus_State extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Extended_Bolus_State() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.extendedBolusMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize)) * 30;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusSoFarInMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusDeliveredSoFar = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-            log.debug("Extended bolus running: " + pump.extendedBolusAbsoluteRate + " U/h");
-            log.debug("Extended bolus duration: " + pump.extendedBolusMinutes + " min");
-            log.debug("Extended bolus so far: " + pump.extendedBolusSoFarInMinutes + " min");
-            log.debug("Extended bolus delivered so far: " + pump.extendedBolusDeliveredSoFar + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_EXTENDED_BOLUS_STATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
new file mode 100644
index 0000000000..c48b08150b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.extendedBolusMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize)) * 30
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusSoFarInMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusDeliveredSoFar = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        failed = error != 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaRPump.extendedBolusAbsoluteRate + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + danaRPump.extendedBolusMinutes + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: " + danaRPump.extendedBolusSoFarInMinutes + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: " + danaRPump.extendedBolusDeliveredSoFar + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_EXTENDED_BOLUS_STATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
deleted file mode 100644
index 9e66d9458b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int extendedMenuOption = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("extendedMenuOption: " + extendedMenuOption);
-            log.debug("Is extended bolus running: " + pump.isExtendedInProgress);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_EXTENDED_MENU_OPTION_STATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
new file mode 100644
index 0000000000..44bcaea4c6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val extendedMenuOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
+        aapsLogger.debug(LTag.PUMPCOMM, "extendedMenuOption: $extendedMenuOption")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_EXTENDED_MENU_OPTION_STATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
deleted file mode 100644
index 37c9d9138e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Get_Initial_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private double initialBolusValue01;
-    private double initialBolusValue02;
-    private double initialBolusValue03;
-    double initialBolusValue04;
-
-    public DanaRS_Packet_Bolus_Get_Initial_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 2;
-        initialBolusValue01 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        initialBolusValue02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        initialBolusValue03 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        initialBolusValue04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        if (initialBolusValue01 == 0d && initialBolusValue02 == 0d && initialBolusValue03 == 0d && initialBolusValue04 == 0d)
-            failed = true;
-        else
-            failed = false;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Initial bolus amount 01: " + initialBolusValue01);
-            log.debug("Initial bolus amount 02: " + initialBolusValue02);
-            log.debug("Initial bolus amount 03: " + initialBolusValue03);
-            log.debug("Initial bolus amount 04: " + initialBolusValue04);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_BOLUS_RATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
new file mode 100644
index 0000000000..5b3fe17f1f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Get_Initial_Bolus(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val initialBolusValue01: Double
+        val initialBolusValue02: Double
+        val initialBolusValue03: Double
+        val initialBolusValue04: Double
+        var dataIndex = DATA_START
+        var dataSize = 2
+        initialBolusValue01 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        initialBolusValue02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        initialBolusValue03 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        initialBolusValue04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        failed = initialBolusValue01 == 0.0 && initialBolusValue02 == 0.0 && initialBolusValue03 == 0.0 && initialBolusValue04 == 0.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 01: $initialBolusValue01")
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 02: $initialBolusValue02")
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 03: $initialBolusValue03")
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 04: $initialBolusValue04")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_BOLUS_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
deleted file mode 100644
index 755fff3829..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet_Bolus_Get_Step_Bolus_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Get_Step_Bolus_Information() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int bolusType = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.initialBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        Date lbt = new Date(); // it doesn't provide day only hour+min, workaround: expecting today
-        dataIndex += dataSize;
-        dataSize = 1;
-        lbt.setHours(byteArrayToInt(getBytes(data, dataIndex, dataSize)));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        lbt.setMinutes(byteArrayToInt(getBytes(data, dataIndex, dataSize)));
-
-        pump.lastBolusTime = lbt.getTime();
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-            log.debug("BolusType: " + bolusType);
-            log.debug("Initial bolus amount: " + pump.initialBolusAmount + " U");
-            log.debug("Last bolus time: " + DateUtil.dateAndTimeFullString(pump.lastBolusTime));
-            log.debug("Last bolus amount: " + pump.lastBolusAmount);
-            log.debug("Max bolus: " + pump.maxBolus + " U");
-            log.debug("Bolus step: " + pump.bolusStep + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__GET_STEP_BOLUS_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
new file mode 100644
index 0000000000..e6c8121506
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val bolusType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.initialBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        val lbt = Date() // it doesn't provide day only hour+min, workaround: expecting today
+        dataIndex += dataSize
+        dataSize = 1
+        lbt.hours = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        lbt.minutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaRPump.lastBolusTime = lbt.time
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        failed = error != 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusType: $bolusType")
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount: " + danaRPump.initialBolusAmount + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeString(danaRPump.lastBolusTime))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_STEP_BOLUS_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
deleted file mode 100644
index 2013bd74eb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Bolus_Option extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private int extendedBolusOptionOnOff;
-
-    private int bolusCalculationOption;
-    private int missedBolusConfig;
-    private int missedBolus01StartHour;
-    private int missedBolus01StartMin;
-    private int missedBolus01EndHour;
-    private int missedBolus01EndMin;
-    private int missedBolus02StartHour;
-    private int missedBolus02StartMin;
-    private int missedBolus02EndHour;
-    private int missedBolus02EndMin;
-    private int missedBolus03StartHour;
-    private int missedBolus03StartMin;
-    private int missedBolus03EndHour;
-    private int missedBolus03EndMin;
-    private int missedBolus04StartHour;
-    private int missedBolus04StartMin;
-    private int missedBolus04EndHour;
-    private int missedBolus04EndMin;
-
-    public DanaRS_Packet_Bolus_Set_Bolus_Option() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION;
-    }
-
-    public DanaRS_Packet_Bolus_Set_Bolus_Option(
-            int extendedBolusOptionOnOff,
-            int bolusCalculationOption,
-            int missedBolusConfig,
-            int missedBolus01StartHour,
-            int missedBolus01StartMin,
-            int missedBolus01EndHour,
-            int missedBolus01EndMin,
-            int missedBolus02StartHour,
-            int missedBolus02StartMin,
-            int missedBolus02EndHour,
-            int missedBolus02EndMin,
-            int missedBolus03StartHour,
-            int missedBolus03StartMin,
-            int missedBolus03EndHour,
-            int missedBolus03EndMin,
-            int missedBolus04StartHour,
-            int missedBolus04StartMin,
-            int missedBolus04EndHour,
-            int missedBolus04EndMin) {
-        this();
-        this.extendedBolusOptionOnOff = extendedBolusOptionOnOff;
-        this.bolusCalculationOption = bolusCalculationOption;
-        this.missedBolusConfig = missedBolusConfig;
-        this.missedBolus01StartHour = missedBolus01StartHour;
-        this.missedBolus01StartMin = missedBolus01StartMin;
-        this.missedBolus01EndHour = missedBolus01EndHour;
-        this.missedBolus01EndMin = missedBolus01EndMin;
-        this.missedBolus02StartHour = missedBolus02StartHour;
-        this.missedBolus02StartMin = missedBolus02StartMin;
-        this.missedBolus02EndHour = missedBolus02EndHour;
-        this.missedBolus02EndMin = missedBolus02EndMin;
-        this.missedBolus03StartHour = missedBolus03StartHour;
-        this.missedBolus03StartMin = missedBolus03StartMin;
-        this.missedBolus03EndHour = missedBolus03EndHour;
-        this.missedBolus03EndMin = missedBolus03EndMin;
-        this.missedBolus04StartHour = missedBolus04StartHour;
-        this.missedBolus04StartMin = missedBolus04StartMin;
-        this.missedBolus04EndHour = missedBolus04EndHour;
-        this.missedBolus04EndMin = missedBolus04EndMin;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting bolus options");
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[19];
-        request[0] = (byte) (extendedBolusOptionOnOff & 0xff);
-        request[1] = (byte) (bolusCalculationOption & 0xff);
-        request[2] = (byte) (missedBolusConfig & 0xff);
-
-        request[3] = (byte) (missedBolus01StartHour & 0xff);
-        request[4] = (byte) (missedBolus01StartMin & 0xff);
-        request[5] = (byte) (missedBolus01EndHour & 0xff);
-        request[6] = (byte) (missedBolus01EndMin & 0xff);
-
-        request[7] = (byte) (missedBolus02StartHour & 0xff);
-        request[8] = (byte) (missedBolus02StartMin & 0xff);
-        request[9] = (byte) (missedBolus02EndHour & 0xff);
-        request[10] = (byte) (missedBolus02EndMin & 0xff);
-
-        request[11] = (byte) (missedBolus03StartHour & 0xff);
-        request[12] = (byte) (missedBolus03StartMin & 0xff);
-        request[13] = (byte) (missedBolus03EndHour & 0xff);
-        request[14] = (byte) (missedBolus03EndMin & 0xff);
-
-        request[15] = (byte) (missedBolus04StartHour & 0xff);
-        request[16] = (byte) (missedBolus04StartMin & 0xff);
-        request[17] = (byte) (missedBolus04EndHour & 0xff);
-        request[18] = (byte) (missedBolus04EndMin & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if ( result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_BOLUS_OPTION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
new file mode 100644
index 0000000000..34f3967351
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
@@ -0,0 +1,74 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_Bolus_Option(
+    private val aapsLogger: AAPSLogger,
+    private var extendedBolusOptionOnOff: Int = 0,
+    private var bolusCalculationOption: Int = 0,
+    private var missedBolusConfig: Int = 0,
+    private var missedBolus01StartHour: Int = 0,
+    private var missedBolus01StartMin: Int = 0,
+    private var missedBolus01EndHour: Int = 0,
+    private var missedBolus01EndMin: Int = 0,
+    private var missedBolus02StartHour: Int = 0,
+    private var missedBolus02StartMin: Int = 0,
+    private var missedBolus02EndHour: Int = 0,
+    private var missedBolus02EndMin: Int = 0,
+    private var missedBolus03StartHour: Int = 0,
+    private var missedBolus03StartMin: Int = 0,
+    private var missedBolus03EndHour: Int = 0,
+    private var missedBolus03EndMin: Int = 0,
+    private var missedBolus04StartHour: Int = 0,
+    private var missedBolus04StartMin: Int = 0,
+    private var missedBolus04EndHour: Int = 0,
+    private var missedBolus04EndMin: Int = 0
+
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting bolus options")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(19)
+        request[0] = (extendedBolusOptionOnOff and 0xff).toByte()
+        request[1] = (bolusCalculationOption and 0xff).toByte()
+        request[2] = (missedBolusConfig and 0xff).toByte()
+        request[3] = (missedBolus01StartHour and 0xff).toByte()
+        request[4] = (missedBolus01StartMin and 0xff).toByte()
+        request[5] = (missedBolus01EndHour and 0xff).toByte()
+        request[6] = (missedBolus01EndMin and 0xff).toByte()
+        request[7] = (missedBolus02StartHour and 0xff).toByte()
+        request[8] = (missedBolus02StartMin and 0xff).toByte()
+        request[9] = (missedBolus02EndHour and 0xff).toByte()
+        request[10] = (missedBolus02EndMin and 0xff).toByte()
+        request[11] = (missedBolus03StartHour and 0xff).toByte()
+        request[12] = (missedBolus03StartMin and 0xff).toByte()
+        request[13] = (missedBolus03EndHour and 0xff).toByte()
+        request[14] = (missedBolus03EndMin and 0xff).toByte()
+        request[15] = (missedBolus04StartHour and 0xff).toByte()
+        request[16] = (missedBolus04StartMin and 0xff).toByte()
+        request[17] = (missedBolus04EndHour and 0xff).toByte()
+        request[18] = (missedBolus04EndMin and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_BOLUS_OPTION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
deleted file mode 100644
index 50a6871bd4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_CIR_CF_Array extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int cir01;
-    private int cir02;
-    private int cir03;
-    private int cir04;
-    private int cir05;
-    private int cir06;
-    private int cir07;
-    private int cf01;
-    private int cf02;
-    private int cf03;
-    private int cf04;
-    private int cf05;
-    private int cf06;
-    private int cf07;
-
-    public DanaRS_Packet_Bolus_Set_CIR_CF_Array() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY;
-    }
-
-    public DanaRS_Packet_Bolus_Set_CIR_CF_Array(int cir01, int cir02, int cir03, int cir04, int cir05, int cir06, int cir07, int cf01, int cf02, int cf03, int cf04, int cf05, int cf06, int cf07) {
-        this();
-        this.cir01 = cir01;
-        this.cir02 = cir02;
-        this.cir03 = cir03;
-        this.cir04 = cir04;
-        this.cir05 = cir05;
-        this.cir06 = cir06;
-        this.cir07 = cir07;
-        this.cf01 = cf01;
-        this.cf02 = cf02;
-        this.cf03 = cf03;
-        this.cf04 = cf04;
-        this.cf05 = cf05;
-        this.cf06 = cf06;
-        this.cf07 = cf07;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[28];
-        request[0] = (byte) (cir01 & 0xff);
-        request[1] = (byte) ((cir01 >>> 8) & 0xff);
-        request[2] = (byte) (cir02 & 0xff);
-        request[3] = (byte) ((cir02 >>> 8) & 0xff);
-        request[4] = (byte) (cir03 & 0xff);
-        request[5] = (byte) ((cir03 >>> 8) & 0xff);
-        request[6] = (byte) (cir04 & 0xff);
-        request[7] = (byte) ((cir04 >>> 8) & 0xff);
-        request[8] = (byte) (cir05 & 0xff);
-        request[9] = (byte) ((cir05 >>> 8) & 0xff);
-        request[10] = (byte) (cir06 & 0xff);
-        request[11] = (byte) ((cir06 >>> 8) & 0xff);
-        request[12] = (byte) (cir07 & 0xff);
-        request[13] = (byte) ((cir07 >>> 8) & 0xff);
-        request[14] = (byte) (cf01 & 0xff);
-        request[15] = (byte) ((cf01 >>> 8) & 0xff);
-        request[16] = (byte) (cf02 & 0xff);
-        request[17] = (byte) ((cf02 >>> 8) & 0xff);
-        request[18] = (byte) (cf03 & 0xff);
-        request[19] = (byte) ((cf03 >>> 8) & 0xff);
-        request[20] = (byte) (cf04 & 0xff);
-        request[21] = (byte) ((cf04 >>> 8) & 0xff);
-        request[22] = (byte) (cf05 & 0xff);
-        request[23] = (byte) ((cf05 >>> 8) & 0xff);
-        request[24] = (byte) (cf06 & 0xff);
-        request[25] = (byte) ((cf06 >>> 8) & 0xff);
-        request[26] = (byte) (cf07 & 0xff);
-        request[27] = (byte) ((cf07 >>> 8) & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_CIR_CF_ARRAY";
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
new file mode 100644
index 0000000000..e31a770db7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
@@ -0,0 +1,77 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
+    private val aapsLogger: AAPSLogger,
+    private var cir01: Int = 0,
+    private var cir02: Int = 0,
+    private var cir03: Int = 0,
+    private var cir04: Int = 0,
+    private var cir05: Int = 0,
+    private var cir06: Int = 0,
+    private var cir07: Int = 0,
+    private var cf01: Int = 0,
+    private var cf02: Int = 0,
+    private var cf03: Int = 0,
+    private var cf04: Int = 0,
+    private var cf05: Int = 0,
+    private var cf06: Int = 0,
+    private var cf07: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(28)
+        request[0] = (cir01 and 0xff).toByte()
+        request[1] = (cir01 ushr 8 and 0xff).toByte()
+        request[2] = (cir02 and 0xff).toByte()
+        request[3] = (cir02 ushr 8 and 0xff).toByte()
+        request[4] = (cir03 and 0xff).toByte()
+        request[5] = (cir03 ushr 8 and 0xff).toByte()
+        request[6] = (cir04 and 0xff).toByte()
+        request[7] = (cir04 ushr 8 and 0xff).toByte()
+        request[8] = (cir05 and 0xff).toByte()
+        request[9] = (cir05 ushr 8 and 0xff).toByte()
+        request[10] = (cir06 and 0xff).toByte()
+        request[11] = (cir06 ushr 8 and 0xff).toByte()
+        request[12] = (cir07 and 0xff).toByte()
+        request[13] = (cir07 ushr 8 and 0xff).toByte()
+        request[14] = (cf01 and 0xff).toByte()
+        request[15] = (cf01 ushr 8 and 0xff).toByte()
+        request[16] = (cf02 and 0xff).toByte()
+        request[17] = (cf02 ushr 8 and 0xff).toByte()
+        request[18] = (cf03 and 0xff).toByte()
+        request[19] = (cf03 ushr 8 and 0xff).toByte()
+        request[20] = (cf04 and 0xff).toByte()
+        request[21] = (cf04 ushr 8 and 0xff).toByte()
+        request[22] = (cf05 and 0xff).toByte()
+        request[23] = (cf05 ushr 8 and 0xff).toByte()
+        request[24] = (cf06 and 0xff).toByte()
+        request[25] = (cf06 ushr 8 and 0xff).toByte()
+        request[26] = (cf07 and 0xff).toByte()
+        request[27] = (cf07 ushr 8 and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_CIR_CF_ARRAY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
deleted file mode 100644
index da11d172fc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Dual_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private double amount;
-    private double extendedAmount;
-    private int extendedBolusDurationInHalfHours;
-
-    public DanaRS_Packet_Bolus_Set_Dual_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS;
-    }
-
-    public DanaRS_Packet_Bolus_Set_Dual_Bolus(double amount, double extendedAmount, int extendedBolusDurationInHalfHours) {
-        this();
-        this.amount = amount;
-        this.extendedAmount = extendedAmount;
-        this.extendedBolusDurationInHalfHours = extendedBolusDurationInHalfHours;
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Dual bolus start : " + amount + " U extended: " + extendedAmount + " U halfhours: " + extendedBolusDurationInHalfHours);
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        int stepBolusRate = (int) (amount / 100d);
-        int extendedBolusRate = (int) (extendedAmount / 100d);
-
-        byte[] request = new byte[5];
-        request[0] = (byte) (stepBolusRate & 0xff);
-        request[1] = (byte) ((stepBolusRate >>> 8) & 0xff);
-        request[2] = (byte) (extendedBolusRate & 0xff);
-        request[3] = (byte) ((extendedBolusRate >>> 8) & 0xff);
-        request[4] = (byte) (extendedBolusDurationInHalfHours & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result!=0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_DUAL_BOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
new file mode 100644
index 0000000000..d0fef47f82
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_Dual_Bolus(
+    private val aapsLogger: AAPSLogger,
+    private var amount: Double = 0.0,
+    private var extendedAmount: Double = 0.0,
+    private var extendedBolusDurationInHalfHours: Int = 0
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS
+        aapsLogger.debug(LTag.PUMPCOMM, "Dual bolus start : $amount U extended: $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val stepBolusRate = (amount / 100.0).toInt()
+        val extendedBolusRate = (extendedAmount / 100.0).toInt()
+        val request = ByteArray(5)
+        request[0] = (stepBolusRate and 0xff).toByte()
+        request[1] = (stepBolusRate ushr 8 and 0xff).toByte()
+        request[2] = (extendedBolusRate and 0xff).toByte()
+        request[3] = (extendedBolusRate ushr 8 and 0xff).toByte()
+        request[4] = (extendedBolusDurationInHalfHours and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_DUAL_BOLUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
deleted file mode 100644
index 4337663d6d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Extended_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private double extendedAmount;
-    private int extendedBolusDurationInHalfHours;
-
-    public DanaRS_Packet_Bolus_Set_Extended_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS;
-    }
-
-    public DanaRS_Packet_Bolus_Set_Extended_Bolus(double extendedAmount, int extendedBolusDurationInHalfHours) {
-        this();
-        this.extendedAmount = extendedAmount;
-        this.extendedBolusDurationInHalfHours = extendedBolusDurationInHalfHours;
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Extended bolus start : " + extendedAmount + " U halfhours: " + extendedBolusDurationInHalfHours);
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        int extendedBolusRate = (int) (extendedAmount * 100d);
-
-        byte[] request = new byte[3];
-        request[0] = (byte) (extendedBolusRate & 0xff);
-        request[1] = (byte) ((extendedBolusRate >>> 8) & 0xff);
-        request[2] = (byte) (extendedBolusDurationInHalfHours & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result!=0)
-            failed=true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_EXTENDED_BOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
new file mode 100644
index 0000000000..620a4722ab
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_Extended_Bolus(
+    private val aapsLogger: AAPSLogger,
+    private var extendedAmount: Double = 0.0,
+    private var extendedBolusDurationInHalfHours: Int = 0
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start : $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val extendedBolusRate = (extendedAmount * 100.0).toInt()
+        val request = ByteArray(3)
+        request[0] = (extendedBolusRate and 0xff).toByte()
+        request[1] = (extendedBolusRate ushr 8 and 0xff).toByte()
+        request[2] = (extendedBolusDurationInHalfHours and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_EXTENDED_BOLUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
deleted file mode 100644
index e8d9df360c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL;
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Cancel extended bolus");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_EXTENDED_BOLUS_CANCEL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
new file mode 100644
index 0000000000..8596219ba4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL
+        aapsLogger.debug(LTag.PUMPCOMM, "Cancel extended bolus")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_EXTENDED_BOLUS_CANCEL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
deleted file mode 100644
index 206a61b6f5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Initial_Bolus extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int bolusRate01;
-    private int bolusRate02;
-    private int bolusRate03;
-    private int bolusRate04;
-
-    public DanaRS_Packet_Bolus_Set_Initial_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE;
-    }
-
-    public DanaRS_Packet_Bolus_Set_Initial_Bolus(double bolusRate01, double bolusRate02, double bolusRate03, double bolusRate04) {
-        this();
-        this.bolusRate01 = (int) (bolusRate01 / 100d);
-        this.bolusRate02 = (int) (bolusRate02 / 100d);
-        this.bolusRate03 = (int) (bolusRate03 / 100d);
-        this.bolusRate04 = (int) (bolusRate04 / 100d);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[8];
-        request[0] = (byte) (bolusRate01 & 0xff);
-        request[1] = (byte) ((bolusRate01 >>> 8) & 0xff);
-        request[2] = (byte) (bolusRate02 & 0xff);
-        request[3] = (byte) ((bolusRate02 >>> 8) & 0xff);
-        request[4] = (byte) (bolusRate03 & 0xff);
-        request[5] = (byte) ((bolusRate03 >>> 8) & 0xff);
-        request[6] = (byte) (bolusRate04 & 0xff);
-        request[7] = (byte) ((bolusRate04 >>> 8) & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result!=0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_BOLUS_RATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
new file mode 100644
index 0000000000..fb1154c43f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Bolus_Set_Initial_Bolus(
+    private val aapsLogger: AAPSLogger,
+    private var bolusRate01: Int = 0,
+    private var bolusRate02: Int = 0,
+    private var bolusRate03: Int = 0,
+    private var bolusRate04: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(8)
+        request[0] = (bolusRate01 and 0xff).toByte()
+        request[1] = (bolusRate01 ushr 8 and 0xff).toByte()
+        request[2] = (bolusRate02 and 0xff).toByte()
+        request[3] = (bolusRate02 ushr 8 and 0xff).toByte()
+        request[4] = (bolusRate03 and 0xff).toByte()
+        request[5] = (bolusRate03 ushr 8 and 0xff).toByte()
+        request[6] = (bolusRate04 and 0xff).toByte()
+        request[7] = (bolusRate04 ushr 8 and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_BOLUS_RATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
deleted file mode 100644
index 7ff91fa9ef..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Bolus_Set_Step_Bolus_Start extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private double amount;
-    private int speed;
-
-    public boolean failed;
-    public static int errorCode;
-
-    public DanaRS_Packet_Bolus_Set_Step_Bolus_Start() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START;
-    }
-
-    // Speed 0 => 12 sec/U, 1 => 30 sec/U, 2 => 60 sec/U
-    public DanaRS_Packet_Bolus_Set_Step_Bolus_Start(double amount, int speed) {
-        this();
-
-        // HARDCODED LIMIT - if there is one that could be created
-        amount = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(amount)).value();
-
-        this.amount = amount;
-        this.speed = speed;
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Bolus start : " + amount + " speed: " + speed);
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        int stepBolusRate = (int) (amount * 100);
-        byte[] request = new byte[3];
-        request[0] = (byte) (stepBolusRate & 0xff);
-        request[1] = (byte) ((stepBolusRate >>> 8) & 0xff);
-        request[2] = (byte) (speed & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        errorCode = intFromBuff(data, 0, 1);
-        if (errorCode != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (errorCode == 0) {
-                log.debug("Result OK");
-            } else {
-                log.error("Result Error: " + errorCode);
-            }
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_STEP_BOLUS_START";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
new file mode 100644
index 0000000000..ce9aaf9e1b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -0,0 +1,50 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+
+class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
+    private val aapsLogger: AAPSLogger,
+    private val danaRSPlugin: DanaRSPlugin,
+    constraintChecker: ConstraintChecker,
+    private var amount: Double = 0.0,
+    private var speed: Int = 0
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START
+        // Speed 0 => 12 sec/U, 1 => 30 sec/U, 2 => 60 sec/U
+        // HARDCODED LIMIT - if there is one that could be created
+        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus start : $amount speed: $speed")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val stepBolusRate = (amount * 100).toInt()
+        val request = ByteArray(3)
+        request[0] = (stepBolusRate and 0xff).toByte()
+        request[1] = (stepBolusRate ushr 8 and 0xff).toByte()
+        request[2] = (speed and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        danaRSPlugin.bolusStartErrorCode = intFromBuff(data, 0, 1)
+        if (danaRSPlugin.bolusStartErrorCode == 0) {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+        } else {
+            aapsLogger.error("Result Error: ${danaRSPlugin.bolusStartErrorCode}")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_STEP_BOLUS_START"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
deleted file mode 100644
index 7cb0a11f9b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-
-public class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private static Treatment t;
-    private static Double amount;
-
-    public static boolean stopped = false;
-    public static boolean forced = false;
-
-    public DanaRS_Packet_Bolus_Set_Step_Bolus_Stop() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP;
-    }
-
-    public DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(Double amount, Treatment t) {
-        this();
-        this.t = t;
-        this.amount = amount;
-        forced = false;
-        stopped = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Stop bolus: amount: " + amount + " treatment: " + t.toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else {
-                log.error("Result Error: " + result);
-                failed = true;
-            }
-        }
-
-        EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-        stopped = true;
-        if (!forced) {
-            t.insulin = amount;
-            bolusingEvent.setStatus(MainApp.gs(R.string.overview_bolusprogress_delivered));
-            bolusingEvent.setPercent(100);
-        } else {
-            bolusingEvent.setStatus(MainApp.gs(R.string.overview_bolusprogress_stoped));
-        }
-        RxBus.INSTANCE.send(bolusingEvent);
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "BOLUS__SET_STEP_BOLUS_STOP";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
new file mode 100644
index 0000000000..f84becafc5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRSPlugin: DanaRSPlugin
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+        val bolusingEvent = EventOverviewBolusProgress
+        danaRSPlugin.bolusStopped = true
+        if (!danaRSPlugin.bolusStopForced) {
+            // delivery ended without user intervention
+            danaRSPlugin.bolusingTreatment.insulin = danaRSPlugin.bolusAmountToBeDelivered
+            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
+            bolusingEvent.percent = 100
+        } else {
+            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_stoped)
+        }
+        rxBus.send(bolusingEvent)
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_STEP_BOLUS_STOP"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
deleted file mode 100644
index 306787d4ee..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-public class DanaRS_Packet_Etc_Keep_Connection extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Etc_Keep_Connection() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (error!=0)
-            failed=true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "ETC__KEEP_CONNECTION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
new file mode 100644
index 0000000000..dd29887ef0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Etc_Keep_Connection(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "ETC__KEEP_CONNECTION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
deleted file mode 100644
index 7c0b652979..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-public class DanaRS_Packet_Etc_Set_History_Save extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int historyType;
-    private int historyYear;
-    private int historyMonth;
-    private int historyDate;
-    private int historyHour;
-    private int historyMinute;
-    private int historySecond;
-    private int historyCode;
-    private int historyValue;
-
-    public DanaRS_Packet_Etc_Set_History_Save() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE;
-    }
-
-    public DanaRS_Packet_Etc_Set_History_Save(int historyType, int historyYear, int historyMonth, int historyDate, int historyHour, int historyMinute, int historySecond, int historyCode, int historyValue) {
-        this();
-        this.historyType = historyType;
-        this.historyYear = historyYear;
-        this.historyMonth = historyMonth;
-        this.historyDate = historyDate;
-        this.historyHour = historyHour;
-        this.historyMinute = historyMinute;
-        this.historySecond = historySecond;
-        this.historyCode = historyCode;
-        this.historyValue = historyValue;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[10];
-        request[0] = (byte) (historyType & 0xff);
-        request[1] = (byte) (historyYear & 0xff);
-        request[2] = (byte) (historyMonth & 0xff);
-        request[3] = (byte) (historyDate & 0xff);
-        request[4] = (byte) (historyHour & 0xff);
-        request[5] = (byte) (historyMinute & 0xff);
-        request[6] = (byte) (historySecond & 0xff);
-        request[7] = (byte) (historyCode & 0xff);
-        request[8] = (byte) (historyValue & 0xff);
-        request[9] = (byte) ((historyValue >>> 8) & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (error != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Result: " + error);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "ETC__SET_HISTORY_SAVE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
new file mode 100644
index 0000000000..99fe5da588
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
@@ -0,0 +1,55 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Etc_Set_History_Save(
+    private val aapsLogger: AAPSLogger,
+    private var historyType: Int = 0,
+    private var historyYear: Int = 0,
+    private var historyMonth: Int = 0,
+    private var historyDate: Int = 0,
+    private var historyHour: Int = 0,
+    private var historyMinute: Int = 0,
+    private var historySecond: Int = 0,
+    private var historyCode: Int = 0,
+    private var historyValue: Int = 0
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(10)
+        request[0] = (historyType and 0xff).toByte()
+        request[1] = (historyYear and 0xff).toByte()
+        request[2] = (historyMonth and 0xff).toByte()
+        request[3] = (historyDate and 0xff).toByte()
+        request[4] = (historyHour and 0xff).toByte()
+        request[5] = (historyMinute and 0xff).toByte()
+        request[6] = (historySecond and 0xff).toByte()
+        request[7] = (historyCode and 0xff).toByte()
+        request[8] = (historyValue and 0xff).toByte()
+        request[9] = (historyValue ushr 8 and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "ETC__SET_HISTORY_SAVE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java
deleted file mode 100644
index 0f5e4a8e02..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_General_Delivery_Status extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Delivery_Status() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int status = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        if (status != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Status: " + status);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__DELIVERY_STATUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
new file mode 100644
index 0000000000..524b8e13c8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_General_Delivery_Status(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__DELIVERY_STATUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java
deleted file mode 100644
index f14197ac41..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_General_Get_More_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_More_Information() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 15){
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 2;
-        pump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusRemainingMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double remainRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        Date lastBolusTime = new Date(); // it doesn't provide day only hour+min, workaround: expecting today
-        dataIndex += dataSize;
-        dataSize = 1;
-        lastBolusTime.setHours(byteArrayToInt(getBytes(data, dataIndex, dataSize)));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        lastBolusTime.setMinutes(byteArrayToInt(getBytes(data, dataIndex, dataSize)));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        // On DanaRS DailyUnits can't be more than 160
-        if(pump.dailyTotalUnits > 160)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Daily total units: " + pump.dailyTotalUnits + " U");
-            log.debug("Is extended in progress: " + pump.isExtendedInProgress);
-            log.debug("Extended bolus remaining minutes: " + pump.extendedBolusRemainingMinutes);
-            log.debug("Last bolus time: " + lastBolusTime.toLocaleString());
-            log.debug("Last bolus amount: " + pump.lastBolusAmount);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_MORE_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
new file mode 100644
index 0000000000..b8e7e6bb53
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class DanaRS_Packet_General_Get_More_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 15) {
+            failed = true
+            return
+        }
+        var dataIndex = DATA_START
+        var dataSize = 2
+        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusRemainingMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        //val remainRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        val lastBolusTime = Date() // it doesn't provide day only hour+min, workaround: expecting today
+        dataIndex += dataSize
+        dataSize = 1
+        lastBolusTime.hours = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        lastBolusTime.minutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        // On DanaRS DailyUnits can't be more than 160
+        if (danaRPump.dailyTotalUnits > 160) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits.toString() + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: " + danaRPump.extendedBolusRemainingMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeAndSecondsString(lastBolusTime.time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_MORE_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java
deleted file mode 100644
index 0a4d15d456..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_General_Get_Password extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_Password() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 2){
-            // returned data size is too small
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int pass = ((data[DATA_START + 1] & 0x000000FF) << 8) + (data[DATA_START + 0] & 0x000000FF);
-        pass = pass ^ 3463;
-        pump.rs_password = Integer.toHexString(pass);
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump password: " + pump.rs_password);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_PASSWORD";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
new file mode 100644
index 0000000000..5a1358c38b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_General_Get_Password(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 2) { // returned data size is too small
+            failed = true
+            return
+        } else {
+            failed = false
+        }
+        var pass: Int = (data[DATA_START + 1].toInt() and 0x000000FF shl 8) + (data[DATA_START + 0].toInt() and 0x000000FF)
+        pass = pass xor 3463
+        danaRPump.rsPassword = Integer.toHexString(pass)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.rsPassword)
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_PASSWORD"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
deleted file mode 100644
index f9bda3dfe5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_General_Get_Pump_Check extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_Pump_Check() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 5) {
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        pump.model = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Model: " + String.format("%02X ", pump.model));
-            log.debug("Protocol: " + String.format("%02X ", pump.protocol));
-            log.debug("Product Code: " + String.format("%02X ", pump.productCode));
-        }
-
-        if (pump.productCode < 2) {
-            RxBus.INSTANCE.send(new EventNewNotification(new Notification(Notification.UNSUPPORTED_FIRMWARE, MainApp.gs(R.string.unsupportedfirmware), Notification.URGENT)));
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_PUMP_CHECK";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
new file mode 100644
index 0000000000..7c6f2fab5c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class DanaRS_Packet_General_Get_Pump_Check(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 5) {
+            failed = true
+            return
+        } else
+            failed = false
+        var dataIndex = DATA_START
+        var dataSize = 1
+        danaRPump.model = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+        if (danaRPump.productCode < 2) {
+            rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_PUMP_CHECK"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
deleted file mode 100644
index e1efa91296..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet_General_Get_Shipping_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_Shipping_Information() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 18) {
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 10;
-        pump.serialNumber = stringFromBuff(data, dataIndex, dataSize);
-
-        dataIndex += dataSize;
-        dataSize = 3;
-        pump.shippingDate = dateFromBuff(data, dataIndex);
-
-        dataIndex += dataSize;
-        dataSize = 3;
-        pump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize);
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Serial number: " + pump.serialNumber);
-            log.debug("Shipping date: " + DateUtil.dateAndTimeString(pump.shippingDate));
-            log.debug("Shipping country: " + pump.shippingCountry);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_SHIPPING_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
new file mode 100644
index 0000000000..00ebd4118a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+
+class DanaRS_Packet_General_Get_Shipping_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 18) {
+            failed = true
+            return
+        } else failed = false
+        var dataIndex = DATA_START
+        var dataSize = 10
+        danaRPump.serialNumber = stringFromBuff(data, dataIndex, dataSize)
+        dataIndex += dataSize
+        dataSize = 3
+        danaRPump.shippingDate = dateFromBuff(data, dataIndex)
+        dataIndex += dataSize
+        dataSize = 3
+        danaRPump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize)
+        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaRPump.serialNumber)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + DateUtil.dateAndTimeString(danaRPump.shippingDate))
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaRPump.shippingCountry)
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_SHIPPING_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
deleted file mode 100644
index c154ac3476..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_General_Get_Today_Delivery_Total extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_Today_Delivery_Total() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 8){
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 2;
-        pump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.dailyTotalBasalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.dailyTotalBolusUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Daily total: " + pump.dailyTotalUnits + " U");
-            log.debug("Daily total bolus: " + pump.dailyTotalBolusUnits + " U");
-            log.debug("Daily total basal: " + pump.dailyTotalBasalUnits + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_TODAY_DELIVERY_TOTAL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
new file mode 100644
index 0000000000..31310e3d08
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_General_Get_Today_Delivery_Total(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 8) {
+            failed = true
+            return
+        } else failed = false
+        var dataIndex = DATA_START
+        var dataSize = 2
+        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.dailyTotalBasalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.dailyTotalBolusUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total bolus: " + danaRPump.dailyTotalBolusUnits + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total basal: " + danaRPump.dailyTotalBasalUnits + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_TODAY_DELIVERY_TOTAL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
deleted file mode 100644
index 65bf066023..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_General_Get_User_Time_Change_Flag extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Get_User_Time_Change_Flag() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 3){
-            failed = true;
-            return;
-        }
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int userTimeChangeFlag = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("UserTimeChangeFlag: " + userTimeChangeFlag);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__GET_USER_TIME_CHANGE_FLAG";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
new file mode 100644
index 0000000000..99c0cc2879
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_General_Get_User_Time_Change_Flag(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 3) {
+            failed = true
+            return
+        } else failed = false
+        val dataIndex = DATA_START
+        val dataSize = 1
+        val userTimeChangeFlag = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        aapsLogger.debug(LTag.PUMPCOMM, "UserTimeChangeFlag: $userTimeChangeFlag")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_USER_TIME_CHANGE_FLAG"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
deleted file mode 100644
index 75b969b1bc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_General_Initial_Screen_Information extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Initial_Screen_Information() {
-        super();
-        type = BleCommandUtil.DANAR_PACKET__TYPE_RESPONSE;
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        if (data.length < 17) {
-            failed = true;
-            return;
-        }
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int status = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        pump.pumpSuspended = (status & 0x01) == 0x01;
-        pump.isTempBasalInProgress = (status & 0x10) == 0x10;
-        pump.isExtendedInProgress = (status & 0x04) == 0x04;
-        pump.isDualBolusInProgress = (status & 0x08) == 0x08;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.maxDailyTotalUnits = (int) (byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d);
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.reservoirRemainingUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.currentBasal = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.tempBasalPercent = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.batteryRemaining = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump suspended: " + pump.pumpSuspended);
-            log.debug("Temp basal in progress: " + pump.isTempBasalInProgress);
-            log.debug("Extended in progress: " + pump.isExtendedInProgress);
-            log.debug("Dual in progress: " + pump.isDualBolusInProgress);
-            log.debug("Daily units: " + pump.dailyTotalUnits);
-            log.debug("Max daily units: " + pump.maxDailyTotalUnits);
-            log.debug("Reservoir remaining units: " + pump.reservoirRemainingUnits);
-            log.debug("Battery: " + pump.batteryRemaining);
-            log.debug("Current basal: " + pump.currentBasal);
-            log.debug("Temp basal percent: " + pump.tempBasalPercent);
-            log.debug("Extended absolute rate: " + pump.extendedBolusAbsoluteRate);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__INITIAL_SCREEN_INFORMATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
new file mode 100644
index 0000000000..fab00aca3d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_General_Initial_Screen_Information(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        type = BleCommandUtil.DANAR_PACKET__TYPE_RESPONSE
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        if (data.size < 17) {
+            failed = true
+            return
+        } else failed = false
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val status = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaRPump.pumpSuspended = status and 0x01 == 0x01
+        danaRPump.isTempBasalInProgress = status and 0x10 == 0x10
+        danaRPump.isExtendedInProgress = status and 0x04 == 0x04
+        danaRPump.isDualBolusInProgress = status and 0x08 == 0x08
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.maxDailyTotalUnits = (byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0).toInt()
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.reservoirRemainingUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.currentBasal = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.tempBasalPercent = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.batteryRemaining = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal in progress: " + danaRPump.isTempBasalInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended in progress: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Dual in progress: " + danaRPump.isDualBolusInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily units: " + danaRPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily units: " + danaRPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Battery: " + danaRPump.batteryRemaining)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal percent: " + danaRPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended absolute rate: " + danaRPump.extendedBolusAbsoluteRate)
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__INITIAL_SCREEN_INFORMATION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
deleted file mode 100644
index 21a15b1dbd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_General_Set_History_Upload_Mode extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int mode;
-
-    public DanaRS_Packet_General_Set_History_Upload_Mode() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE;
-    }
-
-    public DanaRS_Packet_General_Set_History_Upload_Mode(int mode) {
-        this();
-        this.mode = mode;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: mode: " + mode);
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[1];
-        request[0] = (byte) (mode & 0xff);
-        return request;
-    }
-
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__SET_HISTORY_UPLOAD_MODE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
new file mode 100644
index 0000000000..b6b884f27d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_General_Set_History_Upload_Mode(
+    private val aapsLogger: AAPSLogger,
+    private var mode: Int = 0
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message: mode: $mode")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(1)
+        request[0] = (mode and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__SET_HISTORY_UPLOAD_MODE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
deleted file mode 100644
index b8771c1939..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int result = intFromBuff(data, 0, 1);
-        if (result != 0)
-            failed = true;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (result == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + result);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
new file mode 100644
index 0000000000..132141b808
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.L.isEnabled
+import info.nightscout.androidaps.logging.LTag
+import org.slf4j.LoggerFactory
+
+class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java
deleted file mode 100644
index 07893346d7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.DanaRHistoryRecord;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public abstract class DanaRS_Packet_History_ extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int year = 0;
-    private int month = 0;
-    private int day = 0;
-    private int hour = 0;
-    private int min = 0;
-    private int sec = 0;
-
-    public boolean done;
-    public int totalCount;
-
-    public DanaRS_Packet_History_() {
-        super();
-        done = false;
-        totalCount = 0;
-    }
-
-    public DanaRS_Packet_History_(long from) {
-        this();
-        GregorianCalendar cal = new GregorianCalendar();
-        if (from != 0)
-            cal.setTimeInMillis(from);
-        else
-            cal.set(2000, 0, 1, 0, 0, 0);
-        year = cal.get(Calendar.YEAR) - 1900 - 100;
-        month = cal.get(Calendar.MONTH) + 1;
-        day = cal.get(Calendar.DAY_OF_MONTH);
-        hour = cal.get(Calendar.HOUR_OF_DAY);
-        min = cal.get(Calendar.MINUTE);
-        sec = cal.get(Calendar.SECOND);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Loading event history from: " + new Date(cal.getTimeInMillis()).toLocaleString());
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[6];
-        request[0] = (byte) (year & 0xff);
-        request[1] = (byte) (month & 0xff);
-        request[2] = (byte) (day & 0xff);
-        request[3] = (byte) (hour & 0xff);
-        request[4] = (byte) (min & 0xff);
-        request[5] = (byte) (sec & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int error;
-        totalCount = 0;
-        if (data.length == 3) {
-            int dataIndex = DATA_START;
-            int dataSize = 1;
-            error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-            done = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("History end. Code: " + error + " Success: " + (error == 0x00));
-        } else if (data.length == 5) {
-            int dataIndex = DATA_START;
-            int dataSize = 1;
-            error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-            done = true;
-
-            dataIndex += dataSize;
-            dataSize = 2;
-            totalCount = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("History end. Code: " + error + " Success: " + (error == 0x00) + " Toatal count: " + totalCount);
-        } else {
-            int recordCode = byteArrayToInt(getBytes(data, DATA_START, 1));
-            int historyYear = byteArrayToInt(getBytes(data, DATA_START + 1, 1));
-            int historyMonth = byteArrayToInt(getBytes(data, DATA_START + 2, 1));
-            int historyDay = byteArrayToInt(getBytes(data, DATA_START + 3, 1));
-            int historyHour = byteArrayToInt(getBytes(data, DATA_START + 4, 1));
-            double dailyBasal = (((data[DATA_START + 4] & 0xFF) << 8) + (data[DATA_START + 5] & 0xFF)) * 0.01d;
-            int historyMinute = byteArrayToInt(getBytes(data, DATA_START + 5, 1));
-            int historySecond = byteArrayToInt(getBytes(data, DATA_START + 6, 1));
-            byte paramByte7 = (byte) historySecond;
-            double dailyBolus = (((data[DATA_START + 6] & 0xFF) << 8) + (data[DATA_START + 7] & 0xFF)) * 0.01d;
-
-            Date date = new Date(100 + historyYear, historyMonth - 1, historyDay);
-            Date datetime = new Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute);
-            Date datetimewihtsec = new Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute, historySecond);
-
-            int historyCode = byteArrayToInt(getBytes(data, DATA_START + 7, 1));
-            byte paramByte8 = (byte) historyCode;
-
-            int value = ((data[DATA_START + 8] & 0xFF) << 8) + (data[DATA_START + 9] & 0xFF);
-
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("History packet: " + recordCode + " Date: " + datetimewihtsec.toLocaleString() + " Code: " + historyCode + " Value: " + value);
-
-
-            DanaRHistoryRecord danaRHistoryRecord = new DanaRHistoryRecord();
-
-            danaRHistoryRecord.setBytes(data);
-            // danaRHistoryRecord.recordCode is different from DanaR codes
-            // set in switch for every type
-
-            String messageType = "";
-
-            switch (recordCode) {
-                case 0x02:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BOLUS;
-                    danaRHistoryRecord.recordDate = datetime.getTime();
-                    switch (0xF0 & paramByte8) {
-                        case 0xA0:
-                            danaRHistoryRecord.bolusType = "DS";
-                            messageType += "DS bolus";
-                            break;
-                        case 0xC0:
-                            danaRHistoryRecord.bolusType = "E";
-                            messageType += "E bolus";
-                            break;
-                        case 0x80:
-                            danaRHistoryRecord.bolusType = "S";
-                            messageType += "S bolus";
-                            break;
-                        case 0x90:
-                            danaRHistoryRecord.bolusType = "DE";
-                            messageType += "DE bolus";
-                            break;
-                        default:
-                            danaRHistoryRecord.bolusType = "None";
-                            break;
-                    }
-                    danaRHistoryRecord.recordDuration = ((int) paramByte8 & 0x0F) * 60 + (int) paramByte7;
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x03:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_DAILY;
-                    messageType += "dailyinsulin";
-                    danaRHistoryRecord.recordDate = date.getTime();
-                    danaRHistoryRecord.recordDailyBasal = dailyBasal;
-                    danaRHistoryRecord.recordDailyBolus = dailyBolus;
-                    break;
-                case 0x04:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_PRIME;
-                    messageType += "prime";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x05:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_REFILL;
-                    messageType += "refill";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x0b:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BASALHOUR;
-                    messageType += "basal hour";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x99: ///// ????????? don't know the right code
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_TEMP_BASAL;
-                    messageType += "tb";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x06:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_GLUCOSE;
-                    messageType += "glucose";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value;
-                    break;
-                case 0x07:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_CARBO;
-                    messageType += "carbo";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    danaRHistoryRecord.recordValue = value;
-                    break;
-                case 0x0a:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_ALARM;
-                    messageType += "alarm";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    String strAlarm = "None";
-                    switch ((int) paramByte8) {
-                        case 67:
-                            strAlarm = "Check";
-                            break;
-                        case 79:
-                            strAlarm = "Occlusion";
-                            break;
-                        case 66:
-                            strAlarm = "Low Battery";
-                            break;
-                        case 83:
-                            strAlarm = "Shutdown";
-                            break;
-                    }
-                    danaRHistoryRecord.recordAlarm = strAlarm;
-                    danaRHistoryRecord.recordValue = value * 0.01;
-                    break;
-                case 0x09:
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_SUSPEND;
-                    messageType += "suspend";
-                    danaRHistoryRecord.recordDate = datetimewihtsec.getTime();
-                    String strRecordValue = "Off";
-                    if ((int) paramByte8 == 79)
-                        strRecordValue = "On";
-                    danaRHistoryRecord.stringRecordValue = strRecordValue;
-                    break;
-            }
-
-            MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord);
-
-            RxBus.INSTANCE.send(new EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType));
-
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
new file mode 100644
index 0000000000..e8da961028
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
@@ -0,0 +1,204 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+abstract class DanaRS_Packet_History_(
+    protected val aapsLogger: AAPSLogger,
+    protected val rxBus: RxBusWrapper,
+    protected val from: Long
+) : DanaRS_Packet() {
+
+    protected var year = 0
+    protected var month = 0
+    protected var day = 0
+    protected var hour = 0
+    protected var min = 0
+    protected var sec = 0
+
+    var done = false
+    var totalCount = 0
+
+    init {
+        val cal = GregorianCalendar()
+        if (from != 0L) cal.timeInMillis = from
+        else cal[2000, 0, 1, 0, 0] = 0
+        year = cal[Calendar.YEAR] - 1900 - 100
+        month = cal[Calendar.MONTH] + 1
+        day = cal[Calendar.DAY_OF_MONTH]
+        hour = cal[Calendar.HOUR_OF_DAY]
+        min = cal[Calendar.MINUTE]
+        sec = cal[Calendar.SECOND]
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(cal.timeInMillis))
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(6)
+        request[0] = (year and 0xff).toByte()
+        request[1] = (month and 0xff).toByte()
+        request[2] = (day and 0xff).toByte()
+        request[3] = (hour and 0xff).toByte()
+        request[4] = (min and 0xff).toByte()
+        request[5] = (sec and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val error: Int
+        totalCount = 0
+        if (data.size == 3) {
+            val dataIndex = DATA_START
+            val dataSize = 1
+            error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+            done = true
+            aapsLogger.debug(LTag.PUMPCOMM, "History end. Code: " + error + " Success: " + (error == 0x00))
+        } else if (data.size == 5) {
+            var dataIndex = DATA_START
+            var dataSize = 1
+            error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+            done = true
+            dataIndex += dataSize
+            dataSize = 2
+            totalCount = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+            aapsLogger.debug(LTag.PUMPCOMM, "History end. Code: " + error + " Success: " + (error == 0x00) + " Toatal count: " + totalCount)
+        } else {
+            val recordCode = byteArrayToInt(getBytes(data, DATA_START, 1))
+            val historyYear = byteArrayToInt(getBytes(data, DATA_START + 1, 1))
+            val historyMonth = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
+            val historyDay = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
+            val historyHour = byteArrayToInt(getBytes(data, DATA_START + 4, 1))
+            val dailyBasal: Double = ((data[DATA_START + 4].toInt() and 0xFF shl 8) + (data[DATA_START + 5].toInt() and 0xFF)) * 0.01
+            val historyMinute = byteArrayToInt(getBytes(data, DATA_START + 5, 1))
+            val historySecond = byteArrayToInt(getBytes(data, DATA_START + 6, 1))
+            val paramByte7 = historySecond.toByte()
+            val dailyBolus: Double = ((data[DATA_START + 6].toInt() and 0xFF shl 8) + (data[DATA_START + 7].toInt() and 0xFF)) * 0.01
+            val date = Date(100 + historyYear, historyMonth - 1, historyDay)
+            val datetime = Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute)
+            val datetimewihtsec = Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute, historySecond)
+            val historyCode = byteArrayToInt(getBytes(data, DATA_START + 7, 1))
+            val paramByte8 = historyCode.toByte()
+            val value: Int = (data[DATA_START + 8].toInt() and 0xFF shl 8) + (data[DATA_START + 9].toInt() and 0xFF)
+            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + DateUtil.dateAndTimeString(datetimewihtsec) + " Code: " + historyCode + " Value: " + value)
+            val danaRHistoryRecord = DanaRHistoryRecord()
+            danaRHistoryRecord.setBytes(data)
+            // danaRHistoryRecord.recordCode is different from DanaR codes
+// set in switch for every type
+            var messageType = ""
+            when (recordCode) {
+                0x02 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BOLUS
+                    danaRHistoryRecord.recordDate = datetime.time
+                    when (0xF0 and paramByte8.toInt()) {
+                        0xA0 -> {
+                            danaRHistoryRecord.bolusType = "DS"
+                            messageType += "DS bolus"
+                        }
+
+                        0xC0 -> {
+                            danaRHistoryRecord.bolusType = "E"
+                            messageType += "E bolus"
+                        }
+
+                        0x80 -> {
+                            danaRHistoryRecord.bolusType = "S"
+                            messageType += "S bolus"
+                        }
+
+                        0x90 -> {
+                            danaRHistoryRecord.bolusType = "DE"
+                            messageType += "DE bolus"
+                        }
+
+                        else -> danaRHistoryRecord.bolusType = "None"
+                    }
+                    danaRHistoryRecord.recordDuration = (paramByte8.toInt() and 0x0F) * 60 + paramByte7.toInt()
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x03 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_DAILY
+                    messageType += "dailyinsulin"
+                    danaRHistoryRecord.recordDate = date.time
+                    danaRHistoryRecord.recordDailyBasal = dailyBasal
+                    danaRHistoryRecord.recordDailyBolus = dailyBolus
+                }
+
+                0x04 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_PRIME
+                    messageType += "prime"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x05 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_REFILL
+                    messageType += "refill"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x0b -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BASALHOUR
+                    messageType += "basal hour"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x99 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_TEMP_BASAL
+                    messageType += "tb"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x06 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_GLUCOSE
+                    messageType += "glucose"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value.toDouble()
+                }
+
+                0x07 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_CARBO
+                    messageType += "carbo"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordValue = value.toDouble()
+                }
+
+                0x0a -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_ALARM
+                    messageType += "alarm"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    var strAlarm = "None"
+                    when (paramByte8.toInt()) {
+                        67 -> strAlarm = "Check"
+                        79 -> strAlarm = "Occlusion"
+                        66 -> strAlarm = "Low Battery"
+                        83 -> strAlarm = "Shutdown"
+                    }
+                    danaRHistoryRecord.recordAlarm = strAlarm
+                    danaRHistoryRecord.recordValue = value * 0.01
+                }
+
+                0x09 -> {
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_SUSPEND
+                    messageType += "suspend"
+                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    var strRecordValue = "Off"
+                    if (paramByte8.toInt() == 79) strRecordValue = "On"
+                    danaRHistoryRecord.stringRecordValue = strRecordValue
+                }
+            }
+            MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
+            rxBus.send(EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java
deleted file mode 100644
index 437804b102..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Alarm extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Alarm() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALARM;
-    }
-
-    public DanaRS_Packet_History_Alarm(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALARM;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__ALARM";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
new file mode 100644
index 0000000000..9b0c7ef4c6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALARM
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__ALARM"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java
deleted file mode 100644
index 68940dd4c5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_All_History extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_All_History() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY;
-    }
-
-    public DanaRS_Packet_History_All_History(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__ALL_HISTORY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
new file mode 100644
index 0000000000..a8010b2127
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_All_History(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__ALL_HISTORY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java
deleted file mode 100644
index 0a94f16a40..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Basal extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Basal() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BASAL;
-    }
-
-    public DanaRS_Packet_History_Basal(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BASAL;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__BASAL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
new file mode 100644
index 0000000000..0ac22574d5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Basal @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BASAL
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__BASAL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
deleted file mode 100644
index dc0e00d844..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Blood_Glucose extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Blood_Glucose() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE;
-    }
-
-    public DanaRS_Packet_History_Blood_Glucose(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__BLOOD_GLUCOSE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
new file mode 100644
index 0000000000..6ebbeaed53
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__BLOOD_GLUCOSE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java
deleted file mode 100644
index 64fb26dd09..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Bolus extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Bolus() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS;
-    }
-
-    public DanaRS_Packet_History_Bolus(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__BOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
new file mode 100644
index 0000000000..47996fc8c6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__BOLUS"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java
deleted file mode 100644
index 9cd931718d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Carbohydrate extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Carbohydrate() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE;
-    }
-
-    public DanaRS_Packet_History_Carbohydrate(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__CARBOHYDRATE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
new file mode 100644
index 0000000000..1084434962
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__CARBOHYDRATE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java
deleted file mode 100644
index 35a154f5e6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Daily extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Daily() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DAILY;
-    }
-
-    public DanaRS_Packet_History_Daily(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DAILY;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__DAILY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
new file mode 100644
index 0000000000..93e974728d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Daily @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DAILY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__DAILY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java
deleted file mode 100644
index 7ec05fc0e0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Prime extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Prime() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__PRIME;
-    }
-
-    public DanaRS_Packet_History_Prime(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__PRIME;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__PRIME";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
new file mode 100644
index 0000000000..0306e6f129
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Prime @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__PRIME
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__PRIME"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java
deleted file mode 100644
index e031ee1460..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Refill extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Refill() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__REFILL;
-    }
-
-    public DanaRS_Packet_History_Refill(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__REFILL;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__REFILL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
new file mode 100644
index 0000000000..672c5e2cc4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Refill @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__REFILL
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__REFILL"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java
deleted file mode 100644
index 20f4de5098..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Suspend extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Suspend() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SUSPEND;
-    }
-
-    public DanaRS_Packet_History_Suspend(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SUSPEND;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__SUSPEND";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
new file mode 100644
index 0000000000..9868cd10a4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__SUSPEND"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java
deleted file mode 100644
index 65f86c5b7f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_History_Temporary extends DanaRS_Packet_History_ {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_History_Temporary() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY;
-    }
-
-    public DanaRS_Packet_History_Temporary(long from) {
-        super(from);
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__TEMPORARY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
new file mode 100644
index 0000000000..b185748495
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+
+class DanaRS_Packet_History_Temporary(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    from: Long = 0
+) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__TEMPORARY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java
deleted file mode 100644
index 4fc28e4cc9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-
-public class DanaRS_Packet_Notify_Alarm extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int alarmCode;
-
-    public DanaRS_Packet_Notify_Alarm() {
-        super();
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY;
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__ALARM;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        alarmCode = byteArrayToInt(getBytes(data, DATA_START, 1));
-        String errorString = "";
-
-        switch (alarmCode) {
-            case 0x01:
-                // Battery 0% Alarm
-                errorString = MainApp.gs(R.string.batterydischarged);
-                break;
-            case 0x02:
-                // Pump Error
-                errorString = MainApp.gs(R.string.pumperror) + " " + alarmCode;
-                break;
-            case 0x03:
-                // Occlusion
-                errorString = MainApp.gs(R.string.occlusion);
-                break;
-            case 0x04:
-                // LOW BATTERY
-                errorString = MainApp.gs(R.string.lowbattery);
-                break;
-            case 0x05:
-                // Shutdown
-                errorString = MainApp.gs(R.string.lowbattery);
-                break;
-            case 0x06:
-                // Basal Compare
-                errorString = "BasalCompare ????";
-                break;
-            case 0x09:
-                // Empty Reservoir
-                errorString = MainApp.gs(R.string.emptyreservoir);
-                break;
-
-            // BT
-            case 0x07:
-            case 0xFF:
-                // Blood sugar measurement alert
-                errorString = MainApp.gs(R.string.bloodsugarmeasurementalert);
-                break;
-
-            case 0x08:
-            case 0xFE:
-                // Remaining insulin level
-                errorString = MainApp.gs(R.string.remaininsulinalert);
-                break;
-
-            case 0xFD:
-                // Blood sugar check miss alarm
-                errorString = "Blood sugar check miss alarm ???";
-                break;
-        }
-        // No error no need to upload anything
-        if(errorString == "") {
-            failed = true;
-
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Error detected: " + errorString);
-            return;
-        }
-        NSUpload.uploadError(errorString);
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "NOTIFY__ALARM";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
new file mode 100644
index 0000000000..5cc82d93a5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class DanaRS_Packet_Notify_Alarm(
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper
+) : DanaRS_Packet() {
+
+    init {
+        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__ALARM
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val alarmCode = byteArrayToInt(getBytes(data, DATA_START, 1))
+        var errorString = ""
+        when (alarmCode) {
+            0x01       ->  // Battery 0% Alarm
+                errorString = resourceHelper.gs(R.string.batterydischarged)
+            0x02       ->  // Pump Error
+                errorString = resourceHelper.gs(R.string.pumperror) + " " + alarmCode
+            0x03       ->  // Occlusion
+                errorString = resourceHelper.gs(R.string.occlusion)
+            0x04       ->  // LOW BATTERY
+                errorString = resourceHelper.gs(R.string.lowbattery)
+            0x05       ->  // Shutdown
+                errorString = resourceHelper.gs(R.string.lowbattery)
+            0x06       ->  // Basal Compare
+                errorString = "BasalCompare ????"
+            0x09       ->  // Empty Reservoir
+                errorString = resourceHelper.gs(R.string.emptyreservoir)
+            0x07, 0xFF ->  // Blood sugar measurement alert
+                errorString = resourceHelper.gs(R.string.bloodsugarmeasurementalert)
+            0x08, 0xFE ->  // Remaining insulin level
+                errorString = resourceHelper.gs(R.string.remaininsulinalert)
+            0xFD       ->  // Blood sugar check miss alarm
+                errorString = "Blood sugar check miss alarm ???"
+        }
+        // No error no need to upload anything
+        if (errorString == "") {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Error detected: $errorString")
+            return
+        }
+        NSUpload.uploadError(errorString)
+    }
+
+    override fun getFriendlyName(): String {
+        return "NOTIFY__ALARM"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
deleted file mode 100644
index 00b6483fbb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-public class DanaRS_Packet_Notify_Delivery_Complete extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private static Treatment t;
-    private static double amount;
-    public static boolean done;
-
-    public DanaRS_Packet_Notify_Delivery_Complete() {
-        super();
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY;
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_COMPLETE;
-    }
-
-    public DanaRS_Packet_Notify_Delivery_Complete(double amount, Treatment t) {
-        this();
-        this.amount = amount;
-        this.t = t;
-        done = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: amount: " + amount + " treatment: " + t.toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        double deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100d;
-
-        if (t != null) {
-            t.insulin = deliveredInsulin;
-            EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-            bolusingEvent.setStatus(String.format(MainApp.gs(R.string.bolusdelivering), deliveredInsulin));
-            bolusingEvent.setT(t);
-            bolusingEvent.setPercent(Math.min((int) (deliveredInsulin / amount * 100), 100));
-            done = true;
-            RxBus.INSTANCE.send(bolusingEvent);
-        }
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Delivered insulin: " + deliveredInsulin);
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "NOTIFY__DELIVERY_COMPLETE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
new file mode 100644
index 0000000000..246f2c7fe5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlin.math.min
+
+class DanaRS_Packet_Notify_Delivery_Complete(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRSPlugin: DanaRSPlugin
+) : DanaRS_Packet() {
+
+    init {
+        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_COMPLETE
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
+        danaRSPlugin.bolusingTreatment.insulin = deliveredInsulin
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.t = danaRSPlugin.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaRSPlugin.bolusAmountToBeDelivered * 100).toInt(), 100)
+        danaRSPlugin.bolusDone = true
+        rxBus.send(bolusingEvent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin: $deliveredInsulin")
+    }
+
+    override fun getFriendlyName(): String {
+        return "NOTIFY__DELIVERY_COMPLETE"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
deleted file mode 100644
index 1d650cb779..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-public class DanaRS_Packet_Notify_Delivery_Rate_Display extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private static Treatment t;
-    private static double amount;
-
-    public static long lastReceive = 0;
-
-    public DanaRS_Packet_Notify_Delivery_Rate_Display() {
-        super();
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY;
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_RATE_DISPLAY;
-    }
-
-    public DanaRS_Packet_Notify_Delivery_Rate_Display(double amount, Treatment t) {
-        this();
-        this.amount = amount;
-        this.t = t;
-        lastReceive = System.currentTimeMillis();
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: amount: " + amount + " treatment: " + t.toString());
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        double deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100d;
-
-        if (t != null) {
-            lastReceive = System.currentTimeMillis();
-            t.insulin = deliveredInsulin;
-            EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-            bolusingEvent.setStatus(String.format(MainApp.gs(R.string.bolusdelivering), deliveredInsulin));
-            bolusingEvent.setT(t);
-            bolusingEvent.setPercent(Math.min((int) (deliveredInsulin / amount * 100), 100));
-            failed = bolusingEvent.getPercent() < 100? true: false;
-            RxBus.INSTANCE.send(bolusingEvent);
-        }
-
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Delivered insulin so far: " + deliveredInsulin);
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "NOTIFY__DELIVERY_RATE_DISPLAY";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
new file mode 100644
index 0000000000..9705c53669
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlin.math.min
+
+class DanaRS_Packet_Notify_Delivery_Rate_Display(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRSPlugin: DanaRSPlugin
+) : DanaRS_Packet() {
+
+
+    init {
+        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_RATE_DISPLAY
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
+        danaRSPlugin.bolusProgressLastTimeStamp = System.currentTimeMillis()
+        danaRSPlugin.bolusingTreatment.insulin = deliveredInsulin
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.t = danaRSPlugin.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaRSPlugin.bolusAmountToBeDelivered * 100).toInt(), 100)
+        failed = bolusingEvent.percent < 100
+        rxBus.send(bolusingEvent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
+    }
+
+    override fun getFriendlyName(): String {
+        return "NOTIFY__DELIVERY_RATE_DISPLAY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
deleted file mode 100644
index 0d7d9af2c5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Notify_Missed_Bolus_Alarm extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Notify_Missed_Bolus_Alarm() {
-        super();
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY;
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__MISSED_BOLUS_ALARM;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int startHour;
-        int startMin;
-        int endHour;
-        int endMin;
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        startHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        startMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        endHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        endMin = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        if(endMin == 1 && endMin == endHour && startHour == endHour &&startHour == startMin )
-            failed = true;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Start hour: " + startHour);
-            log.debug("Start min: " + startMin);
-            log.debug("End hour: " + endHour);
-            log.debug("End min: " + endMin);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "NOTIFY__MISSED_BOLUS_ALARM";
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
new file mode 100644
index 0000000000..ad5fdbdef6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__MISSED_BOLUS_ALARM
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val startHour: Int
+        val startMin: Int
+        val endHour: Int
+        val endMin: Int
+        var dataIndex = DATA_START
+        var dataSize = 1
+        startHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        startMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        endHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        endMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        if (endMin == 1 && endMin == endHour && startHour == endHour && startHour == startMin) failed = true
+        else failed = false
+        aapsLogger.debug(LTag.PUMPCOMM, "Start hour: $startHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "Start min: $startMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "End hour: $endHour")
+        aapsLogger.debug(LTag.PUMPCOMM, "End min: $endMin")
+    }
+
+    override fun getFriendlyName(): String {
+        return "NOTIFY__MISSED_BOLUS_ALARM"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
deleted file mode 100644
index 500c1707b6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Option_Get_Pump_Time extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Option_Get_Pump_Time() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting pump time");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        int year = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int month = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int day = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int hour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int min = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int sec = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        Date time = new Date(100 + year, month - 1, day, hour, min, sec);
-        DanaRPump.getInstance().pumpTime = time.getTime();
-
-        if ( year == month && month == day && day == hour && hour == min && min == sec && sec == 1)
-            failed = true;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Pump time " + time.toLocaleString());
-        }
-    }
-
-    @Override
-    public void handleMessageNotReceived() {
-        DanaRPump.getInstance().pumpTime = 0;
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "OPTION__GET_PUMP_TIME";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
new file mode 100644
index 0000000000..2b18603d11
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class DanaRS_Packet_Option_Get_Pump_Time(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting pump time")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        val year = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val month = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val day = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val hour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val min = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val sec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        val time = Date(100 + year, month - 1, day, hour, min, sec)
+        danaRPump.pumpTime = time.time
+        failed = year == month && month == day && day == hour && hour == min && min == sec && sec == 1
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + DateUtil.dateAndTimeString(time))
+    }
+
+    override fun handleMessageNotReceived() {
+        danaRPump.pumpTime = 0
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__GET_PUMP_TIME"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
deleted file mode 100644
index 457b7ab2b8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Option_Get_User_Option extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-
-    public DanaRS_Packet_Option_Get_User_Option() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Requesting user settings");
-        }
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        pump.timeDisplayType = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.beepAndAlarm = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.lcdOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.backlightOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.selectedLanguage = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.shutdownHour = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        pump.lowReservoirRate = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.cannulaVolume = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        pump.refillAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int selectableLanguage1 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int selectableLanguage2 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int selectableLanguage3 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int selectableLanguage4 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-
-        dataIndex += dataSize;
-        dataSize = 1;
-        int selectableLanguage5 = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        // Pump's screen on time can't be less than 5
-        failed = pump.lcdOnTimeSec < 5 ? true : false;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("timeDisplayType: " + pump.timeDisplayType);
-            log.debug("buttonScrollOnOff: " + pump.buttonScrollOnOff);
-            log.debug("beepAndAlarm: " + pump.beepAndAlarm);
-            log.debug("lcdOnTimeSec: " + pump.lcdOnTimeSec);
-            log.debug("backlightOnTimeSec: " + pump.backlightOnTimeSec);
-            log.debug("selectedLanguage: " + pump.selectedLanguage);
-            log.debug("Pump units: " + (pump.units == DanaRPump.UNITS_MGDL ? "MGDL" : "MMOL"));
-            log.debug("shutdownHour: " + pump.shutdownHour);
-            log.debug("lowReservoirRate: " + pump.lowReservoirRate);
-            log.debug("refillAmount: " + pump.refillAmount);
-            log.debug("selectableLanguage1: " + selectableLanguage1);
-            log.debug("selectableLanguage2: " + selectableLanguage2);
-            log.debug("selectableLanguage3: " + selectableLanguage3);
-            log.debug("selectableLanguage4: " + selectableLanguage4);
-            log.debug("selectableLanguage5: " + selectableLanguage5);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "OPTION__GET_USER_OPTION";
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
new file mode 100644
index 0000000000..07694f6380
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -0,0 +1,89 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Option_Get_User_Option(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting user settings")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 1
+        danaRPump.timeDisplayType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.beepAndAlarm = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.lcdOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.backlightOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.selectedLanguage = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.shutdownHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        danaRPump.lowReservoirRate = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.cannulaVolume = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 2
+        danaRPump.refillAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val selectableLanguage1 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val selectableLanguage2 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val selectableLanguage3 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val selectableLanguage4 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        dataIndex += dataSize
+        dataSize = 1
+        val selectableLanguage5 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        // Pump's screen on time can't be less than 5
+        failed = if (danaRPump.lcdOnTimeSec < 5) true else false
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaRPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "buttonScrollOnOff: " + danaRPump.buttonScrollOnOff)
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm: " + danaRPump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaRPump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaRPump.backlightOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaRPump.selectedLanguage)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaRPump.shutdownHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaRPump.lowReservoirRate)
+        aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaRPump.refillAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage1: $selectableLanguage1")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage2: $selectableLanguage2")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage3: $selectableLanguage3")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage4: $selectableLanguage4")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage5: $selectableLanguage5")
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__GET_USER_OPTION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
deleted file mode 100644
index 58bf00e6a6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Option_Set_Pump_Time extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    private Date date;
-    public int error;
-
-    public DanaRS_Packet_Option_Set_Pump_Time() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME;
-    }
-
-    public DanaRS_Packet_Option_Set_Pump_Time(Date date) {
-        this();
-        this.date = date;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting pump time " + date.toLocaleString());
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        byte[] request = new byte[6];
-        request[0] = (byte) ((date.getYear() - 100) & 0xff);
-        request[1] = (byte) ((date.getMonth() + 1) & 0xff);
-        request[2] = (byte) (date.getDate() & 0xff);
-        request[3] = (byte) (date.getHours() & 0xff);
-        request[4] = (byte) (date.getMinutes() & 0xff);
-        request[5] = (byte) (date.getSeconds() & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        failed = error != 0;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (error == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + error);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "OPTION__SET_PUMP_TIME";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
new file mode 100644
index 0000000000..ec1a44c789
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.DateUtil
+import java.util.*
+
+class DanaRS_Packet_Option_Set_Pump_Time(
+    private val aapsLogger: AAPSLogger,
+    private var time: Long = 0
+) : DanaRS_Packet() {
+
+    var error = 0
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + DateUtil.dateAndTimeString(time))
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val date = Date(time)
+        val request = ByteArray(6)
+        request[0] = (date.year - 100 and 0xff).toByte()
+        request[1] = (date.month + 1 and 0xff).toByte()
+        request[2] = (date.date and 0xff).toByte()
+        request[3] = (date.hours and 0xff).toByte()
+        request[4] = (date.minutes and 0xff).toByte()
+        request[5] = (date.seconds and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__SET_PUMP_TIME"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
deleted file mode 100644
index 30fc07cfd0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-
-public class DanaRS_Packet_Option_Set_User_Option extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    private int error;
-
-    public DanaRS_Packet_Option_Set_User_Option() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Setting user settings");
-        }
-    }
-
-    @Override
-    public byte[] getRequestParams() {
-        DanaRPump pump = DanaRPump.getInstance();
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("UserOptions:" + (System.currentTimeMillis() - pump.lastConnection) / 1000 + " s ago"
-                    + "\ntimeDisplayType:" + pump.timeDisplayType
-                    + "\nbuttonScroll:" + pump.buttonScrollOnOff
-                    + "\ntimeDisplayType:" + pump.timeDisplayType
-                    + "\nlcdOnTimeSec:" + pump.lcdOnTimeSec
-                    + "\nbacklight:" + pump.backlightOnTimeSec
-                    + "\npumpUnits:" + pump.units
-                    + "\nlowReservoir:" + pump.lowReservoirRate);
-        byte[] request = new byte[13];
-        request[0] = (byte) (pump.timeDisplayType & 0xff);
-        request[1] = (byte) (pump.buttonScrollOnOff & 0xff);
-        request[2] = (byte) (pump.beepAndAlarm & 0xff);
-        request[3] = (byte) (pump.lcdOnTimeSec & 0xff);
-        request[4] = (byte) (pump.backlightOnTimeSec & 0xff);
-        request[5] = (byte) (pump.selectedLanguage & 0xff);
-        request[6] = (byte) (pump.units & 0xff);
-        request[7] = (byte) (pump.shutdownHour & 0xff);
-        request[8] = (byte) (pump.lowReservoirRate & 0xff);
-        request[9] = (byte) (pump.cannulaVolume & 0xff);
-        request[10] = (byte) ((pump.cannulaVolume >>> 8) & 0xff);
-        request[11] = (byte) (pump.refillAmount & 0xff);
-        request[12] = (byte) ((pump.refillAmount >>> 8) & 0xff);
-        return request;
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 1;
-        error = byteArrayToInt(getBytes(data, dataIndex, dataSize));
-        failed = error != 0;
-        if (L.isEnabled(L.PUMPCOMM)) {
-            if (error == 0)
-                log.debug("Result OK");
-            else
-                log.error("Result Error: " + error);
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "OPTION__SET_USER_OPTION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
new file mode 100644
index 0000000000..2ca965fc60
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+
+class DanaRS_Packet_Option_Set_User_Option(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting user settings")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        aapsLogger.debug(LTag.PUMPCOMM,
+            "UserOptions:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
+                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
+                + "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
+                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
+                + "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
+                + "\nbacklight:" + danaRPump.backlightOnTimeSec
+                + "\ndanaRPumpUnits:" + danaRPump.units
+                + "\nlowReservoir:" + danaRPump.lowReservoirRate)
+        val request = ByteArray(13)
+        request[0] = (danaRPump.timeDisplayType and 0xff).toByte()
+        request[1] = (danaRPump.buttonScrollOnOff and 0xff).toByte()
+        request[2] = (danaRPump.beepAndAlarm and 0xff).toByte()
+        request[3] = (danaRPump.lcdOnTimeSec and 0xff).toByte()
+        request[4] = (danaRPump.backlightOnTimeSec and 0xff).toByte()
+        request[5] = (danaRPump.selectedLanguage and 0xff).toByte()
+        request[6] = (danaRPump.units and 0xff).toByte()
+        request[7] = (danaRPump.shutdownHour and 0xff).toByte()
+        request[8] = (danaRPump.lowReservoirRate and 0xff).toByte()
+        request[9] = (danaRPump.cannulaVolume and 0xff).toByte()
+        request[10] = (danaRPump.cannulaVolume ushr 8 and 0xff).toByte()
+        request[11] = (danaRPump.refillAmount and 0xff).toByte()
+        request[12] = (danaRPump.refillAmount ushr 8 and 0xff).toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__SET_USER_OPTION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
deleted file mode 100644
index 50edd71bd6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
-public class DanaRS_Packet_Review_Bolus_Avg extends DanaRS_Packet {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public DanaRS_Packet_Review_Bolus_Avg() {
-        super();
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] data) {
-        int dataIndex = DATA_START;
-        int dataSize = 2;
-        double bolusAvg03 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double bolusAvg07 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double bolusAvg14 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double bolusAvg21 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-
-        dataIndex += dataSize;
-        dataSize = 2;
-        double bolusAvg28 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100d;
-        double required = (((1 & 0x000000FF) << 8) + (1 & 0x000000FF)) / 100d;
-        if ( bolusAvg03 == bolusAvg07 && bolusAvg07 == bolusAvg14 && bolusAvg14 == bolusAvg21 && bolusAvg21 == bolusAvg28 && bolusAvg28 == required )
-            failed = true;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Bolus average 3d: " + bolusAvg03 + " U");
-            log.debug("Bolus average 7d: " + bolusAvg07 + " U");
-            log.debug("Bolus average 14d: " + bolusAvg14 + " U");
-            log.debug("Bolus average 21d: " + bolusAvg21 + " U");
-            log.debug("Bolus average 28d: " + bolusAvg28 + " U");
-        }
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "REVIEW__BOLUS_AVG";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
new file mode 100644
index 0000000000..c99a56a2b8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+
+class DanaRS_Packet_Review_Bolus_Avg(
+    private val aapsLogger: AAPSLogger
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        var dataIndex = DATA_START
+        var dataSize = 2
+        val bolusAvg03 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        val bolusAvg07 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        val bolusAvg14 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        val bolusAvg21 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        dataIndex += dataSize
+        dataSize = 2
+        val bolusAvg28 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        val required = ((1 and 0x000000FF shl 8) + (1 and 0x000000FF)) / 100.0
+        if (bolusAvg03 == bolusAvg07 && bolusAvg07 == bolusAvg14 && bolusAvg14 == bolusAvg21 && bolusAvg21 == bolusAvg28 && bolusAvg28 == required) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 3d: $bolusAvg03 U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 7d: $bolusAvg07 U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 14d: $bolusAvg14 U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 21d: $bolusAvg21 U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 28d: $bolusAvg28 U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__BOLUS_AVG"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
index bad9e98112..9518dac337 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
@@ -109,10 +109,10 @@ public class PairingProgressDialog extends DialogFragment {
     @Override
     public void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(RxBus.Companion.getINSTANCE()
                 .toObservable(EventDanaRSPairingSuccess.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> pairingEnded = true, FabricPrivacy::logException)
+                .subscribe(event -> pairingEnded = true, exception -> FabricPrivacy.getInstance().logException(exception))
         );
         if (pairingEnded) dismiss();
         getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
index 253b861811..75ceba52ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
@@ -43,7 +44,7 @@ import info.nightscout.androidaps.utils.SP;
  */
 
 public class BLEComm {
-    private Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private final long WRITE_DELAY_MILLIS = 50;
 
@@ -52,12 +53,15 @@ public class BLEComm {
 
     private final byte PACKET_START_BYTE = (byte) 0xA5;
     private final byte PACKET_END_BYTE = (byte) 0x5A;
-    private static BLEComm instance = null;
+    private Context context;
+    private DanaRPump danaRPump;
+    private DanaRSMessageHashTable danaRSMessageHashTable;
 
-    public static BLEComm getInstance(DanaRSService service) {
-        if (instance == null)
-            instance = new BLEComm(service);
-        return instance;
+    public BLEComm(Context context, DanaRSMessageHashTable danaRSMessageHashTable, DanaRPump danaRPump) {
+        this.context = context;
+        this.danaRPump = danaRPump;
+        this.danaRSMessageHashTable = danaRSMessageHashTable;
+        initialize();
     }
 
     private ScheduledFuture<?> scheduledDisconnection = null;
@@ -76,13 +80,6 @@ public class BLEComm {
     private BluetoothGattCharacteristic UART_Read;
     private BluetoothGattCharacteristic UART_Write;
 
-    private DanaRSService service;
-
-    private BLEComm(DanaRSService service) {
-        this.service = service;
-        initialize();
-    }
-
     private boolean initialize() {
         if (L.isEnabled(L.PUMPBTCOMM))
             log.debug("Initializing BLEComm.");
@@ -145,7 +142,7 @@ public class BLEComm {
         if (L.isEnabled(L.PUMPBTCOMM))
             log.debug("Trying to create a new connection from: " + from);
         mBluetoothDeviceName = device.getName();
-        mBluetoothGatt = device.connectGatt(service.getApplicationContext(), false, mGattCallback);
+        mBluetoothGatt = device.connectGatt(context, false, mGattCallback);
         setCharacteristicNotification(getUARTReadBTGattChar(), true);
         return true;
     }
@@ -338,7 +335,7 @@ public class BLEComm {
             close();
             isConnected = false;
             isConnecting = false;
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
+            RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
             if (L.isEnabled(L.PUMPBTCOMM))
                 log.debug("Device was disconnected " + gatt.getDevice().getName());//Device was disconnected
         }
@@ -451,24 +448,24 @@ public class BLEComm {
                                         if (L.isEnabled(L.PUMPBTCOMM))
                                             log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(inputBuffer));
                                         mSendQueue.clear();
-                                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumperror)));
+                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumperror)));
                                         NSUpload.uploadError(MainApp.gs(R.string.pumperror));
                                         Notification n = new Notification(Notification.PUMPERROR, MainApp.gs(R.string.pumperror), Notification.URGENT);
-                                        RxBus.INSTANCE.send(new EventNewNotification(n));
+                                        RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
                                     } else if (inputBuffer.length == 6 && inputBuffer[2] == 'B' && inputBuffer[3] == 'U' && inputBuffer[4] == 'S' && inputBuffer[5] == 'Y') {
                                         if (L.isEnabled(L.PUMPBTCOMM))
                                             log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(inputBuffer));
                                         mSendQueue.clear();
-                                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumpbusy)));
+                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumpbusy)));
                                     } else {
                                         // ERROR in response, wrong serial number
                                         if (L.isEnabled(L.PUMPBTCOMM))
                                             log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(inputBuffer));
                                         mSendQueue.clear();
-                                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.connectionerror)));
+                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.connectionerror)));
                                         SP.remove(MainApp.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName);
                                         Notification n = new Notification(Notification.WRONGSERIALNUMBER, MainApp.gs(R.string.wrongpassword), Notification.URGENT);
-                                        RxBus.INSTANCE.send(new EventNewNotification(n));
+                                        RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
                                     }
                                     break;
                                 // 2nd packet, pairing key
@@ -495,7 +492,7 @@ public class BLEComm {
                                     if (L.isEnabled(L.PUMPBTCOMM))
                                         log.debug("<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(inputBuffer));
                                     // Paring is successfull, sending time info
-                                    RxBus.INSTANCE.send(new EventDanaRSPairingSuccess());
+                                    RxBus.Companion.getINSTANCE().send(new EventDanaRSPairingSuccess());
                                     SendTimeInfo();
                                     byte[] pairingKey = {inputBuffer[2], inputBuffer[3]};
                                     // store pairing key to preferences
@@ -510,11 +507,11 @@ public class BLEComm {
                                     int size = inputBuffer.length;
                                     int pass = ((inputBuffer[size - 1] & 0x000000FF) << 8) + ((inputBuffer[size - 2] & 0x000000FF));
                                     pass = pass ^ 3463;
-                                    DanaRPump.getInstance().rs_password = Integer.toHexString(pass);
+                                    danaRPump.setRsPassword(Integer.toHexString(pass));
                                     if (L.isEnabled(L.PUMPBTCOMM))
                                         log.debug("Pump user password: " + Integer.toHexString(pass));
 
-                                    RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED));
+                                    RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED));
                                     isConnected = true;
                                     isConnecting = false;
                                     if (L.isEnabled(L.PUMPBTCOMM))
@@ -533,7 +530,7 @@ public class BLEComm {
                                 message = processsedMessage;
                             } else {
                                 // it's not response to last message, create new instance
-                                message = DanaRSMessageHashTable.findMessage(receivedCommand);
+                                message = danaRSMessageHashTable.findMessage(receivedCommand);
                             }
                             if (message != null) {
                                 if (L.isEnabled(L.PUMPBTCOMM))
@@ -665,7 +662,7 @@ public class BLEComm {
         String devicename = getConnectDeviceName();
         if (devicename == null || devicename.equals("")) {
             Notification n = new Notification(Notification.DEVICENOTPAIRED, MainApp.gs(R.string.pairfirst), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(n));
+            RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
             return;
         }
         byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, devicename);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index 4e56133222..df12f7b0c3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -1,40 +1,43 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.services;
 
-import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.SystemClock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
+import javax.inject.Inject;
 
+import dagger.android.DaggerService;
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_History_Events;
@@ -69,27 +72,39 @@ import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Prime;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Refill;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Suspend;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Notify_Delivery_Complete;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Notify_Delivery_Rate_Display;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_Pump_Time;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_User_Option;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_Pump_Time;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_User_Option;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-public class DanaRSService extends Service {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+public class DanaRSService extends DaggerService {
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject SP sp;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ProfileFunction profileFunction;
+    @Inject CommandQueueProvider commandQueue;
+    @Inject Context context;
+    @Inject DanaRSPlugin danaRSPlugin;
+    @Inject DanaRPump danaRPump;
+    @Inject DanaRSMessageHashTable danaRSMessageHashTable;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private BLEComm bleComm = BLEComm.getInstance(this);
+    private BLEComm bleComm;
 
     private IBinder mBinder = new LocalBinder();
 
@@ -98,19 +113,17 @@ public class DanaRSService extends Service {
     private long lastHistoryFetched = 0;
     private long lastApproachingDailyLimit = 0;
 
-    public DanaRSService() {
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
-        disposable.add(RxBus.INSTANCE
+        bleComm = new BLEComm(this, danaRSMessageHashTable, danaRPump);
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (L.isEnabled(L.PUMP)) log.debug("EventAppExit received");
+                    aapsLogger.debug(LTag.PUMPCOMM, "EventAppExit received");
                     stopSelf();
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
@@ -140,121 +153,116 @@ public class DanaRSService extends Service {
         bleComm.disconnect(from);
     }
 
+    @SuppressWarnings("unused")
     public void sendMessage(DanaRS_Packet message) {
         bleComm.sendMessage(message);
     }
 
     public void getPumpStatus() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
 
-            bleComm.sendMessage(new DanaRS_Packet_General_Initial_Screen_Information());
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingextendedbolusstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State());
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information()); // last bolus, bolusStep, maxBolus
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingtempbasalstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
+            bleComm.sendMessage(new DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
+            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus, bolusStep, maxBolus
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
+            bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
 
-            danaRPump.lastConnection = System.currentTimeMillis();
+            danaRPump.setLastConnection(System.currentTimeMillis());
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate()); // basal profile, basalStep, maxBasal
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
-                    RxBus.INSTANCE.send(new EventProfileNeedsUpdate());
+            Profile profile = profileFunction.getProfile();
+            PumpInterface pump = activePlugin.getActivePump();
+            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)); // basal profile, basalStep, maxBasal
+                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
-            bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time());
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+            bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
 
-            long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-            if (danaRPump.pumpTime == 0) {
+            long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+            if (danaRPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
-                danaRPump.lastConnection = 0;
-                RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                RxBus.INSTANCE.send(new EventInitializationChanged());
+                danaRPump.setLastConnection(0);
+                rxBus.send(new EventDanaRNewStatus());
+                rxBus.send(new EventInitializationChanged());
                 return;
             }
             long now = System.currentTimeMillis();
-            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information()); // serial no
-                bleComm.sendMessage(new DanaRS_Packet_General_Get_Pump_Check()); // firmware
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Profile_Number());
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Bolus_Option()); // isExtendedEnabled
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate()); // basal profile, basalStep, maxBasal
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Calculation_Information()); // target
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_CIR_CF_Array());
-                bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option()); // Getting user options
-                danaRPump.lastSettingsRead = now;
+            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)); // serial no
+                bleComm.sendMessage(new DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)); // firmware
+                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump));
+                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)); // isExtendedEnabled
+                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)); // basal profile, basalStep, maxBasal
+                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)); // target
+                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump));
+                bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)); // Getting user options
+                danaRPump.setLastSettingsRead(now);
             }
 
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Pump time difference: " + timeDiff + " seconds");
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds");
             if (Math.abs(timeDiff) > 3) {
                 if (Math.abs(timeDiff) > 60 * 60 * 1.5) {
-                    if (L.isEnabled(L.PUMPCOMM))
-                        log.debug("Pump time difference: " + timeDiff + " seconds - large difference");
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds - large difference");
                     //If time-diff is very large, warn user until we can synchronize history readings properly
-                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                    Intent i = new Intent(context, ErrorHelperActivity.class);
                     i.putExtra("soundid", R.raw.error);
-                    i.putExtra("status", MainApp.gs(R.string.largetimediff));
-                    i.putExtra("title", MainApp.gs(R.string.largetimedifftitle));
+                    i.putExtra("status", resourceHelper.gs(R.string.largetimediff));
+                    i.putExtra("title", resourceHelper.gs(R.string.largetimedifftitle));
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    MainApp.instance().startActivity(i);
+                    context.startActivity(i);
 
                     //deinitialize pump
-                    danaRPump.lastConnection = 0;
-                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                    RxBus.INSTANCE.send(new EventInitializationChanged());
+                    danaRPump.setLastConnection(0);
+                    rxBus.send(new EventDanaRNewStatus());
+                    rxBus.send(new EventInitializationChanged());
                     return;
                 } else {
-                    if (danaRPump.protocol >= 6) {
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(new Date()));
+                    if (danaRPump.getProtocol() >= 6) {
+                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now()));
                     } else {
                         waitForWholeMinute(); // Dana can set only whole minute
                         // add 10sec to be sure we are over minute (will be cutted off anyway)
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(new Date(DateUtil.now() + T.secs(10).msecs())));
+                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now() + T.secs(10).msecs()));
                     }
-                    bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time());
-                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                    if (L.isEnabled(L.PUMPCOMM))
-                        log.debug("Pump time difference: " + timeDiff + " seconds");
+                    bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
+                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds");
                 }
             }
 
             loadEvents();
 
-            RxBus.INSTANCE.send(new EventDanaRNewStatus());
-            RxBus.INSTANCE.send(new EventInitializationChanged());
-            NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            rxBus.send(new EventDanaRNewStatus());
+            rxBus.send(new EventInitializationChanged());
+            //NSUpload.uploadDeviceStatus();
+            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
-                    RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    rxBus.send(new EventNewNotification(reportFail));
+                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception", e);
         }
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Pump status loaded");
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump status loaded");
     }
 
     public PumpEnactResult loadEvents() {
 
-        if (!DanaRSPlugin.getPlugin().isInitialized()) {
-            PumpEnactResult result = new PumpEnactResult().success(false);
+        if (!danaRSPlugin.isInitialized()) {
+            PumpEnactResult result = new PumpEnactResult(injector).success(false);
             result.comment = "pump not initialized";
             return result;
         }
@@ -263,33 +271,29 @@ public class DanaRSService extends Service {
 
         DanaRS_Packet_APS_History_Events msg;
         if (lastHistoryFetched == 0) {
-            msg = new DanaRS_Packet_APS_History_Events(0);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Loading complete event history");
+            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, 0);
+            aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history");
         } else {
-            msg = new DanaRS_Packet_APS_History_Events(lastHistoryFetched);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Loading event history from: " + DateUtil.dateAndTimeFullString(lastHistoryFetched));
+            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, lastHistoryFetched);
+            aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
         }
         bleComm.sendMessage(msg);
-        while (!msg.done && bleComm.isConnected()) {
+        while (!danaRSPlugin.apsHistoryDone && bleComm.isConnected()) {
             SystemClock.sleep(100);
         }
-        if (DanaRS_Packet_APS_History_Events.lastEventTimeLoaded != 0)
-            lastHistoryFetched = DanaRS_Packet_APS_History_Events.lastEventTimeLoaded - T.mins(1).msecs();
+        if (danaRSPlugin.lastEventTimeLoaded != 0)
+            lastHistoryFetched = danaRSPlugin.lastEventTimeLoaded - T.mins(1).msecs();
         else
             lastHistoryFetched = 0;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Events loaded");
-        DanaRPump.getInstance().lastConnection = System.currentTimeMillis();
-        return new PumpEnactResult().success(true);
+        aapsLogger.debug(LTag.PUMPCOMM, "Events loaded");
+        danaRPump.setLastConnection(System.currentTimeMillis());
+        return new PumpEnactResult(injector).success(true);
     }
 
 
     public PumpEnactResult setUserSettings() {
-        bleComm.sendMessage(new DanaRS_Packet_Option_Set_User_Option());
-        bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option());
-        return new PumpEnactResult().success(true);
+        bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump));
+        return new PumpEnactResult(injector).success(true);
     }
 
 
@@ -297,38 +301,39 @@ public class DanaRSService extends Service {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.startingbolus)));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
         bolusingTreatment = t;
-        final int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Start start = new DanaRS_Packet_Bolus_Set_Step_Bolus_Start(insulin, preferencesSpeed);
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Stop stop = new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(insulin, t); // initialize static variables
-        DanaRS_Packet_Notify_Delivery_Complete complete = new DanaRS_Packet_Notify_Delivery_Complete(insulin, t); // initialize static variables
+        final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
+        danaRSPlugin.bolusingTreatment = t;
+        danaRSPlugin.bolusAmountToBeDelivered = insulin;
+        danaRSPlugin.bolusStopped = false;
+        danaRSPlugin.bolusStopForced = false;
+        danaRSPlugin.bolusProgressLastTimeStamp = DateUtil.now();
 
+        DanaRS_Packet_Bolus_Set_Step_Bolus_Start start = new DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker, insulin, preferencesSpeed);
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbtime, carbs); ####
 //            bleComm.sendMessage(msg);
-            DanaRS_Packet_APS_Set_Event_History msgSetHistoryEntry_v2 = new DanaRS_Packet_APS_Set_Event_History(DanaRPump.CARBS, carbtime, carbs, 0);
+            DanaRS_Packet_APS_Set_Event_History msgSetHistoryEntry_v2 = new DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, carbtime, carbs, 0);
             bleComm.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
 
         final long bolusStart = System.currentTimeMillis();
         if (insulin > 0) {
-            if (!stop.stopped) {
+            if (!danaRSPlugin.bolusStopped) {
                 bleComm.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            DanaRS_Packet_Notify_Delivery_Rate_Display progress = new DanaRS_Packet_Notify_Delivery_Rate_Display(insulin, t); // initialize static variables
 
-            while (!stop.stopped && !start.failed && !complete.done) {
+            while (!danaRSPlugin.bolusStopped && !start.failed && !danaRSPlugin.bolusDone) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
-                    stop.stopped = true;
-                    stop.forced = true;
-                    if (L.isEnabled(L.PUMPCOMM))
-                        log.debug("Communication stopped");
+                if ((System.currentTimeMillis() - danaRSPlugin.bolusProgressLastTimeStamp) > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
+                    danaRSPlugin.bolusStopped = true;
+                    danaRSPlugin.bolusStopForced = true;
+                    aapsLogger.debug(LTag.PUMPCOMM, "Communication stopped");
                 }
             }
         }
@@ -354,176 +359,175 @@ public class DanaRSService extends Service {
         long expectedEnd = bolusStart + bolusDurationInMSec + 2000;
         while (System.currentTimeMillis() < expectedEnd) {
             long waitTime = expectedEnd - System.currentTimeMillis();
-            bolusingEvent.setStatus(String.format(MainApp.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
-            RxBus.INSTANCE.send(bolusingEvent);
+            bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
+            rxBus.send(bolusingEvent);
             SystemClock.sleep(1000);
         }
         // do not call loadEvents() directly, reconnection may be needed
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadEvents(new Callback() {
+        commandQueue.loadEvents(new Callback() {
             @Override
             public void run() {
                 // reread bolus status
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information()); // last bolus
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus
                 bolusingEvent.setPercent(100);
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.disconnecting)));
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
         });
         return !start.failed;
     }
 
     public void bolusStop() {
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Stop stop = new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop();
-        stop.forced = true;
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
+        DanaRS_Packet_Bolus_Set_Step_Bolus_Stop stop = new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin);
+        danaRSPlugin.bolusStopForced = true;
         if (isConnected()) {
             bleComm.sendMessage(stop);
-            while (!stop.stopped) {
+            while (!danaRSPlugin.bolusStopped) {
                 bleComm.sendMessage(stop);
                 SystemClock.sleep(200);
             }
         } else {
-            stop.stopped = true;
+            danaRSPlugin.bolusStopped = true;
         }
     }
 
     public boolean tempBasal(Integer percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (DanaRPump.getInstance().isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Temporary_Basal(percent, durationInHours));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, percent, durationInHours));
         SystemClock.sleep(200);
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean highTempBasal(Integer percent) {
-        if (DanaRPump.getInstance().isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(percent));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalShortDuration(Integer percent, int durationInMinutes) {
         if (durationInMinutes != 15 && durationInMinutes != 30) {
-            log.error("Wrong duration param");
+            aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param");
             return false;
         }
 
-        if (DanaRPump.getInstance().isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(percent, durationInMinutes == 15, durationInMinutes == 30));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal());
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolus(Double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingextendedbolus)));
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus(insulin, durationInHalfHours));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, insulin, durationInHalfHours));
         SystemClock.sleep(200);
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State());
+        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingextendedbolus)));
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel());
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger));
+        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean updateBasalsInPump(Profile profile) {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
-        double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
-        DanaRS_Packet_Basal_Set_Profile_Basal_Rate msgSet = new DanaRS_Packet_Basal_Set_Profile_Basal_Rate(0, basal);
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        DanaRS_Packet_Basal_Set_Profile_Basal_Rate msgSet = new DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, basal);
         bleComm.sendMessage(msgSet);
-        DanaRS_Packet_Basal_Set_Profile_Number msgActivate = new DanaRS_Packet_Basal_Set_Profile_Number(0);
+        DanaRS_Packet_Basal_Set_Profile_Number msgActivate = new DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 0);
         bleComm.sendMessage(msgActivate);
-        DanaRPump.getInstance().lastSettingsRead = 0; // force read full settings
+        danaRPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(injector);
         if (!isConnected()) return result;
         DanaRS_Packet_History_ msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new DanaRS_Packet_History_Alarm();
+                msg = new DanaRS_Packet_History_Alarm(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_PRIME:
-                msg = new DanaRS_Packet_History_Prime();
+                msg = new DanaRS_Packet_History_Prime(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new DanaRS_Packet_History_Basal();
+                msg = new DanaRS_Packet_History_Basal(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new DanaRS_Packet_History_Bolus();
+                msg = new DanaRS_Packet_History_Bolus(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new DanaRS_Packet_History_Carbohydrate();
+                msg = new DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new DanaRS_Packet_History_Daily();
+                msg = new DanaRS_Packet_History_Daily(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new DanaRS_Packet_History_Blood_Glucose();
+                msg = new DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new DanaRS_Packet_History_Refill();
+                msg = new DanaRS_Packet_History_Refill(aapsLogger, rxBus);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new DanaRS_Packet_History_Suspend();
+                msg = new DanaRS_Packet_History_Suspend(aapsLogger, rxBus);
                 break;
         }
         if (msg != null) {
-            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(1));
+            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1));
             SystemClock.sleep(200);
             bleComm.sendMessage(msg);
-            while (!msg.done && isConnected()) {
+            while (!msg.getDone() && isConnected()) {
                 SystemClock.sleep(100);
             }
             SystemClock.sleep(200);
-            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(0));
+            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 0));
         }
         result.success = true;
         result.comment = "OK";
@@ -554,7 +558,7 @@ public class DanaRSService extends Service {
             long timeToWholeMinute = (60000 - time % 60000);
             if (timeToWholeMinute > 59800 || timeToWholeMinute < 300)
                 break;
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
             SystemClock.sleep(Math.min(timeToWholeMinute, 100));
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index 3437d37656..e783d13d78 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -6,48 +6,75 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 
-import info.nightscout.androidaps.MainApp;
+import androidx.annotation.NonNull;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
 import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class DanaRv2Plugin extends AbstractDanaRPlugin {
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static DanaRv2Plugin plugin = null;
+    private final AAPSLogger aapsLogger;
+    private final Context context;
+    private final ResourceHelper resourceHelper;
+    private final ConstraintChecker constraintChecker;
+    private final DetailedBolusInfoStorage detailedBolusInfoStorage;
 
-    public static DanaRv2Plugin getPlugin() {
-        if (plugin == null)
-            plugin = new DanaRv2Plugin();
-        return plugin;
-    }
 
-    private DanaRv2Plugin() {
-        pluginDescription.description(R.string.description_pump_dana_r_v2);
+    public long lastEventTimeLoaded = 0;
+    public boolean eventsLoadingDone = false;
+
+    @Inject
+    public DanaRv2Plugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            Context context,
+            DanaRPump danaRPump,
+            ResourceHelper resourceHelper,
+            ConstraintChecker constraintChecker,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            DetailedBolusInfoStorage detailedBolusInfoStorage
+    ) {
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        this.aapsLogger = aapsLogger;
+        this.context = context;
+        this.resourceHelper = resourceHelper;
+        this.constraintChecker = constraintChecker;
+        this.detailedBolusInfoStorage = detailedBolusInfoStorage;
+        getPluginDescription().description(R.string.description_pump_dana_r_v2);
 
         useExtendedBoluses = false;
         pumpDescription.setPumpDescription(PumpType.DanaRv2);
@@ -55,23 +82,19 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     @Override
     protected void onStart() {
-        Context context = MainApp.instance().getApplicationContext();
         Intent intent = new Intent(context, DanaRv2ExecutionService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
 
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    MainApp.instance().getApplicationContext().unbindService(mConnection);
-                }, FabricPrivacy::logException)
+                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         super.onStart();
     }
 
     @Override
     protected void onStop() {
-        Context context = MainApp.instance().getApplicationContext();
         context.unbindService(mConnection);
 
         disposable.clear();
@@ -81,23 +104,22 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is disconnected");
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
             sExecutionService = null;
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
-            if (L.isEnabled(L.PUMP))
-                log.debug("Service is connected");
+            aapsLogger.debug(LTag.PUMP, "Service is connected");
             DanaRv2ExecutionService.LocalBinder mLocalBinder = (DanaRv2ExecutionService.LocalBinder) service;
             sExecutionService = mLocalBinder.getServiceInstance();
         }
     };
 
     // Plugin base interface
+    @NonNull
     @Override
     public String getName() {
-        return MainApp.gs(R.string.danarv2pump);
+        return resourceHelper.gs(R.string.danarv2pump);
     }
 
     @Override
@@ -112,7 +134,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        return DanaRPump.getInstance().lastConnection > 0 && DanaRPump.getInstance().maxBasal > 0 && DanaRPump.getInstance().isPasswordOK();
+        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0 && danaRPump.isPasswordOK();
     }
 
     @Override
@@ -126,13 +148,13 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     }
 
     // Pump interface
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             // v2 stores end time for bolus, we need to adjust time
             // default delivery speed is 12 sec/U
-            int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
+            int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
             int speed = 12;
             switch (preferencesSpeed) {
                 case 0:
@@ -154,32 +176,31 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             if (carbTime == 0) carbTime--; // better set 1 man back to prevent clash with insulin
             detailedBolusInfo.carbTime = 0;
 
-            DetailedBolusInfoStorage.INSTANCE.add(detailedBolusInfo); // will be picked up on reading history
+            detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
 
             Treatment t = new Treatment();
             t.isSMB = detailedBolusInfo.isSMB;
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || carbs > 0)
                 connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) carbs, DateUtil.now() + T.mins(carbTime).msecs(), t);
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, MsgBolusStartWithSpeed.errorCode);
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
             else
-                result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
-            // remove carbs because it's get from history seprately
+                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
+            // remove carbs because it's get from history separately
             return result;
         } else {
-            PumpEnactResult result = new PumpEnactResult();
+            PumpEnactResult result = new PumpEnactResult(getInjector());
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("deliverTreatment: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
     }
@@ -187,14 +208,14 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     @Override
     public void stopBolusDelivering() {
         if (sExecutionService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
+            aapsLogger.error("stopBolusDelivering sExecutionService is null");
             return;
         }
         sExecutionService.bolusStop();
     }
 
     // This is called from APS
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
         // Recheck pump status if older than 30 min
         //This should not be needed while using queue because connection should be done before calling this
@@ -202,9 +223,9 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         //    connect("setTempBasalAbsolute old data");
         //}
 
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        absoluteRate = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
         final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate();
@@ -212,9 +233,8 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
         if (doTempOff) {
             // If temp in progress
-            if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("setTempBasalAbsolute: Stopping temp basal (doTempOff)");
+            if (treatmentsPlugin.isTempBasalInProgress()) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
                 return cancelTempBasal(false);
             }
             result.success = true;
@@ -222,8 +242,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.percent = 100;
             result.isPercent = true;
             result.isTempCancel = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: doTempOff OK");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK");
             return result;
         }
 
@@ -234,7 +253,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             if (percentRate > 500) // Special high temp 500/15min
                 percentRate = 500;
             // Check if some temp is already in progress
-            TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+            TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
             if (activeTemp != null) {
                 // Correct basal already set ?
                 if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
@@ -245,63 +264,59 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
                         result.duration = activeTemp.getPlannedRemainingMinutes();
                         result.isPercent = true;
                         result.isTempCancel = false;
-                        if (L.isEnabled(L.PUMP))
-                            log.debug("setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
                         return result;
                     }
                 }
             }
             // Convert duration from minutes to hours
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
             if (percentRate == 0 && durationInMinutes > 30) {
                 result = setTempBasalPercent(percentRate, durationInMinutes, profile, enforceNew);
             } else {
                 // use special APS temp basal call ... 100+/15min .... 100-/30min
-                result = setHighTempBasalPercent(percentRate);
+                result = setHighTempBasalPercent(percentRate, durationInMinutes);
             }
             if (!result.success) {
-                log.error("setTempBasalAbsolute: Failed to set hightemp basal");
+                aapsLogger.error("setTempBasalAbsolute: Failed to set hightemp basal");
                 return result;
             }
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalAbsolute: hightemp basal set ok");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: hightemp basal set ok");
             return result;
         }
         // We should never end here
-        log.error("setTempBasalAbsolute: Internal error");
+        aapsLogger.error("setTempBasalAbsolute: Internal error");
         result.success = false;
         result.comment = "Internal error";
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = DanaRPump.getInstance();
-        PumpEnactResult result = new PumpEnactResult();
-        percent = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
+        DanaRPump pump = danaRPump;
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
             result.isTempCancel = false;
             result.enacted = false;
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            aapsLogger.error("setTempBasalPercent: Invalid input");
             return result;
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
         if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: Correct value already set");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
             return result;
         }
         boolean connectionOK;
@@ -311,74 +326,71 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             int durationInHours = Math.max(durationInMinutes / 60, 1);
             connectionOK = sExecutionService.tempBasal(percent, durationInHours);
         }
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setTempBasalPercent: OK");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.tempbasaldeliveryerror);
-        log.error("setTempBasalPercent: Failed to set temp basal");
+        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror);
+        aapsLogger.error("setTempBasalPercent: Failed to set temp basal");
         return result;
     }
 
-    private PumpEnactResult setHighTempBasalPercent(Integer percent) {
-        DanaRPump pump = DanaRPump.getInstance();
-        PumpEnactResult result = new PumpEnactResult();
-        boolean connectionOK = sExecutionService.highTempBasal(percent);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+    private PumpEnactResult setHighTempBasalPercent(Integer percent, int durationInMinutes) {
+        DanaRPump pump = danaRPump;
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        boolean connectionOK = sExecutionService.highTempBasal(percent, durationInMinutes);
+        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
+            result.duration = pump.getTempBasalRemainingMin();
+            result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
-            if (L.isEnabled(L.PUMP))
-                log.debug("setHighTempBasalPercent: OK");
+            aapsLogger.debug(LTag.PUMP, "setHighTempBasalPercent: OK");
             return result;
         }
         result.enacted = false;
         result.success = false;
-        result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
-        log.error("setHighTempBasalPercent: Failed to set temp basal");
+        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
+        aapsLogger.error("setHighTempBasalPercent: Failed to set temp basal");
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = new PumpEnactResult();
-        TemporaryBasal runningTB = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!DanaRPump.getInstance().isTempBasalInProgress) {
+        if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
-            if (L.isEnabled(L.PUMP))
-                log.debug("cancelRealTempBasal: OK");
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
             result.success = false;
-            result.comment = MainApp.gs(R.string.danar_valuenotsetproperly);
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
             result.isTempCancel = true;
-            log.error("cancelRealTempBasal: Failed to cancel temp basal");
+            aapsLogger.error("cancelRealTempBasal: Failed to cancel temp basal");
             return result;
         }
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.DanaRv2;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
index f22a3cf3fa..b131aa55fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -1,70 +1,98 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.*
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
+class MessageHashTableRv2 @Inject constructor(
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    constraintChecker: ConstraintChecker,
+    danaRPump: DanaRPump,
+    danaRPlugin: DanaRPlugin,
+    danaRKoreanPlugin: DanaRKoreanPlugin,
+    danaRv2Plugin: DanaRv2Plugin,
+    configBuilderPlugin: ConfigBuilderPlugin,
+    commandQueue: CommandQueueProvider,
+    activePlugin: ActivePluginProvider,
+    detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    treatmentsPlugin: TreatmentsPlugin
+) : MessageHashTableBase {
 
-object MessageHashTableRv2 : MessageHashTableBase {
     var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed())       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-
-        put(MsgStatusTempBasal_v2())        // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended_v2())    // 0x0207 CMD_PUMP_EXPANS_INS_I
-
-        put(MsgStatusBasic())               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus())                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime())        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic())       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption())      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError())              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill())             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend())            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour())          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone())               // 0x31F1 CMD_HISTORY_DONT_USED
-        put(MsgSettingBasal())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions())        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile())      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll())   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile())           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions())            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile())   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone())            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_v2())             // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgStatusAPS_v2())              // 0xE001 CMD_PUMPSTATUS_APS
-        put(MsgSetAPSTempBasalStart_v2())   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2())          // 0xE003 CMD_GET_HISTORY
-        put(MsgSetHistoryEntry_v2())        // 0xE004 CMD_SET_HISTORY_ENTRY
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal_v2(aapsLogger, danaRPump))        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended_v2(aapsLogger, danaRPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgStatusAPS_v2(aapsLogger, danaRPump))              // 0xE001 CMD_PUMPSTATUS_APS
+        put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
+        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin))          // 0xE003 CMD_GET_HISTORY
+        put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
     override fun put(message: MessageBase) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java
deleted file mode 100644
index 3070c52b64..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventRebuildTabs;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-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.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-
-/**
- * Created by mike on 30.06.2016.
- */
-public class MsgCheckValue_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgCheckValue_v2() {
-        SetCommand(0xF0F1);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        DanaRPump pump = DanaRPump.getInstance();
-
-        pump.isNewPump = true;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New firmware confirmed");
-
-        pump.model = intFromBuff(bytes, 0, 1);
-        pump.protocol = intFromBuff(bytes, 1, 1);
-        pump.productCode = intFromBuff(bytes, 2, 1);
-        if (pump.model != DanaRPump.EXPORT_MODEL) {
-            pump.lastConnection = 0;
-            Notification notification = new Notification(Notification.WRONG_DRIVER, MainApp.gs(R.string.pumpdrivercorrected), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            DanaRPlugin.getPlugin().disconnect("Wrong Model");
-            log.error("Wrong model selected. Switching to Korean DanaR");
-            DanaRKoreanPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, true);
-            DanaRKoreanPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, true);
-            DanaRPlugin.getPlugin().setPluginEnabled(PluginType.PUMP, false);
-            DanaRPlugin.getPlugin().setFragmentVisible(PluginType.PUMP, false);
-
-            DanaRPump.reset(); // mark not initialized
-
-            //If profile coming from pump, switch it as well
-            if (DanaRPlugin.getPlugin().isEnabled(PluginType.PROFILE)) {
-                (DanaRPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, false);
-                (DanaRKoreanPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, true);
-            }
-
-            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaRv2Driver");
-            RxBus.INSTANCE.send(new EventRebuildTabs());
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
-            return;
-        }
-
-        if (pump.protocol != 2) {
-            pump.lastConnection = 0;
-            Notification notification = new Notification(Notification.WRONG_DRIVER, MainApp.gs(R.string.pumpdrivercorrected), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            DanaRKoreanPlugin.getPlugin().disconnect("Wrong Model");
-            log.error("Wrong model selected. Switching to non APS DanaR");
-            (DanaRv2Plugin.getPlugin()).setPluginEnabled(PluginType.PUMP, false);
-            (DanaRv2Plugin.getPlugin()).setFragmentVisible(PluginType.PUMP, false);
-            (DanaRPlugin.getPlugin()).setPluginEnabled(PluginType.PUMP, true);
-            (DanaRPlugin.getPlugin()).setFragmentVisible(PluginType.PUMP, true);
-
-            //If profile coming from pump, switch it as well
-            if (DanaRv2Plugin.getPlugin().isEnabled(PluginType.PROFILE)) {
-                (DanaRv2Plugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, false);
-                (DanaRPlugin.getPlugin()).setPluginEnabled(PluginType.PROFILE, true);
-            }
-
-            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaRv2Driver");
-            RxBus.INSTANCE.send(new EventRebuildTabs());
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
-            return;
-        }
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Model: " + String.format("%02X ", pump.model));
-            log.debug("Protocol: " + String.format("%02X ", pump.protocol));
-            log.debug("Product Code: " + String.format("%02X ", pump.productCode));
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
new file mode 100644
index 0000000000..d680490a15
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventRebuildTabs
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+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.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class MsgCheckValue_v2(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val danaRPump: DanaRPump,
+    private val danaRPlugin: DanaRPlugin,
+    private val danaRKoreanPlugin: DanaRKoreanPlugin,
+    private val danaRv2Plugin: DanaRv2Plugin,
+    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val commandQueue: CommandQueueProvider
+) : MessageBase() {
+
+
+    init {
+        SetCommand(0xF0F1)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        danaRPump.isNewPump = true
+        aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
+        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.protocol = intFromBuff(bytes, 1, 1)
+        danaRPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaRPump.model != DanaRPump.EXPORT_MODEL) {
+            danaRPump.lastConnection = 0
+            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+            danaRPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to Korean DanaR")
+            danaRKoreanPlugin.setPluginEnabled(PluginType.PUMP, true)
+            danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, true)
+            danaRPlugin.setPluginEnabled(PluginType.PUMP, false)
+            danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
+            danaRPump.reset() // mark not initialized
+            //If profile coming from pump, switch it as well
+            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            rxBus.send(EventRebuildTabs())
+            commandQueue.readStatus("PumpDriverChange", null) // force new connection
+            return
+        }
+        if (danaRPump.protocol != 2) {
+            danaRPump.lastConnection = 0
+            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            rxBus.send(EventNewNotification(notification))
+            danaRKoreanPlugin.disconnect("Wrong Model")
+            aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to non APS DanaR")
+            danaRv2Plugin.setPluginEnabled(PluginType.PUMP, false)
+            danaRv2Plugin.setFragmentVisible(PluginType.PUMP, false)
+            danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+            danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
+            //If profile coming from pump, switch it as well
+            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            rxBus.send(EventRebuildTabs())
+            commandQueue.readStatus("PumpDriverChange", null) // force new connection
+            return
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
deleted file mode 100644
index 3ef43cad86..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgHistoryEvents_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-    public boolean done;
-
-    public static long lastEventTimeLoaded = 0;
-
-    public MsgHistoryEvents_v2() {
-        this(0);
-    }
-
-    public MsgHistoryEvents_v2(long from) {
-        SetCommand(0xE003);
-
-        if (from > DateUtil.now()) {
-            log.debug("Asked to load from the future");
-            from = 0;
-        }
-
-        if (from == 0) {
-            AddParamByte((byte) 0);
-            AddParamByte((byte) 1);
-            AddParamByte((byte) 1);
-            AddParamByte((byte) 0);
-            AddParamByte((byte) 0);
-        } else {
-            GregorianCalendar gfrom = new GregorianCalendar();
-            gfrom.setTimeInMillis(from);
-            AddParamDate(gfrom);
-        }
-
-        done = false;
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        byte recordCode = (byte) intFromBuff(bytes, 0, 1);
-
-        // Last record
-        if (recordCode == (byte) 0xFF) {
-            done = true;
-            return;
-        }
-
-        long datetime = dateTimeSecFromBuff(bytes, 1);             // 6 bytes
-        int param1 = intFromBuff(bytes, 7, 2);
-        int param2 = intFromBuff(bytes, 9, 2);
-
-        TemporaryBasal temporaryBasal = new TemporaryBasal()
-                .date(datetime)
-                .source(Source.PUMP)
-                .pumpId(datetime);
-
-        ExtendedBolus extendedBolus = new ExtendedBolus()
-                .date(datetime)
-                .source(Source.PUMP)
-                .pumpId(datetime);
-
-        String status = "";
-
-        switch (recordCode) {
-            case DanaRPump.TEMPSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min");
-                temporaryBasal.percentRate = param1;
-                temporaryBasal.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
-                status = "TEMPSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.TEMPSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime));
-                TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
-                status = "TEMPSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.EXTENDEDSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                extendedBolus.insulin = param1 / 100d;
-                extendedBolus.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "EXTENDEDSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.EXTENDEDSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Delivered: " + (param1 / 100d) + "U RealDuration: " + param2 + "min");
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.BOLUS:
-                DetailedBolusInfo detailedBolusInfo = DetailedBolusInfoStorage.INSTANCE.findDetailedBolusInfo(datetime, param1 / 100d);
-                if (detailedBolusInfo == null) {
-                    detailedBolusInfo = new DetailedBolusInfo();
-                }
-                detailedBolusInfo.date = datetime;
-                detailedBolusInfo.source = Source.PUMP;
-                detailedBolusInfo.pumpId = datetime;
-
-                detailedBolusInfo.insulin = param1 / 100d;
-                boolean newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                status = "BOLUS " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALBOLUS:
-                detailedBolusInfo = DetailedBolusInfoStorage.INSTANCE.findDetailedBolusInfo(datetime, param1 / 100d);
-                if (detailedBolusInfo == null) {
-                    detailedBolusInfo = new DetailedBolusInfo();
-                }
-                detailedBolusInfo.date = datetime;
-                detailedBolusInfo.source = Source.PUMP;
-                detailedBolusInfo.pumpId = datetime;
-
-                detailedBolusInfo.insulin = param1 / 100d;
-                newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Bolus: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                status = "DUALBOLUS " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALEXTENDEDSTART:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + (param1 / 100d) + "U Duration: " + param2 + "min");
-                extendedBolus.insulin = param1 / 100d;
-                extendedBolus.durationInMinutes = param2;
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.DUALEXTENDEDSTOP:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Delivered: " + (param1 / 100d) + "U RealDuration: " + param2 + "min");
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.SUSPENDON:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")");
-                status = "SUSPENDON " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.SUSPENDOFF:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")");
-                status = "SUSPENDOFF " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.REFILL:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100d + "U");
-                status = "REFILL " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.PRIME:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100d + "U");
-                status = "PRIME " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.PROFILECHANGE:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + (param2 / 100d) + "U/h");
-                status = "PROFILECHANGE " + DateUtil.timeString(datetime);
-                break;
-            case DanaRPump.CARBS:
-                DetailedBolusInfo emptyCarbsInfo = new DetailedBolusInfo();
-                emptyCarbsInfo.carbs = param1;
-                emptyCarbsInfo.date = datetime;
-                emptyCarbsInfo.source = Source.PUMP;
-                emptyCarbsInfo.pumpId = datetime;
-                newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(emptyCarbsInfo, false);
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug((newRecord ? "**NEW** " : "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g");
-                status = "CARBS " + DateUtil.timeString(datetime);
-                break;
-            default:
-                if (L.isEnabled(L.PUMPCOMM))
-                    log.debug("Event: " + recordCode + " " + DateUtil.dateAndTimeFullString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2);
-                status = "UNKNOWN " + DateUtil.timeString(datetime);
-                break;
-        }
-
-        if (datetime > lastEventTimeLoaded)
-            lastEventTimeLoaded = datetime;
-
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.processinghistory) + ": " + status));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
new file mode 100644
index 0000000000..ffb9c6a9f3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -0,0 +1,184 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.db.ExtendedBolus
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+
+class MsgHistoryEvents_v2 constructor(
+    val aapsLogger: AAPSLogger,
+    val resourceHelper: ResourceHelper,
+    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    val danaRv2Plugin: DanaRv2Plugin,
+    val rxBus: RxBusWrapper,
+    val treatmentsPlugin: TreatmentsPlugin,
+    var from: Long = 0
+) : MessageBase() {
+
+    init {
+        SetCommand(0xE003)
+        if (from > DateUtil.now()) {
+            aapsLogger.error("Asked to load from the future")
+            from = 0
+        }
+        if (from == 0L) {
+            AddParamByte(0.toByte())
+            AddParamByte(1.toByte())
+            AddParamByte(1.toByte())
+            AddParamByte(0.toByte())
+            AddParamByte(0.toByte())
+        } else {
+            val gfrom = GregorianCalendar()
+            gfrom.timeInMillis = from
+            AddParamDate(gfrom)
+        }
+        danaRv2Plugin.eventsLoadingDone = false
+        aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val recordCode = intFromBuff(bytes, 0, 1).toByte()
+
+        // Last record
+        if (recordCode == 0xFF.toByte()) {
+            danaRv2Plugin.eventsLoadingDone = true
+            return
+        }
+        danaRv2Plugin.eventsLoadingDone = false
+        val datetime = dateTimeSecFromBuff(bytes, 1) // 6 bytes
+        val param1 = intFromBuff(bytes, 7, 2)
+        val param2 = intFromBuff(bytes, 9, 2)
+        val temporaryBasal = TemporaryBasal()
+            .date(datetime)
+            .source(Source.PUMP)
+            .pumpId(datetime)
+        val extendedBolus = ExtendedBolus()
+            .date(datetime)
+            .source(Source.PUMP)
+            .pumpId(datetime)
+        val status: String
+        when (recordCode.toInt()) {
+            DanaRPump.TEMPSTART         -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                temporaryBasal.percentRate = param1
+                temporaryBasal.durationInMinutes = param2
+                treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
+                status = "TEMPSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.TEMPSTOP          -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
+                treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
+                status = "TEMPSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.EXTENDEDSTART     -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                extendedBolus.insulin = param1 / 100.0
+                extendedBolus.durationInMinutes = param2
+                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                status = "EXTENDEDSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.EXTENDEDSTOP      -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.BOLUS             -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                    ?: DetailedBolusInfo()
+                detailedBolusInfo.date = datetime
+                detailedBolusInfo.source = Source.PUMP
+                detailedBolusInfo.pumpId = datetime
+                detailedBolusInfo.insulin = param1 / 100.0
+                val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                status = "BOLUS " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALBOLUS         -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                    ?: DetailedBolusInfo()
+                detailedBolusInfo.date = datetime
+                detailedBolusInfo.source = Source.PUMP
+                detailedBolusInfo.pumpId = datetime
+                detailedBolusInfo.insulin = param1 / 100.0
+                val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                status = "DUALBOLUS " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALEXTENDEDSTART -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                extendedBolus.insulin = param1 / 100.0
+                extendedBolus.durationInMinutes = param2
+                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.DUALEXTENDEDSTOP  -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.SUSPENDON         -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                status = "SUSPENDON " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.SUSPENDOFF        -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                status = "SUSPENDOFF " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.REFILL            -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                status = "REFILL " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.PRIME             -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                status = "PRIME " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.PROFILECHANGE     -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                status = "PROFILECHANGE " + DateUtil.timeString(datetime)
+            }
+
+            DanaRPump.CARBS             -> {
+                val emptyCarbsInfo = DetailedBolusInfo()
+                emptyCarbsInfo.carbs = param1.toDouble()
+                emptyCarbsInfo.date = datetime
+                emptyCarbsInfo.source = Source.PUMP
+                emptyCarbsInfo.pumpId = datetime
+                val newRecord = treatmentsPlugin.addToHistoryTreatment(emptyCarbsInfo, false)
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                status = "CARBS " + DateUtil.timeString(datetime)
+            }
+
+            else                        -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+                status = "UNKNOWN " + DateUtil.timeString(datetime)
+            }
+        }
+        if (datetime > danaRv2Plugin.lastEventTimeLoaded) danaRv2Plugin.lastEventTimeLoaded = datetime
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
deleted file mode 100644
index 875cd4ac64..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgSetAPSTempBasalStart_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    protected final int PARAM30MIN = 160;
-    protected final int PARAM15MIN = 150;
-
-    public MsgSetAPSTempBasalStart_v2() {
-        SetCommand(0xE002);
-    }
-
-    public MsgSetAPSTempBasalStart_v2(int percent) {
-        this();
-        setParams(percent);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message: percent: " + percent);
-    }
-
-    protected void setParams(int percent) {
-        //HARDCODED LIMITS
-        if (percent < 0) percent = 0;
-        if (percent > 500) percent = 500;
-
-        AddParamInt(percent);
-        if (percent < 100) {
-            AddParamByte((byte) PARAM30MIN);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 30 min");
-        } else {
-            AddParamByte((byte) PARAM15MIN);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 15 min");
-        }
-    }
-
-    public MsgSetAPSTempBasalStart_v2(int percent, boolean fifteenMinutes, boolean thirtyMinutes) {
-        this();
-        setParams(percent, fifteenMinutes, thirtyMinutes);
-    }
-
-    protected void setParams(int percent, boolean fifteenMinutes, boolean thirtyMinutes) {
-        //HARDCODED LIMITS
-        if (percent < 0) percent = 0;
-        if (percent > 500) percent = 500;
-
-        AddParamInt(percent);
-        if (thirtyMinutes && percent <= 200) { // 30 min is allowed up to 200%
-            AddParamByte((byte) PARAM30MIN);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 30 min");
-        } else {
-            AddParamByte((byte) PARAM15MIN);
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("APS Temp basal start percent: " + percent + " duration 15 min");
-        }
-    }
-
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set APS temp basal start result: " + result + " FAILED!!!");
-        } else {
-            failed = false;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set APS temp basal start result: " + result);
-        }
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
new file mode 100644
index 0000000000..95d2b56b77
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+
+class MsgSetAPSTempBasalStart_v2(
+    private val aapsLogger: AAPSLogger,
+    private var percent: Int,
+    fifteenMinutes: Boolean,
+    thirtyMinutes: Boolean
+) : MessageBase() {
+
+    val PARAM30MIN = 160
+    val PARAM15MIN = 150
+
+    init {
+        SetCommand(0xE002)
+        //HARDCODED LIMITS
+        if (percent < 0) percent = 0
+        if (percent > 500) percent = 500
+        AddParamInt(percent)
+        if (thirtyMinutes && percent <= 200) { // 30 min is allowed up to 200%
+            AddParamByte(PARAM30MIN.toByte())
+            aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 30 min")
+        } else {
+            AddParamByte(PARAM15MIN.toByte())
+            aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 15 min")
+        }
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set APS temp basal start result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set APS temp basal start result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
deleted file mode 100644
index b817495ba3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgSetHistoryEntry_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgSetHistoryEntry_v2() {
-        SetCommand(0xE004);
-    }
-
-    public MsgSetHistoryEntry_v2(int type, long time, int param1, int param2) {
-        this();
-
-        AddParamByte((byte) type);
-        GregorianCalendar gtime = new GregorianCalendar();
-        gtime.setTimeInMillis(time);
-        AddParamDateTime(gtime);
-        AddParamInt(param1);
-        AddParamInt(param2);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Set history entry: type: " + type + " date: " + new Date(time).toString() + " param1: " + param1 + " param2: " + param2);
-    }
-
-    @Override
-    public void handleMessage(byte[] bytes) {
-        int result = intFromBuff(bytes, 0, 1);
-        if (result != 1) {
-            failed = true;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set history entry result: " + result + " FAILED!!!");
-        } else {
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Set history entry result: " + result);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt
new file mode 100644
index 0000000000..b0d8777efa
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import java.util.*
+
+class MsgSetHistoryEntry_v2(
+    private val aapsLogger: AAPSLogger,
+    type: Int, time: Long, param1: Int, param2: Int
+) : MessageBase() {
+
+    init {
+        SetCommand(0xE004)
+        AddParamByte(type.toByte())
+        val gtime = GregorianCalendar()
+        gtime.timeInMillis = time
+        AddParamDateTime(gtime)
+        AddParamInt(param1)
+        AddParamInt(param2)
+        aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: type: " + type + " date: " + Date(time).toString() + " param1: " + param1 + " param2: " + param2)
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val result = intFromBuff(bytes, 0, 1)
+        if (result != 1) {
+            failed = true
+            aapsLogger.debug(LTag.PUMPCOMM, "Set history entry result: $result FAILED!!!")
+        } else {
+            failed = false
+            aapsLogger.debug(LTag.PUMPCOMM, "Set history entry result: $result")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java
deleted file mode 100644
index 601a5d4933..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgStatusAPS_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusAPS_v2() {
-        SetCommand(0xE001);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        double iob = intFromBuff(bytes, 0, 2) / 100d;
-        double deliveredSoFar = intFromBuff(bytes, 2, 2) / 100d;
-
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.iob = iob;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Delivered so far: " + deliveredSoFar);
-            log.debug("Current pump IOB: " + iob);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
new file mode 100644
index 0000000000..1821c17321
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+
+class MsgStatusAPS_v2(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0xE001)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val iob = intFromBuff(bytes, 0, 2) / 100.0
+        val deliveredSoFar = intFromBuff(bytes, 2, 2) / 100.0
+        danaRPump.iob = iob
+        aapsLogger.debug(LTag.PUMPCOMM, "Delivered so far: $deliveredSoFar")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump IOB: $iob")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
deleted file mode 100644
index a829b3afcb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-public class MsgStatusBolusExtended_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusBolusExtended_v2() {
-        SetCommand(0x0207);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        boolean isExtendedInProgress = intFromBuff(bytes, 0, 1) == 1;
-        int extendedBolusHalfHours = intFromBuff(bytes, 1, 1);
-        int extendedBolusMinutes = extendedBolusHalfHours * 30;
-
-        double extendedBolusAmount = intFromBuff(bytes, 2, 2) / 100d;
-        int extendedBolusSoFarInSecs = intFromBuff(bytes, 4, 3);
-// This is available only on korean, but not needed now
-//        int extendedBolusDeliveryPulse = intFromBuff(bytes, 7, 2);
-//        int isEasyUIUserSleep = intFromBuff(bytes, 9, 1);
-
-        int extendedBolusSoFarInMinutes = extendedBolusSoFarInSecs / 60;
-        double extendedBolusAbsoluteRate = isExtendedInProgress ? extendedBolusAmount / extendedBolusMinutes * 60 : 0d;
-        long extendedBolusStart = isExtendedInProgress ? getDateFromSecAgo(extendedBolusSoFarInSecs) : 0;
-        int extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes;
-
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.isExtendedInProgress = isExtendedInProgress;
-        pump.extendedBolusMinutes = extendedBolusMinutes;
-        pump.extendedBolusAmount = extendedBolusAmount;
-        pump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes;
-        pump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate;
-        pump.extendedBolusStart = extendedBolusStart;
-        pump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is extended bolus running: " + isExtendedInProgress);
-            log.debug("Extended bolus min: " + extendedBolusMinutes);
-            log.debug("Extended bolus amount: " + extendedBolusAmount);
-            log.debug("Extended bolus so far in minutes: " + extendedBolusSoFarInMinutes);
-            log.debug("Extended bolus absolute rate: " + extendedBolusAbsoluteRate);
-            log.debug("Extended bolus start: " + extendedBolusStart);
-            log.debug("Extended bolus remaining minutes: " + extendedBolusRemainingMinutes);
-        }
-    }
-
-    @NonNull
-    private long getDateFromSecAgo(int tempBasalAgoSecs) {
-        return (long) (Math.ceil(System.currentTimeMillis() / 1000d) - tempBasalAgoSecs) * 1000;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
new file mode 100644
index 0000000000..b769b8a8f8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import kotlin.math.ceil
+
+class MsgStatusBolusExtended_v2(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0207)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val isExtendedInProgress = intFromBuff(bytes, 0, 1) == 1
+        val extendedBolusHalfHours = intFromBuff(bytes, 1, 1)
+        val extendedBolusMinutes = extendedBolusHalfHours * 30
+        val extendedBolusAmount = intFromBuff(bytes, 2, 2) / 100.0
+        val extendedBolusSoFarInSecs = intFromBuff(bytes, 4, 3)
+        // This is available only on korean, but not needed now
+//        int extendedBolusDeliveryPulse = intFromBuff(bytes, 7, 2);
+//        int isEasyUIUserSleep = intFromBuff(bytes, 9, 1);
+        val extendedBolusSoFarInMinutes = extendedBolusSoFarInSecs / 60
+        val extendedBolusAbsoluteRate = if (isExtendedInProgress) extendedBolusAmount / extendedBolusMinutes * 60 else 0.0
+        val extendedBolusStart = if (isExtendedInProgress) getDateFromSecAgo(extendedBolusSoFarInSecs) else 0
+        val extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes
+        danaRPump.isExtendedInProgress = isExtendedInProgress
+        danaRPump.extendedBolusMinutes = extendedBolusMinutes
+        danaRPump.extendedBolusAmount = extendedBolusAmount
+        danaRPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
+        danaRPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
+        danaRPump.extendedBolusStart = extendedBolusStart
+        danaRPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: $isExtendedInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: $extendedBolusMinutes")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: $extendedBolusAmount")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far in minutes: $extendedBolusSoFarInMinutes")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus absolute rate: $extendedBolusAbsoluteRate")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start: $extendedBolusStart")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: $extendedBolusRemainingMinutes")
+    }
+
+    private fun getDateFromSecAgo(tempBasalAgoSecs: Int): Long {
+        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
deleted file mode 100644
index 19a0a2b6ce..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class MsgStatusTempBasal_v2 extends MessageBase {
-    private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
-
-    public MsgStatusTempBasal_v2() {
-        SetCommand(0x0205);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("New message");
-    }
-
-    public void handleMessage(byte[] bytes) {
-        boolean isTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x01) == 0x01;
-        boolean isAPSTempBasalInProgress = (intFromBuff(bytes, 0, 1) & 0x02) == 0x02;
-        int tempBasalPercent = intFromBuff(bytes, 1, 1);
-        if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10;
-        int tempBasalTotalSec;
-        if (intFromBuff(bytes, 2, 1) == 150) tempBasalTotalSec = 15 * 60;
-        else if (intFromBuff(bytes, 2, 1) == 160) tempBasalTotalSec = 30 * 60;
-        else tempBasalTotalSec = intFromBuff(bytes, 2, 1) * 60 * 60;
-        int tempBasalRunningSeconds = intFromBuff(bytes, 3, 3);
-        int tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60;
-        long tempBasalStart = isTempBasalInProgress ? getDateFromTempBasalSecAgo(tempBasalRunningSeconds) : 0;
-
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.isTempBasalInProgress = isTempBasalInProgress;
-        pump.tempBasalPercent = tempBasalPercent;
-        pump.tempBasalRemainingMin = tempBasalRemainingMin;
-        pump.tempBasalTotalSec = tempBasalTotalSec;
-        pump.tempBasalStart = tempBasalStart;
-
-        if (L.isEnabled(L.PUMPCOMM)) {
-            log.debug("Is temp basal running: " + isTempBasalInProgress);
-            log.debug("Is APS temp basal running: " + isAPSTempBasalInProgress);
-            log.debug("Current temp basal percent: " + tempBasalPercent);
-            log.debug("Current temp basal remaining min: " + tempBasalRemainingMin);
-            log.debug("Current temp basal total sec: " + tempBasalTotalSec);
-            log.debug("Current temp basal start: " + DateUtil.dateAndTimeFullString(tempBasalStart));
-        }
-    }
-
-    @NonNull
-    private long getDateFromTempBasalSecAgo(int tempBasalAgoSecs) {
-        return (long) (Math.ceil(System.currentTimeMillis() / 1000d) - tempBasalAgoSecs) * 1000;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
new file mode 100644
index 0000000000..ac21c3f533
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.utils.DateUtil
+import kotlin.math.ceil
+
+class MsgStatusTempBasal_v2(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+
+) : MessageBase() {
+
+    init {
+        SetCommand(0x0205)
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(bytes: ByteArray) {
+        val isTempBasalInProgress = intFromBuff(bytes, 0, 1) and 0x01 == 0x01
+        val isAPSTempBasalInProgress = intFromBuff(bytes, 0, 1) and 0x02 == 0x02
+        var tempBasalPercent = intFromBuff(bytes, 1, 1)
+        if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10
+        val tempBasalTotalSec: Int = if (intFromBuff(bytes, 2, 1) == 150) 15 * 60 else if (intFromBuff(bytes, 2, 1) == 160) 30 * 60 else intFromBuff(bytes, 2, 1) * 60 * 60
+        val tempBasalRunningSeconds = intFromBuff(bytes, 3, 3)
+        val tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60
+        val tempBasalStart = if (isTempBasalInProgress) getDateFromTempBasalSecAgo(tempBasalRunningSeconds) else 0
+        danaRPump.isTempBasalInProgress = isTempBasalInProgress
+        danaRPump.tempBasalPercent = tempBasalPercent
+        danaRPump.tempBasalRemainingMin = tempBasalRemainingMin
+        danaRPump.tempBasalTotalSec = tempBasalTotalSec
+        danaRPump.tempBasalStart = tempBasalStart
+        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: $isTempBasalInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: $tempBasalPercent")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: $tempBasalTotalSec")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + DateUtil.dateAndTimeString(tempBasalStart))
+    }
+
+    private fun getDateFromTempBasalSecAgo(tempBasalAgoSecs: Int): Long {
+        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index ef254580f9..264c7dadf1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.services;
 
 import android.bluetooth.BluetoothDevice;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
@@ -9,34 +10,40 @@ import android.os.SystemClock;
 import java.io.IOException;
 import java.util.Date;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
@@ -60,6 +67,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MessageHashTableRv2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgCheckValue_v2;
@@ -69,24 +77,40 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetHistoryEntry_v
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusBolusExtended_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusTempBasal_v2;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
-    private CompositeDisposable disposable = new CompositeDisposable();
+    @Inject HasAndroidInjector injector;
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject ConstraintChecker constraintChecker;
+    @Inject DanaRPump danaRPump;
+    @Inject DanaRPlugin danaRPlugin;
+    @Inject DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject DanaRv2Plugin danaRv2Plugin;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject CommandQueueProvider commandQueue;
+    @Inject Context context;
+    @Inject MessageHashTableRv2 messageHashTableRv2;
+    @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject ProfileFunction profileFunction;
+    @Inject SP sp;
 
     private long lastHistoryFetched = 0;
 
     public DanaRv2ExecutionService() {
-        mBinder = new LocalBinder();
-
-        MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
     }
 
     public class LocalBinder extends Binder {
@@ -98,33 +122,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Override
     public void onCreate() {
         super.onCreate();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("EventPreferenceChange");
-                }, FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("EventAppExit received");
-
-                    if (mSerialIOThread != null)
-                        mSerialIOThread.disconnect("Application exit");
-                    MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
-                    stopSelf();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        disposable.clear();
-        super.onDestroy();
+        mBinder = new LocalBinder();
     }
 
     public void connect() {
@@ -145,7 +143,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             } catch (IOException e) {
                 //log.error("Unhandled exception", e);
                 if (e.getMessage().contains("socket closed")) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error("Unhandled exception", e);
                 }
             }
 
@@ -153,9 +151,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableRv2.INSTANCE);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableRv2, danaRPump);
                 mHandshakeInProgress = true;
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
+                rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
 
             mConnectionInProgress = false;
@@ -163,201 +161,193 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus();
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic();
-            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2();
-            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2();
-            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2();
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
+            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
+            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaRPump);
+            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaRPump);
+            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
 
-            if (danaRPump.isNewPump) {
+            if (danaRPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
                 }
             }
 
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
             mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
 
-            danaRPump.lastConnection = System.currentTimeMillis();
+            danaRPump.setLastConnection(System.currentTimeMillis());
 
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
-                    RxBus.INSTANCE.send(new EventProfileNeedsUpdate());
+            Profile profile = profileFunction.getProfile();
+            PumpInterface pump = activePlugin.getActivePump();
+            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
-            mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-            if (danaRPump.pumpTime == 0) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+            if (danaRPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
-                danaRPump.lastConnection = 0;
-                danaRPump.lastSettingsRead = 0;
-                RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                RxBus.INSTANCE.send(new EventInitializationChanged());
+                danaRPump.setLastConnection(0);
+                danaRPump.setLastSettingsRead(0);
+                rxBus.send(new EventDanaRNewStatus());
+                rxBus.send(new EventInitializationChanged());
                 return;
             }
-            long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-            if (L.isEnabled(L.PUMP))
-                log.debug("Pump time difference: " + timeDiff + " seconds");
+            long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+            aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
             if (Math.abs(timeDiff) > 3) {
                 if (Math.abs(timeDiff) > 60 * 60 * 1.5) {
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Pump time difference: " + timeDiff + " seconds - large difference");
+                    aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds - large difference");
                     //If time-diff is very large, warn user until we can synchronize history readings properly
-                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                    Intent i = new Intent(context, ErrorHelperActivity.class);
                     i.putExtra("soundid", R.raw.error);
-                    i.putExtra("status", MainApp.gs(R.string.largetimediff));
-                    i.putExtra("title", MainApp.gs(R.string.largetimedifftitle));
+                    i.putExtra("status", resourceHelper.gs(R.string.largetimediff));
+                    i.putExtra("title", resourceHelper.gs(R.string.largetimedifftitle));
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    MainApp.instance().startActivity(i);
+                    context.startActivity(i);
 
                     //deinitialize pump
-                    danaRPump.lastConnection = 0;
-                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
-                    RxBus.INSTANCE.send(new EventInitializationChanged());
+                    danaRPump.setLastConnection(0);
+                    rxBus.send(new EventDanaRNewStatus());
+                    rxBus.send(new EventInitializationChanged());
                     return;
                 } else {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("Pump time difference: " + timeDiff + " seconds");
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date(DateUtil.now() + T.secs(10).msecs())));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
             }
 
             long now = System.currentTimeMillis();
-            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
-                mSerialIOThread.sendMessage(new MsgSettingMeal());
-                mSerialIOThread.sendMessage(new MsgSettingBasal());
+            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues());
-                mSerialIOThread.sendMessage(new MsgSettingGlucose());
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions());
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll());
-                danaRPump.lastSettingsRead = now;
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaRPump));
+                danaRPump.setLastSettingsRead(now);
             }
 
             loadEvents();
 
-            RxBus.INSTANCE.send(new EventDanaRNewStatus());
-            RxBus.INSTANCE.send(new EventInitializationChanged());
-            NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            rxBus.send(new EventDanaRNewStatus());
+            rxBus.send(new EventInitializationChanged());
+            //NSUpload.uploadDeviceStatus();
+            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
-                    RxBus.INSTANCE.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    rxBus.send(new EventNewNotification(reportFail));
+                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
-    public boolean highTempBasal(int percent) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
+    public boolean highTempBasal(int percent, int durationInMinutes) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(percent));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (durationInMinutes != 15 && durationInMinutes != 30) {
-            log.error("Wrong duration param");
+            aapsLogger.error("Wrong duration param");
             return false;
         }
 
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
-            RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
+        if (danaRPump.isTempBasalInProgress()) {
+            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop());
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2());
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaRPump));
         loadEvents();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
@@ -365,40 +355,42 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.startingbolus)));
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
         mBolusingTreatment = t;
-        final int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
+        final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(amount);
+            start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
         else
-            start = new MsgBolusStartWithSpeed(amount, preferencesSpeed);
-        MsgBolusStop stop = new MsgBolusStop(amount, t);
+            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, amount, preferencesSpeed);
+        danaRPump.setBolusStopped(false);
+        danaRPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbtime, carbs);
+            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, carbtime, carbs);
             mSerialIOThread.sendMessage(msg);
-            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(DanaRPump.CARBS, carbtime, carbs, 0);
+            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaRPump.CARBS, carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
 
         final long bolusStart = System.currentTimeMillis();
         if (amount > 0) {
-            MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
+            danaRPump.setBolusingTreatment(t);
+            danaRPump.setBolusAmountToBeDelivered(amount);
 
-            if (!stop.stopped) {
+            if (!danaRPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!stop.stopped && !start.failed) {
+            while (!danaRPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    stop.stopped = true;
-                    stop.forced = true;
-                    log.error("Communication stopped");
+                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaRPump.setBolusStopped(true);
+                    danaRPump.setBolusStopForced(true);
+                    aapsLogger.error("Communication stopped");
                 }
             }
         }
@@ -424,103 +416,83 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         long expectedEnd = bolusStart + bolusDurationInMSec + 2000;
         while (System.currentTimeMillis() < expectedEnd) {
             long waitTime = expectedEnd - System.currentTimeMillis();
-            bolusingEvent.setStatus(String.format(MainApp.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
-            RxBus.INSTANCE.send(bolusingEvent);
+            bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
+            rxBus.send(bolusingEvent);
             SystemClock.sleep(1000);
         }
         // do not call loadEvents() directly, reconnection may be needed
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadEvents(new Callback() {
+        commandQueue.loadEvents(new Callback() {
             @Override
             public void run() {
                 // load last bolus status
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
-                mSerialIOThread.sendMessage(new MsgStatus());
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+                mSerialIOThread.sendMessage(new MsgStatus(aapsLogger, danaRPump));
                 bolusingEvent.setPercent(100);
-                RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.disconnecting)));
+                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
         });
         return !start.failed;
     }
 
-    public void bolusStop() {
-        if (L.isEnabled(L.PUMP))
-            log.debug("bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
-        MsgBolusStop stop = new MsgBolusStop();
-        stop.forced = true;
-        if (isConnected()) {
-            mSerialIOThread.sendMessage(stop);
-            while (!stop.stopped) {
-                mSerialIOThread.sendMessage(stop);
-                SystemClock.sleep(200);
-            }
-        } else {
-            stop.stopped = true;
-        }
-    }
-
     public boolean carbsEntry(int amount, long time) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(time, amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, time, amount);
         mSerialIOThread.sendMessage(msg);
-        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(DanaRPump.CARBS, time, amount, 0);
+        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaRPump.CARBS, time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
         lastHistoryFetched = Math.min(lastHistoryFetched, time - T.mins(1).msecs());
         return true;
     }
 
     public PumpEnactResult loadEvents() {
-        DanaRPump danaRPump = DanaRPump.getInstance();
-
-        if (!DanaRv2Plugin.getPlugin().isInitialized()) {
-            PumpEnactResult result = new PumpEnactResult().success(false);
+        if (!danaRv2Plugin.isInitialized()) {
+            PumpEnactResult result = new PumpEnactResult(injector).success(false);
             result.comment = "pump not initialized";
             return result;
         }
 
 
         if (!isConnected())
-            return new PumpEnactResult().success(false);
+            return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(lastHistoryFetched);
-        if (L.isEnabled(L.PUMP))
-            log.debug("Loading event history from: " + DateUtil.dateAndTimeFullString(lastHistoryFetched));
+        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, lastHistoryFetched);
+        aapsLogger.debug(LTag.PUMP, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
-        while (!msg.done && mRfcommSocket.isConnected()) {
+        while (!danaRv2Plugin.eventsLoadingDone && mRfcommSocket.isConnected()) {
             SystemClock.sleep(100);
         }
         SystemClock.sleep(200);
-        if (MsgHistoryEvents_v2.lastEventTimeLoaded != 0)
-            lastHistoryFetched = MsgHistoryEvents_v2.lastEventTimeLoaded - T.mins(1).msecs();
+        if (danaRv2Plugin.lastEventTimeLoaded != 0)
+            lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.mins(1).msecs();
         else
             lastHistoryFetched = 0;
-        danaRPump.lastConnection = System.currentTimeMillis();
-        return new PumpEnactResult().success(true);
+        danaRPump.setLastConnection(System.currentTimeMillis());
+        return new PumpEnactResult(injector).success(true);
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
-        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
-        double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile((byte) 0, basal);
+        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
-        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
 
     public PumpEnactResult setUserOptions() {
         if (!isConnected())
-            return new PumpEnactResult().success(false);
+            return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions();
+        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaRPump);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
-        return new PumpEnactResult().success(!msg.failed);
+        return new PumpEnactResult(injector).success(!msg.failed);
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 26555898c0..2f8b451e0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -1,26 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
-import android.app.Service;
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.media.AudioAttributes;
-import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Binder;
-import android.os.Build;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.Vibrator;
+import android.text.Html;
+
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.lifecycle.MutableLiveData;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
 
-import info.nightscout.androidaps.logging.L;
+import dagger.android.DaggerService;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SnoozeAlertMessage;
@@ -32,19 +32,24 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-public class InsightAlertService extends Service implements InsightConnectionService.StateCallback {
+public class InsightAlertService extends DaggerService implements InsightConnectionService.StateCallback {
 
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+    @Inject AAPSLogger aapsLogger;
+    @Inject ResourceHelper resourceHelper;
+    @Inject AlertUtils alertUtils;
+
+    private static final int NOTIFICATION_ID = 31345;
 
     private LocalBinder localBinder = new LocalBinder();
     private boolean connectionRequested;
     private final Object $alertLock = new Object[0];
-    private Alert alert;
+    private Alert alert = null;
+    private MutableLiveData<Alert> alertLiveData = new MutableLiveData<>();
     private Thread thread;
-    private InsightAlertActivity alertActivity;
-    private Ringtone ringtone;
     private Vibrator vibrator;
     private boolean vibrating;
     private InsightConnectionService connectionService;
@@ -65,27 +70,6 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         }
     };
 
-    private void retrieveRingtone() {
-        Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
-        ringtone = RingtoneManager.getRingtone(this, uri);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            ringtone.setAudioAttributes(new AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
-                    .setLegacyStreamType(AudioManager.STREAM_RING).build());
-        } else ringtone.setStreamType(AudioManager.STREAM_RING);
-    }
-
-    public Alert getAlert() {
-        synchronized ($alertLock) {
-            return alert;
-        }
-    }
-
-    public void setAlertActivity(InsightAlertActivity alertActivity) {
-        this.alertActivity = alertActivity;
-    }
-
     public void ignore(AlertType alertType) {
         synchronized ($alertLock) {
             if (alertType == null) {
@@ -98,6 +82,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         }
     }
 
+    public MutableLiveData<Alert> getAlertLiveData() {
+        return alertLiveData;
+    }
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -106,8 +94,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
 
     @Override
     public void onCreate() {
+        super.onCreate();
         vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
         bindService(new Intent(this, InsightConnectionService.class), serviceConnection, BIND_AUTO_CREATE);
+        alertLiveData.setValue(null);
     }
 
     @Override
@@ -118,6 +108,12 @@ public class InsightAlertService extends Service implements InsightConnectionSer
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if ("mute".equals(intent.getStringExtra("command"))) {
+            mute();
+        } else if ("confirm".equals(intent.getStringExtra("command"))) {
+            dismissNotification();
+            confirm();
+        }
         return START_STICKY;
     }
 
@@ -127,25 +123,47 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             thread = new Thread(this::queryActiveAlert);
             thread.start();
 
-        } else if (thread != null) thread.interrupt();
+        } else {
+            dismissNotification();
+            if (thread != null) thread.interrupt();
+        }
     }
 
     private void queryActiveAlert() {
         while (!Thread.currentThread().isInterrupted()) {
             try {
-                Alert alert = connectionService.requestMessage(new GetActiveAlertMessage()).await().getAlert();
-                if (Thread.currentThread().isInterrupted()) {
-                    connectionService.withdrawConnectionRequest(thread);
-                    break;
-                }
                 synchronized ($alertLock) {
-                    if ((this.alert == null && alert != null)
+                    Alert alert = connectionService.requestMessage(new GetActiveAlertMessage()).await().getAlert();
+                    if (alert == null || (alert.getAlertType() == ignoreType && System.currentTimeMillis() - ignoreTimestamp < 10000)) {
+                        if (connectionRequested) {
+                            connectionService.withdrawConnectionRequest(this);
+                            connectionRequested = false;
+                        }
+                        this.alertLiveData.postValue(null);
+                        this.alert = null;
+                        dismissNotification();
+                        stopAlerting();
+                    } else if (!alert.equals(this.alert)) {
+                        if (!connectionRequested) {
+                            connectionService.requestConnection(this);
+                            connectionRequested = true;
+                        }
+                        showNotification(alert);
+                        this.alertLiveData.postValue(alert);
+                        this.alert = alert;
+                        if (alert.getAlertStatus() == AlertStatus.SNOOZED) stopAlerting();
+                        else alert();
+                    }
+                    /*if ((this.alert == null && alert != null)
                             || (this.alert != null && alert == null)
                             || (this.alert != null && alert != null && !this.alert.equals(alert))) {
                         if (this.alert != null && (alert == null || this.alert.getAlertId() != alert.getAlertId())) stopAlerting();
                         this.alert = alert;
-                        if (alertActivity != null && alert != null)
-                            new Handler(Looper.getMainLooper()).post(() -> alertActivity.update(alert));
+                        if (alert != null)
+                            new Handler(Looper.getMainLooper()).post(() -> {
+                                //showNotification(alert);
+                                //alertActivity.update(alert);
+                            });
                     }
                     if (alert == null) {
                         stopAlerting();
@@ -153,8 +171,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                             connectionService.withdrawConnectionRequest(this);
                             connectionRequested = false;
                         }
-                        if (alertActivity != null)
-                            new Handler(Looper.getMainLooper()).post(() -> alertActivity.finish());
+                        new Handler(Looper.getMainLooper()).post(() -> {
+                            //dismissNotification();
+                            //alertActivity.finish();
+                        });
                     } else if (!(alert.getAlertType() == ignoreType && System.currentTimeMillis() - ignoreTimestamp < 10000))  {
                         if (alert.getAlertStatus() == AlertStatus.ACTIVE) alert();
                         else stopAlerting();
@@ -162,22 +182,22 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                             connectionService.requestConnection(this);
                             connectionRequested = true;
                         }
-                        if (alertActivity == null) {
+                        /*if (alertActivity == null) {
                             Intent intent = new Intent(InsightAlertService.this, InsightAlertActivity.class);
                             intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
                             new Handler(Looper.getMainLooper()).post(() -> startActivity(intent));
-                        }
-                    }
+                        }*/
+                    //}
                 }
             } catch (InterruptedException ignored) {
                 connectionService.withdrawConnectionRequest(thread);
                 break;
             } catch (AppLayerErrorException e) {
-                log.info("Exception while fetching alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                aapsLogger.info(LTag.PUMP, "Exception while fetching alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {
-                log.info("Exception while fetching alert: " + e.getClass().getSimpleName());
+                aapsLogger.info(LTag.PUMP, "Exception while fetching alert: " + e.getClass().getSimpleName());
             } catch (Exception e) {
-                log.error("Exception while fetching alert", e);
+                aapsLogger.error(LTag.PUMP, "Exception while fetching alert", e);
             }
             try {
                 Thread.sleep(1000);
@@ -189,21 +209,18 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             connectionService.withdrawConnectionRequest(thread);
             connectionRequested = false;
         }
-        if (alertActivity != null)
-            new Handler(Looper.getMainLooper()).post(() -> alertActivity.finish());
         stopAlerting();
+        alertLiveData.postValue(null);
+        this.alert = null;
+        dismissNotification();
         thread = null;
     }
 
     private void alert() {
         if (!vibrating) {
-            vibrator.vibrate(new long[] {0, 1000, 1000}, 0);
+            vibrator.vibrate(new long[]{0, 1000, 1000}, 0);
             vibrating = true;
         }
-        if (ringtone == null || !ringtone.isPlaying()) {
-            retrieveRingtone();
-            ringtone.play();
-        }
     }
 
     private void stopAlerting() {
@@ -211,23 +228,29 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             vibrator.cancel();
             vibrating = false;
         }
-        if (ringtone != null && ringtone.isPlaying()) ringtone.stop();
     }
 
     public void mute() {
         new Thread(() -> {
             try {
-                SnoozeAlertMessage snoozeAlertMessage = new SnoozeAlertMessage();
-                snoozeAlertMessage.setAlertID(alert.getAlertId());
-                connectionService.requestMessage(snoozeAlertMessage).await();
+                synchronized ($alertLock) {
+                    if (alert == null) return;
+                    alert.setAlertStatus(AlertStatus.SNOOZED);
+                    alertLiveData.postValue(alert);
+                    stopAlerting();
+                    showNotification(alert);
+                    SnoozeAlertMessage snoozeAlertMessage = new SnoozeAlertMessage();
+                    snoozeAlertMessage.setAlertID(alert.getAlertId());
+                    connectionService.requestMessage(snoozeAlertMessage).await();
+                }
             } catch (AppLayerErrorException e) {
-                log.info("Exception while muting alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                aapsLogger.info(LTag.PUMP, "Exception while muting alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             } catch (InsightException e) {
-                log.info("Exception while muting alert: " + e.getClass().getSimpleName());
+                aapsLogger.info(LTag.PUMP, "Exception while muting alert: " + e.getClass().getSimpleName());
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             } catch (Exception e) {
-                log.error("Exception while muting alert", e);
+                aapsLogger.error(LTag.PUMP, "Exception while muting alert", e);
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             }
         }).start();
@@ -236,22 +259,71 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     public void confirm() {
         new Thread(() -> {
             try {
-                ConfirmAlertMessage confirmAlertMessage = new ConfirmAlertMessage();
-                confirmAlertMessage.setAlertID(alert.getAlertId());
-                connectionService.requestMessage(confirmAlertMessage).await();
+                synchronized ($alertLock) {
+                    if (alert == null) return;
+                    stopAlerting();
+                    alertLiveData.postValue(null);
+                    dismissNotification();
+                    ConfirmAlertMessage confirmAlertMessage = new ConfirmAlertMessage();
+                    confirmAlertMessage.setAlertID(alert.getAlertId());
+                    connectionService.requestMessage(confirmAlertMessage).await();
+                    this.alert = null;
+                }
             } catch (AppLayerErrorException e) {
-                log.info("Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                aapsLogger.info(LTag.PUMP, "Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             } catch (InsightException e) {
-                log.info("Exception while confirming alert: " + e.getClass().getSimpleName());
+                aapsLogger.info(LTag.PUMP, "Exception while confirming alert: " + e.getClass().getSimpleName());
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             } catch (Exception e) {
-                log.error("Exception while confirming alert", e);
+                aapsLogger.error(LTag.PUMP, "Exception while confirming alert", e);
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
             }
         }).start();
     }
 
+    private void showNotification(Alert alert) {
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, LocalInsightPlugin.ALERT_CHANNEL_ID);
+
+        notificationBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        notificationBuilder.setCategory(NotificationCompat.CATEGORY_ALARM);
+        notificationBuilder.setVibrate(new long[0]);
+        notificationBuilder.setShowWhen(false);
+        notificationBuilder.setOngoing(true);
+        notificationBuilder.setOnlyAlertOnce(true);
+        notificationBuilder.setAutoCancel(false);
+        notificationBuilder.setSmallIcon(alertUtils.getAlertIcon(alert.getAlertCategory()));
+
+        notificationBuilder.setContentTitle(alertUtils.getAlertCode(alert.getAlertType()) + " – " + alertUtils.getAlertTitle(alert.getAlertType()));
+        String description = alertUtils.getAlertDescription(alert);
+        if (description != null)
+            notificationBuilder.setContentText(Html.fromHtml(description).toString());
+
+        Intent fullScreenIntent = new Intent(this, InsightAlertActivity.class);
+        PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(this, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        notificationBuilder.setFullScreenIntent(fullScreenPendingIntent, true);
+
+        switch (alert.getAlertStatus()) {
+            case ACTIVE:
+                Intent muteIntent = new Intent(this, InsightAlertService.class).putExtra("command", "mute");
+                PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                notificationBuilder.addAction(0, resourceHelper.gs(R.string.mute_alert), mutePendingIntent);
+            case SNOOZED:
+                Intent confirmIntent = new Intent(this, InsightAlertService.class).putExtra("command", "confirm");
+                PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                notificationBuilder.addAction(0, resourceHelper.gs(R.string.confirm), confirmPendingIntent);
+        }
+
+        Notification notification = notificationBuilder.build();
+        NotificationManagerCompat.from(this).notify(NOTIFICATION_ID, notification);
+        startForeground(NOTIFICATION_ID, notification);
+    }
+
+    private void dismissNotification() {
+        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID);
+        stopForeground(true);
+    }
+
     public class LocalBinder extends Binder {
         public InsightAlertService getService() {
             return InsightAlertService.this;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 3464a1803a..603e8aabb9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -12,15 +12,15 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
+import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
@@ -30,13 +30,21 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.plugins.pump.insight.events.EventLocalInsightUpdateGUI;
 import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class LocalInsightFragment extends Fragment implements View.OnClickListener {
+public class LocalInsightFragment extends DaggerFragment implements View.OnClickListener {
+    @Inject LocalInsightPlugin localInsightPlugin;
+    @Inject CommandQueue commandQueue;
+    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper resourceHelper;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private static final boolean ENABLE_OPERATING_MODE_BUTTON = false;
@@ -69,10 +77,10 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
     @Override
     public synchronized void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventLocalInsightUpdateGUI.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGUI(), FabricPrivacy::logException)
+                .subscribe(event -> updateGUI(), fabricPrivacy::logException)
         );
         updateGUI();
     }
@@ -92,7 +100,7 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
     @Override
     public void onClick(View v) {
         if (v == operatingMode) {
-            if (LocalInsightPlugin.getPlugin().getOperatingMode() != null) {
+            if (localInsightPlugin.getOperatingMode() != null) {
                 operatingMode.setEnabled(false);
                 operatingModeCallback = new Callback() {
                     @Override
@@ -103,17 +111,17 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
                         });
                     }
                 };
-                switch (LocalInsightPlugin.getPlugin().getOperatingMode()) {
+                switch (localInsightPlugin.getOperatingMode()) {
                     case PAUSED:
                     case STOPPED:
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().startPump(operatingModeCallback);
+                        commandQueue.startPump(operatingModeCallback);
                         break;
                     case STARTED:
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().stopPump(operatingModeCallback);
+                        commandQueue.stopPump(operatingModeCallback);
                 }
             }
         } else if (v == tbrOverNotification) {
-            TBROverNotificationBlock notificationBlock = LocalInsightPlugin.getPlugin().getTBROverNotificationBlock();
+            TBROverNotificationBlock notificationBlock = localInsightPlugin.getTBROverNotificationBlock();
             if (notificationBlock != null) {
                 tbrOverNotification.setEnabled(false);
                 tbrOverNotificationCallback = new Callback() {
@@ -125,8 +133,7 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
                         });
                     }
                 };
-                ConfigBuilderPlugin.getPlugin().getCommandQueue()
-                        .setTBROverNotification(tbrOverNotificationCallback, !notificationBlock.isEnabled());
+                commandQueue.setTBROverNotification(tbrOverNotificationCallback, !notificationBlock.isEnabled());
             }
         } else if (v == refresh) {
             refresh.setEnabled(false);
@@ -139,14 +146,14 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
                     });
                 }
             };
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("InsightRefreshButton", refreshCallback);
+            commandQueue.readStatus("InsightRefreshButton", refreshCallback);
         }
     }
 
     protected void updateGUI() {
         if (!viewsCreated) return;
         statusItemContainer.removeAllViews();
-        if (!LocalInsightPlugin.getPlugin().isInitialized()) {
+        if (!localInsightPlugin.isInitialized()) {
             operatingMode.setVisibility(View.GONE);
             tbrOverNotification.setVisibility(View.GONE);
             refresh.setVisibility(View.GONE);
@@ -154,7 +161,7 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
         }
         refresh.setVisibility(View.VISIBLE);
         refresh.setEnabled(refreshCallback == null);
-        TBROverNotificationBlock notificationBlock = LocalInsightPlugin.getPlugin().getTBROverNotificationBlock();
+        TBROverNotificationBlock notificationBlock = localInsightPlugin.getTBROverNotificationBlock();
         tbrOverNotification.setVisibility(notificationBlock == null ? View.GONE : View.VISIBLE);
         if (notificationBlock != null)
             tbrOverNotification.setText(notificationBlock.isEnabled() ? R.string.disable_tbr_over_notification : R.string.enable_tbr_over_notification);
@@ -185,7 +192,7 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
 
     private void getConnectionStatusItem(List<View> statusItems) {
         int string = 0;
-        InsightState state = LocalInsightPlugin.getPlugin().getConnectionService().getState();
+        InsightState state = localInsightPlugin.getConnectionService().getState();
         switch (state) {
             case NOT_PAIRED:
                 string = R.string.not_paired;
@@ -215,34 +222,34 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
                 string = R.string.recovering;
                 break;
         }
-        statusItems.add(getStatusItem(MainApp.gs(R.string.insight_status), MainApp.gs(string)));
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.insight_status), resourceHelper.gs(string)));
         if (state == InsightState.RECOVERING) {
-            statusItems.add(getStatusItem(MainApp.gs(R.string.recovery_duration), LocalInsightPlugin.getPlugin().getConnectionService().getRecoveryDuration() / 1000 + "s"));
+            statusItems.add(getStatusItem(resourceHelper.gs(R.string.recovery_duration), localInsightPlugin.getConnectionService().getRecoveryDuration() / 1000 + "s"));
         }
     }
 
     private void getLastConnectedItem(List<View> statusItems) {
-        switch (LocalInsightPlugin.getPlugin().getConnectionService().getState()) {
+        switch (localInsightPlugin.getConnectionService().getState()) {
             case CONNECTED:
             case NOT_PAIRED:
                 return;
             default:
-                long lastConnection = LocalInsightPlugin.getPlugin().getConnectionService().getLastConnected();
+                long lastConnection = localInsightPlugin.getConnectionService().getLastConnected();
                 if (lastConnection == 0) return;
                 int min = (int) ((System.currentTimeMillis() - lastConnection) / 60000);
-                statusItems.add(getStatusItem(MainApp.gs(R.string.last_connected), DateUtil.timeString(lastConnection)));
+                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected), DateUtil.timeString(lastConnection)));
         }
     }
 
     private void getOperatingModeItem(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getOperatingMode() == null) {
+        if (localInsightPlugin.getOperatingMode() == null) {
             operatingMode.setVisibility(View.GONE);
             return;
         }
         int string = 0;
         if (ENABLE_OPERATING_MODE_BUTTON) operatingMode.setVisibility(View.VISIBLE);
         operatingMode.setEnabled(operatingModeCallback == null);
-        switch (LocalInsightPlugin.getPlugin().getOperatingMode()) {
+        switch (localInsightPlugin.getOperatingMode()) {
             case STARTED:
                 operatingMode.setText(R.string.stop_pump);
                 string = R.string.started;
@@ -256,62 +263,62 @@ public class LocalInsightFragment extends Fragment implements View.OnClickListen
                 string = R.string.paused;
                 break;
         }
-        statusItems.add(getStatusItem(MainApp.gs(R.string.operating_mode), MainApp.gs(string)));
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.operating_mode), resourceHelper.gs(string)));
     }
 
     private void getBatteryStatusItem(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getBatteryStatus() == null) return;
-        statusItems.add(getStatusItem(MainApp.gs(R.string.pump_battery_label),
-                LocalInsightPlugin.getPlugin().getBatteryStatus().getBatteryAmount() + "%"));
+        if (localInsightPlugin.getBatteryStatus() == null) return;
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_battery_label),
+                localInsightPlugin.getBatteryStatus().getBatteryAmount() + "%"));
     }
 
     private void getCartridgeStatusItem(List<View> statusItems) {
-        CartridgeStatus cartridgeStatus = LocalInsightPlugin.getPlugin().getCartridgeStatus();
+        CartridgeStatus cartridgeStatus = localInsightPlugin.getCartridgeStatus();
         if (cartridgeStatus == null) return;
         String status;
         if (cartridgeStatus.isInserted())
-            status = DecimalFormatter.to2Decimal(LocalInsightPlugin.getPlugin().getCartridgeStatus().getRemainingAmount()) + "U";
-        else status = MainApp.gs(R.string.not_inserted);
-        statusItems.add(getStatusItem(MainApp.gs(R.string.pump_reservoir_label), status));
+            status = DecimalFormatter.to2Decimal(localInsightPlugin.getCartridgeStatus().getRemainingAmount()) + "U";
+        else status = resourceHelper.gs(R.string.not_inserted);
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_reservoir_label), status));
     }
 
     private void getTDDItems(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getTotalDailyDose() == null) return;
-        TotalDailyDose tdd = LocalInsightPlugin.getPlugin().getTotalDailyDose();
-        statusItems.add(getStatusItem(MainApp.gs(R.string.tdd_bolus), DecimalFormatter.to2Decimal(tdd.getBolus())));
-        statusItems.add(getStatusItem(MainApp.gs(R.string.tdd_basal), DecimalFormatter.to2Decimal(tdd.getBasal())));
-        statusItems.add(getStatusItem(MainApp.gs(R.string.tdd_total), DecimalFormatter.to2Decimal(tdd.getBolusAndBasal())));
+        if (localInsightPlugin.getTotalDailyDose() == null) return;
+        TotalDailyDose tdd = localInsightPlugin.getTotalDailyDose();
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_bolus), DecimalFormatter.to2Decimal(tdd.getBolus())));
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_basal), DecimalFormatter.to2Decimal(tdd.getBasal())));
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_total), DecimalFormatter.to2Decimal(tdd.getBolusAndBasal())));
     }
 
     private void getBaseBasalRateItem(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getActiveBasalRate() == null) return;
-        ActiveBasalRate activeBasalRate = LocalInsightPlugin.getPlugin().getActiveBasalRate();
-        statusItems.add(getStatusItem(MainApp.gs(R.string.pump_basebasalrate_label),
+        if (localInsightPlugin.getActiveBasalRate() == null) return;
+        ActiveBasalRate activeBasalRate = localInsightPlugin.getActiveBasalRate();
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_basebasalrate_label),
                 DecimalFormatter.to2Decimal(activeBasalRate.getActiveBasalRate()) + " U/h (" + activeBasalRate.getActiveBasalProfileName() + ")"));
     }
 
     private void getTBRItem(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getActiveTBR() == null) return;
-        ActiveTBR activeTBR = LocalInsightPlugin.getPlugin().getActiveTBR();
-        statusItems.add(getStatusItem(MainApp.gs(R.string.pump_tempbasal_label),
-                MainApp.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
+        if (localInsightPlugin.getActiveTBR() == null) return;
+        ActiveTBR activeTBR = localInsightPlugin.getActiveTBR();
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_tempbasal_label),
+                resourceHelper.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
     }
 
     private void getBolusItems(List<View> statusItems) {
-        if (LocalInsightPlugin.getPlugin().getActiveBoluses() == null) return;
-        for (ActiveBolus activeBolus : LocalInsightPlugin.getPlugin().getActiveBoluses()) {
+        if (localInsightPlugin.getActiveBoluses() == null) return;
+        for (ActiveBolus activeBolus : localInsightPlugin.getActiveBoluses()) {
             String label;
             switch (activeBolus.getBolusType()) {
                 case MULTIWAVE:
-                    label = MainApp.gs(R.string.multiwave_bolus);
+                    label = resourceHelper.gs(R.string.multiwave_bolus);
                     break;
                 case EXTENDED:
-                    label = MainApp.gs(R.string.extended_bolus);
+                    label = resourceHelper.gs(R.string.extended_bolus);
                     break;
                 default:
                     continue;
             }
-            statusItems.add(getStatusItem(label, MainApp.gs(R.string.eb_formatter, activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())));
+            statusItems.add(getStatusItem(label, resourceHelper.gs(R.string.eb_formatter, activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())));
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 5104e70fe8..a75398554e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1,19 +1,20 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -22,7 +23,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
@@ -35,18 +41,19 @@ import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
 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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
@@ -128,13 +135,22 @@ import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-public class LocalInsightPlugin extends PluginBase implements PumpInterface, ConstraintsInterface, InsightConnectionService.StateCallback {
+@Singleton
+public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface, ConstraintsInterface, InsightConnectionService.StateCallback {
 
-    private static LocalInsightPlugin instance = null;
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final TreatmentsPlugin treatmentsPlugin;
+    private final SP sp;
+    private final CommandQueueProvider commandQueue;
+    private final ProfileFunction profileFunction;
+    private final Context context;
 
-    private Logger log = LoggerFactory.getLogger(L.PUMP);
+    public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert";
 
     private PumpDescription pumpDescription;
     private InsightAlertService alertService;
@@ -150,7 +166,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 alertService = ((InsightAlertService.LocalBinder) binder).getService();
             }
             if (connectionService != null && alertService != null) {
-                RxBus.INSTANCE.send(new EventInitializationChanged());
+                rxBus.send(new EventInitializationChanged());
             }
         }
 
@@ -181,20 +197,36 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     private boolean statusLoaded;
     private TBROverNotificationBlock tbrOverNotificationBlock;
 
-    public static LocalInsightPlugin getPlugin() {
-        if (instance == null) instance = new LocalInsightPlugin();
-        return instance;
-    }
-
-    public LocalInsightPlugin() {
+    @Inject
+    public LocalInsightPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            TreatmentsPlugin treatmentsPlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            ProfileFunction profileFunction,
+            Context context
+    ) {
         super(new PluginDescription()
-                .pluginName(R.string.insight_local)
-                .shortName(R.string.insightpump_shortname)
-                .mainType(PluginType.PUMP)
-                .description(R.string.description_pump_insight_local)
-                .fragmentClass(LocalInsightFragment.class.getName())
-                .preferencesId(MainApp.instance().getPackageName().equals("info.nightscout.androidaps")
-                        ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol));
+                        .pluginName(R.string.insight_local)
+                        .shortName(R.string.insightpump_shortname)
+                        .mainType(PluginType.PUMP)
+                        .description(R.string.description_pump_insight_local)
+                        .fragmentClass(LocalInsightFragment.class.getName())
+                        .preferencesId(Config.APS ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol),
+                injector, aapsLogger, resourceHelper, commandQueue
+
+        );
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
+        this.treatmentsPlugin = treatmentsPlugin;
+        this.sp = sp;
+        this.commandQueue = commandQueue;
+        this.profileFunction = profileFunction;
+        this.context = context;
 
         pumpDescription = new PumpDescription();
         pumpDescription.setPumpDescription(PumpType.AccuChekInsightBluetooth);
@@ -243,19 +275,24 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     @Override
     protected void onStart() {
         super.onStart();
-        MainApp.instance().bindService(new Intent(MainApp.instance(), InsightConnectionService.class), serviceConnection, Context.BIND_AUTO_CREATE);
-        MainApp.instance().bindService(new Intent(MainApp.instance(), InsightAlertService.class), serviceConnection, Context.BIND_AUTO_CREATE);
+        context.bindService(new Intent(context, InsightConnectionService.class), serviceConnection, Context.BIND_AUTO_CREATE);
+        context.bindService(new Intent(context, InsightAlertService.class), serviceConnection, Context.BIND_AUTO_CREATE);
+        createNotificationChannel();
+    }
+
+    private void createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+            NotificationChannel channel = new NotificationChannel(ALERT_CHANNEL_ID, resourceHelper.gs(R.string.insight_alert_notification_channel), NotificationManager.IMPORTANCE_HIGH);
+            channel.setSound(null, null);
+            notificationManager.createNotificationChannel(channel);
+        }
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        MainApp.instance().unbindService(serviceConnection);
-    }
-
-    @Override
-    public void switchAllowed(boolean newState, FragmentActivity activity, PluginType type) {
-        confirmPumpPluginActivation(newState, activity, type);
+        context.unbindService(serviceConnection);
     }
 
     @Override
@@ -329,11 +366,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             updatePumpTimeIfNeeded();
             fetchStatus();
         } catch (AppLayerErrorException e) {
-            log.info("Exception while fetching status: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception while fetching status: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception while fetching status: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception while fetching status: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception while fetching status", e);
+            aapsLogger.error("Exception while fetching status", e);
         }
     }
 
@@ -357,8 +394,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             SetDateTimeMessage setDateTimeMessage = new SetDateTimeMessage();
             setDateTimeMessage.setPumpTime(pumpTime);
             connectionService.requestMessage(setDateTimeMessage).await();
-            Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, MainApp.gs(R.string.pump_time_updated), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, resourceHelper.gs(R.string.pump_time_updated), Notification.INFO, 60);
+            rxBus.send(new EventNewNotification(notification));
         }
     }
 
@@ -426,8 +463,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         }
         lastUpdated = System.currentTimeMillis();
         new Handler(Looper.getMainLooper()).post(() -> {
-            RxBus.INSTANCE.send(new EventLocalInsightUpdateGUI());
-            RxBus.INSTANCE.send(new EventRefreshOverview("LocalInsightPlugin::fetchStatus"));
+            rxBus.send(new EventLocalInsightUpdateGUI());
+            rxBus.send(new EventRefreshOverview("LocalInsightPlugin::fetchStatus"));
         });
     }
 
@@ -441,10 +478,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         limitsFetched = true;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
-        RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+        PumpEnactResult result = new PumpEnactResult(getInjector());
+        rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
         List<BasalProfileBlock> profileBlocks = new ArrayList<>();
         for (int i = 0; i < profile.getBasalValues().length; i++) {
             Profile.ProfileValue basalValue = profile.getBasalValues()[i];
@@ -464,32 +501,32 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             BRProfileBlock profileBlock = new BRProfile1Block();
             profileBlock.setProfileBlocks(profileBlocks);
             ParameterBlockUtil.writeConfigurationBlock(connectionService, profileBlock);
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
+            rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60);
+            rxBus.send(new EventNewNotification(notification));
             result.success = true;
             result.enacted = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             this.profileBlocks = profileBlocks;
             try {
                 fetchStatus();
             } catch (Exception ignored) {
             }
         } catch (AppLayerErrorException e) {
-            log.info("Exception while setting profile: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while setting profile: " + e.getClass().getCanonicalName());
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName());
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while setting profile", e);
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while setting profile", e);
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            rxBus.send(new EventNewNotification(notification));
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
@@ -507,7 +544,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 nextValue = profile.getBasalValues()[i + 1];
             if (profileBlock.getDuration() * 60 != (nextValue != null ? nextValue.timeAsSeconds : 24 * 60 * 60) - basalValue.timeAsSeconds)
                 return false;
-            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > (basalValue.value > 5 ? 0.05 : 0.005))
+            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > (basalValue.value > 5 ? 0.051 : 0.0051))
                 return false;
         }
         return true;
@@ -538,9 +575,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         return batteryStatus.getBatteryAmount();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         double insulin = Math.round(detailedBolusInfo.insulin / 0.01) * 0.01;
         if (insulin > 0) {
             try {
@@ -559,9 +596,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 t.isSMB = detailedBolusInfo.isSMB;
                 final EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
                 bolusingEvent.setT(t);
-                bolusingEvent.setStatus(MainApp.gs(R.string.insight_delivered, 0d, insulin));
+                bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, 0d, insulin));
                 bolusingEvent.setPercent(0);
-                RxBus.INSTANCE.send(bolusingEvent);
+                rxBus.send(bolusingEvent);
                 int trials = 0;
                 InsightBolusID insightBolusID = new InsightBolusID();
                 insightBolusID.bolusID = bolusID;
@@ -571,7 +608,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 detailedBolusInfo.date = insightBolusID.timestamp;
                 detailedBolusInfo.source = Source.PUMP;
                 detailedBolusInfo.pumpId = insightBolusID.id;
-                TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
+                if (detailedBolusInfo.carbs > 0 && detailedBolusInfo.carbTime != 0) {
+                    DetailedBolusInfo carbInfo = new DetailedBolusInfo();
+                    carbInfo.carbs = detailedBolusInfo.carbs;
+                    carbInfo.date = detailedBolusInfo.date + detailedBolusInfo.carbTime * 60L * 1000L;
+                    carbInfo.source = Source.USER;
+                    treatmentsPlugin.addToHistoryTreatment(carbInfo, false);
+                    detailedBolusInfo.carbTime = 0;
+                    detailedBolusInfo.carbs = 0;
+                }
+                treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true);
                 while (true) {
                     synchronized ($bolusLock) {
                         if (bolusCancelled) break;
@@ -590,16 +636,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                         trials = -1;
                         int percentBefore = bolusingEvent.getPercent();
                         bolusingEvent.setPercent((int) (100D / activeBolus.getInitialAmount() * (activeBolus.getInitialAmount() - activeBolus.getRemainingAmount())));
-                        bolusingEvent.setStatus(MainApp.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount()));
+                        bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount()));
                         if (percentBefore != bolusingEvent.getPercent())
-                            RxBus.INSTANCE.send(bolusingEvent);
+                            rxBus.send(bolusingEvent);
                     } else {
                         synchronized ($bolusLock) {
                             if (bolusCancelled || trials == -1 || trials++ >= 5) {
                                 if (!bolusCancelled) {
-                                    bolusingEvent.setStatus(MainApp.gs(R.string.insight_delivered, insulin, insulin));
+                                    bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, insulin, insulin));
                                     bolusingEvent.setPercent(100);
-                                    RxBus.INSTANCE.send(bolusingEvent);
+                                    rxBus.send(bolusingEvent);
                                 }
                                 break;
                             }
@@ -610,14 +656,14 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 readHistory();
                 fetchStatus();
             } catch (AppLayerErrorException e) {
-                log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-                result.comment = ExceptionTranslator.getString(e);
+                aapsLogger.info(LTag.PUMP, "Exception while delivering bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                result.comment = ExceptionTranslator.getString(context, e);
             } catch (InsightException e) {
-                log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName());
-                result.comment = ExceptionTranslator.getString(e);
+                aapsLogger.info(LTag.PUMP, "Exception while delivering bolus: " + e.getClass().getCanonicalName());
+                result.comment = ExceptionTranslator.getString(context, e);
             } catch (Exception e) {
-                log.error("Exception while delivering bolus", e);
-                result.comment = ExceptionTranslator.getString(e);
+                aapsLogger.error("Exception while delivering bolus", e);
+                result.comment = ExceptionTranslator.getString(context, e);
             }
         } else if (detailedBolusInfo.carbs > 0) {
             result.success = true;
@@ -638,21 +684,22 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     cancelBolusMessage.setBolusID(bolusID);
                     connectionService.requestMessage(cancelBolusMessage).await();
                     bolusCancelled = true;
+                    confirmAlert(AlertType.WARNING_38);
+                    alertService.ignore(null);
                 }
-                confirmAlert(AlertType.WARNING_38);
             } catch (AppLayerErrorException e) {
-                log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                aapsLogger.info(LTag.PUMP, "Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {
-                log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName());
+                aapsLogger.info(LTag.PUMP, "Exception while canceling bolus: " + e.getClass().getCanonicalName());
             } catch (Exception e) {
-                log.error("Exception while canceling bolus", e);
+                aapsLogger.error("Exception while canceling bolus", e);
             }
         }).start();
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         if (activeBasalRate == null) return result;
         if (activeBasalRate.getActiveBasalRate() == 0) return result;
         double percent = 100D / activeBasalRate.getActiveBasalRate() * absoluteRate;
@@ -670,7 +717,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                             result.isPercent = false;
                             result.absolute = absoluteRate;
                             result.duration = durationInMinutes;
-                            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+                            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
                         } else {
                             result.comment = ebResult.comment;
                         }
@@ -690,18 +737,18 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception after setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception after setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception after setting TBR: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception after setting TBR: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception after setting TBR", e);
+            aapsLogger.error("Exception after setting TBR", e);
         }
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         percent = (int) Math.round(((double) percent) / 10d) * 10;
         if (percent == 100) return cancelTempBasal(true);
         else if (percent > 250) percent = 250;
@@ -722,23 +769,23 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.duration = durationInMinutes;
             result.success = true;
             result.enacted = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             readHistory();
             fetchStatus();
         } catch (AppLayerErrorException e) {
-            log.info("Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while setting TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while setting TBR: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while setting TBR: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while setting TBR", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while setting TBR", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
         PumpEnactResult result = cancelExtendedBolusOnly();
         if (result.success) result = setExtendedBolusOnly(insulin, durationInMinutes);
@@ -746,17 +793,17 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception after delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception after delivering extended bolus: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception after delivering extended bolus", e);
+            aapsLogger.error("Exception after delivering extended bolus", e);
         }
         return result;
     }
 
     public PumpEnactResult setExtendedBolusOnly(Double insulin, Integer durationInMinutes) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             DeliverBolusMessage bolusMessage = new DeliverBolusMessage();
             bolusMessage.setBolusType(BolusType.EXTENDED);
@@ -775,26 +822,26 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             extendedBolus.durationInMinutes = durationInMinutes;
             extendedBolus.insulin = insulin;
             extendedBolus.pumpId = insightBolusID.id;
-            TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
+            treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
             result.success = true;
             result.enacted = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         } catch (AppLayerErrorException e) {
-            log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while delivering extended bolus: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while delivering extended bolus", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while delivering extended bolus", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         PumpEnactResult cancelEBResult = null;
         if (isFakingTempsByExtendedBoluses()) cancelEBResult = cancelExtendedBolusOnly();
         PumpEnactResult cancelTBRResult = cancelTempBasalOnly();
@@ -805,17 +852,17 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception after canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception after canceling TBR: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception after canceling TBR", e);
+            aapsLogger.error("Exception after canceling TBR", e);
         }
         return result;
     }
 
     private PumpEnactResult cancelTempBasalOnly() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             alertService.ignore(AlertType.WARNING_36);
             connectionService.requestMessage(new CancelTBRMessage()).await();
@@ -824,41 +871,41 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.isTempCancel = true;
             confirmAlert(AlertType.WARNING_36);
             alertService.ignore(null);
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         } catch (NoActiveTBRToCanceLException e) {
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         } catch (AppLayerErrorException e) {
-            log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while canceling TBR: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while canceling TBR", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while canceling TBR", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = cancelExtendedBolusOnly();
         try {
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception after canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception after canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception after canceling extended bolus: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception after canceling extended bolus: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception after canceling extended bolus", e);
+            aapsLogger.error("Exception after canceling extended bolus", e);
         }
         return result;
     }
 
     private PumpEnactResult cancelExtendedBolusOnly() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             for (ActiveBolus activeBolus : activeBoluses) {
                 if (activeBolus.getBolusType() == BolusType.EXTENDED || activeBolus.getBolusType() == BolusType.MULTIWAVE) {
@@ -881,7 +928,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                                 else UploadQueue.removeID("dbAdd", _id);
                                 MainApp.getDbHelper().delete(extendedBolus);
                             } else
-                                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
+                                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
                         }
                         result.enacted = true;
                         result.success = true;
@@ -889,16 +936,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 }
             }
             result.success = true;
-            result.comment = MainApp.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
         } catch (AppLayerErrorException e) {
-            log.info("Exception while canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while canceling extended bolus: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while canceling extended bolus: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while canceling extended bolus", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while canceling extended bolus", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
@@ -917,17 +964,18 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 }
             }
         } catch (AppLayerErrorException e) {
-            log.info("Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception while confirming alert: " + e.getClass().getCanonicalName());
+            aapsLogger.info(LTag.PUMP, "Exception while confirming alert: " + e.getClass().getCanonicalName());
         } catch (Exception e) {
-            log.error("Exception while confirming alert", e);
+            aapsLogger.error("Exception while confirming alert", e);
         }
     }
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
         long now = System.currentTimeMillis();
+        if (connectionService == null) return null;
         if (System.currentTimeMillis() - connectionService.getLastConnected() > (60 * 60 * 1000)) {
             return null;
         }
@@ -940,16 +988,16 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             status.put("timestamp", DateUtil.toISOString(connectionService.getLastConnected()));
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
             try {
-                extended.put("ActiveProfile", ProfileFunctions.getInstance().getProfileName());
+                extended.put("ActiveProfile", profileFunction.getProfileName());
             } catch (Exception e) {
             }
-            TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
+            TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
                 extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
-            ExtendedBolus eb = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
+            ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
                 extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
@@ -968,29 +1016,29 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             }
             pump.put("clock", DateUtil.toISOString(now));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return pump;
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return ManufacturerType.Roche;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.AccuChekInsightBluetooth;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
         if (connectionService == null || alertService == null) return "Unknown";
         return connectionService.getPumpSystemIdentification().getSerialNumber();
     }
 
     public PumpEnactResult stopPump() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             SetOperatingModeMessage operatingModeMessage = new SetOperatingModeMessage();
             operatingModeMessage.setOperatingMode(OperatingMode.STOPPED);
@@ -1000,20 +1048,20 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception while stopping pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while stopping pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while stopping pump: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while stopping pump: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while stopping pump", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while stopping pump", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
     public PumpEnactResult startPump() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             SetOperatingModeMessage operatingModeMessage = new SetOperatingModeMessage();
             operatingModeMessage.setOperatingMode(OperatingMode.STARTED);
@@ -1023,20 +1071,20 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             fetchStatus();
             readHistory();
         } catch (AppLayerErrorException e) {
-            log.info("Exception while starting pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while starting pump: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
-            log.info("Exception while starting pump: " + e.getClass().getCanonicalName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while starting pump: " + e.getClass().getCanonicalName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
-            log.error("Exception while starting pump", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while starting pump", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
     public PumpEnactResult setTBROverNotification(boolean enabled) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         boolean valueBefore = tbrOverNotificationBlock.isEnabled();
         tbrOverNotificationBlock.setEnabled(enabled);
         try {
@@ -1045,62 +1093,62 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             result.enacted = true;
         } catch (AppLayerErrorException e) {
             tbrOverNotificationBlock.setEnabled(valueBefore);
-            log.info("Exception while updating TBR notification block: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while updating TBR notification block: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (InsightException e) {
             tbrOverNotificationBlock.setEnabled(valueBefore);
-            log.info("Exception while updating TBR notification block: " + e.getClass().getSimpleName());
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.info(LTag.PUMP, "Exception while updating TBR notification block: " + e.getClass().getSimpleName());
+            result.comment = ExceptionTranslator.getString(context, e);
         } catch (Exception e) {
             tbrOverNotificationBlock.setEnabled(valueBefore);
-            log.error("Exception while updating TBR notification block", e);
-            result.comment = ExceptionTranslator.getString(e);
+            aapsLogger.error("Exception while updating TBR notification block", e);
+            result.comment = ExceptionTranslator.getString(context, e);
         }
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
 
-    @Override
+    @NonNull @Override
     public String shortStatus(boolean veryShort) {
         StringBuilder ret = new StringBuilder();
         if (connectionService.getLastConnected() != 0) {
             Long agoMsec = System.currentTimeMillis() - connectionService.getLastConnected();
             int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret.append(MainApp.gs(R.string.short_status_last_connected, agoMin) + "\n");
+            ret.append(resourceHelper.gs(R.string.short_status_last_connected, agoMin) + "\n");
         }
         if (activeTBR != null) {
-            ret.append(MainApp.gs(R.string.short_status_tbr, activeTBR.getPercentage(),
+            ret.append(resourceHelper.gs(R.string.short_status_tbr, activeTBR.getPercentage(),
                     activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration()) + "\n");
         }
         if (activeBoluses != null) for (ActiveBolus activeBolus : activeBoluses) {
             if (activeBolus.getBolusType() == BolusType.STANDARD) continue;
-            ret.append(MainApp.gs(activeBolus.getBolusType() == BolusType.MULTIWAVE ? R.string.short_status_multiwave : R.string.short_status_extended,
+            ret.append(resourceHelper.gs(activeBolus.getBolusType() == BolusType.MULTIWAVE ? R.string.short_status_multiwave : R.string.short_status_extended,
                     activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration()) + "\n");
         }
         if (!veryShort && totalDailyDose != null) {
-            ret.append(MainApp.gs(R.string.short_status_tdd, totalDailyDose.getBolusAndBasal()) + "\n");
+            ret.append(resourceHelper.gs(R.string.short_status_tdd, totalDailyDose.getBolusAndBasal()) + "\n");
         }
         if (cartridgeStatus != null) {
-            ret.append(MainApp.gs(R.string.short_status_reservoir, cartridgeStatus.getRemainingAmount()) + "\n");
+            ret.append(resourceHelper.gs(R.string.short_status_reservoir, cartridgeStatus.getRemainingAmount()) + "\n");
         }
         if (batteryStatus != null) {
-            ret.append(MainApp.gs(R.string.short_status_battery, batteryStatus.getBatteryAmount()) + "\n");
+            ret.append(resourceHelper.gs(R.string.short_status_battery, batteryStatus.getBatteryAmount()) + "\n");
         }
         return ret.toString();
     }
 
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
-        return SP.getBoolean("insight_enable_tbr_emulation", false);
+        return sp.getBoolean("insight_enable_tbr_emulation", false);
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
-        return new PumpEnactResult().success(true);
+        return new PumpEnactResult(getInjector()).success(true);
     }
 
     @Override
@@ -1149,11 +1197,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     MainApp.getDbHelper().createOrUpdate(historyOffset);
                 }
             } catch (AppLayerErrorException e) {
-                log.info("Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+                aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {
-                log.info("Exception while reading history: " + e.getClass().getSimpleName());
+                aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getSimpleName());
             } catch (Exception e) {
-                log.error("Exception while reading history", e);
+                aapsLogger.error("Exception while reading history", e);
             } finally {
                 try {
                     connectionService.requestMessage(new StopReadingHistoryMessage()).await();
@@ -1161,13 +1209,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 }
             }
         } catch (AppLayerErrorException e) {
-            log.info("Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
+            aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
         } catch (InsightException e) {
-            log.info("Exception while reading history: " + e.getClass().getSimpleName());
+            aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getSimpleName());
         } catch (Exception e) {
-            log.error("Exception while reading history", e);
+            aapsLogger.error("Exception while reading history", e);
         }
-        new Handler(Looper.getMainLooper()).post(() -> RxBus.INSTANCE.send(new EventRefreshOverview("LocalInsightPlugin::readHistory")));
+        new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventRefreshOverview("LocalInsightPlugin::readHistory")));
     }
 
     private void processHistoryEvents(String serial, List<HistoryEvent> historyEvents) {
@@ -1192,7 +1240,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         }
         Collections.sort(temporaryBasals, (o1, o2) -> (int) (o1.date - o2.date));
         for (TemporaryBasal temporaryBasal : temporaryBasals)
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
+            treatmentsPlugin.addToHistoryTempBasal(temporaryBasal);
     }
 
     private boolean processHistoryEvent(String serial, List<TemporaryBasal> temporaryBasals, List<InsightPumpID> pumpStartedEvents, HistoryEvent event) {
@@ -1229,7 +1277,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     }
 
     private void processCannulaFilledEvent(CannulaFilledEvent event) {
-        if (!SP.getBoolean("insight_log_site_changes", false)) return;
+        if (!sp.getBoolean("insight_log_site_changes", false)) return;
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         uploadCareportalEvent(timestamp, CareportalEvent.SITECHANGE);
@@ -1250,21 +1298,21 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     }
 
     private void processTubeFilledEvent(TubeFilledEvent event) {
-        if (!SP.getBoolean("insight_log_tube_changes", false)) return;
+        if (!sp.getBoolean("insight_log_tube_changes", false)) return;
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
-        logNote(timestamp, MainApp.gs(R.string.tube_changed));
+        logNote(timestamp, resourceHelper.gs(R.string.tube_changed));
     }
 
     private void processSniffingDoneEvent(SniffingDoneEvent event) {
-        if (!SP.getBoolean("insight_log_reservoir_changes", false)) return;
+        if (!sp.getBoolean("insight_log_reservoir_changes", false)) return;
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         uploadCareportalEvent(timestamp, CareportalEvent.INSULINCHANGE);
     }
 
     private void processPowerUpEvent(PowerUpEvent event) {
-        if (!SP.getBoolean("insight_log_battery_changes", false)) return;
+        if (!sp.getBoolean("insight_log_battery_changes", false)) return;
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         uploadCareportalEvent(timestamp, CareportalEvent.PUMPBATTERYCHANGE);
@@ -1281,18 +1329,18 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             case STARTED:
                 pumpID.eventType = "PumpStarted";
                 pumpStartedEvents.add(pumpID);
-                if (SP.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, MainApp.gs(R.string.pump_started));
+                if (sp.getBoolean("insight_log_operating_mode_changes", false))
+                    logNote(timestamp, resourceHelper.gs(R.string.pump_started));
                 break;
             case STOPPED:
                 pumpID.eventType = "PumpStopped";
-                if (SP.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, MainApp.gs(R.string.pump_stopped));
+                if (sp.getBoolean("insight_log_operating_mode_changes", false))
+                    logNote(timestamp, resourceHelper.gs(R.string.pump_stopped));
                 break;
             case PAUSED:
                 pumpID.eventType = "PumpPaused";
-                if (SP.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, MainApp.gs(R.string.pump_paused));
+                if (sp.getBoolean("insight_log_operating_mode_changes", false))
+                    logNote(timestamp, resourceHelper.gs(R.string.pump_paused));
                 break;
         }
         MainApp.getDbHelper().createOrUpdate(pumpID);
@@ -1357,7 +1405,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             detailedBolusInfo.source = Source.PUMP;
             detailedBolusInfo.pumpId = bolusID.id;
             detailedBolusInfo.insulin = event.getImmediateAmount();
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
+            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true);
         }
         if ((event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE)) {
             ExtendedBolus extendedBolus = new ExtendedBolus();
@@ -1366,8 +1414,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             extendedBolus.durationInMinutes = event.getDuration();
             extendedBolus.insulin = event.getExtendedAmount();
             extendedBolus.pumpId = bolusID.id;
-            if (ProfileFunctions.getInstance().getProfile(extendedBolus.date) != null)
-                TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
+            if (profileFunction.getProfile(extendedBolus.date) != null)
+                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
         }
     }
 
@@ -1391,7 +1439,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             detailedBolusInfo.source = Source.PUMP;
             detailedBolusInfo.pumpId = bolusID.id;
             detailedBolusInfo.insulin = event.getImmediateAmount();
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
+            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, true);
         }
         if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) {
             if (event.getDuration() == 0) {
@@ -1409,14 +1457,14 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 extendedBolus.durationInMinutes = event.getDuration();
                 extendedBolus.insulin = event.getExtendedAmount();
                 extendedBolus.pumpId = bolusID.id;
-                if (ProfileFunctions.getInstance().getProfile(extendedBolus.date) != null)
-                    TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
+                if (profileFunction.getProfile(extendedBolus.date) != null)
+                    treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
             }
         }
     }
 
     private void processOccurrenceOfAlertEvent(OccurrenceOfAlertEvent event) {
-        if (!SP.getBoolean("insight_log_alerts", false)) return;
+        if (!sp.getBoolean("insight_log_alerts", false)) return;
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         Integer code = null;
@@ -1500,7 +1548,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 break;
         }
         if (code != null)
-            logNote(timestamp, MainApp.gs(R.string.insight_alert_formatter, MainApp.gs(code), MainApp.gs(title)));
+            logNote(timestamp, resourceHelper.gs(R.string.insight_alert_formatter, resourceHelper.gs(code), resourceHelper.gs(title)));
     }
 
     private long parseDate(int year, int month, int day, int hour, int minute, int second) {
@@ -1519,14 +1567,20 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             if (MainApp.getDbHelper().getCareportalEventFromTimestamp(date) != null)
                 return;
             JSONObject data = new JSONObject();
-            String enteredBy = SP.getString("careportal_enteredby", "");
+            String enteredBy = sp.getString("careportal_enteredby", "");
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", CareportalEvent.NOTE);
             data.put("notes", note);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = CareportalEvent.NOTE;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1548,40 +1602,46 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             return;
         try {
             JSONObject data = new JSONObject();
-            String enteredBy = SP.getString("careportal_enteredby", "");
+            String enteredBy = sp.getString("careportal_enteredby", "");
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", event);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = event;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    @Override
-    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
-        percentRate.setIfGreater(0, String.format(MainApp.gs(R.string.limitingpercentrate), 0, MainApp.gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getPumpDescription().maxTempPercent, String.format(MainApp.gs(R.string.limitingpercentrate), getPumpDescription().maxTempPercent, MainApp.gs(R.string.pumplimit)), this);
+    @NonNull @Override
+    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
+        percentRate.setIfGreater(getAapsLogger(), 0, String.format(resourceHelper.gs(R.string.limitingpercentrate), 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().maxTempPercent, String.format(resourceHelper.gs(R.string.limitingpercentrate), getPumpDescription().maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this);
         return percentRate;
     }
 
-    @Override
-    public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
+    @NonNull @Override
+    public Constraint<Double> applyBolusConstraints(@NonNull Constraint<Double> insulin) {
         if (!limitsFetched) return insulin;
-        insulin.setIfSmaller(maximumBolusAmount, String.format(MainApp.gs(R.string.limitingbolus), maximumBolusAmount, MainApp.gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), maximumBolusAmount, String.format(resourceHelper.gs(R.string.limitingbolus), maximumBolusAmount, resourceHelper.gs(R.string.pumplimit)), this);
         if (insulin.value() < minimumBolusAmount) {
 
             //TODO: Add function to Constraints or use different approach
             // This only works if the interface of the InsightPlugin is called last.
             // If not, another constraint could theoretically set the value between 0 and minimumBolusAmount
 
-            insulin.set(0d, String.format(MainApp.gs(R.string.limitingbolus), minimumBolusAmount, MainApp.gs(R.string.pumplimit)), this);
+            insulin.set(getAapsLogger(), 0d, String.format(resourceHelper.gs(R.string.limitingbolus), minimumBolusAmount, resourceHelper.gs(R.string.pumplimit)), this);
         }
         return insulin;
     }
 
-    @Override
-    public Constraint<Double> applyExtendedBolusConstraints(Constraint<Double> insulin) {
+    @NonNull @Override
+    public Constraint<Double> applyExtendedBolusConstraints(@NonNull Constraint<Double> insulin) {
         return applyBolusConstraints(insulin);
     }
 
@@ -1589,7 +1649,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     public void onStateChanged(InsightState state) {
         if (state == InsightState.CONNECTED) {
             statusLoaded = false;
-            new Handler(Looper.getMainLooper()).post(() -> RxBus.INSTANCE.send(new EventDismissNotification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE)));
+            new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventDismissNotification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE)));
         } else if (state == InsightState.NOT_PAIRED) {
             connectionService.withdrawConnectionRequest(this);
             statusLoaded = false;
@@ -1602,20 +1662,20 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             activeTBR = null;
             activeBoluses = null;
             tbrOverNotificationBlock = null;
-            new Handler(Looper.getMainLooper()).post(() -> RxBus.INSTANCE.send(new EventRefreshOverview("LocalInsightPlugin::onStateChanged")));
+            new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventRefreshOverview("LocalInsightPlugin::onStateChanged")));
         }
-        new Handler(Looper.getMainLooper()).post(() -> RxBus.INSTANCE.send(new EventLocalInsightUpdateGUI()));
+        new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventLocalInsightUpdateGUI()));
     }
 
     @Override
     public void onPumpPaired() {
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Pump paired", null);
+        commandQueue.readStatus("Pump paired", null);
     }
 
     @Override
     public void onTimeoutDuringHandshake() {
-        Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, MainApp.gs(R.string.timeout_during_handshake), Notification.URGENT);
-        new Handler(Looper.getMainLooper()).post(() -> RxBus.INSTANCE.send(new EventNewNotification(notification)));
+        Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, resourceHelper.gs(R.string.timeout_during_handshake), Notification.URGENT);
+        new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventNewNotification(notification)));
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index 77be3ab03a..65034d321a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -14,17 +14,19 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
-import java.text.DecimalFormat;
+import javax.inject.Inject;
 
+import dagger.android.support.DaggerAppCompatActivity;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
+import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils;
 
-public class InsightAlertActivity extends NoSplashAppCompatActivity {
+public class InsightAlertActivity extends DaggerAppCompatActivity {
+
+    @Inject AlertUtils alertUtils;
 
-    private Alert alert;
     private InsightAlertService alertService;
 
     private ImageView icon;
@@ -38,10 +40,10 @@ public class InsightAlertActivity extends NoSplashAppCompatActivity {
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
             alertService = ((InsightAlertService.LocalBinder) binder).getService();
-            alertService.setAlertActivity(InsightAlertActivity.this);
-            alert = alertService.getAlert();
-            if (alert == null) finish();
-            else update(alert);
+            alertService.getAlertLiveData().observe(InsightAlertActivity.this, alert -> {
+                if (alert == null) finish();
+                else update(alert);
+            });
         }
 
         @Override
@@ -70,174 +72,22 @@ public class InsightAlertActivity extends NoSplashAppCompatActivity {
                 | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
-        layoutParams.screenBrightness = 1.0F;
-        getWindow().setAttributes(layoutParams);
     }
 
     @Override
     protected void onDestroy() {
-        alertService.setAlertActivity(null);
         unbindService(serviceConnection);
         super.onDestroy();
     }
 
     public void update(Alert alert) {
-        this.alert = alert;
         mute.setEnabled(true);
         mute.setVisibility(alert.getAlertStatus() == AlertStatus.SNOOZED ? View.GONE : View.VISIBLE);
         confirm.setEnabled(true);
-        int icon = 0;
-        int code = 0;
-        int title = 0;
-        String description = null;
-        switch (alert.getAlertCategory()) {
-            case ERROR:
-                icon = R.drawable.ic_error;
-                break;
-            case MAINTENANCE:
-                icon = R.drawable.ic_maintenance;
-                break;
-            case WARNING:
-                icon = R.drawable.ic_warning;
-                break;
-            case REMINDER:
-                icon = R.drawable.ic_reminder;
-                break;
-        }
-        DecimalFormat decimalFormat = new DecimalFormat("##0.00");
-        int hours = alert.getTBRDuration() / 60;
-        int minutes = alert.getTBRDuration() - hours * 60;
-        switch (alert.getAlertType()) {
-            case REMINDER_01:
-                code = R.string.alert_r1_code;
-                title = R.string.alert_r1_title;
-                break;
-            case REMINDER_02:
-                code = R.string.alert_r2_code;
-                title = R.string.alert_r2_title;
-                break;
-            case REMINDER_03:
-                code = R.string.alert_r3_code;
-                title = R.string.alert_r3_title;
-                break;
-            case REMINDER_04:
-                code = R.string.alert_r4_code;
-                title = R.string.alert_r4_title;
-                break;
-            case REMINDER_07:
-                code = R.string.alert_r7_code;
-                title = R.string.alert_r7_title;
-                description = getString(R.string.alert_r7_description, alert.getTBRAmount(), new DecimalFormat("#0").format(hours) + ":" + new DecimalFormat("00").format(minutes));
-                break;
-            case WARNING_31:
-                code = R.string.alert_w31_code;
-                title = R.string.alert_w31_title;
-                description = getString(R.string.alert_w31_description, decimalFormat.format(alert.getCartridgeAmount()));
-                break;
-            case WARNING_32:
-                code = R.string.alert_w32_code;
-                title = R.string.alert_w32_title;
-                description = getString(R.string.alert_w32_description);
-                break;
-            case WARNING_33:
-                code = R.string.alert_w33_code;
-                title = R.string.alert_w33_title;
-                description = getString(R.string.alert_w33_description);
-                break;
-            case WARNING_34:
-                code = R.string.alert_w34_code;
-                title = R.string.alert_w34_title;
-                description = getString(R.string.alert_w34_description);
-                break;
-            case WARNING_36:
-                code = R.string.alert_w36_code;
-                title = R.string.alert_w36_title;
-                description = getString(R.string.alert_w36_description, alert.getTBRAmount(), new DecimalFormat("#0").format(hours) + ":" + new DecimalFormat("00").format(minutes));
-                break;
-            case WARNING_38:
-                code = R.string.alert_w38_code;
-                title = R.string.alert_w38_title;
-                description = getString(R.string.alert_w38_description, decimalFormat.format(alert.getProgrammedBolusAmount()), decimalFormat.format(alert.getDeliveredBolusAmount()));
-                break;
-            case WARNING_39:
-                code = R.string.alert_w39_code;
-                title = R.string.alert_w39_title;
-                break;
-            case MAINTENANCE_20:
-                code = R.string.alert_m20_code;
-                title = R.string.alert_m20_title;
-                description = getString(R.string.alert_m20_description);
-                break;
-            case MAINTENANCE_21:
-                code = R.string.alert_m21_code;
-                title = R.string.alert_m21_title;
-                description = getString(R.string.alert_m21_description);
-                break;
-            case MAINTENANCE_22:
-                code = R.string.alert_m22_code;
-                title = R.string.alert_m22_title;
-                description = getString(R.string.alert_m22_description);
-                break;
-            case MAINTENANCE_23:
-                code = R.string.alert_m23_code;
-                title = R.string.alert_m23_title;
-                description = getString(R.string.alert_m23_description);
-                break;
-            case MAINTENANCE_24:
-                code = R.string.alert_m24_code;
-                title = R.string.alert_m24_title;
-                description = getString(R.string.alert_m24_description);
-                break;
-            case MAINTENANCE_25:
-                code = R.string.alert_m25_code;
-                title = R.string.alert_m25_title;
-                description = getString(R.string.alert_m25_description);
-                break;
-            case MAINTENANCE_26:
-                code = R.string.alert_m26_code;
-                title = R.string.alert_m26_title;
-                description = getString(R.string.alert_m26_description);
-                break;
-            case MAINTENANCE_27:
-                code = R.string.alert_m27_code;
-                title = R.string.alert_m27_title;
-                description = getString(R.string.alert_m27_description);
-                break;
-            case MAINTENANCE_28:
-                code = R.string.alert_m28_code;
-                title = R.string.alert_m28_title;
-                description = getString(R.string.alert_m28_description);
-                break;
-            case MAINTENANCE_29:
-                code = R.string.alert_m29_code;
-                title = R.string.alert_m29_title;
-                description = getString(R.string.alert_m29_description);
-                break;
-            case MAINTENANCE_30:
-                code = R.string.alert_m30_code;
-                title = R.string.alert_m30_title;
-                description = getString(R.string.alert_m30_description);
-                break;
-            case ERROR_6:
-                code = R.string.alert_e6_code;
-                title = R.string.alert_e6_title;
-                description = getString(R.string.alert_e6_description);
-                break;
-            case ERROR_10:
-                code = R.string.alert_e10_code;
-                title = R.string.alert_e10_title;
-                description = getString(R.string.alert_e10_description);
-                break;
-            case ERROR_13:
-                code = R.string.alert_e13_code;
-                title = R.string.alert_e13_title;
-                description = getString(R.string.alert_e13_description);
-                break;
-        }
-        this.icon.setImageDrawable(ContextCompat.getDrawable(this, icon));
-        this.errorCode.setText(code);
-        this.errorTitle.setText(title);
+        this.icon.setImageDrawable(ContextCompat.getDrawable(this, alertUtils.getAlertIcon(alert.getAlertCategory())));
+        this.errorCode.setText(alertUtils.getAlertCode(alert.getAlertType()));
+        this.errorTitle.setText(alertUtils.getAlertTitle(alert.getAlertType()));
+        String description = alertUtils.getAlertDescription(alert);
         if (description == null) this.errorDescription.setVisibility(View.GONE);
         else {
             this.errorDescription.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
index f6b3dc588c..4af9965a90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryEventIDs;
 import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
@@ -7,7 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class HistoryEvent implements Comparable<HistoryEvent> {
-    private static final Logger log = LoggerFactory.getLogger(HistoryEvent.class);
+    private static final Logger log = StacktraceLoggerWrapper.getLogger(HistoryEvent.class);
 
     private int eventYear;
     private int eventMonth;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
index cecb631776..a646cc9f05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
-import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
@@ -8,10 +7,9 @@ import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.PowerManager;
+
 import androidx.annotation.Nullable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.spongycastle.crypto.InvalidCipherTextException;
 
 import java.io.IOException;
@@ -19,7 +17,11 @@ import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.logging.L;
+import javax.inject.Inject;
+
+import dagger.android.DaggerService;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
@@ -82,11 +84,12 @@ import info.nightscout.androidaps.plugins.pump.insight.utils.PairingDataStorage;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.Cryptograph;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.DerivedKeys;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.KeyPair;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-public class InsightConnectionService extends Service implements ConnectionEstablisher.Callback, InputStreamReader.Callback, OutputStreamWriter.Callback {
+public class InsightConnectionService extends DaggerService implements ConnectionEstablisher.Callback, InputStreamReader.Callback, OutputStreamWriter.Callback {
 
-    private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
 
     private static final int BUFFER_SIZE = 1024;
     private static final int TIMEOUT_DURING_HANDSHAKE_NOTIFICATION_THRESHOLD = 3;
@@ -138,10 +141,10 @@ public class InsightConnectionService extends Service implements ConnectionEstab
     }
 
     private void increaseRecoveryDuration() {
-        long maxRecoveryDuration = SP.getInt("insight_max_recovery_duration", 20);
+        long maxRecoveryDuration = sp.getInt("insight_max_recovery_duration", 20);
         maxRecoveryDuration = Math.min(maxRecoveryDuration, 20);
         maxRecoveryDuration = Math.max(maxRecoveryDuration, 0);
-        long minRecoveryDuration = SP.getInt("insight_min_recovery_duration", 5);
+        long minRecoveryDuration = sp.getInt("insight_min_recovery_duration", 5);
         minRecoveryDuration = Math.min(minRecoveryDuration, 20);
         minRecoveryDuration = Math.max(minRecoveryDuration, 0);
         recoveryDuration += 1000;
@@ -251,6 +254,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
 
     @Override
     public synchronized void onCreate() {
+        super.onCreate();
         pairingDataStorage = new PairingDataStorage(this);
         state = pairingDataStorage.isPaired() ? InsightState.DISCONNECTED : InsightState.NOT_PAIRED;
         wakeLock = ((PowerManager) getSystemService(POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:InsightConnectionService");
@@ -264,7 +268,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
         else if (!wakeLock.isHeld()) wakeLock.acquire();
         this.state = state;
         for (StateCallback stateCallback : stateCallbacks) stateCallback.onStateChanged(state);
-        log.info("Insight state changed: " + state.name());
+        aapsLogger.info(LTag.PUMP, "Insight state changed: " + state.name());
     }
 
     public synchronized void requestConnection(Object lock) {
@@ -291,10 +295,10 @@ public class InsightConnectionService extends Service implements ConnectionEstab
                 setState(InsightState.DISCONNECTED);
                 cleanup(true);
             } else if (state != InsightState.DISCONNECTED) {
-                long disconnectTimeout = SP.getInt("insight_disconnect_delay", 5);
+                long disconnectTimeout = sp.getInt("insight_disconnect_delay", 5);
                 disconnectTimeout = Math.min(disconnectTimeout, 15);
                 disconnectTimeout = Math.max(disconnectTimeout, 0);
-                log.info("Last connection lock released, will disconnect in " + disconnectTimeout + " seconds");
+                aapsLogger.info(LTag.PUMP, "Last connection lock released, will disconnect in " + disconnectTimeout + " seconds");
                 disconnectTimer = DelayedActionThread.runDelayed("Disconnect Timer", disconnectTimeout * 1000, this::disconnect);
             }
         }
@@ -353,7 +357,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
             case RECOVERING:
                 return;
         }
-        log.info("Exception occurred: " + e.getClass().getSimpleName());
+        aapsLogger.info(LTag.PUMP, "Exception occurred: " + e.getClass().getSimpleName());
         if (pairingDataStorage.isPaired()) {
             if (e instanceof TimeoutException && (state == InsightState.SATL_SYN_REQUEST || state == InsightState.APP_CONNECT_MESSAGE)) {
                 if (++timeoutDuringHandshakeCounter == TIMEOUT_DURING_HANDSHAKE_NOTIFICATION_THRESHOLD) {
@@ -411,7 +415,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
             throw new IllegalStateException("Pump must be unbonded first.");
         if (connectionRequests.size() == 0)
             throw new IllegalStateException("A connection lock must be hold for pairing");
-        log.info("Pairing initiated");
+        aapsLogger.info(LTag.PUMP, "Pairing initiated");
         cleanup(true);
         pairingDataStorage.setMacAddress(macAddress);
         connect();
@@ -742,7 +746,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
                 SystemIdentification systemIdentification = ((SystemIdentificationBlock) message.getParameterBlock()).getSystemIdentification();
                 pairingDataStorage.setSystemIdentification(systemIdentification);
                 pairingDataStorage.setPaired(true);
-                log.info("Pairing completed YEE-HAW ♪ ┏(・o･)┛ ♪ ┗( ･o･)┓ ♪");
+                aapsLogger.info(LTag.PUMP, "Pairing completed YEE-HAW ♪ ┏(・o･)┛ ♪ ┗( ･o･)┓ ♪");
                 setState(InsightState.CONNECTED);
                 for (StateCallback stateCallback : stateCallbacks) stateCallback.onPumpPaired();
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
index 8f6668c1ca..028fcb3b71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
@@ -83,4 +83,24 @@ public class Alert {
     public double getCartridgeAmount() {
         return cartridgeAmount;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Alert alert = (Alert) o;
+
+        if (alertId != alert.alertId) return false;
+        if (tbrAmount != alert.tbrAmount) return false;
+        if (tbrDuration != alert.tbrDuration) return false;
+        if (Double.compare(alert.programmedBolusAmount, programmedBolusAmount) != 0)
+            return false;
+        if (Double.compare(alert.deliveredBolusAmount, deliveredBolusAmount) != 0)
+            return false;
+        if (Double.compare(alert.cartridgeAmount, cartridgeAmount) != 0) return false;
+        if (alertCategory != alert.alertCategory) return false;
+        if (alertType != alert.alertType) return false;
+        return alertStatus == alert.alertStatus;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
new file mode 100644
index 0000000000..8e26c318c5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
@@ -0,0 +1,113 @@
+package info.nightscout.androidaps.plugins.pump.insight.utils
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertCategory
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.text.DecimalFormat
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AlertUtils @Inject constructor(private val resourceHelper: ResourceHelper) {
+
+    fun getAlertCode(alertType: AlertType) = resourceHelper.gs(when (alertType) {
+        AlertType.REMINDER_01    -> R.string.alert_r1_code
+        AlertType.REMINDER_02    -> R.string.alert_r2_code
+        AlertType.REMINDER_03    -> R.string.alert_r3_code
+        AlertType.REMINDER_04    -> R.string.alert_r4_code
+        AlertType.REMINDER_07    -> R.string.alert_r7_code
+        AlertType.WARNING_31     -> R.string.alert_w31_code
+        AlertType.WARNING_32     -> R.string.alert_w32_code
+        AlertType.WARNING_33     -> R.string.alert_w33_code
+        AlertType.WARNING_34     -> R.string.alert_w34_code
+        AlertType.WARNING_36     -> R.string.alert_w36_code
+        AlertType.WARNING_38     -> R.string.alert_w38_code
+        AlertType.WARNING_39     -> R.string.alert_w39_code
+        AlertType.MAINTENANCE_20 -> R.string.alert_m20_code
+        AlertType.MAINTENANCE_21 -> R.string.alert_m21_code
+        AlertType.MAINTENANCE_22 -> R.string.alert_m22_code
+        AlertType.MAINTENANCE_23 -> R.string.alert_m23_code
+        AlertType.MAINTENANCE_24 -> R.string.alert_m24_code
+        AlertType.MAINTENANCE_25 -> R.string.alert_m25_code
+        AlertType.MAINTENANCE_26 -> R.string.alert_m26_code
+        AlertType.MAINTENANCE_27 -> R.string.alert_m27_code
+        AlertType.MAINTENANCE_28 -> R.string.alert_m28_code
+        AlertType.MAINTENANCE_29 -> R.string.alert_m29_code
+        AlertType.MAINTENANCE_30 -> R.string.alert_m30_code
+        AlertType.ERROR_6        -> R.string.alert_e6_code
+        AlertType.ERROR_10       -> R.string.alert_e10_code
+        AlertType.ERROR_13       -> R.string.alert_e13_code
+    })
+
+    fun getAlertTitle(alertType: AlertType) = resourceHelper.gs(when (alertType) {
+        AlertType.REMINDER_01    -> R.string.alert_r1_title
+        AlertType.REMINDER_02    -> R.string.alert_r2_title
+        AlertType.REMINDER_03    -> R.string.alert_r3_title
+        AlertType.REMINDER_04    -> R.string.alert_r4_title
+        AlertType.REMINDER_07    -> R.string.alert_r7_title
+        AlertType.WARNING_31     -> R.string.alert_w31_title
+        AlertType.WARNING_32     -> R.string.alert_w32_title
+        AlertType.WARNING_33     -> R.string.alert_w33_title
+        AlertType.WARNING_34     -> R.string.alert_w34_title
+        AlertType.WARNING_36     -> R.string.alert_w36_title
+        AlertType.WARNING_38     -> R.string.alert_w38_title
+        AlertType.WARNING_39     -> R.string.alert_w39_title
+        AlertType.MAINTENANCE_20 -> R.string.alert_m20_title
+        AlertType.MAINTENANCE_21 -> R.string.alert_m21_title
+        AlertType.MAINTENANCE_22 -> R.string.alert_m22_title
+        AlertType.MAINTENANCE_23 -> R.string.alert_m23_title
+        AlertType.MAINTENANCE_24 -> R.string.alert_m24_title
+        AlertType.MAINTENANCE_25 -> R.string.alert_m25_title
+        AlertType.MAINTENANCE_26 -> R.string.alert_m26_title
+        AlertType.MAINTENANCE_27 -> R.string.alert_m27_title
+        AlertType.MAINTENANCE_28 -> R.string.alert_m28_title
+        AlertType.MAINTENANCE_29 -> R.string.alert_m29_title
+        AlertType.MAINTENANCE_30 -> R.string.alert_m30_title
+        AlertType.ERROR_6        -> R.string.alert_e6_title
+        AlertType.ERROR_10       -> R.string.alert_e10_title
+        AlertType.ERROR_13       -> R.string.alert_e13_title
+    })
+
+    fun getAlertDescription(alert: Alert): String? {
+        val decimalFormat = DecimalFormat("##0.00")
+        val hours = alert.tbrDuration / 60
+        val minutes = alert.tbrDuration - hours * 60
+        return when (alert.alertType!!) {
+            AlertType.REMINDER_01    -> null
+            AlertType.REMINDER_02    -> null
+            AlertType.REMINDER_03    -> null
+            AlertType.REMINDER_04    -> null
+            AlertType.REMINDER_07    -> resourceHelper.gs(R.string.alert_r7_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+            AlertType.WARNING_31     -> resourceHelper.gs(R.string.alert_w31_description, decimalFormat.format(alert.cartridgeAmount))
+            AlertType.WARNING_32     -> resourceHelper.gs(R.string.alert_w32_description)
+            AlertType.WARNING_33     -> resourceHelper.gs(R.string.alert_w33_description)
+            AlertType.WARNING_34     -> resourceHelper.gs(R.string.alert_w34_description)
+            AlertType.WARNING_36     -> resourceHelper.gs(R.string.alert_w36_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+            AlertType.WARNING_38     -> resourceHelper.gs(R.string.alert_w38_description, decimalFormat.format(alert.programmedBolusAmount), decimalFormat.format(alert.deliveredBolusAmount))
+            AlertType.WARNING_39     -> null
+            AlertType.MAINTENANCE_20 -> resourceHelper.gs(R.string.alert_m20_description)
+            AlertType.MAINTENANCE_21 -> resourceHelper.gs(R.string.alert_m21_description)
+            AlertType.MAINTENANCE_22 -> resourceHelper.gs(R.string.alert_m22_description)
+            AlertType.MAINTENANCE_23 -> resourceHelper.gs(R.string.alert_m23_description)
+            AlertType.MAINTENANCE_24 -> resourceHelper.gs(R.string.alert_m24_description)
+            AlertType.MAINTENANCE_25 -> resourceHelper.gs(R.string.alert_m25_description)
+            AlertType.MAINTENANCE_26 -> resourceHelper.gs(R.string.alert_m26_description)
+            AlertType.MAINTENANCE_27 -> resourceHelper.gs(R.string.alert_m27_description)
+            AlertType.MAINTENANCE_28 -> resourceHelper.gs(R.string.alert_m28_description)
+            AlertType.MAINTENANCE_29 -> resourceHelper.gs(R.string.alert_m29_description)
+            AlertType.MAINTENANCE_30 -> resourceHelper.gs(R.string.alert_m30_description)
+            AlertType.ERROR_6        -> resourceHelper.gs(R.string.alert_e6_description)
+            AlertType.ERROR_10       -> resourceHelper.gs(R.string.alert_e10_description)
+            AlertType.ERROR_13       -> resourceHelper.gs(R.string.alert_e13_description)
+        }
+    }
+
+    fun getAlertIcon(alertCategory: AlertCategory) = when (alertCategory) {
+        AlertCategory.ERROR       -> R.drawable.ic_error
+        AlertCategory.MAINTENANCE -> R.drawable.ic_maintenance
+        AlertCategory.WARNING     -> R.drawable.ic_warning
+        AlertCategory.REMINDER    -> R.drawable.ic_reminder
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
index 7eda84d01b..d756a803f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
@@ -8,7 +8,6 @@ import android.widget.Toast;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.ConnectionFailedException;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.ConnectionLostException;
@@ -44,12 +43,12 @@ public class ExceptionTranslator {
         TABLE.put(RunModeNotAllowedException.class, R.string.run_mode_not_allowed);
     }
 
-    public static String getString(Exception exception) {
+    public static String getString(Context context, Exception exception) {
         Integer res = TABLE.get(exception.getClass());
-        return res == null ? exception.getClass().getSimpleName() : MainApp.gs(res);
+        return res == null ? exception.getClass().getSimpleName() : context.getString(res);
     }
 
     public static void makeToast(Context context, Exception exception) {
-        new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, getString(exception), Toast.LENGTH_LONG).show());
+        new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(context, getString(context, exception), Toast.LENGTH_LONG).show());
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index 21cac73d5d..d494912990 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -1,24 +1,30 @@
 package info.nightscout.androidaps.plugins.pump.mdi;
 
+import androidx.annotation.NonNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 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.logging.L;
+import info.nightscout.androidaps.interfaces.PumpPluginBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
@@ -26,30 +32,35 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class MDIPlugin extends PluginBase implements PumpInterface {
-    private static Logger log = LoggerFactory.getLogger(MDIPlugin.class);
-
-    private static MDIPlugin plugin = null;
-
-    public static MDIPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new MDIPlugin();
-        return plugin;
-    }
+@Singleton
+public class MDIPlugin extends PumpPluginBase implements PumpInterface {
 
+    private TreatmentsPlugin treatmentsPlugin;
     private PumpDescription pumpDescription = new PumpDescription();
 
-    private MDIPlugin() {
+    @Inject
+    public MDIPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            CommandQueueProvider commandQueue,
+            TreatmentsPlugin treatmentsPlugin
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.PUMP)
-                .pluginName(R.string.mdi)
-                .description(R.string.description_pump_mdi)
+                        .mainType(PluginType.PUMP)
+                        .pluginName(R.string.mdi)
+                        .description(R.string.description_pump_mdi),
+                injector, aapsLogger, resourceHelper, commandQueue
         );
+        this.treatmentsPlugin = treatmentsPlugin;
+
         pumpDescription.isBolusCapable = true;
         pumpDescription.bolusStep = 0.5d;
 
@@ -64,10 +75,10 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
         return false;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult loadTDDs() {
         //no result, could read DB in the future?
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         return result;
     }
 
@@ -121,10 +132,10 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     public void getPumpStatus() {
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
         // Do nothing here. we are using ConfigBuilderPlugin.getPlugin().getActiveProfile().getProfile();
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         return result;
     }
@@ -145,19 +156,23 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     }
 
     @Override
-    public double getReservoirLevel() { return -1; }
+    public double getReservoirLevel() {
+        return -1;
+    }
 
     @Override
-    public int getBatteryLevel() { return -1; }
+    public int getBatteryLevel() {
+        return -1;
+    }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         result.bolusDelivered = detailedBolusInfo.insulin;
         result.carbsDelivered = detailedBolusInfo.carbs;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
+        result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+        treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
         return result;
     }
 
@@ -165,57 +180,52 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     public void stopBolusDelivering() {
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = false;
-        result.comment = MainApp.gs(R.string.pumperror);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Setting temp basal absolute: " + result);
+        result.comment = getResourceHelper().gs(R.string.pumperror);
+        getAapsLogger().debug(LTag.PUMPBTCOMM, "Setting temp basal absolute: " + result);
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = false;
-        result.comment = MainApp.gs(R.string.pumperror);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Settings temp basal percent: " + result);
+        result.comment = getResourceHelper().gs(R.string.pumperror);
+        getAapsLogger().debug(LTag.PUMPBTCOMM, "Settings temp basal percent: " + result);
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = false;
-        result.comment = MainApp.gs(R.string.pumperror);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Setting extended bolus: " + result);
+        result.comment = getResourceHelper().gs(R.string.pumperror);
+        getAapsLogger().debug(LTag.PUMPBTCOMM, "Setting extended bolus: " + result);
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = false;
-        result.comment = MainApp.gs(R.string.pumperror);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Cancel temp basal: " + result);
+        result.comment = getResourceHelper().gs(R.string.pumperror);
+        getAapsLogger().debug(LTag.PUMPBTCOMM, "Cancel temp basal: " + result);
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
+        PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = false;
-        result.comment = MainApp.gs(R.string.pumperror);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Canceling extended bolus: " + result);
+        result.comment = getResourceHelper().gs(R.string.pumperror);
+        getAapsLogger().debug(LTag.PUMPBTCOMM, "Canceling extended bolus: " + result);
         return result;
     }
 
-    @Override
+    @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
         long now = System.currentTimeMillis();
         JSONObject pump = new JSONObject();
@@ -238,27 +248,27 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
         return pump;
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return ManufacturerType.AndroidAPS;
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return PumpType.MDI;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
         return InstanceId.INSTANCE.instanceId();
     }
 
-    @Override
+    @NonNull @Override
     public PumpDescription getPumpDescription() {
         return pumpDescription;
     }
 
-    @Override
+    @NonNull @Override
     public String shortStatus(boolean veryShort) {
         return model().getModel();
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 69e0e0bbe8..05ff1cf463 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -7,15 +7,17 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
@@ -31,18 +33,30 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPu
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.events.EventQueueChanged
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.SetWarnColor
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.medtronic_fragment.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 
+class MedtronicFragment : DaggerFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
 
-class MedtronicFragment : Fragment() {
-    private val log = LoggerFactory.getLogger(L.PUMP)
     private var disposable: CompositeDisposable = CompositeDisposable()
 
     private val loopHandler = Handler()
@@ -62,9 +76,9 @@ class MedtronicFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        medtronic_pumpstatus.setBackgroundColor(MainApp.gc(R.color.colorInitializingBorder))
+        medtronic_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        medtronic_rl_status.text = MainApp.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+        medtronic_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.MedtronicPump))
 
         medtronic_pump_status.setTextColor(Color.WHITE)
         medtronic_pump_status.text = "{fa-bed}"
@@ -73,17 +87,17 @@ class MedtronicFragment : Fragment() {
             if (MedtronicUtil.getPumpStatus().verifyConfiguration()) {
                 startActivity(Intent(context, MedtronicHistoryActivity::class.java))
             } else {
-                MedtronicUtil.displayNotConfiguredDialog(context)
+                displayNotConfiguredDialog()
             }
         }
 
         medtronic_refresh.setOnClickListener {
             if (!MedtronicUtil.getPumpStatus().verifyConfiguration()) {
-                MedtronicUtil.displayNotConfiguredDialog(context)
+                displayNotConfiguredDialog()
             } else {
                 medtronic_refresh.isEnabled = false
-                MedtronicPumpPlugin.getPlugin().resetStatusState()
-                ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("Clicked refresh", object : Callback() {
+                medtronicPumpPlugin.resetStatusState()
+                commandQueue.readStatus("Clicked refresh", object : Callback() {
                     override fun run() {
                         activity?.runOnUiThread { medtronic_refresh?.isEnabled = true }
                     }
@@ -95,7 +109,7 @@ class MedtronicFragment : Fragment() {
             if (MedtronicUtil.getPumpStatus().verifyConfiguration()) {
                 startActivity(Intent(context, RileyLinkStatusActivity::class.java))
             } else {
-                MedtronicUtil.displayNotConfiguredDialog(context)
+                displayNotConfiguredDialog()
             }
         }
     }
@@ -104,47 +118,45 @@ class MedtronicFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
-        disposable += RxBus
-                .toObservable(EventRefreshButtonState::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ medtronic_refresh.isEnabled = it.newState }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventMedtronicDeviceStatusChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    if (L.isEnabled(L.PUMP))
-                        log.info("onStatusEvent(EventMedtronicDeviceStatusChange): {}", it)
-                    setDeviceStatus()
-                }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventMedtronicPumpValuesChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventExtendedBolusChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventTempBasalChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventMedtronicPumpConfigurationChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    if (L.isEnabled(L.PUMP))
-                        log.debug("EventMedtronicPumpConfigurationChanged triggered")
-                    MedtronicUtil.getPumpStatus().verifyConfiguration()
-                    updateGUI()
-                }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventPumpStatusChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
-        disposable += RxBus
-                .toObservable(EventQueueChanged::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGUI() }, { FabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventRefreshButtonState::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ medtronic_refresh.isEnabled = it.newState }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventMedtronicDeviceStatusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                aapsLogger.debug(LTag.PUMP, "onStatusEvent(EventMedtronicDeviceStatusChange): $it")
+                setDeviceStatus()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventMedtronicPumpValuesChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventMedtronicPumpConfigurationChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                aapsLogger.debug(LTag.PUMP, "EventMedtronicPumpConfigurationChanged triggered")
+                MedtronicUtil.getPumpStatus().verifyConfiguration()
+                updateGUI()
+            }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventQueueChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
 
         updateGUI()
     }
@@ -160,61 +172,63 @@ class MedtronicFragment : Fragment() {
     private fun setDeviceStatus() {
         val pumpStatus: MedtronicPumpStatus = MedtronicUtil.getPumpStatus()
         pumpStatus.rileyLinkServiceState = checkStatusSet(pumpStatus.rileyLinkServiceState,
-                RileyLinkUtil.getServiceState()) as RileyLinkServiceState?
+            RileyLinkUtil.getServiceState()) as RileyLinkServiceState?
 
         val resourceId = pumpStatus.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.MedtronicPump)
         val rileyLinkError = RileyLinkUtil.getError()
         medtronic_rl_status.text =
-                when {
-                    pumpStatus.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> MainApp.gs(resourceId)
-                    pumpStatus.rileyLinkServiceState.isConnecting -> "{fa-bluetooth-b spin}   " + MainApp.gs(resourceId)
-                    pumpStatus.rileyLinkServiceState.isError && rileyLinkError == null -> "{fa-bluetooth-b}   " + MainApp.gs(resourceId)
-                    pumpStatus.rileyLinkServiceState.isError && rileyLinkError != null -> "{fa-bluetooth-b}   " + MainApp.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
-                    else -> "{fa-bluetooth-b}   " + MainApp.gs(resourceId)
-                }
+            when {
+                pumpStatus.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
+                pumpStatus.rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
+                pumpStatus.rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                pumpStatus.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                else                                                                 -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+            }
         medtronic_rl_status.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
         pumpStatus.rileyLinkError = checkStatusSet(pumpStatus.rileyLinkError, RileyLinkUtil.getError()) as RileyLinkError?
 
         medtronic_errors.text =
-                pumpStatus.rileyLinkError?.let {
-                    MainApp.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
-                } ?: "-"
+            pumpStatus.rileyLinkError?.let {
+                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+            } ?: "-"
 
         pumpStatus.pumpDeviceState = checkStatusSet(pumpStatus.pumpDeviceState,
-                MedtronicUtil.getPumpDeviceState()) as PumpDeviceState?
+            MedtronicUtil.getPumpDeviceState()) as PumpDeviceState?
 
         when (pumpStatus.pumpDeviceState) {
             null,
-            PumpDeviceState.Sleeping -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
+            PumpDeviceState.Sleeping             -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
             PumpDeviceState.NeverContacted,
             PumpDeviceState.WakingUp,
             PumpDeviceState.PumpUnreachable,
             PumpDeviceState.ErrorWhenCommunicating,
             PumpDeviceState.TimeoutWhenCommunicating,
-            PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + MainApp.gs(pumpStatus.pumpDeviceState.resourceId)
-            PumpDeviceState.Active -> {
+            PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + resourceHelper.gs(pumpStatus.pumpDeviceState.resourceId)
+
+            PumpDeviceState.Active               -> {
                 val cmd = MedtronicUtil.getCurrentCommand()
                 if (cmd == null)
-                    medtronic_pump_status.text = " " + MainApp.gs(pumpStatus.pumpDeviceState.resourceId)
+                    medtronic_pump_status.text = " " + resourceHelper.gs(pumpStatus.pumpDeviceState.resourceId)
                 else {
-                    log.debug("Command: " + cmd)
+                    aapsLogger.debug(LTag.PUMP, "Command: " + cmd)
                     val cmdResourceId = cmd.resourceId
                     if (cmd == MedtronicCommandType.GetHistoryData) {
                         medtronic_pump_status.text = MedtronicUtil.frameNumber?.let {
-                            MainApp.gs(cmdResourceId, MedtronicUtil.pageNumber, MedtronicUtil.frameNumber)
+                            resourceHelper.gs(cmdResourceId, MedtronicUtil.pageNumber, MedtronicUtil.frameNumber)
                         }
-                                ?: MainApp.gs(R.string.medtronic_cmd_desc_get_history_request, MedtronicUtil.pageNumber)
+                            ?: resourceHelper.gs(R.string.medtronic_cmd_desc_get_history_request, MedtronicUtil.pageNumber)
                     } else {
-                        medtronic_pump_status.text = " " + (cmdResourceId?.let { MainApp.gs(it) }
-                                ?: cmd.getCommandDescription())
+                        medtronic_pump_status.text = " " + (cmdResourceId?.let { resourceHelper.gs(it) }
+                            ?: cmd.getCommandDescription())
                     }
                 }
             }
-            else -> log.warn("Unknown pump state: " + pumpStatus.pumpDeviceState)
+
+            else                                 -> aapsLogger.warn(LTag.PUMP, "Unknown pump state: " + pumpStatus.pumpDeviceState)
         }
 
-        val status = ConfigBuilderPlugin.getPlugin().commandQueue.spannedStatus()
+        val status = commandQueue.spannedStatus()
         if (status.toString() == "") {
             medtronic_queue.visibility = View.GONE
         } else {
@@ -223,7 +237,6 @@ class MedtronicFragment : Fragment() {
         }
     }
 
-
     private fun checkStatusSet(object1: Any?, object2: Any?): Any? {
         return if (object1 == null) {
             object2
@@ -235,18 +248,24 @@ class MedtronicFragment : Fragment() {
         }
     }
 
+    private fun displayNotConfiguredDialog() {
+        context?.let {
+            OKDialog.show(it, resourceHelper.gs(R.string.combo_warning),
+                resourceHelper.gs(R.string.medtronic_error_operation_not_possible_no_configuration), null)
+        }
+    }
+
     // GUI functions
     @Synchronized
     fun updateGUI() {
         if (medtronic_rl_status == null) return
-        val plugin = MedtronicPumpPlugin.getPlugin()
         val pumpStatus = MedtronicUtil.getPumpStatus()
 
         setDeviceStatus()
 
         // last connection
         if (pumpStatus.lastConnection != 0L) {
-            val minAgo = DateUtil.minAgo(pumpStatus.lastConnection)
+            val minAgo = DateUtil.minAgo(resourceHelper, pumpStatus.lastConnection)
             val min = (System.currentTimeMillis() - pumpStatus.lastConnection) / 1000 / 60
             if (pumpStatus.lastConnection + 60 * 1000 > System.currentTimeMillis()) {
                 medtronic_lastconnection.setText(R.string.combo_pump_connected_now)
@@ -254,17 +273,17 @@ class MedtronicFragment : Fragment() {
             } else if (pumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) {
 
                 if (min < 60) {
-                    medtronic_lastconnection.text = MainApp.gs(R.string.minago, min)
+                    medtronic_lastconnection.text = resourceHelper.gs(R.string.minago, min)
                 } else if (min < 1440) {
                     val h = (min / 60).toInt()
-                    medtronic_lastconnection.text = (MainApp.gq(R.plurals.objective_hours, h, h) + " "
-                            + MainApp.gs(R.string.ago))
+                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.objective_hours, h, h) + " "
+                        + resourceHelper.gs(R.string.ago))
                 } else {
                     val h = (min / 60).toInt()
                     val d = h / 24
                     // h = h - (d * 24);
-                    medtronic_lastconnection.text = (MainApp.gq(R.plurals.objective_days, d, d) + " "
-                            + MainApp.gs(R.string.ago))
+                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.objective_days, d, d) + " "
+                        + resourceHelper.gs(R.string.ago))
                 }
                 medtronic_lastconnection.setTextColor(Color.RED)
             } else {
@@ -279,26 +298,26 @@ class MedtronicFragment : Fragment() {
         if (bolus != null && bolusTime != null) {
             val agoMsc = System.currentTimeMillis() - pumpStatus.lastBolusTime.time
             val bolusMinAgo = agoMsc.toDouble() / 60.0 / 1000.0
-            val unit = MainApp.gs(R.string.insulin_unit_shortname)
+            val unit = resourceHelper.gs(R.string.insulin_unit_shortname)
             val ago: String
             if (agoMsc < 60 * 1000) {
-                ago = MainApp.gs(R.string.combo_pump_connected_now)
+                ago = resourceHelper.gs(R.string.combo_pump_connected_now)
             } else if (bolusMinAgo < 60) {
-                ago = DateUtil.minAgo(pumpStatus.lastBolusTime.time)
+                ago = DateUtil.minAgo(resourceHelper, pumpStatus.lastBolusTime.time)
             } else {
-                ago = DateUtil.hourAgo(pumpStatus.lastBolusTime.time)
+                ago = DateUtil.hourAgo(pumpStatus.lastBolusTime.time, resourceHelper)
             }
-            medtronic_lastbolus.text = MainApp.gs(R.string.combo_last_bolus, bolus, unit, ago)
+            medtronic_lastbolus.text = resourceHelper.gs(R.string.combo_last_bolus, bolus, unit, ago)
         } else {
             medtronic_lastbolus.text = ""
         }
 
         // base basal rate
         medtronic_basabasalrate.text = ("(" + pumpStatus.activeProfileName + ")  "
-                + MainApp.gs(R.string.pump_basebasalrate, plugin.baseBasalRate))
+            + resourceHelper.gs(R.string.pump_basebasalrate, medtronicPumpPlugin.baseBasalRate))
 
-        medtronic_tempbasal.text = TreatmentsPlugin.getPlugin()
-                .getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull() ?: ""
+        medtronic_tempbasal.text = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+            ?: ""
 
         // battery
         if (MedtronicUtil.getBatteryType() == BatteryType.None || pumpStatus.batteryVoltage == null) {
@@ -309,7 +328,7 @@ class MedtronicFragment : Fragment() {
         SetWarnColor.setColorInverse(medtronic_pumpstate_battery, pumpStatus.batteryRemaining.toDouble(), 25.0, 10.0)
 
         // reservoir
-        medtronic_reservoir.text = MainApp.gs(R.string.reservoirvalue, pumpStatus.reservoirRemainingUnits, pumpStatus.reservoirFullUnits)
+        medtronic_reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pumpStatus.reservoirRemainingUnits, pumpStatus.reservoirFullUnits)
         SetWarnColor.setColorInverse(medtronic_reservoir, pumpStatus.reservoirRemainingUnits, 50.0, 20.0)
 
         medtronic_errors.text = pumpStatus.errorInfo
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 48780e2343..1c23665406 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -1,17 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.medtronic;
 
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.os.Bundle;
 import android.os.IBinder;
 import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
 
 import org.joda.time.LocalDateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +23,12 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -35,16 +36,17 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventCustomActionsChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
@@ -78,8 +80,9 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButt
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 import static info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.sendNotification;
 
@@ -88,20 +91,19 @@ import static info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUt
  *
  * @author Andy Rozman (andy.rozman@gmail.com)
  */
+@Singleton
 public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInterface {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    private final SP sp;
 
     protected static MedtronicPumpPlugin plugin = null;
     private RileyLinkMedtronicService medtronicService;
     private MedtronicPumpStatus pumpStatusLocal = null;
-    private MedtronicUIComm medtronicUIComm = new MedtronicUIComm();
+    private MedtronicUIComm medtronicUIComm;
 
     // variables for handling statuses and history
     private boolean firstRun = true;
     private boolean isRefresh = false;
-    private boolean isBasalProfileInvalid = false;
-    private boolean basalProfileChanged = false;
     private Map<MedtronicStatusRefreshType, Long> statusRefreshMap = new HashMap<>();
     private boolean isInitialized = false;
     private MedtronicHistoryData medtronicHistoryData;
@@ -110,11 +112,21 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     public static boolean isBusy = false;
     private List<Long> busyTimestamps = new ArrayList<>();
-    private boolean sentIdToFirebase = false;
     private boolean hasTimeDateOrTimeZoneChanged = false;
 
 
-    private MedtronicPumpPlugin() {
+    @Inject
+    public MedtronicPumpPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            Context context,
+            ResourceHelper resourceHelper,
+            ActivePluginProvider activePlugin,
+            SP sp,
+            CommandQueueProvider commandQueue,
+            FabricPrivacy fabricPrivacy
+    ) {
 
         super(new PluginDescription() //
                         .mainType(PluginType.PUMP) //
@@ -122,24 +134,25 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                         .pluginName(R.string.medtronic_name) //
                         .shortName(R.string.medtronic_name_short) //
                         .preferencesId(R.xml.pref_medtronic).description(R.string.description_pump_medtronic), //
-                PumpType.Medtronic_522_722 // we default to most basic model, correct model from config is loaded later
+                PumpType.Medtronic_522_722, // we default to most basic model, correct model from config is loaded later
+                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, context, fabricPrivacy
         );
+        this.plugin = this;
+
+        this.rxBus = rxBus;
+        this.sp = sp;
 
         displayConnectionMessages = false;
 
-        medtronicHistoryData = new MedtronicHistoryData();
-
         serviceConnection = new ServiceConnection() {
 
             public void onServiceDisconnected(ComponentName name) {
-                if (isLoggingEnabled())
-                    LOG.debug("RileyLinkMedtronicService is disconnected");
+                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is disconnected");
                 medtronicService = null;
             }
 
             public void onServiceConnected(ComponentName name, IBinder service) {
-                if (isLoggingEnabled())
-                    LOG.debug("RileyLinkMedtronicService is connected");
+                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is connected");
                 RileyLinkMedtronicService.LocalBinder mLocalBinder = (RileyLinkMedtronicService.LocalBinder) service;
                 medtronicService = mLocalBinder.getServiceInstance();
 
@@ -149,8 +162,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                         SystemClock.sleep(5000);
 
                         if (MedtronicUtil.getPumpStatus() != null) {
-                            if (isLoggingEnabled())
-                                LOG.debug("Starting Medtronic-RileyLink service");
+                            aapsLogger.debug(LTag.PUMP, "Starting Medtronic-RileyLink service");
                             if (MedtronicUtil.getPumpStatus().setNotInPreInit()) {
                                 break;
                             }
@@ -162,9 +174,17 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     }
 
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        medtronicUIComm = new MedtronicUIComm(aapsLogger, rxBus, getResourceHelper());
+        medtronicHistoryData = new MedtronicHistoryData(aapsLogger, sp, activePlugin);
+    }
+
+    @Deprecated
     public static MedtronicPumpPlugin getPlugin() {
         if (plugin == null)
-            plugin = new MedtronicPumpPlugin();
+            throw new IllegalStateException("Plugin not injected jet");
         return plugin;
     }
 
@@ -185,14 +205,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         this.pumpStatusLocal = new MedtronicPumpStatus(pumpDescription);
         MedtronicUtil.setPumpStatus(pumpStatusLocal);
 
-        pumpStatusLocal.lastConnection = SP.getLong(RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
+        pumpStatusLocal.lastConnection = sp.getLong(RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
         pumpStatusLocal.lastDataTime = new LocalDateTime(pumpStatusLocal.lastConnection);
         pumpStatusLocal.previousConnection = pumpStatusLocal.lastConnection;
 
         pumpStatusLocal.refreshConfiguration();
 
-        if (isLoggingEnabled())
-            LOG.debug("initPumpStatusData: {}", this.pumpStatusLocal);
+        aapsLogger.debug(LTag.PUMP, "initPumpStatusData: " + this.pumpStatusLocal);
 
         this.pumpStatus = pumpStatusLocal;
 
@@ -200,29 +219,28 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         pumpDescription.maxTempAbsolute = (pumpStatusLocal.maxBasal != null) ? pumpStatusLocal.maxBasal : 35.0d;
 
         // set first Medtronic Pump Start
-        if (!SP.contains(MedtronicConst.Statistics.FirstPumpStart)) {
-            SP.putLong(MedtronicConst.Statistics.FirstPumpStart, System.currentTimeMillis());
+        if (!sp.contains(MedtronicConst.Statistics.FirstPumpStart)) {
+            sp.putLong(MedtronicConst.Statistics.FirstPumpStart, System.currentTimeMillis());
         }
 
         migrateSettings();
 
     }
 
-
     private void migrateSettings() {
 
-        if ("US (916 MHz)".equals(SP.getString(MedtronicConst.Prefs.PumpFrequency, null))) {
-            SP.putString(MedtronicConst.Prefs.PumpFrequency, MainApp.gs(R.string.key_medtronic_pump_frequency_us_ca));
+        if ("US (916 MHz)".equals(sp.getString(MedtronicConst.Prefs.PumpFrequency, "US (916 MHz)"))) {
+            sp.putString(MedtronicConst.Prefs.PumpFrequency, getResourceHelper().gs(R.string.key_medtronic_pump_frequency_us_ca));
         }
 
-        String encoding = SP.getString(MedtronicConst.Prefs.Encoding, null);
+        String encoding = sp.getString(MedtronicConst.Prefs.Encoding, "RileyLink 4b6b Encoding");
 
         if ("RileyLink 4b6b Encoding".equals(encoding)) {
-            SP.putString(MedtronicConst.Prefs.Encoding, MainApp.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink));
+            sp.putString(MedtronicConst.Prefs.Encoding, getResourceHelper().gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink));
         }
 
         if ("Local 4b6b Encoding".equals(encoding)) {
-            SP.putString(MedtronicConst.Prefs.Encoding, MainApp.gs(R.string.key_medtronic_pump_encoding_4b6b_local));
+            sp.putString(MedtronicConst.Prefs.Encoding, getResourceHelper().gs(R.string.key_medtronic_pump_encoding_4b6b_local));
         }
     }
 
@@ -241,9 +259,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                             StatusRefreshAction.GetData, null, null);
 
                     if (doWeHaveAnyStatusNeededRefereshing(statusRefresh)) {
-                        if (!ConfigBuilderPlugin.getPlugin().getCommandQueue().statusInQueue()) {
-                            ConfigBuilderPlugin.getPlugin().getCommandQueue()
-                                    .readStatus("Scheduled Status Refresh", null);
+                        if (!getCommandQueue().statusInQueue()) {
+                            getCommandQueue().readStatus("Scheduled Status Refresh", null);
                         }
                     }
 
@@ -288,16 +305,16 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     @Override
     public boolean isInitialized() {
-        if (isLoggingEnabled() && displayConnectionMessages)
-            LOG.debug("MedtronicPumpPlugin::isInitialized");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isInitialized");
         return isServiceSet() && isInitialized;
     }
 
 
     @Override
     public boolean isBusy() {
-        if (isLoggingEnabled() && displayConnectionMessages)
-            LOG.debug("MedtronicPumpPlugin::isBusy");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isBusy");
 
         if (isServiceSet()) {
 
@@ -347,16 +364,16 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     @Override
     public boolean isConnected() {
-        if (isLoggingEnabled() && displayConnectionMessages)
-            LOG.debug("MedtronicPumpPlugin::isConnected");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnected");
         return isServiceSet() && medtronicService.isInitialized();
     }
 
 
     @Override
     public boolean isConnecting() {
-        if (isLoggingEnabled() && displayConnectionMessages)
-            LOG.debug("MedtronicPumpPlugin::isConnecting");
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnecting");
         return !isServiceSet() || !medtronicService.isInitialized();
     }
 
@@ -372,7 +389,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             refreshAnyStatusThatNeedsToBeRefreshed();
         }
 
-        RxBus.INSTANCE.send(new EventMedtronicPumpValuesChanged());
+        rxBus.send(new EventMedtronicPumpValuesChanged());
     }
 
 
@@ -387,14 +404,14 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         RileyLinkServiceState rileyLinkServiceState = MedtronicUtil.getServiceState();
 
         if (rileyLinkServiceState == null) {
-            LOG.error("RileyLink unreachable. RileyLinkServiceState is null.");
+            aapsLogger.debug(LTag.PUMP, "RileyLink unreachable. RileyLinkServiceState is null.");
             return false;
         }
 
         if (rileyLinkServiceState != RileyLinkServiceState.PumpConnectorReady //
                 && rileyLinkServiceState != RileyLinkServiceState.RileyLinkReady //
                 && rileyLinkServiceState != RileyLinkServiceState.TuneUpDevice) {
-            LOG.error("RileyLink unreachable.");
+            aapsLogger.debug(LTag.PUMP, "RileyLink unreachable.");
             return false;
         }
 
@@ -414,14 +431,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         boolean resetTime = false;
 
         if (isPumpNotReachable()) {
-            if (isLoggingEnabled())
-                LOG.error("Pump unreachable.");
-            MedtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable);
+            aapsLogger.error("Pump unreachable.");
+            MedtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, getResourceHelper(), rxBus);
 
             return;
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
 
 
         if (hasTimeDateOrTimeZoneChanged) {
@@ -496,14 +512,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
 
     private void setRefreshButtonEnabled(boolean enabled) {
-        RxBus.INSTANCE.send(new EventRefreshButtonState(enabled));
+        rxBus.send(new EventRefreshButtonState(enabled));
     }
 
 
     private void initializePump(boolean realInit) {
 
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "initializePump - start");
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "initializePump - start");
 
         if (medtronicCommunicationManager == null) {
             medtronicCommunicationManager = MedtronicCommunicationManager.getInstance();
@@ -516,16 +531,15 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         if (isRefresh) {
             if (isPumpNotReachable()) {
-                if (isLoggingEnabled())
-                    LOG.error(getLogPrefix() + "initializePump::Pump unreachable.");
-                MedtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable);
+                aapsLogger.error(getLogPrefix() + "initializePump::Pump unreachable.");
+                MedtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, getResourceHelper(), rxBus);
 
                 setRefreshButtonEnabled(true);
 
                 return;
             }
 
-            MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+            MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
         }
 
         // model (once)
@@ -533,9 +547,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             medtronicUIComm.executeCommand(MedtronicCommandType.PumpModel);
         } else {
             if (pumpStatusLocal.medtronicDeviceType != MedtronicUtil.getMedtronicPumpModel()) {
-                if (isLoggingEnabled())
-                    LOG.warn(getLogPrefix() + "Configured pump is not the same as one detected.");
-                MedtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame);
+                aapsLogger.warn(LTag.PUMP, getLogPrefix() + "Configured pump is not the same as one detected.");
+                MedtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, getResourceHelper(), rxBus);
             }
         }
 
@@ -563,8 +576,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         int errorCount = medtronicUIComm.getInvalidResponsesCount();
 
         if (errorCount >= 5) {
-            if (isLoggingEnabled())
-                LOG.error("Number of error counts was 5 or more. Starting tunning.");
+            aapsLogger.error("Number of error counts was 5 or more. Starting tunning.");
             setRefreshButtonEnabled(true);
             ServiceTaskExecutor.startTask(new WakeAndTuneTask());
             return;
@@ -577,14 +589,6 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             pumpState = PumpDriverState.Initialized;
         }
 
-        if (!sentIdToFirebase) {
-            Bundle params = new Bundle();
-            params.putString("version", BuildConfig.VERSION);
-            MainApp.getFirebaseAnalytics().logEvent("MedtronicPumpInit", params);
-
-            sentIdToFirebase = true;
-        }
-
         isInitialized = true;
         // this.pumpState = PumpDriverState.Initialized;
 
@@ -604,7 +608,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     @Override
     public boolean isThisProfileSet(Profile profile) {
         MedtronicPumpStatus mdtPumpStatus = getMDTPumpStatus();
-        LOG.debug("isThisProfileSet: basalInitalized={}", mdtPumpStatus.basalProfileStatus);
+        aapsLogger.debug(LTag.PUMP, "isThisProfileSet: basalInitalized=" + mdtPumpStatus.basalProfileStatus);
 
         if (!isInitialized)
             return true;
@@ -630,9 +634,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         Double[] basalsByHour = getMDTPumpStatus().basalsByHour;
         PumpType pumpType = getMDTPumpStatus().getPumpType();
 
-        if (isLoggingEnabled())
-            LOG.debug("Current Basals (h):   "
-                    + (basalsByHour == null ? "null" : BasalProfile.getProfilesByHourToString(basalsByHour)));
+        aapsLogger.debug(LTag.PUMP, "Current Basals (h):   "
+                + (basalsByHour == null ? "null" : BasalProfile.getProfilesByHourToString(basalsByHour)));
 
         // int index = 0;
 
@@ -655,14 +658,12 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             stringBuilder.append(" ");
         }
 
-        if (isLoggingEnabled()) {
-            LOG.debug(stringBuilder.toString());
+        aapsLogger.debug(LTag.PUMP, stringBuilder.toString());
 
-            if (!invalid) {
-                LOG.debug("Basal profile is same as AAPS one.");
-            } else {
-                LOG.debug("Basal profile on Pump is different than the AAPS one.");
-            }
+        if (!invalid) {
+            aapsLogger.debug(LTag.PUMP, "Basal profile is same as AAPS one.");
+        } else {
+            aapsLogger.debug(LTag.PUMP, "Basal profile on Pump is different than the AAPS one.");
         }
 
         return (!invalid);
@@ -702,8 +703,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     private MedtronicPumpStatus getMDTPumpStatus() {
         if (pumpStatusLocal == null) {
             // FIXME I don't know why this happens
-            if (isLoggingEnabled())
-                LOG.warn("!!!! Reset Pump Status Local");
+            aapsLogger.warn(LTag.PUMP, "!!!! Reset Pump Status Local");
             pumpStatusLocal = MedtronicUtil.getPumpStatus();
         }
 
@@ -712,7 +712,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
 
     protected void triggerUIChange() {
-        RxBus.INSTANCE.send(new EventMedtronicPumpValuesChanged());
+        rxBus.send(new EventMedtronicPumpValuesChanged());
     }
 
     private BolusDeliveryType bolusDeliveryType = BolusDeliveryType.Idle;
@@ -727,18 +727,17 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     private void checkTimeAndOptionallySetTime() {
 
-        if (isLoggingEnabled())
-            LOG.info("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Start");
+        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Start");
 
         setRefreshButtonEnabled(false);
 
         if (isPumpNotReachable()) {
-            LOG.debug("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Pump Unreachable.");
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Pump Unreachable.");
             setRefreshButtonEnabled(true);
             return;
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
 
         medtronicUIComm.executeCommand(MedtronicCommandType.GetRealTimeClock);
 
@@ -759,25 +758,23 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
             if ((clock.localDeviceTime.getYear() <= 2015) || (timeDiff <= 24 * 60 * 60)) {
 
-                if (isLoggingEnabled())
-                    LOG.info("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Set time on pump.", timeDiff);
+                aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Set time on pump." + timeDiff);
 
                 medtronicUIComm.executeCommand(MedtronicCommandType.SetRealTimeClock);
 
                 if (clock.timeDifference == 0) {
-                    Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, MainApp.gs(R.string.pump_time_updated), Notification.INFO, 60);
-                    RxBus.INSTANCE.send(new EventNewNotification(notification));
+                    Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, getResourceHelper().gs(R.string.pump_time_updated), Notification.INFO, 60);
+                    rxBus.send(new EventNewNotification(notification));
                 }
             } else {
                 if ((clock.localDeviceTime.getYear() > 2015)) {
-                    LOG.error("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff={}]. Doing nothing.", timeDiff);
-                    sendNotification(MedtronicNotificationType.TimeChangeOver24h);
+                    aapsLogger.error("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff={}]. Doing nothing." + timeDiff);
+                    sendNotification(MedtronicNotificationType.TimeChangeOver24h, getResourceHelper(), rxBus);
                 }
             }
 
         } else {
-            if (isLoggingEnabled())
-                LOG.info("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Do nothing.", timeDiff);
+            aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Do nothing." + timeDiff);
         }
 
         scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, 0);
@@ -787,17 +784,17 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     @NonNull
     protected PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
 
-        LOG.info("MedtronicPumpPlugin::deliverBolus - {}", BolusDeliveryType.DeliveryPrepared);
+        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - " + BolusDeliveryType.DeliveryPrepared);
 
         setRefreshButtonEnabled(false);
 
         MedtronicPumpStatus mdtPumpStatus = getMDTPumpStatus();
 
         if (detailedBolusInfo.insulin > mdtPumpStatus.reservoirRemainingUnits) {
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
                             mdtPumpStatus.reservoirRemainingUnits,
                             detailedBolusInfo.insulin));
         }
@@ -805,11 +802,11 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         bolusDeliveryType = BolusDeliveryType.DeliveryPrepared;
 
         if (isPumpNotReachable()) {
-            LOG.debug("MedtronicPumpPlugin::deliverBolus - Pump Unreachable.");
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - Pump Unreachable.");
             return setNotReachable(true, false);
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
 
         if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
             // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled.");
@@ -818,7 +815,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         // LOG.debug("MedtronicPumpPlugin::deliverBolus - Starting wait period.");
 
-        int sleepTime = SP.getInt(MedtronicConst.Prefs.BolusDelay, 10) * 1000;
+        int sleepTime = sp.getInt(MedtronicConst.Prefs.BolusDelay, 10) * 1000;
 
         SystemClock.sleep(sleepTime);
 
@@ -856,12 +853,12 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                         // LOG.debug("MedtronicPumpPlugin::deliverBolus - Show dialog. Context: "
                         // + MainApp.instance().getApplicationContext());
 
-                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.boluserror);
-                        i.putExtra("status", MainApp.gs(R.string.medtronic_cmd_cancel_bolus_not_supported));
-                        i.putExtra("title", MainApp.gs(R.string.combo_warning));
+                        i.putExtra("status", getResourceHelper().gs(R.string.medtronic_cmd_cancel_bolus_not_supported));
+                        i.putExtra("title", getResourceHelper().gs(R.string.combo_warning));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        MainApp.instance().startActivity(i);
+                        context.startActivity(i);
 
                     }).start();
                 }
@@ -871,7 +868,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 detailedBolusInfo.date = now;
                 detailedBolusInfo.deliverAt = now; // not sure about that one
 
-                TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
+                activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
 
                 // we subtract insulin, exact amount will be visible with next remainingInsulin update.
                 getMDTPumpStatus().reservoirRemainingUnits -= detailedBolusInfo.insulin;
@@ -887,16 +884,16 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 this.busyTimestamps.add(time);
                 setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, true);
 
-                return new PumpEnactResult().success(true) //
+                return new PumpEnactResult(getInjector()).success(true) //
                         .enacted(true) //
                         .bolusDelivered(detailedBolusInfo.insulin) //
                         .carbsDelivered(detailedBolusInfo.carbs);
 
             } else {
-                return new PumpEnactResult() //
+                return new PumpEnactResult(getInjector()) //
                         .success(bolusDeliveryType == BolusDeliveryType.CancelDelivery) //
                         .enacted(false) //
-                        .comment(MainApp.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered));
+                        .comment(getResourceHelper().gs(R.string.medtronic_cmd_bolus_could_not_be_delivered));
             }
 
         } finally {
@@ -914,14 +911,14 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         }
 
         if (success) {
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(true) //
                     .enacted(false);
         } else {
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_pump_status_pump_unreachable));
+                    .comment(getResourceHelper().gs(R.string.medtronic_pump_status_pump_unreachable));
         }
     }
 
@@ -936,15 +933,15 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
 
     private void incrementStatistics(String statsKey) {
-        long currentCount = SP.getLong(statsKey, 0L);
+        long currentCount = sp.getLong(statsKey, 0L);
         currentCount++;
-        SP.putLong(statsKey, currentCount);
+        sp.putLong(statsKey, currentCount);
     }
 
 
     // if enforceNew===true current temp basal is canceled and new TBR set (duration is prolonged),
     // if false and the same rate is requested enacted=false and success=true is returned and TBR is not changed
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile,
                                                 boolean enforceNew) {
 
@@ -954,32 +951,28 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
             setRefreshButtonEnabled(true);
 
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_pump_status_pump_unreachable));
+                    .comment(getResourceHelper().gs(R.string.medtronic_pump_status_pump_unreachable));
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
 
         getMDTPumpStatus();
 
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "setTempBasalAbsolute: rate: {}, duration={}", absoluteRate, durationInMinutes);
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute: rate: " + absoluteRate + ", duration=" + durationInMinutes);
 
         // read current TBR
         TempBasalPair tbrCurrent = readTBR();
 
         if (tbrCurrent == null) {
-            if (isLoggingEnabled())
-                LOG.warn(getLogPrefix() + "setTempBasalAbsolute - Could not read current TBR, canceling operation.");
+            aapsLogger.warn(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - Could not read current TBR, canceling operation.");
             finishAction("TBR");
-            return new PumpEnactResult().success(false).enacted(false)
-                    .comment(MainApp.gs(R.string.medtronic_cmd_cant_read_tbr));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_cant_read_tbr));
         } else {
-            if (isLoggingEnabled())
-                LOG.info(getLogPrefix() + "setTempBasalAbsolute: Current Basal: duration: {} min, rate={}",
-                        tbrCurrent.getDurationMinutes(), tbrCurrent.getInsulinRate());
+            aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute: Current Basal: duration: " + tbrCurrent.getDurationMinutes() + " min, rate=" + tbrCurrent.getInsulinRate());
         }
 
         if (!enforceNew) {
@@ -993,10 +986,9 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 }
 
                 if (sameRate) {
-                    if (isLoggingEnabled())
-                        LOG.info(getLogPrefix() + "setTempBasalAbsolute - No enforceNew and same rate. Exiting.");
+                    aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - No enforceNew and same rate. Exiting.");
                     finishAction("TBR");
-                    return new PumpEnactResult().success(true).enacted(false);
+                    return new PumpEnactResult(getInjector()).success(true).enacted(false);
                 }
             }
             // if not the same rate, we cancel and start new
@@ -1004,8 +996,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         // if TBR is running we will cancel it.
         if (tbrCurrent.getInsulinRate() != 0.0f && tbrCurrent.getDurationMinutes() > 0) {
-            if (isLoggingEnabled())
-                LOG.info(getLogPrefix() + "setTempBasalAbsolute - TBR running - so canceling it.");
+            aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - TBR running - so canceling it.");
 
             // CANCEL
 
@@ -1014,16 +1005,14 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             Boolean response = (Boolean) responseTask2.returnData;
 
             if (response) {
-                if (isLoggingEnabled())
-                    LOG.info(getLogPrefix() + "setTempBasalAbsolute - Current TBR cancelled.");
+                aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - Current TBR cancelled.");
             } else {
-                if (isLoggingEnabled())
-                    LOG.error(getLogPrefix() + "setTempBasalAbsolute - Cancel TBR failed.");
+                aapsLogger.error(getLogPrefix() + "setTempBasalAbsolute - Cancel TBR failed.");
 
                 finishAction("TBR");
 
-                return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.gs(R.string.medtronic_cmd_cant_cancel_tbr_stop_op));
+                return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                        .comment(getResourceHelper().gs(R.string.medtronic_cmd_cant_cancel_tbr_stop_op));
             }
         }
 
@@ -1033,8 +1022,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         Boolean response = (Boolean) responseTask.returnData;
 
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "setTempBasalAbsolute - setTBR. Response: " + response);
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - setTBR. Response: " + response);
 
         if (response) {
             // FIXME put this into UIPostProcessor
@@ -1048,26 +1036,26 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                     .absolute(absoluteRate) //
                     .source(Source.USER);
 
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStart);
+            activePlugin.getActiveTreatments().addToHistoryTempBasal(tempStart);
 
             incrementStatistics(MedtronicConst.Statistics.TBRsSet);
 
             finishAction("TBR");
 
-            return new PumpEnactResult().success(true).enacted(true) //
+            return new PumpEnactResult(getInjector()).success(true).enacted(true) //
                     .absolute(absoluteRate).duration(durationInMinutes);
 
         } else {
             finishAction("TBR");
 
-            return new PumpEnactResult().success(false).enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_tbr_could_not_be_delivered));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false) //
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_tbr_could_not_be_delivered));
         }
 
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile,
                                                boolean enforceNew) {
         if (percent == 0) {
@@ -1076,7 +1064,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             double absoluteValue = profile.getBasal() * (percent / 100.0d);
             getMDTPumpStatus();
             absoluteValue = pumpStatusLocal.pumpType.determineCorrectBasalSize(absoluteValue);
-            LOG.warn("setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% (%d). This will start setTempBasalAbsolute, with calculated value (%.3f). Result might not be 100% correct.", percent, absoluteValue);
+            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% (" + percent + "). This will start setTempBasalAbsolute, with calculated value (" + absoluteValue + "). Result might not be 100% correct.");
             return setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew);
         }
     }
@@ -1085,7 +1073,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     private void finishAction(String overviewKey) {
 
         if (overviewKey != null)
-            RxBus.INSTANCE.send(new EventRefreshOverview(overviewKey));
+            rxBus.send(new EventRefreshOverview(overviewKey));
 
         triggerUIChange();
 
@@ -1119,14 +1107,12 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         if (medtronicHistoryData.isPumpSuspended()) {
             this.pumpState = PumpDriverState.Suspended;
-            if (isLoggingEnabled())
-                LOG.debug(getLogPrefix() + "isPumpSuspended: true");
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isPumpSuspended: true");
         } else {
             if (previousState == PumpDriverState.Suspended) {
                 this.pumpState = PumpDriverState.Ready;
             }
-            if (isLoggingEnabled())
-                LOG.debug(getLogPrefix() + "isPumpSuspended: false");
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isPumpSuspended: false");
         }
 
         medtronicHistoryData.processNewHistoryData();
@@ -1143,8 +1129,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         if (lastPumpHistoryEntry == null) {
 
-            if (isLoggingEnabled())
-                LOG.debug(getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: null");
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: null");
 
             Long lastPumpHistoryEntryTime = getLastPumpEntryTime();
 
@@ -1153,16 +1138,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             medtronicHistoryData.setIsInInit(true);
 
             if (lastPumpHistoryEntryTime == 0L) {
-                if (isLoggingEnabled())
-                    LOG.debug(getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
-                            + targetDate);
+                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
+                        + targetDate);
                 targetDate = timeMinus36h;
             } else {
                 // LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
 
-                if (isLoggingEnabled())
-                    LOG.debug(getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: {} - targetDate: {}",
-                            lastPumpHistoryEntryTime, targetDate);
+                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate);
 
                 medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntryTime);
 
@@ -1178,43 +1160,38 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
                 targetDate = (timeMinus36h.isAfter(lastHistoryRecordTime) ? timeMinus36h : lastHistoryRecordTime);
 
-                if (isLoggingEnabled())
-                    LOG.debug(getLogPrefix() + "readPumpHistoryLogic(): targetDate: " + targetDate);
+                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): targetDate: " + targetDate);
             }
         } else {
-            if (isLoggingEnabled())
-                LOG.debug(getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - {}",
-                        MedtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry));
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - " + MedtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry));
             medtronicHistoryData.setIsInInit(false);
             // medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntry.atechDateTime);
 
             // targetDate = lastPumpHistoryEntry.atechDateTime;
         }
 
-        LOG.debug("HST: Target Date: {}", targetDate);
+        aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
 
         MedtronicUITask responseTask2 = medtronicUIComm.executeCommand(MedtronicCommandType.GetHistoryData,
                 lastPumpHistoryEntry, targetDate);
 
-        LOG.debug("HST: After task");
+        aapsLogger.debug(LTag.PUMP, "HST: After task");
 
         PumpHistoryResult historyResult = (PumpHistoryResult) responseTask2.returnData;
 
-        LOG.debug("HST: History Result: {}", historyResult.toString());
+        aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString());
 
         PumpHistoryEntry latestEntry = historyResult.getLatestEntry();
 
-        if (isLoggingEnabled())
-            LOG.debug(getLogPrefix() + "Last entry: " + latestEntry);
+        aapsLogger.debug(LTag.PUMP, getLogPrefix() + "Last entry: " + latestEntry);
 
         if (latestEntry == null) // no new history to read
             return;
 
         this.lastPumpHistoryEntry = latestEntry;
-        SP.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, latestEntry.atechDateTime);
+        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, latestEntry.atechDateTime);
 
-        LOG.debug("HST: History: valid={}, unprocessed={}", historyResult.validEntries.size(),
-                historyResult.unprocessedEntries.size());
+        aapsLogger.debug(LTag.PUMP, "HST: History: valid=" + historyResult.validEntries.size() + ", unprocessed=" + historyResult.unprocessedEntries.size());
 
         this.medtronicHistoryData.addNewHistory(historyResult);
         this.medtronicHistoryData.filterNewEntries();
@@ -1242,20 +1219,20 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     }
 
     private Long getLastPumpEntryTime() {
-        Long lastPumpEntryTime = SP.getLong(MedtronicConst.Statistics.LastPumpHistoryEntry, 0L);
+        Long lastPumpEntryTime = sp.getLong(MedtronicConst.Statistics.LastPumpHistoryEntry, 0L);
 
         try {
             LocalDateTime localDateTime = DateTimeUtil.toLocalDateTime(lastPumpEntryTime);
 
             if (localDateTime.getYear() != (new GregorianCalendar().get(Calendar.YEAR))) {
-                LOG.warn("Saved LastPumpHistoryEntry was invalid. Year was not the same.");
+                aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid. Year was not the same.");
                 return 0L;
             }
 
             return lastPumpEntryTime;
 
         } catch (Exception ex) {
-            LOG.warn("Saved LastPumpHistoryEntry was invalid.");
+            aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid.");
             return 0L;
         }
 
@@ -1352,40 +1329,37 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     }
 
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean enforceNew) {
 
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "cancelTempBasal - started");
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - started");
 
         if (isPumpNotReachable()) {
 
             setRefreshButtonEnabled(true);
 
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_pump_status_pump_unreachable));
+                    .comment(getResourceHelper().gs(R.string.medtronic_pump_status_pump_unreachable));
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
         setRefreshButtonEnabled(false);
 
         TempBasalPair tbrCurrent = readTBR();
 
         if (tbrCurrent != null) {
             if (tbrCurrent.getInsulinRate() == 0.0f && tbrCurrent.getDurationMinutes() == 0) {
-                if (isLoggingEnabled())
-                    LOG.info(getLogPrefix() + "cancelTempBasal - TBR already canceled.");
+                aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - TBR already canceled.");
                 finishAction("TBR");
-                return new PumpEnactResult().success(true).enacted(false);
+                return new PumpEnactResult(getInjector()).success(true).enacted(false);
             }
         } else {
-            if (isLoggingEnabled())
-                LOG.warn(getLogPrefix() + "cancelTempBasal - Could not read currect TBR, canceling operation.");
+            aapsLogger.warn(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Could not read currect TBR, canceling operation.");
             finishAction("TBR");
-            return new PumpEnactResult().success(false).enacted(false)
-                    .comment(MainApp.gs(R.string.medtronic_cmd_cant_read_tbr));
+            return new PumpEnactResult(getInjector()).success(false).enacted(false)
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_cant_read_tbr));
         }
 
         MedtronicUITask responseTask2 = medtronicUIComm.executeCommand(MedtronicCommandType.CancelTBR);
@@ -1395,53 +1369,50 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         finishAction("TBR");
 
         if (response) {
-            if (isLoggingEnabled())
-                LOG.info(getLogPrefix() + "cancelTempBasal - Cancel TBR successful.");
+            aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Cancel TBR successful.");
 
             TemporaryBasal tempBasal = new TemporaryBasal() //
                     .date(System.currentTimeMillis()) //
                     .duration(0) //
                     .source(Source.USER);
 
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempBasal);
+            activePlugin.getActiveTreatments().addToHistoryTempBasal(tempBasal);
 
-            return new PumpEnactResult().success(true).enacted(true) //
+            return new PumpEnactResult(getInjector()).success(true).enacted(true) //
                     .isTempCancel(true);
         } else {
-            if (isLoggingEnabled())
-                LOG.info(getLogPrefix() + "cancelTempBasal - Cancel TBR failed.");
+            aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Cancel TBR failed.");
 
-            return new PumpEnactResult().success(response).enacted(response) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_cant_cancel_tbr));
+            return new PumpEnactResult(getInjector()).success(response).enacted(response) //
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_cant_cancel_tbr));
         }
     }
 
-    @Override
+    @NonNull @Override
     public ManufacturerType manufacturer() {
         return getMDTPumpStatus().pumpType.getManufacturer();
     }
 
-    @Override
+    @NonNull @Override
     public PumpType model() {
         return getMDTPumpStatus().pumpType;
     }
 
-    @Override
+    @NonNull @Override
     public String serialNumber() {
         return getMDTPumpStatus().serialNumber;
     }
 
-    @Override
+    @NonNull @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "setNewBasalProfile");
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setNewBasalProfile");
 
         // this shouldn't be needed, but let's do check if profile setting we are setting is same as current one
         if (isProfileSame(profile)) {
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(true) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_basal_profile_not_set_is_same));
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_basal_profile_not_set_is_same));
         }
 
         setRefreshButtonEnabled(false);
@@ -1450,23 +1421,23 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
             setRefreshButtonEnabled(true);
 
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_pump_status_pump_unreachable));
+                    .comment(getResourceHelper().gs(R.string.medtronic_pump_status_pump_unreachable));
         }
 
-        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+        MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
 
         BasalProfile basalProfile = convertProfileToMedtronicProfile(profile);
 
         String profileInvalid = isProfileValid(basalProfile);
 
         if (profileInvalid != null) {
-            return new PumpEnactResult() //
+            return new PumpEnactResult(getInjector()) //
                     .success(false) //
                     .enacted(false) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid));
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid));
         }
 
         MedtronicUITask responseTask = medtronicUIComm.executeCommand(MedtronicCommandType.SetBasalProfileSTD,
@@ -1474,14 +1445,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         Boolean response = (Boolean) responseTask.returnData;
 
-        if (isLoggingEnabled())
-            LOG.info(getLogPrefix() + "Basal Profile was set: " + response);
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "Basal Profile was set: " + response);
 
         if (response) {
-            return new PumpEnactResult().success(true).enacted(true);
+            return new PumpEnactResult(getInjector()).success(true).enacted(true);
         } else {
-            return new PumpEnactResult().success(response).enacted(response) //
-                    .comment(MainApp.gs(R.string.medtronic_cmd_basal_profile_could_not_be_set));
+            return new PumpEnactResult(getInjector()).success(response).enacted(response) //
+                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_basal_profile_could_not_be_set));
         }
     }
 
@@ -1570,12 +1540,12 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 if (MedtronicUtil.getPumpStatus().verifyConfiguration()) {
                     ServiceTaskExecutor.startTask(new WakeAndTuneTask());
                 } else {
-                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                    Intent i = new Intent(context, ErrorHelperActivity.class);
                     i.putExtra("soundid", R.raw.boluserror);
-                    i.putExtra("status", MainApp.gs(R.string.medtronic_error_operation_not_possible_no_configuration));
-                    i.putExtra("title", MainApp.gs(R.string.combo_warning));
+                    i.putExtra("status", getResourceHelper().gs(R.string.medtronic_error_operation_not_possible_no_configuration));
+                    i.putExtra("title", getResourceHelper().gs(R.string.combo_warning));
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    MainApp.instance().startActivity(i);
+                    context.startActivity(i);
                 }
             }
             break;
@@ -1601,14 +1571,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     @Override
     public void timeDateOrTimeZoneChanged() {
 
-        if (isLoggingEnabled())
-            LOG.warn(getLogPrefix() + "Time, Date and/or TimeZone changed. ");
+        aapsLogger.warn(LTag.PUMP, getLogPrefix() + "Time, Date and/or TimeZone changed. ");
 
         this.hasTimeDateOrTimeZoneChanged = true;
     }
 
     private void refreshCustomActionsList() {
-        RxBus.INSTANCE.send(new EventCustomActionsChanged());
+        rxBus.send(new EventCustomActionsChanged());
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index e054539e8f..81d1425e91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -57,7 +58,7 @@ import info.nightscout.androidaps.utils.SP;
  */
 public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
     private static final int MAX_COMMAND_TRIES = 3;
     private static final int DEFAULT_TIMEOUT = 2000;
     private static final long RILEYLINK_TIMEOUT = 15 * 60 * 1000; // 15 min
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
index dc0a35f2e8..9fb871c45a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
@@ -27,7 +28,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 public class MedtronicConverter {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     MedtronicDeviceType pumpModel;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
index fa0e58a15a..4a2fa12a28 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
@@ -25,7 +26,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 public abstract class MedtronicHistoryDecoder<T extends MedtronicHistoryEntry> implements MedtronicHistoryDecoderInterface<T> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     protected ByteUtil bitUtils;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
index 3b9dfbb48d..fb42eca31c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -24,7 +25,7 @@ public abstract class MedtronicHistoryEntry implements MedtronicHistoryEntryInte
 
     protected List<Byte> rawData;
 
-    public static final Logger LOG = LoggerFactory.getLogger(MedtronicHistoryEntry.class);
+    public static final Logger LOG = StacktraceLoggerWrapper.getLogger(MedtronicHistoryEntry.class);
 
     protected int[] sizes = new int[3];
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
index 77ae298235..86c463cc0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.CRC;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -15,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class RawHistoryPage {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
 
     private byte[] data = new byte[0];
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
index 5a0f1e7983..e2bf3a4935 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
@@ -9,6 +9,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus;
@@ -22,7 +23,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDeco
 
 public class MedtronicCGMSHistoryDecoder extends MedtronicHistoryDecoder<CGMSHistoryEntry> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
 
     // CGMSValuesWriter cgmsValuesWriter = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
index 71f387d176..29b30b01a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Locale;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
@@ -32,7 +33,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHistoryEntry> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     private PumpHistoryEntry tbrPreviousRecord;
     private PumpHistoryEntry changeTimeRecord;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
index 5a290c6a02..84e021e1bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicH
 
 public class PumpHistoryEntry extends MedtronicHistoryEntry {
 
-    private static Logger LOG = LoggerFactory.getLogger(PumpHistoryEntry.class);
+    private static Logger LOG = StacktraceLoggerWrapper.getLogger(PumpHistoryEntry.class);
 
     @Expose
     private PumpHistoryEntryType entryType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
index 58c9b77d6b..f5ffb13a73 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
@@ -8,6 +8,7 @@ import java.util.Collections;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 
 /**
@@ -17,7 +18,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
  */
 public class PumpHistoryResult {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     private boolean searchFinished = false;
     private PumpHistoryEntry searchEntry = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
index 4d81d81bfe..9d63574748 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
@@ -13,7 +14,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandTy
  */
 public class PumpMessage implements RLMessage {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     public PacketType packetType = PacketType.Carelink;
     public byte[] address = new byte[]{0, 0, 0};
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
index 35fa184147..b4cebbb1cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
@@ -1,24 +1,34 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
  * Created by andy on 6/14/18.
  */
 public class MedtronicUIComm {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    private final AAPSLogger aapsLogger;
 
     MedtronicCommunicationManager mcmInstance = null;
-    MedtronicUIPostprocessor uiPostprocessor = new MedtronicUIPostprocessor();
+    MedtronicUIPostprocessor uiPostprocessor;
+
+    public MedtronicUIComm(
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper
+    ) {
+        this.aapsLogger = aapsLogger;
+
+        uiPostprocessor = new MedtronicUIPostprocessor(aapsLogger, rxBus, resourceHelper);
+    }
 
 
     private MedtronicCommunicationManager getCommunicationManager() {
@@ -32,8 +42,7 @@ public class MedtronicUIComm {
 
     public synchronized MedtronicUITask executeCommand(MedtronicCommandType commandType, Object... parameters) {
 
-        if (isLogEnabled())
-            LOG.warn("Execute Command: " + commandType.name());
+        aapsLogger.warn(LTag.PUMP, "Execute Command: " + commandType.name());
 
         MedtronicUITask task = new MedtronicUITask(commandType, parameters);
 
@@ -67,8 +76,8 @@ public class MedtronicUIComm {
         // }
         // }
 
-        if (!task.isReceived() && isLogEnabled()) {
-            LOG.warn("Reply not received for " + commandType);
+        if (!task.isReceived()) {
+            aapsLogger.warn(LTag.PUMP, "Reply not received for " + commandType);
         }
 
         task.postProcess(uiPostprocessor);
@@ -101,9 +110,4 @@ public class MedtronicUIComm {
     public void startTunning() {
         RileyLinkUtil.sendBroadcastMessage(RileyLinkConst.IPC.MSG_PUMP_tunePump);
     }
-
-    private boolean isLogEnabled() {
-        return L.isEnabled(L.PUMP);
-    }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
index e79531d4fc..0875ffe186 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui;
 
 import org.joda.time.DateTimeZone;
 import org.joda.time.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 import java.util.Map;
 
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
@@ -18,6 +18,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificat
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 import static info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.sendNotification;
 
@@ -25,14 +26,21 @@ import static info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUt
  * Created by andy on 6/15/18.
  */
 
-public class MedtronicUIPostprocessor {
+class MedtronicUIPostprocessor {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
-
-    MedtronicPumpStatus pumpStatus;
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
 
 
-    public MedtronicUIPostprocessor() {
+    private MedtronicPumpStatus pumpStatus;
+
+
+
+    public MedtronicUIPostprocessor(AAPSLogger aapsLogger, RxBusWrapper rxBus, ResourceHelper resourceHelper) {
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.resourceHelper = resourceHelper;
         pumpStatus = MedtronicUtil.getPumpStatus();
     }
 
@@ -66,10 +74,10 @@ public class MedtronicUIPostprocessor {
                     } else {
                         uiTask.responseType = MedtronicUIResponseType.Error;
                         uiTask.errorDescription = "No profile found.";
-                        LOG.error("Basal Profile was NOT valid. [{}]", basalProfile.basalProfileToStringError());
+                        aapsLogger.error("Basal Profile was NOT valid. [{}]", basalProfile.basalProfileToStringError());
                     }
                 } catch (Exception ex) {
-                    LOG.error("Basal Profile was returned, but was invalid. [{}]", basalProfile.basalProfileToStringError());
+                    aapsLogger.error("Basal Profile was returned, but was invalid. [{}]", basalProfile.basalProfileToStringError());
                     uiTask.responseType = MedtronicUIResponseType.Error;
                     uiTask.errorDescription = "No profile found.";
                 }
@@ -102,8 +110,7 @@ public class MedtronicUIPostprocessor {
             case SetRealTimeClock: {
                 boolean response = (Boolean) uiTask.returnData;
 
-                if (isLogEnabled())
-                    LOG.debug("New time was {} set.", response ? "" : "NOT");
+                aapsLogger.debug(LTag.PUMP, "New time was {} set.", response ? "" : "NOT");
 
                 if (response) {
                     MedtronicUtil.getPumpTime().timeDifference = 0;
@@ -121,17 +128,15 @@ public class MedtronicUIPostprocessor {
                     pumpStatus.batteryVoltage = batteryStatusDTO.voltage;
                 }
 
-                if (isLogEnabled())
-                    LOG.info("BatteryStatus: {}", batteryStatusDTO.toString());
+                aapsLogger.debug(LTag.PUMP, "BatteryStatus: {}", batteryStatusDTO.toString());
 
             }
             break;
 
             case PumpModel: {
                 if (pumpStatus.medtronicDeviceType != MedtronicUtil.getMedtronicPumpModel()) {
-                    if (isLogEnabled())
-                        LOG.warn("Configured pump is different then pump detected !");
-                    sendNotification(MedtronicNotificationType.PumpTypeNotSame);
+                    aapsLogger.warn(LTag.PUMP, "Configured pump is different then pump detected !");
+                    sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus);
                 }
             }
             break;
@@ -145,8 +150,7 @@ public class MedtronicUIPostprocessor {
             // no postprocessing
 
             default:
-                if (isLogEnabled())
-                    LOG.trace("Post-processing not implemented for {}.", uiTask.commandType.name());
+                aapsLogger.error(LTag.PUMP, "Post-processing not implemented for {}.", uiTask.commandType.name());
 
         }
 
@@ -164,9 +168,8 @@ public class MedtronicUIPostprocessor {
 
         MedtronicUtil.setPumpTime(clockDTO);
 
-        if (isLogEnabled())
-            LOG.debug("Pump Time: " + clockDTO.localDeviceTime + ", DeviceTime=" + clockDTO.pumpTime + //
-                    ", diff: " + dur.getStandardSeconds() + " s");
+        aapsLogger.debug(LTag.PUMP, "Pump Time: " + clockDTO.localDeviceTime + ", DeviceTime=" + clockDTO.pumpTime + //
+                ", diff: " + dur.getStandardSeconds() + " s");
 
 //        if (dur.getStandardMinutes() >= 10) {
 //            if (isLogEnabled())
@@ -192,28 +195,24 @@ public class MedtronicUIPostprocessor {
         PumpSettingDTO checkValue = null;
 
         if (pumpStatus == null) {
-            if (isLogEnabled())
-                LOG.debug("Pump Status: was null");
+            aapsLogger.debug(LTag.PUMP, "Pump Status: was null");
             pumpStatus = MedtronicUtil.getPumpStatus();
-            if (isLogEnabled())
-                LOG.debug("Pump Status: " + this.pumpStatus);
+            aapsLogger.debug(LTag.PUMP, "Pump Status: " + this.pumpStatus);
         }
 
         this.pumpStatus.verifyConfiguration();
 
         // check profile
         if (!"Yes".equals(settings.get("PCFG_BASAL_PROFILES_ENABLED").value)) {
-            if (isLogEnabled())
-                LOG.error("Basal profiles are not enabled on pump.");
-            sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled);
+            aapsLogger.error(LTag.PUMP, "Basal profiles are not enabled on pump.");
+            sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled, resourceHelper, rxBus);
 
         } else {
             checkValue = settings.get("PCFG_ACTIVE_BASAL_PROFILE");
 
             if (!"STD".equals(checkValue.value)) {
-                if (isLogEnabled())
-                    LOG.error("Basal profile set on pump is incorrect (must be STD).");
-                sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected);
+                aapsLogger.error("Basal profile set on pump is incorrect (must be STD).");
+                sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected, resourceHelper, rxBus);
             }
         }
 
@@ -222,9 +221,8 @@ public class MedtronicUIPostprocessor {
         checkValue = settings.get("PCFG_TEMP_BASAL_TYPE");
 
         if (!"Units".equals(checkValue.value)) {
-            if (isLogEnabled())
-                LOG.error("Wrong TBR type set on pump (must be Absolute).");
-            sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet);
+            aapsLogger.error("Wrong TBR type set on pump (must be Absolute).");
+            sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet, resourceHelper, rxBus);
         }
 
         // MAXes
@@ -232,22 +230,16 @@ public class MedtronicUIPostprocessor {
         checkValue = settings.get("PCFG_MAX_BOLUS");
 
         if (!MedtronicUtil.isSame(Double.parseDouble(checkValue.value), pumpStatus.maxBolus)) {
-            LOG.error("Wrong Max Bolus set on Pump (current={}, required={}).", checkValue.value, pumpStatus.maxBolus);
-            sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, pumpStatus.maxBolus);
+            aapsLogger.error("Wrong Max Bolus set on Pump (current={}, required={}).", checkValue.value, pumpStatus.maxBolus);
+            sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, resourceHelper, rxBus, pumpStatus.maxBolus);
         }
 
         checkValue = settings.get("PCFG_MAX_BASAL");
 
         if (!MedtronicUtil.isSame(Double.parseDouble(checkValue.value), pumpStatus.maxBasal)) {
-            if (isLogEnabled())
-                LOG.error("Wrong Max Basal set on Pump (current={}, required={}).", checkValue.value, pumpStatus.maxBasal);
-            sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, pumpStatus.maxBasal);
+            aapsLogger.error("Wrong Max Basal set on Pump (current={}, required={}).", checkValue.value, pumpStatus.maxBasal);
+            sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, resourceHelper, rxBus, pumpStatus.maxBasal);
         }
 
     }
-
-    private boolean isLogEnabled() {
-        return L.isEnabled(L.PUMP);
-    }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
index d6df56bb57..0a52785e40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
@@ -24,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 public class MedtronicUITask {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
 
     public MedtronicCommandType commandType;
     public Object returnData;
@@ -192,13 +193,13 @@ public class MedtronicUITask {
         }
 
         if (responseType == MedtronicUIResponseType.Invalid) {
-            RxBus.INSTANCE.send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+            RxBus.Companion.getINSTANCE().send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
                     "Unsupported command in MedtronicUITask"));
         } else if (responseType == MedtronicUIResponseType.Error) {
-            RxBus.INSTANCE.send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+            RxBus.Companion.getINSTANCE().send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
                     errorDescription));
         } else {
-            RxBus.INSTANCE.send(new EventMedtronicPumpValuesChanged());
+            RxBus.Companion.getINSTANCE().send(new EventMedtronicPumpValuesChanged());
             MedtronicUtil.getPumpStatus().setLastCommunicationToNow();
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 11d1bad3d9..ac07c9a337 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -8,8 +8,6 @@ import org.joda.time.LocalDateTime;
 import org.joda.time.Minutes;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -29,9 +27,10 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -53,7 +52,7 @@ import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 
 /**
@@ -69,7 +68,10 @@ import info.nightscout.androidaps.utils.SP;
 // All things marked with "TODO: Fix db code" needs to be updated in new 2.5 database code
 
 public class MedtronicHistoryData {
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+
+    private static AAPSLogger aapsLogger;
+    private SP sp;
+    private ActivePluginProvider activePlugin;
 
     private List<PumpHistoryEntry> allHistory = null;
     private List<PumpHistoryEntry> newHistory = null;
@@ -93,11 +95,15 @@ public class MedtronicHistoryData {
     public static boolean doubleBolusDebug = false;
 
 
-    public MedtronicHistoryData() {
+    public MedtronicHistoryData(AAPSLogger aapsLogger, SP sp, ActivePluginProvider activePlugin) {
         this.allHistory = new ArrayList<>();
         this.gson = MedtronicUtil.gsonInstance;
         this.gsonCore = MedtronicUtil.getGsonInstanceCore();
 
+        this.aapsLogger = aapsLogger;
+        this.sp = sp;
+        this.activePlugin = activePlugin;
+
         if (this.gson == null) {
             this.gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
         }
@@ -133,20 +139,16 @@ public class MedtronicHistoryData {
 
 
     private static void showLogs(String header, String data) {
-
-        if (!isLogEnabled())
-            return;
-
         if (header != null) {
-            LOG.debug(header);
+            aapsLogger.debug(LTag.PUMP, header);
         }
 
         if (StringUtils.isNotBlank(data)) {
             for (final String token : StringUtil.splitString(data, 3500)) {
-                LOG.debug("{}", token);
+                aapsLogger.debug(LTag.PUMP, "{}", token);
             }
         } else {
-            LOG.debug("No data.");
+            aapsLogger.debug(LTag.PUMP, "No data.");
         }
     }
 
@@ -163,7 +165,7 @@ public class MedtronicHistoryData {
         List<PumpHistoryEntry> bolusEstimates = new ArrayList<>();
         long atechDate = DateTimeUtil.toATechDate(new GregorianCalendar());
 
-        //LOG.debug("Filter new entries: Before {}", newHistory);
+        //aapsLogger.debug(LTag.PUMP, "Filter new entries: Before {}", newHistory);
 
         if (!isCollectionEmpty(newHistory)) {
 
@@ -204,8 +206,7 @@ public class MedtronicHistoryData {
             sort(this.newHistory);
         }
 
-        if (isLogEnabled())
-            LOG.debug("New History entries found: {}", this.newHistory.size());
+        aapsLogger.debug(LTag.PUMP, "New History entries found: {}", this.newHistory.size());
 
         showLogs("List of history (after filtering): [" + this.newHistory.size() + "]", gson.toJson(this.newHistory));
 
@@ -257,14 +258,14 @@ public class MedtronicHistoryData {
             return;
 
         this.setLastHistoryRecordTime(pheLast.atechDateTime);
-        SP.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, pheLast.atechDateTime);
+        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, pheLast.atechDateTime);
 
         LocalDateTime dt = null;
 
         try {
             dt = DateTimeUtil.toLocalDateTime(pheLast.atechDateTime);
         } catch (Exception ex) {
-            LOG.error("Problem decoding date from last record: {}" + pheLast);
+            aapsLogger.error("Problem decoding date from last record: {}" + pheLast);
         }
 
         if (dt != null) {
@@ -286,11 +287,10 @@ public class MedtronicHistoryData {
 
             this.sort(this.allHistory);
 
-            if (isLogEnabled())
-                LOG.debug("All History records [afterFilterCount={}, removedItemsCount={}, newItemsCount={}]",
-                        allHistory.size(), removeList.size(), newHistory.size());
+            aapsLogger.debug(LTag.PUMP, "All History records [afterFilterCount={}, removedItemsCount={}, newItemsCount={}]",
+                    allHistory.size(), removeList.size(), newHistory.size());
         } else {
-            LOG.error("Since we couldn't determine date, we don't clean full history. This is just workaround.");
+            aapsLogger.error("Since we couldn't determine date, we don't clean full history. This is just workaround.");
         }
 
         this.newHistory.clear();
@@ -334,8 +334,7 @@ public class MedtronicHistoryData {
                     pumpHistoryEntryType == PumpHistoryEntryType.BatteryChange || //
                     pumpHistoryEntryType == PumpHistoryEntryType.Prime);
 
-            if (isLogEnabled())
-                LOG.debug("isPumpSuspended. Last entry type={}, isSuspended={}", pumpHistoryEntryType, isSuspended);
+            aapsLogger.debug(LTag.PUMP, "isPumpSuspended. Last entry type={}, isSuspended={}", pumpHistoryEntryType, isSuspended);
 
             return isSuspended;
         } else
@@ -408,14 +407,13 @@ public class MedtronicHistoryData {
         // Prime (for reseting autosense)
         List<PumpHistoryEntry> primeRecords = getFilteredItems(PumpHistoryEntryType.Prime);
 
-        if (isLogEnabled())
-            LOG.debug("ProcessHistoryData: Prime [count={}, items={}]", primeRecords.size(), gson.toJson(primeRecords));
+        aapsLogger.debug(LTag.PUMP, "ProcessHistoryData: Prime [count={}, items={}]", primeRecords.size(), gson.toJson(primeRecords));
 
         if (isCollectionNotEmpty(primeRecords)) {
             try {
                 processPrime(primeRecords);
             } catch (Exception ex) {
-                LOG.error("ProcessHistoryData: Error processing Prime entries: " + ex.getMessage(), ex);
+                aapsLogger.error("ProcessHistoryData: Error processing Prime entries: " + ex.getMessage(), ex);
                 throw ex;
             }
         }
@@ -423,14 +421,13 @@ public class MedtronicHistoryData {
         // TDD
         List<PumpHistoryEntry> tdds = getFilteredItems(PumpHistoryEntryType.EndResultTotals, getTDDType());
 
-        if (isLogEnabled())
-            LOG.debug("ProcessHistoryData: TDD [count={}, items={}]", tdds.size(), gson.toJson(tdds));
+        aapsLogger.debug(LTag.PUMP, "ProcessHistoryData: TDD [count={}, items={}]", tdds.size(), gson.toJson(tdds));
 
         if (isCollectionNotEmpty(tdds)) {
             try {
                 processTDDs(tdds);
             } catch (Exception ex) {
-                LOG.error("ProcessHistoryData: Error processing TDD entries: " + ex.getMessage(), ex);
+                aapsLogger.error("ProcessHistoryData: Error processing TDD entries: " + ex.getMessage(), ex);
                 throw ex;
             }
         }
@@ -440,14 +437,13 @@ public class MedtronicHistoryData {
         // Bolus
         List<PumpHistoryEntry> treatments = getFilteredItems(PumpHistoryEntryType.Bolus);
 
-        if (isLogEnabled())
-            LOG.debug("ProcessHistoryData: Bolus [count={}, items={}]", treatments.size(), gson.toJson(treatments));
+        aapsLogger.debug(LTag.PUMP, "ProcessHistoryData: Bolus [count={}, items={}]", treatments.size(), gson.toJson(treatments));
 
         if (treatments.size() > 0) {
             try {
                 processBolusEntries(treatments);
             } catch (Exception ex) {
-                LOG.error("ProcessHistoryData: Error processing Bolus entries: " + ex.getMessage(), ex);
+                aapsLogger.error("ProcessHistoryData: Error processing Bolus entries: " + ex.getMessage(), ex);
                 throw ex;
             }
         }
@@ -455,14 +451,13 @@ public class MedtronicHistoryData {
         // TBR
         List<PumpHistoryEntry> tbrs = getFilteredItems(PumpHistoryEntryType.TempBasalCombined);
 
-        if (isLogEnabled())
-            LOG.debug("ProcessHistoryData: TBRs Processed [count={}, items={}]", tbrs.size(), gson.toJson(tbrs));
+        aapsLogger.debug(LTag.PUMP, "ProcessHistoryData: TBRs Processed [count={}, items={}]", tbrs.size(), gson.toJson(tbrs));
 
         if (tbrs.size() > 0) {
             try {
                 processTBREntries(tbrs);
             } catch (Exception ex) {
-                LOG.error("ProcessHistoryData: Error processing TBR entries: " + ex.getMessage(), ex);
+                aapsLogger.error("ProcessHistoryData: Error processing TBR entries: " + ex.getMessage(), ex);
                 throw ex;
             }
         }
@@ -473,19 +468,18 @@ public class MedtronicHistoryData {
         try {
             suspends = getSuspends();
         } catch (Exception ex) {
-            LOG.error("ProcessHistoryData: Error getting Suspend entries: " + ex.getMessage(), ex);
+            aapsLogger.error("ProcessHistoryData: Error getting Suspend entries: " + ex.getMessage(), ex);
             throw ex;
         }
 
-        if (isLogEnabled())
-            LOG.debug("ProcessHistoryData: 'Delivery Suspend' Processed [count={}, items={}]", suspends.size(),
-                    gson.toJson(suspends));
+        aapsLogger.debug(LTag.PUMP, "ProcessHistoryData: 'Delivery Suspend' Processed [count={}, items={}]", suspends.size(),
+                gson.toJson(suspends));
 
         if (isCollectionNotEmpty(suspends)) {
             try {
                 processSuspends(suspends);
             } catch (Exception ex) {
-                LOG.error("ProcessHistoryData: Error processing Suspends entries: " + ex.getMessage(), ex);
+                aapsLogger.error("ProcessHistoryData: Error processing Suspends entries: " + ex.getMessage(), ex);
                 throw ex;
             }
         }
@@ -508,12 +502,12 @@ public class MedtronicHistoryData {
         }
 
         if (lastPrimeRecord != 0L) {
-            long lastPrimeFromAAPS = SP.getLong(MedtronicConst.Statistics.LastPrime, 0L);
+            long lastPrimeFromAAPS = sp.getLong(MedtronicConst.Statistics.LastPrime, 0L);
 
             if (lastPrimeRecord != lastPrimeFromAAPS) {
                 uploadCareportalEvent(DateTimeUtil.toMillisFromATD(lastPrimeRecord), CareportalEvent.SITECHANGE);
 
-                SP.putLong(MedtronicConst.Statistics.LastPrime, lastPrimeRecord);
+                sp.putLong(MedtronicConst.Statistics.LastPrime, lastPrimeRecord);
             }
         }
     }
@@ -524,13 +518,19 @@ public class MedtronicHistoryData {
             return;
         try {
             JSONObject data = new JSONObject();
-            String enteredBy = SP.getString("careportal_enteredby", "");
+            String enteredBy = sp.getString("careportal_enteredby", "");
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", event);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = event;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            LOG.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -539,8 +539,7 @@ public class MedtronicHistoryData {
 
         List<PumpHistoryEntry> tdds = filterTDDs(tddsIn);
 
-        if (isLogEnabled())
-            LOG.debug(getLogPrefix() + "TDDs found: {}.\n{}", tdds.size(), gson.toJson(tdds));
+        aapsLogger.debug(LTag.PUMP, getLogPrefix() + "TDDs found: {}.\n{}", tdds.size(), gson.toJson(tdds));
 
         List<TDD> tddsDb = databaseHelper.getTDDsForLastXDays(3);
 
@@ -550,14 +549,13 @@ public class MedtronicHistoryData {
 
             DailyTotalsDTO totalsDTO = (DailyTotalsDTO) tdd.getDecodedData().get("Object");
 
-            //LOG.debug("DailyTotals: {}", totalsDTO);
+            //aapsLogger.debug(LTag.PUMP, "DailyTotals: {}", totalsDTO);
 
             if (tddDbEntry == null) {
                 TDD tddNew = new TDD();
                 totalsDTO.setTDD(tddNew);
 
-                if (isLogEnabled())
-                    LOG.debug("TDD Add: {}", tddNew);
+                aapsLogger.debug(LTag.PUMP, "TDD Add: {}", tddNew);
 
                 databaseHelper.createOrUpdateTDD(tddNew);
 
@@ -566,8 +564,7 @@ public class MedtronicHistoryData {
                 if (!totalsDTO.doesEqual(tddDbEntry)) {
                     totalsDTO.setTDD(tddDbEntry);
 
-                    if (isLogEnabled())
-                        LOG.debug("TDD Edit: {}", tddDbEntry);
+                    aapsLogger.debug(LTag.PUMP, "TDD Edit: {}", tddDbEntry);
 
                     databaseHelper.createOrUpdateTDD(tddDbEntry);
                 }
@@ -603,39 +600,37 @@ public class MedtronicHistoryData {
         List<? extends DbObjectBase> entriesFromHistory = getDatabaseEntriesByLastTimestamp(oldestTimestamp, ProcessHistoryRecord.Bolus);
 
         if (doubleBolusDebug)
-            LOG.debug("DoubleBolusDebug: List (before filter): {}, FromDb={}", gson.toJson(entryList),
+            aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: List (before filter): {}, FromDb={}", gson.toJson(entryList),
                     gsonCore.toJson(entriesFromHistory));
 
         filterOutAlreadyAddedEntries(entryList, entriesFromHistory);
 
         if (entryList.isEmpty()) {
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: EntryList was filtered out.");
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: EntryList was filtered out.");
             return;
         }
 
         filterOutNonInsulinEntries(entriesFromHistory);
 
         if (doubleBolusDebug)
-            LOG.debug("DoubleBolusDebug: List (after filter): {}, FromDb={}", gson.toJson(entryList),
+            aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: List (after filter): {}, FromDb={}", gson.toJson(entryList),
                     gsonCore.toJson(entriesFromHistory));
 
         if (isCollectionEmpty(entriesFromHistory)) {
             for (PumpHistoryEntry treatment : entryList) {
-                if (isLogEnabled())
-                    LOG.debug("Add Bolus (no db entry): " + treatment);
+                aapsLogger.debug(LTag.PUMP, "Add Bolus (no db entry): " + treatment);
                 if (doubleBolusDebug)
-                    LOG.debug("DoubleBolusDebug: Add Bolus: FromDb=null, Treatment={}", treatment);
+                    aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: Add Bolus: FromDb=null, Treatment={}", treatment);
 
                 addBolus(treatment, null);
             }
         } else {
             for (PumpHistoryEntry treatment : entryList) {
                 DbObjectBase treatmentDb = findDbEntry(treatment, entriesFromHistory);
-                if (isLogEnabled())
-                    LOG.debug("Add Bolus {} - (entryFromDb={}) ", treatment, treatmentDb);
+                aapsLogger.debug(LTag.PUMP, "Add Bolus {} - (entryFromDb={}) ", treatment, treatmentDb);
                 if (doubleBolusDebug)
-                    LOG.debug("DoubleBolusDebug: Add Bolus: FromDb={}, Treatment={}", treatmentDb, treatment);
+                    aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: Add Bolus: FromDb={}, Treatment={}", treatmentDb, treatment);
 
                 addBolus(treatment, (Treatment) treatmentDb);
             }
@@ -649,7 +644,7 @@ public class MedtronicHistoryData {
 
         for (DbObjectBase dbObjectBase : entriesFromHistory) {
 
-            Treatment treatment = (Treatment)dbObjectBase;
+            Treatment treatment = (Treatment) dbObjectBase;
 
             if (RileyLinkUtil.isSame(treatment.insulin, 0d)) {
                 removeList.add(dbObjectBase);
@@ -683,9 +678,8 @@ public class MedtronicHistoryData {
 
         List<? extends DbObjectBase> entriesFromHistory = getDatabaseEntriesByLastTimestamp(oldestTimestamp, ProcessHistoryRecord.TBR);
 
-        if (isLogEnabled())
-            LOG.debug(ProcessHistoryRecord.TBR.getDescription() + " List (before filter): {}, FromDb={}", gson.toJson(entryList),
-                    gson.toJson(entriesFromHistory));
+        aapsLogger.debug(LTag.PUMP, ProcessHistoryRecord.TBR.getDescription() + " List (before filter): {}, FromDb={}", gson.toJson(entryList),
+                gson.toJson(entriesFromHistory));
 
 
         TempBasalProcessDTO processDTO = null;
@@ -705,7 +699,7 @@ public class MedtronicHistoryData {
                         readOldItem = false;
                     }
                 } else {
-                    LOG.error("processDTO was null - shouldn't happen. ItemTwo={}", treatment);
+                    aapsLogger.error("processDTO was null - shouldn't happen. ItemTwo={}", treatment);
                 }
             } else {
                 if (processDTO != null) {
@@ -737,10 +731,9 @@ public class MedtronicHistoryData {
 
                         databaseHelper.createOrUpdate(tempBasal);
 
-                        if (isLogEnabled())
-                            LOG.debug("Edit " + ProcessHistoryRecord.TBR.getDescription() + " - (entryFromDb={}) ", tempBasal);
+                        aapsLogger.debug(LTag.PUMP, "Edit " + ProcessHistoryRecord.TBR.getDescription() + " - (entryFromDb={}) ", tempBasal);
                     } else {
-                        LOG.error("TempBasal not found. Item: {}", tempBasalProcessDTO.itemOne);
+                        aapsLogger.error("TempBasal not found. Item: {}", tempBasalProcessDTO.itemOne);
                     }
 
                 } else {
@@ -756,14 +749,13 @@ public class MedtronicHistoryData {
                     if (tempBasal == null) {
                         DbObjectBase treatmentDb = findDbEntry(treatment, entriesFromHistory);
 
-                        if (isLogEnabled())
-                            LOG.debug("Add " + ProcessHistoryRecord.TBR.getDescription() + " {} - (entryFromDb={}) ", treatment, treatmentDb);
+                        aapsLogger.debug(LTag.PUMP, "Add " + ProcessHistoryRecord.TBR.getDescription() + " {} - (entryFromDb={}) ", treatment, treatmentDb);
 
                         addTBR(treatment, (TemporaryBasal) treatmentDb);
                     } else {
                         // this shouldn't happen
                         if (tempBasal.durationInMinutes != tempBasalProcessDTO.getDuration()) {
-                            LOG.debug("Found entry with wrong duration (shouldn't happen)... updating");
+                            aapsLogger.debug(LTag.PUMP, "Found entry with wrong duration (shouldn't happen)... updating");
                             tempBasal.durationInMinutes = tempBasalProcessDTO.getDuration();
                         }
 
@@ -806,26 +798,26 @@ public class MedtronicHistoryData {
         //proposedTime += (this.pumpTime.timeDifference * 1000);
 
         if (doubleBolusDebug)
-            LOG.debug("DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}", treatment, gson.toJson(entriesFromHistory));
+            aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}", treatment, gson.toJson(entriesFromHistory));
 
         if (entriesFromHistory.size() == 0) {
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: findDbEntry Treatment={}, FromDb=null", treatment);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb=null", treatment);
             return null;
         } else if (entriesFromHistory.size() == 1) {
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=SingleEntry", treatment, entriesFromHistory.get(0));
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=SingleEntry", treatment, entriesFromHistory.get(0));
 
             // TODO: Fix db code
             // if difference is bigger than 2 minutes we discard entry
             long maxMillisAllowed = DateTimeUtil.getMillisFromATDWithAddedMinutes(treatment.atechDateTime, 2);
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: findDbEntry maxMillisAllowed={}, AtechDateTime={} (add 2 minutes). ", maxMillisAllowed, treatment.atechDateTime);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry maxMillisAllowed={}, AtechDateTime={} (add 2 minutes). ", maxMillisAllowed, treatment.atechDateTime);
 
             if (entriesFromHistory.get(0).getDate() > maxMillisAllowed) {
                 if (doubleBolusDebug)
-                    LOG.debug("DoubleBolusDebug: findDbEntry entry filtered out, returning null. ");
+                    aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry entry filtered out, returning null. ");
                 return null;
             }
 
@@ -853,17 +845,16 @@ public class MedtronicHistoryData {
 
                 if (outList.size() == 1) {
                     if (doubleBolusDebug)
-                        LOG.debug("DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=EntrySelected, AtTimeMin={}, AtTimeSec={}", treatment, entriesFromHistory.get(0), min, sec);
+                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=EntrySelected, AtTimeMin={}, AtTimeSec={}", treatment, entriesFromHistory.get(0), min, sec);
 
                     return outList.get(0);
                 }
 
                 if (min == 0 && sec == 10 && outList.size() > 1) {
-                    if (isLogEnabled())
-                        LOG.error("Too many entries (with too small diff): (timeDiff=[min={},sec={}],count={},list={})",
-                                min, sec, outList.size(), gson.toJson(outList));
+                    aapsLogger.error("Too many entries (with too small diff): (timeDiff=[min={},sec={}],count={},list={})",
+                            min, sec, outList.size(), gson.toJson(outList));
                     if (doubleBolusDebug)
-                        LOG.debug("DoubleBolusDebug: findDbEntry Error - Too many entries (with too small diff): (timeDiff=[min={},sec={}],count={},list={})",
+                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry Error - Too many entries (with too small diff): (timeDiff=[min={},sec={}],count={},list={})",
                                 min, sec, outList.size(), gson.toJson(outList));
                 }
             }
@@ -875,7 +866,7 @@ public class MedtronicHistoryData {
 
     private List<? extends DbObjectBase> getDatabaseEntriesByLastTimestamp(long startTimestamp, ProcessHistoryRecord processHistoryRecord) {
         if (processHistoryRecord == ProcessHistoryRecord.Bolus) {
-            return TreatmentsPlugin.getPlugin().getTreatmentsFromHistoryAfterTimestamp(startTimestamp);
+            return activePlugin.getActiveTreatments().getTreatmentsFromHistoryAfterTimestamp(startTimestamp);
         } else {
             return databaseHelper.getTemporaryBasalsDataFromTime(startTimestamp, true);
         }
@@ -913,7 +904,7 @@ public class MedtronicHistoryData {
         }
 
         if (doubleBolusDebug)
-            LOG.debug("DoubleBolusDebug: filterOutAlreadyAddedEntries: PumpHistory={}, Treatments={}",
+            aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: filterOutAlreadyAddedEntries: PumpHistory={}, Treatments={}",
                     gson.toJson(removeTreatmentsFromPH),
                     gsonCore.toJson(removeTreatmentsFromHistory));
 
@@ -927,7 +918,7 @@ public class MedtronicHistoryData {
 
         if (treatment == null) {
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addBolus(tretament==null): Bolus={}", bolusDTO);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): Bolus={}", bolusDTO);
 
             switch (bolusDTO.getBolusType()) {
                 case Normal: {
@@ -941,15 +932,14 @@ public class MedtronicHistoryData {
                     addCarbsFromEstimate(detailedBolusInfo, bolus);
 
                     if (doubleBolusDebug)
-                        LOG.debug("DoubleBolusDebug: addBolus(tretament==null): DetailedBolusInfo={}", detailedBolusInfo);
+                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): DetailedBolusInfo={}", detailedBolusInfo);
 
-                    boolean newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
+                    boolean newRecord = activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
 
                     bolus.setLinkedObject(detailedBolusInfo);
 
-                    if (isLogEnabled())
-                        LOG.debug("addBolus - [date={},pumpId={}, insulin={}, newRecord={}]", detailedBolusInfo.date,
-                                detailedBolusInfo.pumpId, detailedBolusInfo.insulin, newRecord);
+                    aapsLogger.debug(LTag.PUMP, "addBolus - [date={},pumpId={}, insulin={}, newRecord={}]", detailedBolusInfo.date,
+                            detailedBolusInfo.pumpId, detailedBolusInfo.insulin, newRecord);
                 }
                 break;
 
@@ -966,13 +956,12 @@ public class MedtronicHistoryData {
                     bolus.setLinkedObject(extendedBolus);
 
                     if (doubleBolusDebug)
-                        LOG.debug("DoubleBolusDebug: addBolus(tretament==null): ExtendedBolus={}", extendedBolus);
+                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): ExtendedBolus={}", extendedBolus);
 
-                    TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
+                    activePlugin.getActiveTreatments().addToHistoryExtendedBolus(extendedBolus);
 
-                    if (isLogEnabled())
-                        LOG.debug("addBolus - Extended [date={},pumpId={}, insulin={}, duration={}]", extendedBolus.date,
-                                extendedBolus.pumpId, extendedBolus.insulin, extendedBolus.durationInMinutes);
+                    aapsLogger.debug(LTag.PUMP, "addBolus - Extended [date={},pumpId={}, insulin={}, duration={}]", extendedBolus.date,
+                            extendedBolus.pumpId, extendedBolus.insulin, extendedBolus.durationInMinutes);
 
                 }
                 break;
@@ -981,20 +970,19 @@ public class MedtronicHistoryData {
         } else {
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addBolus(OldTreatment={}): Bolus={}", treatment, bolusDTO);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(OldTreatment={}): Bolus={}", treatment, bolusDTO);
 
             treatment.source = Source.PUMP;
             treatment.pumpId = bolus.getPumpId();
             treatment.insulin = bolusDTO.getDeliveredAmount();
 
-            TreatmentService.UpdateReturn updateReturn = TreatmentsPlugin.getPlugin().getService().createOrUpdateMedtronic(treatment, false);
+            TreatmentService.UpdateReturn updateReturn = ((TreatmentsPlugin)activePlugin.getActiveTreatments()).getService().createOrUpdateMedtronic(treatment, false);
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addBolus(tretament!=null): NewTreatment={}, UpdateReturn={}", treatment, updateReturn);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament!=null): NewTreatment={}, UpdateReturn={}", treatment, updateReturn);
 
-            if (isLogEnabled())
-                LOG.debug("editBolus - [date={},pumpId={}, insulin={}, newRecord={}]", treatment.date,
-                        treatment.pumpId, treatment.insulin, updateReturn.toString());
+            aapsLogger.debug(LTag.PUMP, "editBolus - [date={},pumpId={}, insulin={}, newRecord={}]", treatment.date,
+                    treatment.pumpId, treatment.insulin, updateReturn.toString());
 
             bolus.setLinkedObject(treatment);
 
@@ -1009,7 +997,7 @@ public class MedtronicHistoryData {
             BolusWizardDTO bolusWizard = (BolusWizardDTO) bolus.getDecodedData().get("Estimate");
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addCarbsFromEstimate: Bolus={}, BolusWizardDTO={}", bolus, bolusWizard);
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addCarbsFromEstimate: Bolus={}, BolusWizardDTO={}", bolus, bolusWizard);
 
             detailedBolusInfo.carbs = bolusWizard.carbs;
         }
@@ -1040,14 +1028,13 @@ public class MedtronicHistoryData {
 
         databaseHelper.createOrUpdate(temporaryBasalDb);
 
-        if (isLogEnabled())
-            LOG.debug(operation + " - [date={},pumpId={}, rate={} {}, duration={}]", //
-                    temporaryBasalDb.date, //
-                    temporaryBasalDb.pumpId, //
-                    temporaryBasalDb.isAbsolute ? String.format(Locale.ENGLISH, "%.2f", temporaryBasalDb.absoluteRate) :
-                            String.format(Locale.ENGLISH, "%d", temporaryBasalDb.percentRate), //
-                    temporaryBasalDb.isAbsolute ? "U/h" : "%", //
-                    temporaryBasalDb.durationInMinutes);
+        aapsLogger.debug(LTag.PUMP, operation + " - [date={},pumpId={}, rate={} {}, duration={}]", //
+                temporaryBasalDb.date, //
+                temporaryBasalDb.pumpId, //
+                temporaryBasalDb.isAbsolute ? String.format(Locale.ENGLISH, "%.2f", temporaryBasalDb.absoluteRate) :
+                        String.format(Locale.ENGLISH, "%d", temporaryBasalDb.percentRate), //
+                temporaryBasalDb.isAbsolute ? "U/h" : "%", //
+                temporaryBasalDb.durationInMinutes);
     }
 
 
@@ -1329,7 +1316,7 @@ public class MedtronicHistoryData {
 //                oldestEntryTime = oldestEntryTime.plusSeconds(this.pumpTime.timeDifference);
 //            }
         } catch (Exception ex) {
-            LOG.error("Problem decoding date from last record: {}" + currentTreatment);
+            aapsLogger.error("Problem decoding date from last record: {}" + currentTreatment);
             return 8; // default return of 6 minutes
         }
 
@@ -1338,9 +1325,8 @@ public class MedtronicHistoryData {
         Minutes minutes = Minutes.minutesBetween(oldestEntryTime, now);
 
         // returns oldest time in history, with calculated time difference between pump and phone, minus 5 minutes
-        if (isLogEnabled())
-            LOG.debug("Oldest entry: {}, pumpTimeDifference={}, newDt={}, currentTime={}, differenceMin={}", dt,
-                    this.pumpTime.timeDifference, oldestEntryTime, now, minutes.getMinutes());
+        aapsLogger.debug(LTag.PUMP, "Oldest entry: {}, pumpTimeDifference={}, newDt={}, currentTime={}, differenceMin={}", dt,
+                this.pumpTime.timeDifference, oldestEntryTime, now, minutes.getMinutes());
 
         return minutes.getMinutes();
     }
@@ -1360,22 +1346,22 @@ public class MedtronicHistoryData {
         }
 
         if (doubleBolusDebug)
-            LOG.debug("DoubleBolusDebug: getOldestTimestamp. Oldest entry found: time={}, object={}", dt, currentTreatment);
+            aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: getOldestTimestamp. Oldest entry found: time={}, object={}", dt, currentTreatment);
 
         try {
 
             GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(dt);
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: getOldestTimestamp. oldestEntryTime: {}", DateTimeUtil.toString(oldestEntryTime));
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime: {}", DateTimeUtil.toString(oldestEntryTime));
             oldestEntryTime.add(Calendar.MINUTE, -2);
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: getOldestTimestamp. oldestEntryTime (-2m): {}, timeInMillis={}", DateTimeUtil.toString(oldestEntryTime), oldestEntryTime.getTimeInMillis());
+                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime (-2m): {}, timeInMillis={}", DateTimeUtil.toString(oldestEntryTime), oldestEntryTime.getTimeInMillis());
 
             return oldestEntryTime.getTimeInMillis();
 
         } catch (Exception ex) {
-            LOG.error("Problem decoding date from last record: {}", currentTreatment);
+            aapsLogger.error("Problem decoding date from last record: {}", currentTreatment);
             return 8; // default return of 6 minutes
         }
 
@@ -1415,8 +1401,7 @@ public class MedtronicHistoryData {
 
         List<PumpHistoryEntry> filteredItems = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile);
 
-        if (isLogEnabled())
-            LOG.debug("hasBasalProfileChanged. Items: " + gson.toJson(filteredItems));
+        aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson.toJson(filteredItems));
 
         return (filteredItems.size() > 0);
     }
@@ -1426,8 +1411,7 @@ public class MedtronicHistoryData {
 
         List<PumpHistoryEntry> filteredItems = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile);
 
-        if (isLogEnabled())
-            LOG.debug("processLastBasalProfileChange. Items: " + filteredItems);
+        aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. Items: " + filteredItems);
 
         PumpHistoryEntry newProfile = null;
         Long lastDate = null;
@@ -1446,8 +1430,7 @@ public class MedtronicHistoryData {
         }
 
         if (newProfile != null) {
-            if (isLogEnabled())
-                LOG.debug("processLastBasalProfileChange. item found, setting new basalProfileLocally: " + newProfile);
+            aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. item found, setting new basalProfileLocally: " + newProfile);
             BasalProfile basalProfile = (BasalProfile) newProfile.getDecodedData().get("Object");
 
             mdtPumpStatus.basalsByHour = basalProfile.getProfilesByHour();
@@ -1511,8 +1494,7 @@ public class MedtronicHistoryData {
         } else {
             List<PumpHistoryEntry> filteredItems = getFilteredItems(entryTypes);
 
-            if (isLogEnabled())
-                LOG.debug("Items: " + filteredItems);
+            aapsLogger.debug(LTag.PUMP, "Items: " + filteredItems);
 
             return filteredItems.size() > 0;
         }
@@ -1521,7 +1503,7 @@ public class MedtronicHistoryData {
 
     private List<PumpHistoryEntry> getFilteredItems(List<PumpHistoryEntry> inList, PumpHistoryEntryType... entryTypes) {
 
-        // LOG.debug("InList: " + inList.size());
+        // aapsLogger.debug(LTag.PUMP, "InList: " + inList.size());
         List<PumpHistoryEntry> outList = new ArrayList<>();
 
         if (inList != null && inList.size() > 0) {
@@ -1541,7 +1523,7 @@ public class MedtronicHistoryData {
             }
         }
 
-        // LOG.debug("OutList: " + outList.size());
+        // aapsLogger.debug(LTag.PUMP, "OutList: " + outList.size());
 
         return outList;
     }
@@ -1556,8 +1538,4 @@ public class MedtronicHistoryData {
         return "MedtronicHistoryData::";
     }
 
-    private static boolean isLogEnabled() {
-        return (L.isEnabled(L.PUMP));
-    }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
index 25facaf9e6..9956e9103e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -31,7 +32,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class BasalProfile {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     public static final int MAX_RAW_DATA_SIZE = (48 * 3) + 1;
     private static final boolean DEBUG_BASALPROFILE = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
index 9768ad2fc8..757ffc2f79 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 /**
@@ -14,7 +15,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class BasalProfileEntry {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     public byte[] rate_raw;
     public double rate;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
index 93b5eb10cb..ed0ff2bad1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
@@ -40,11 +40,12 @@ public class BatteryStatusDTO {
 
 
     public String toString() {
-        return String.format(Locale.ENGLISH, "BatteryStatusDTO [voltage=%.2f, alkaline=%d, lithium=%d, niZn={}]",
+        return String.format(Locale.ENGLISH, "BatteryStatusDTO [voltage=%.2f, alkaline=%d, lithium=%d, niZn=%d, nimh=%d]",
                 voltage == null ? 0.0f : voltage,
                 getCalculatedPercent(BatteryType.Alkaline),
                 getCalculatedPercent(BatteryType.Lithium),
-                getCalculatedPercent(BatteryType.NiZn));
+                getCalculatedPercent(BatteryType.NiZn),
+                getCalculatedPercent(BatteryType.NiMH));
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
index 495bce8a31..01327a8ea4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -23,7 +24,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpH
 
 public class DailyTotalsDTO {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     // bg avg, bg low hi, number Bgs,
     // Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
index 7a17767243..850df2ccc0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Locale;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class TempBasalPair {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
 
     @Expose
     private double insulinRate = 0.0d;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
index 5c7bf245a2..9ae1b8921a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
@@ -15,7 +15,8 @@ public enum BatteryType {
     None(R.string.key_medtronic_pump_battery_no, 0, 0),
     Alkaline(R.string.key_medtronic_pump_battery_alkaline, 1.20d, 1.47d), //
     Lithium(R.string.key_medtronic_pump_battery_lithium, 1.22d, 1.64d), //
-    NiZn(R.string.key_medtronic_pump_battery_nizn, 1.40d, 1.70d) //
+    NiZn(R.string.key_medtronic_pump_battery_nizn, 1.40d, 1.70d), //
+    NiMH(R.string.key_medtronic_pump_battery_nimh, 1.10d, 1.40d) //
     ;
 
     private final String description;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
index 7641e5c4cb..75577098d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
@@ -13,22 +13,20 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryGroup;
 
 public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
 
-    private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
 
     Spinner historyTypeSpinner;
     TextView statusView;
@@ -45,17 +43,12 @@ public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
     List<TypeList> typeListFull;
 
 
-    public MedtronicHistoryActivity() {
-        super();
-    }
-
-
     private void filterHistory(PumpHistoryEntryGroup group) {
 
         this.filteredHistoryList.clear();
 
         List<PumpHistoryEntry> list = new ArrayList<>();
-        list.addAll(MedtronicPumpPlugin.getPlugin().getMedtronicHistoryData().getAllHistory());
+        list.addAll(medtronicPumpPlugin.getMedtronicHistoryData().getAllHistory());
 
         //LOG.debug("Items on full list: {}", list.size());
 
@@ -112,9 +105,9 @@ public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.medtronic_history_activity);
 
-        historyTypeSpinner = (Spinner) findViewById(R.id.medtronic_historytype);
-        statusView = (TextView) findViewById(R.id.medtronic_historystatus);
-        recyclerView = (RecyclerView) findViewById(R.id.medtronic_history_recyclerview);
+        historyTypeSpinner = findViewById(R.id.medtronic_historytype);
+        statusView = findViewById(R.id.medtronic_historystatus);
+        recyclerView = findViewById(R.id.medtronic_history_recyclerview);
 
         recyclerView.setHasFixedSize(true);
         llm = new LinearLayoutManager(this);
@@ -244,9 +237,9 @@ public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
             HistoryViewHolder(View itemView) {
                 super(itemView);
                 // cv = (CardView)itemView.findViewById(R.id.rileylink_history_item);
-                timeView = (TextView) itemView.findViewById(R.id.medtronic_history_time);
-                typeView = (TextView) itemView.findViewById(R.id.medtronic_history_source);
-                valueView = (TextView) itemView.findViewById(R.id.medtronic_history_description);
+                timeView = itemView.findViewById(R.id.medtronic_history_time);
+                typeView = itemView.findViewById(R.id.medtronic_history_source);
+                valueView = itemView.findViewById(R.id.medtronic_history_description);
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
index fc1208a340..315aeb0869 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
@@ -37,7 +38,7 @@ import info.nightscout.androidaps.utils.SP;
 
 public class MedtronicPumpStatus extends PumpStatus {
 
-    private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+    private static Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
 
     public String errorDescription = null;
     public String serialNumber;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index cba33353f1..c3e403f723 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -1,16 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.service;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Binder;
 import android.os.IBinder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -29,14 +29,17 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * RileyLinkMedtronicService is intended to stay running when the gui-app is closed.
  */
 public class RileyLinkMedtronicService extends RileyLinkService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    @Inject AAPSLogger aapsLogger;
+    @Inject Context context;
+    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
+    @Inject SP sp;
 
     private static RileyLinkMedtronicService instance;
     private static ServiceTask currentTask = null;
@@ -48,12 +51,11 @@ public class RileyLinkMedtronicService extends RileyLinkService {
 
 
     public RileyLinkMedtronicService() {
-        super(MainApp.instance().getApplicationContext());
+        super();
         instance = this;
-        if (isLogEnabled())
-            LOG.debug("RileyLinkMedtronicService newly constructed");
+        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
         MedtronicUtil.setMedtronicService(this);
-        pumpStatus = (MedtronicPumpStatus) MedtronicPumpPlugin.getPlugin().getPumpStatusData();
+        pumpStatus = (MedtronicPumpStatus) medtronicPumpPlugin.getPumpStatusData();
     }
 
 
@@ -62,15 +64,9 @@ public class RileyLinkMedtronicService extends RileyLinkService {
     }
 
 
-    public static MedtronicCommunicationManager getCommunicationManager() {
-        return instance.medtronicCommunicationManager;
-    }
-
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        if (isLogEnabled())
-            LOG.warn("onConfigurationChanged");
+        aapsLogger.warn(LTag.PUMPCOMM, "onConfigurationChanged");
         super.onConfigurationChanged(newConfig);
     }
 
@@ -97,10 +93,10 @@ public class RileyLinkMedtronicService extends RileyLinkService {
         RileyLinkUtil.setRileyLinkServiceData(rileyLinkServiceData);
         RileyLinkUtil.setTargetDevice(RileyLinkTargetDevice.MedtronicPump);
 
-        setPumpIDString(SP.getString(MedtronicConst.Prefs.PumpSerial, "000000"));
+        setPumpIDString(sp.getString(MedtronicConst.Prefs.PumpSerial, "000000"));
 
         // get most recently used RileyLink address
-        rileyLinkServiceData.rileylinkAddress = SP.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
 
         rileyLinkBLE = new RileyLinkBLE(this.context); // or this
         rfspy = new RFSpy(rileyLinkBLE);
@@ -126,29 +122,29 @@ public class RileyLinkMedtronicService extends RileyLinkService {
 
     public void setPumpIDString(String pumpID) {
         if (pumpID.length() != 6) {
-            LOG.error("setPumpIDString: invalid pump id string: " + pumpID);
+            aapsLogger.error("setPumpIDString: invalid pump id string: " + pumpID);
             return;
         }
 
         byte[] pumpIDBytes = ByteUtil.fromHexString(pumpID);
 
         if (pumpIDBytes == null) {
-            LOG.error("Invalid pump ID? - PumpID is null.");
+            aapsLogger.error("Invalid pump ID? - PumpID is null.");
 
             rileyLinkServiceData.setPumpID("000000", new byte[]{0, 0, 0});
 
         } else if (pumpIDBytes.length != 3) {
-            LOG.error("Invalid pump ID? " + ByteUtil.shortHexString(pumpIDBytes));
+            aapsLogger.error("Invalid pump ID? " + ByteUtil.shortHexString(pumpIDBytes));
 
             rileyLinkServiceData.setPumpID("000000", new byte[]{0, 0, 0});
 
         } else if (pumpID.equals("000000")) {
-            LOG.error("Using pump ID " + pumpID);
+            aapsLogger.error("Using pump ID " + pumpID);
 
             rileyLinkServiceData.setPumpID(pumpID, new byte[]{0, 0, 0});
 
         } else {
-            LOG.info("Using pump ID " + pumpID);
+            aapsLogger.info(LTag.PUMPBTCOMM, "Using pump ID " + pumpID);
 
             String oldId = rileyLinkServiceData.pumpID;
 
@@ -197,9 +193,4 @@ public class RileyLinkMedtronicService extends RileyLinkService {
     @Override
     public void registerDeviceSpecificBroadcasts(IntentFilter intentFilter) {
     }
-
-
-    private boolean isLogEnabled() {
-        return L.isEnabled(L.PUMPCOMM);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
index 2c7ee69c2f..7f02a42d21 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.util;
 
-import android.content.Context;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import org.joda.time.LocalTime;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -15,11 +12,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -39,7 +36,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
-import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
  * Created by andy on 5/9/18.
@@ -47,7 +44,7 @@ import info.nightscout.androidaps.utils.OKDialog;
 
 public class MedtronicUtil extends RileyLinkUtil {
 
-    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+    private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
     static int ENVELOPE_SIZE = 4; // 0xA7 S1 S2 S3 CMD PARAM_COUNT [PARAMS]
     static int CRC_SIZE = 1;
     private static boolean lowLevelDebug = true;
@@ -226,26 +223,26 @@ public class MedtronicUtil extends RileyLinkUtil {
     }
 
 
-    public static void sendNotification(MedtronicNotificationType notificationType) {
+    public static void sendNotification(MedtronicNotificationType notificationType, ResourceHelper resourceHelper, RxBusWrapper rxBus) {
         Notification notification = new Notification( //
                 notificationType.getNotificationType(), //
-                MainApp.gs(notificationType.getResourceId()), //
+                resourceHelper.gs(notificationType.getResourceId()), //
                 notificationType.getNotificationUrgency());
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
+        rxBus.send(new EventNewNotification(notification));
     }
 
 
-    public static void sendNotification(MedtronicNotificationType notificationType, Object... parameters) {
+    public static void sendNotification(MedtronicNotificationType notificationType, ResourceHelper resourceHelper, RxBusWrapper rxBus, Object... parameters) {
         Notification notification = new Notification( //
                 notificationType.getNotificationType(), //
-                MainApp.gs(notificationType.getResourceId(), parameters), //
+                resourceHelper.gs(notificationType.getResourceId(), parameters), //
                 notificationType.getNotificationUrgency());
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
+        rxBus.send(new EventNewNotification(notification));
     }
 
 
-    public static void dismissNotification(MedtronicNotificationType notificationType) {
-        RxBus.INSTANCE.send(new EventDismissNotification(notificationType.getNotificationType()));
+    public static void dismissNotification(MedtronicNotificationType notificationType, RxBusWrapper rxBus) {
+        rxBus.send(new EventDismissNotification(notificationType.getNotificationType()));
     }
 
 
@@ -420,7 +417,7 @@ public class MedtronicUtil extends RileyLinkUtil {
 
         historyRileyLink.add(new RLHistoryItem(pumpDeviceState, RileyLinkTargetDevice.MedtronicPump));
 
-        RxBus.INSTANCE.send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
+        RxBus.Companion.getINSTANCE().send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
     }
 
 
@@ -489,7 +486,7 @@ public class MedtronicUtil extends RileyLinkUtil {
             setCurrentCommand(currentCommand);
         }
 
-        RxBus.INSTANCE.send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
+        RxBus.Companion.getINSTANCE().send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
     }
 
 
@@ -529,9 +526,4 @@ public class MedtronicUtil extends RileyLinkUtil {
     }
 
 
-    public static void displayNotConfiguredDialog(Context context) {
-        OKDialog.show(context, MainApp.gs(R.string.combo_warning),
-                MainApp.gs(R.string.medtronic_error_operation_not_possible_no_configuration), null);
-    }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
index 08402520c2..d534e51e2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -5,22 +5,29 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import info.nightscout.androidaps.MainApp
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventTempBasalChange
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.virtualpump_fragment.*
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+class VirtualPumpFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
 
-class VirtualPumpFragment : Fragment() {
     private val disposable = CompositeDisposable()
 
     private val loopHandler = Handler()
@@ -40,21 +47,18 @@ class VirtualPumpFragment : Fragment() {
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
-                .toObservable(EventVirtualPumpUpdateGui::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        )
-        disposable.add(RxBus
-                .toObservable(EventTempBasalChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        )
-        disposable.add(RxBus
-                .toObservable(EventExtendedBolusChange::class.java)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ updateGui() }, { FabricPrivacy.logException(it) })
-        )
+        disposable += rxBus
+            .toObservable(EventVirtualPumpUpdateGui::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }, { fabricPrivacy.logException(it) })
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
         updateGui()
     }
@@ -68,18 +72,18 @@ class VirtualPumpFragment : Fragment() {
 
     @Synchronized
     private fun updateGui() {
-        val virtualPump = VirtualPumpPlugin.getPlugin()
-        virtualpump_basabasalrate?.text = MainApp.gs(R.string.pump_basebasalrate, virtualPump.baseBasalRate)
-        virtualpump_tempbasal?.text = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
-                ?: ""
-        virtualpump_extendedbolus?.text = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis())?.toString() ?: ""
-        virtualpump_battery?.text = MainApp.gs(R.string.format_percent, virtualPump.batteryPercent)
-        virtualpump_reservoir?.text = MainApp.gs(R.string.formatinsulinunits, virtualPump.reservoirInUnits.toDouble())
+        virtualpump_basabasalrate?.text = resourceHelper.gs(R.string.pump_basebasalrate, virtualPumpPlugin.baseBasalRate)
+        virtualpump_tempbasal?.text = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+            ?: ""
+        virtualpump_extendedbolus?.text = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())?.toString()
+            ?: ""
+        virtualpump_battery?.text = resourceHelper.gs(R.string.format_percent, virtualPumpPlugin.batteryPercent)
+        virtualpump_reservoir?.text = resourceHelper.gs(R.string.formatinsulinunits, virtualPumpPlugin.reservoirInUnits.toDouble())
 
-        virtualPump.refreshConfiguration()
-        val pumpType = virtualPump.pumpType
+        virtualPumpPlugin.refreshConfiguration()
+        val pumpType = virtualPumpPlugin.pumpType
 
-        virtualpump_type?.text = pumpType.description
-        virtualpump_type_def?.text = pumpType.getFullDescription(MainApp.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals())
+        virtualpump_type?.text = pumpType?.description
+        virtualpump_type_def?.text = pumpType?.getFullDescription(resourceHelper.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals())
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
deleted file mode 100644
index 447367c510..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.virtual;
-
-import android.os.SystemClock;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.PluginBase;
-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.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.InstanceId;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
-    private Logger log = LoggerFactory.getLogger(L.PUMP);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    Integer batteryPercent = 50;
-    Integer reservoirInUnits = 50;
-    private static VirtualPumpPlugin plugin = null;
-    private boolean fromNSAreCommingFakedExtendedBoluses = false;
-    private PumpType pumpType = null;
-    private long lastDataTime = 0;
-    private PumpDescription pumpDescription = new PumpDescription();
-
-    public VirtualPumpPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.PUMP)
-                .fragmentClass(VirtualPumpFragment.class.getName())
-                .pluginName(R.string.virtualpump)
-                .shortName(R.string.virtualpump_shortname)
-                .preferencesId(R.xml.pref_virtualpump)
-                .neverVisible(Config.NSCLIENT)
-                .description(R.string.description_pump_virtual)
-        );
-        pumpDescription.isBolusCapable = true;
-        pumpDescription.bolusStep = 0.1d;
-
-        pumpDescription.isExtendedBolusCapable = true;
-        pumpDescription.extendedBolusStep = 0.05d;
-        pumpDescription.extendedBolusDurationStep = 30;
-        pumpDescription.extendedBolusMaxDuration = 8 * 60;
-
-        pumpDescription.isTempBasalCapable = true;
-        pumpDescription.tempBasalStyle = PumpDescription.PERCENT | PumpDescription.ABSOLUTE;
-
-        pumpDescription.maxTempPercent = 500;
-        pumpDescription.tempPercentStep = 10;
-
-        pumpDescription.tempDurationStep = 30;
-        pumpDescription.tempDurationStep15mAllowed = true;
-        pumpDescription.tempDurationStep30mAllowed = true;
-        pumpDescription.tempMaxDuration = 24 * 60;
-
-
-        pumpDescription.isSetBasalProfileCapable = true;
-        pumpDescription.basalStep = 0.01d;
-        pumpDescription.basalMinimumRate = 0.01d;
-
-        pumpDescription.isRefillingCapable = true;
-
-        pumpDescription.storesCarbInfo = false;
-        pumpDescription.is30minBasalRatesCapable = true;
-    }
-
-    public static VirtualPumpPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new VirtualPumpPlugin();
-        plugin.loadFakingStatus();
-        return plugin;
-    }
-
-    private void loadFakingStatus() {
-        fromNSAreCommingFakedExtendedBoluses = SP.getBoolean(R.string.key_fromNSAreCommingFakedExtendedBoluses, false);
-    }
-
-    public boolean getFakingStatus() {
-        return fromNSAreCommingFakedExtendedBoluses;
-    }
-
-    public void setFakingStatus(boolean newStatus) {
-        fromNSAreCommingFakedExtendedBoluses = newStatus;
-        SP.putBoolean(R.string.key_fromNSAreCommingFakedExtendedBoluses, fromNSAreCommingFakedExtendedBoluses);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (event.isChanged(R.string.key_virtualpump_type))
-                        refreshConfiguration();
-                }, FabricPrivacy::logException)
-        );
-        refreshConfiguration();
-    }
-
-    @Override
-    protected void onStop() {
-        disposable.clear();
-        super.onStop();
-    }
-
-    @Override
-    public boolean isFakingTempsByExtendedBoluses() {
-        return (Config.NSCLIENT) && fromNSAreCommingFakedExtendedBoluses;
-    }
-
-    @Override
-    public PumpEnactResult loadTDDs() {
-        //no result, could read DB in the future?
-        return new PumpEnactResult();
-    }
-
-    @Override
-    public List<CustomAction> getCustomActions() {
-        return null;
-    }
-
-    @Override
-    public void executeCustomAction(CustomActionType customActionType) {
-
-    }
-
-    @Override
-    public boolean isInitialized() {
-        return true;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return false;
-    }
-
-    @Override
-    public boolean isBusy() {
-        return false;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return true;
-    }
-
-    @Override
-    public boolean isConnecting() {
-        return false;
-    }
-
-    @Override
-    public boolean isHandshakeInProgress() {
-        return false;
-    }
-
-    @Override
-    public void finishHandshaking() {
-    }
-
-    @Override
-    public void connect(String reason) {
-        if (!Config.NSCLIENT)
-            NSUpload.uploadDeviceStatus();
-        lastDataTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public void disconnect(String reason) {
-    }
-
-    @Override
-    public void stopConnecting() {
-    }
-
-    @Override
-    public void getPumpStatus() {
-        lastDataTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        lastDataTime = System.currentTimeMillis();
-        // Do nothing here. we are using ConfigBuilderPlugin.getPlugin().getActiveProfile().getProfile();
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = true;
-        Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
-        return result;
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        return true;
-    }
-
-    @Override
-    public long lastDataTime() {
-        return lastDataTime;
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile != null)
-            return profile.getBasal();
-        else
-            return 0d;
-    }
-
-
-    @Override
-    public double getReservoirLevel() {
-        return reservoirInUnits;
-    }
-
-    @Override
-    public int getBatteryLevel() {
-        return batteryPercent;
-    }
-
-    @Override
-    public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = true;
-        result.bolusDelivered = detailedBolusInfo.insulin;
-        result.carbsDelivered = detailedBolusInfo.carbs;
-        result.enacted = result.bolusDelivered > 0 || result.carbsDelivered > 0;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-
-        Double delivering = 0d;
-
-        while (delivering < detailedBolusInfo.insulin) {
-            SystemClock.sleep(200);
-            EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-            bolusingEvent.setStatus(String.format(MainApp.gs(R.string.bolusdelivering), delivering));
-            bolusingEvent.setPercent(Math.min((int) (delivering / detailedBolusInfo.insulin * 100), 100));
-            RxBus.INSTANCE.send(bolusingEvent);
-            delivering += 0.1d;
-        }
-        SystemClock.sleep(200);
-        EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-        bolusingEvent.setStatus(String.format(MainApp.gs(R.string.bolusdelivered), detailedBolusInfo.insulin));
-        bolusingEvent.setPercent(100);
-        RxBus.INSTANCE.send(bolusingEvent);
-        SystemClock.sleep(1000);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Delivering treatment insulin: " + detailedBolusInfo.insulin + "U carbs: " + detailedBolusInfo.carbs + "g " + result);
-        RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        lastDataTime = System.currentTimeMillis();
-        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-        return result;
-    }
-
-    @Override
-    public void stopBolusDelivering() {
-    }
-
-    @Override
-    public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-
-        TemporaryBasal tempBasal = new TemporaryBasal()
-                .date(System.currentTimeMillis())
-                .absolute(absoluteRate)
-                .duration(durationInMinutes)
-                .source(Source.USER);
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = true;
-        result.enacted = true;
-        result.isTempCancel = false;
-        result.absolute = absoluteRate;
-        result.duration = durationInMinutes;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempBasal);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Setting temp basal absolute: " + result);
-        RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        lastDataTime = System.currentTimeMillis();
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        TemporaryBasal tempBasal = new TemporaryBasal()
-                .date(System.currentTimeMillis())
-                .percent(percent)
-                .duration(durationInMinutes)
-                .source(Source.USER);
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = true;
-        result.enacted = true;
-        result.percent = percent;
-        result.isPercent = true;
-        result.isTempCancel = false;
-        result.duration = durationInMinutes;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempBasal);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Settings temp basal percent: " + result);
-        RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        lastDataTime = System.currentTimeMillis();
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        PumpEnactResult result = cancelExtendedBolus();
-        if (!result.success)
-            return result;
-
-        ExtendedBolus extendedBolus = new ExtendedBolus()
-                .date(System.currentTimeMillis())
-                .insulin(insulin)
-                .durationInMinutes(durationInMinutes)
-                .source(Source.USER);
-        result.success = true;
-        result.enacted = true;
-        result.bolusDelivered = insulin;
-        result.isTempCancel = false;
-        result.duration = durationInMinutes;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(extendedBolus);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Setting extended bolus: " + result);
-        RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        lastDataTime = System.currentTimeMillis();
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = true;
-        result.isTempCancel = true;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) {
-            result.enacted = true;
-            TemporaryBasal tempStop = new TemporaryBasal().date(System.currentTimeMillis()).source(Source.USER);
-            TreatmentsPlugin.getPlugin().addToHistoryTempBasal(tempStop);
-            //tempBasal = null;
-            if (L.isEnabled(L.PUMPCOMM))
-                log.debug("Canceling temp basal: " + result);
-            RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        }
-        lastDataTime = System.currentTimeMillis();
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress()) {
-            ExtendedBolus exStop = new ExtendedBolus(System.currentTimeMillis());
-            exStop.source = Source.USER;
-            TreatmentsPlugin.getPlugin().addToHistoryExtendedBolus(exStop);
-        }
-        result.success = true;
-        result.enacted = true;
-        result.isTempCancel = true;
-        result.comment = MainApp.gs(R.string.virtualpump_resultok);
-        if (L.isEnabled(L.PUMPCOMM))
-            log.debug("Canceling extended bolus: " + result);
-        RxBus.INSTANCE.send(new EventVirtualPumpUpdateGui());
-        lastDataTime = System.currentTimeMillis();
-        return result;
-    }
-
-    @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
-        long now = System.currentTimeMillis();
-        if (!SP.getBoolean("virtualpump_uploadstatus", false)) {
-            return null;
-        }
-        JSONObject pump = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", batteryPercent);
-            status.put("status", "normal");
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            try {
-                extended.put("ActiveProfile", profileName);
-            } catch (Exception ignored) {
-            }
-            TemporaryBasal tb = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(now);
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            status.put("timestamp", DateUtil.toISOString(now));
-
-            pump.put("battery", battery);
-            pump.put("status", status);
-            pump.put("extended", extended);
-            pump.put("reservoir", reservoirInUnits);
-            pump.put("clock", DateUtil.toISOString(now));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return pump;
-    }
-
-    @Override
-    public ManufacturerType manufacturer() {
-        return pumpDescription.pumpType.getManufacturer();
-    }
-
-    @Override
-    public PumpType model() {
-        return pumpDescription.pumpType;
-    }
-
-    @Override
-    public String serialNumber() {
-        return InstanceId.INSTANCE.instanceId();
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    @Override
-    public String shortStatus(boolean veryShort) {
-        return "Virtual Pump";
-    }
-
-    public PumpType getPumpType() {
-        return pumpType;
-    }
-
-    @Override
-    public boolean canHandleDST() {
-        return true;
-    }
-
-
-    public void refreshConfiguration() {
-        String pumptype = SP.getString(R.string.key_virtualpump_type, "Generic AAPS");
-
-        PumpType pumpTypeNew = PumpType.getByDescription(pumptype);
-
-        if (L.isEnabled(L.PUMP))
-            log.debug("Pump in configuration: {}, PumpType object: {}", pumptype, pumpTypeNew);
-
-        if (pumpType == pumpTypeNew)
-            return;
-
-        if (L.isEnabled(L.PUMP))
-            log.debug("New pump configuration found ({}), changing from previous ({})", pumpTypeNew, pumpType);
-
-        pumpDescription.setPumpDescription(pumpTypeNew);
-
-        this.pumpType = pumpTypeNew;
-
-    }
-
-
-    @Override
-    public void timeDateOrTimeZoneChanged() {
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
new file mode 100644
index 0000000000..b70ff5b93a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -0,0 +1,413 @@
+package info.nightscout.androidaps.plugins.pump.virtual
+
+import android.os.SystemClock
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.ExtendedBolus
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.common.ManufacturerType
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.InstanceId.instanceId
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.min
+
+@Singleton
+class VirtualPumpPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private var fabricPrivacy: FabricPrivacy,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val profileFunction: ProfileFunction,
+    private val treatmentsPlugin: TreatmentsPlugin,
+    commandQueue: CommandQueueProvider
+) : PumpPluginBase(PluginDescription()
+    .mainType(PluginType.PUMP)
+    .fragmentClass(VirtualPumpFragment::class.java.name)
+    .pluginName(R.string.virtualpump)
+    .shortName(R.string.virtualpump_shortname)
+    .preferencesId(R.xml.pref_virtualpump)
+    .neverVisible(Config.NSCLIENT)
+    .description(R.string.description_pump_virtual)
+    .setDefault(),
+    injector, aapsLogger, resourceHelper, commandQueue
+), PumpInterface {
+
+
+    companion object {
+        private lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+        @Deprecated("Use dagger to get an instance")
+        fun getPlugin(): VirtualPumpPlugin {
+            checkNotNull(virtualPumpPlugin) { "Accessing VirtualPumpPlugin before first instantiation" }
+            return virtualPumpPlugin
+        }
+    }
+
+    private val disposable = CompositeDisposable()
+    var batteryPercent = 50
+    var reservoirInUnits = 50
+
+    var pumpType: PumpType? = null
+        private set
+    private var lastDataTime: Long = 0
+    private val pumpDescription = PumpDescription()
+
+    init {
+        virtualPumpPlugin = this
+        pumpDescription.isBolusCapable = true
+        pumpDescription.bolusStep = 0.1
+        pumpDescription.isExtendedBolusCapable = true
+        pumpDescription.extendedBolusStep = 0.05
+        pumpDescription.extendedBolusDurationStep = 30.0
+        pumpDescription.extendedBolusMaxDuration = 8 * 60.toDouble()
+        pumpDescription.isTempBasalCapable = true
+        pumpDescription.tempBasalStyle = PumpDescription.PERCENT or PumpDescription.ABSOLUTE
+        pumpDescription.maxTempPercent = 500
+        pumpDescription.tempPercentStep = 10
+        pumpDescription.tempDurationStep = 30
+        pumpDescription.tempDurationStep15mAllowed = true
+        pumpDescription.tempDurationStep30mAllowed = true
+        pumpDescription.tempMaxDuration = 24 * 60
+        pumpDescription.isSetBasalProfileCapable = true
+        pumpDescription.basalStep = 0.01
+        pumpDescription.basalMinimumRate = 0.01
+        pumpDescription.isRefillingCapable = true
+        pumpDescription.storesCarbInfo = false
+        pumpDescription.is30minBasalRatesCapable = true
+    }
+
+    fun getFakingStatus(): Boolean {
+        return sp.getBoolean(R.string.key_fromNSAreCommingFakedExtendedBoluses, false)
+    }
+
+    fun setFakingStatus(newStatus: Boolean) {
+        sp.putBoolean(R.string.key_fromNSAreCommingFakedExtendedBoluses, newStatus)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        disposable += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ event: EventPreferenceChange -> if (event.isChanged(resourceHelper, R.string.key_virtualpump_type)) refreshConfiguration() }) { fabricPrivacy.logException(it) }
+        refreshConfiguration()
+    }
+
+    override fun onStop() {
+        disposable.clear()
+        super.onStop()
+    }
+
+    override fun isFakingTempsByExtendedBoluses(): Boolean {
+        return Config.NSCLIENT && getFakingStatus()
+    }
+
+    override fun loadTDDs(): PumpEnactResult { //no result, could read DB in the future?
+        return PumpEnactResult(injector)
+    }
+
+    override fun getCustomActions(): List<CustomAction>? {
+        return null
+    }
+
+    override fun executeCustomAction(customActionType: CustomActionType) {}
+    override fun isInitialized(): Boolean {
+        return true
+    }
+
+    override fun isSuspended(): Boolean {
+        return false
+    }
+
+    override fun isBusy(): Boolean {
+        return false
+    }
+
+    override fun isConnected(): Boolean {
+        return true
+    }
+
+    override fun isConnecting(): Boolean {
+        return false
+    }
+
+    override fun isHandshakeInProgress(): Boolean {
+        return false
+    }
+
+    override fun finishHandshaking() {}
+    override fun connect(reason: String) {
+        //if (!Config.NSCLIENT) NSUpload.uploadDeviceStatus()
+        lastDataTime = System.currentTimeMillis()
+    }
+
+    override fun disconnect(reason: String) {}
+    override fun stopConnecting() {}
+    override fun getPumpStatus() {
+        lastDataTime = System.currentTimeMillis()
+    }
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        lastDataTime = System.currentTimeMillis()
+        // Do nothing here. we are using ConfigBuilderPlugin.getPlugin().getActiveProfile().getProfile();
+        val result = PumpEnactResult(injector)
+        result.success = true
+        val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+        rxBus.send(EventNewNotification(notification))
+        return result
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        return true
+    }
+
+    override fun lastDataTime(): Long {
+        return lastDataTime
+    }
+
+    override fun getBaseBasalRate(): Double {
+        return profileFunction.getProfile()?.basal ?: 0.0
+    }
+
+    override fun getReservoirLevel(): Double {
+        return reservoirInUnits.toDouble()
+    }
+
+    override fun getBatteryLevel(): Int {
+        return batteryPercent
+    }
+
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        result.success = true
+        result.bolusDelivered = detailedBolusInfo.insulin
+        result.carbsDelivered = detailedBolusInfo.carbs
+        result.enacted = result.bolusDelivered > 0 || result.carbsDelivered > 0
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        var delivering = 0.0
+        while (delivering < detailedBolusInfo.insulin) {
+            SystemClock.sleep(200)
+            val bolusingEvent = EventOverviewBolusProgress
+            bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, delivering)
+            bolusingEvent.percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100)
+            rxBus.send(bolusingEvent)
+            delivering += 0.1
+        }
+        SystemClock.sleep(200)
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivered, detailedBolusInfo.insulin)
+        bolusingEvent.percent = 100
+        rxBus.send(bolusingEvent)
+        SystemClock.sleep(1000)
+        aapsLogger.debug(LTag.PUMP, "Delivering treatment insulin: " + detailedBolusInfo.insulin + "U carbs: " + detailedBolusInfo.carbs + "g " + result)
+        rxBus.send(EventVirtualPumpUpdateGui())
+        lastDataTime = System.currentTimeMillis()
+        treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
+        return result
+    }
+
+    override fun stopBolusDelivering() {}
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+        val tempBasal = TemporaryBasal()
+            .date(System.currentTimeMillis())
+            .absolute(absoluteRate)
+            .duration(durationInMinutes)
+            .source(Source.USER)
+        val result = PumpEnactResult(injector)
+        result.success = true
+        result.enacted = true
+        result.isTempCancel = false
+        result.absolute = absoluteRate
+        result.duration = durationInMinutes
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        treatmentsPlugin.addToHistoryTempBasal(tempBasal)
+        aapsLogger.debug(LTag.PUMP, "Setting temp basal absolute: $result")
+        rxBus.send(EventVirtualPumpUpdateGui())
+        lastDataTime = System.currentTimeMillis()
+        return result
+    }
+
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+        val tempBasal = TemporaryBasal()
+            .date(System.currentTimeMillis())
+            .percent(percent)
+            .duration(durationInMinutes)
+            .source(Source.USER)
+        val result = PumpEnactResult(injector)
+        result.success = true
+        result.enacted = true
+        result.percent = percent
+        result.isPercent = true
+        result.isTempCancel = false
+        result.duration = durationInMinutes
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        treatmentsPlugin.addToHistoryTempBasal(tempBasal)
+        aapsLogger.debug(LTag.PUMP, "Settings temp basal percent: $result")
+        rxBus.send(EventVirtualPumpUpdateGui())
+        lastDataTime = System.currentTimeMillis()
+        return result
+    }
+
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        val result = cancelExtendedBolus()
+        if (!result.success) return result
+        val extendedBolus = ExtendedBolus()
+            .date(System.currentTimeMillis())
+            .insulin(insulin)
+            .durationInMinutes(durationInMinutes)
+            .source(Source.USER)
+        result.success = true
+        result.enacted = true
+        result.bolusDelivered = insulin
+        result.isTempCancel = false
+        result.duration = durationInMinutes
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+        aapsLogger.debug(LTag.PUMP, "Setting extended bolus: $result")
+        rxBus.send(EventVirtualPumpUpdateGui())
+        lastDataTime = System.currentTimeMillis()
+        return result
+    }
+
+    override fun cancelTempBasal(force: Boolean): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        result.success = true
+        result.isTempCancel = true
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        if (treatmentsPlugin.isTempBasalInProgress) {
+            result.enacted = true
+            val tempStop = TemporaryBasal().date(System.currentTimeMillis()).source(Source.USER)
+            treatmentsPlugin.addToHistoryTempBasal(tempStop)
+            //tempBasal = null;
+            aapsLogger.debug(LTag.PUMP, "Canceling temp basal: $result")
+            rxBus.send(EventVirtualPumpUpdateGui())
+        }
+        lastDataTime = System.currentTimeMillis()
+        return result
+    }
+
+    override fun cancelExtendedBolus(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (treatmentsPlugin.isInHistoryExtendedBoluslInProgress) {
+            val exStop = ExtendedBolus(System.currentTimeMillis())
+            exStop.source = Source.USER
+            treatmentsPlugin.addToHistoryExtendedBolus(exStop)
+        }
+        result.success = true
+        result.enacted = true
+        result.isTempCancel = true
+        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        aapsLogger.debug(LTag.PUMP, "Canceling extended bolus: $result")
+        rxBus.send(EventVirtualPumpUpdateGui())
+        lastDataTime = System.currentTimeMillis()
+        return result
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String): JSONObject {
+        val now = System.currentTimeMillis()
+        if (!sp.getBoolean("virtualpump_uploadstatus", false)) {
+            return JSONObject()
+        }
+        val pump = JSONObject()
+        val battery = JSONObject()
+        val status = JSONObject()
+        val extended = JSONObject()
+        try {
+            battery.put("percent", batteryPercent)
+            status.put("status", "normal")
+            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
+            try {
+                extended.put("ActiveProfile", profileName)
+            } catch (ignored: Exception) {
+            }
+            val tb = treatmentsPlugin.getTempBasalFromHistory(now)
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile))
+                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date))
+                extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
+            }
+            val eb = treatmentsPlugin.getExtendedBolusFromHistory(now)
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate())
+                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date))
+                extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
+            }
+            status.put("timestamp", DateUtil.toISOString(now))
+            pump.put("battery", battery)
+            pump.put("status", status)
+            pump.put("extended", extended)
+            pump.put("reservoir", reservoirInUnits)
+            pump.put("clock", DateUtil.toISOString(now))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return pump
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return pumpDescription.pumpType.manufacturer
+    }
+
+    override fun model(): PumpType {
+        return pumpDescription.pumpType
+    }
+
+    override fun serialNumber(): String {
+        return instanceId()
+    }
+
+    override fun getPumpDescription(): PumpDescription {
+        return pumpDescription
+    }
+
+    override fun shortStatus(veryShort: Boolean): String {
+        return "Virtual Pump"
+    }
+
+    override fun canHandleDST(): Boolean {
+        return true
+    }
+
+    fun refreshConfiguration() {
+        val pumptype = sp.getString(R.string.key_virtualpump_type, "Generic AAPS")
+        val pumpTypeNew = PumpType.getByDescription(pumptype)
+        aapsLogger.debug(LTag.PUMP, "Pump in configuration: $pumptype, PumpType object: $pumpTypeNew")
+        if (pumpType == pumpTypeNew) return
+        aapsLogger.debug(LTag.PUMP, "New pump configuration found ($pumpTypeNew), changing from previous ($pumpType)")
+        pumpDescription.setPumpDescription(pumpTypeNew)
+        pumpType = pumpTypeNew
+    }
+
+    override fun timeDateOrTimeZoneChanged() {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java
deleted file mode 100644
index 6c8a9e8ba5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.sensitivity;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.SensitivityInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SafeParse;
-
-public abstract class AbstractSensitivityPlugin extends PluginBase implements SensitivityInterface {
-
-    private static final Logger log = LoggerFactory.getLogger(L.AUTOSENS);
-
-    public AbstractSensitivityPlugin(PluginDescription pluginDescription) {
-        super(pluginDescription);
-    }
-
-    @Override
-    public abstract AutosensResult detectSensitivity(IobCobCalculatorPlugin plugin, long fromTime, long toTime);
-
-    AutosensResult fillResult(double ratio, double carbsAbsorbed, String pastSensitivity,
-                              String ratioLimit, String sensResult, int deviationsArraySize) {
-        return this.fillResult(ratio, carbsAbsorbed, pastSensitivity, ratioLimit, sensResult,
-                deviationsArraySize,
-                SafeParse.stringToDouble(SP.getString(R.string.key_openapsama_autosens_min, "0.7")),
-                SafeParse.stringToDouble(SP.getString(R.string.key_openapsama_autosens_max, "1.2")));
-    }
-
-    public AutosensResult fillResult(double ratio, double carbsAbsorbed, String pastSensitivity,
-                                     String ratioLimit, String sensResult, int deviationsArraySize,
-                                     double ratioMin, double ratioMax) {
-        double rawRatio = ratio;
-        ratio = Math.max(ratio, ratioMin);
-        ratio = Math.min(ratio, ratioMax);
-
-        //If not-excluded data <= MIN_HOURS -> don't do Autosens
-        //If not-excluded data >= MIN_HOURS_FULL_AUTOSENS -> full Autosens
-        //Between MIN_HOURS and MIN_HOURS_FULL_AUTOSENS: gradually increase autosens
-        double autosensContrib = (Math.min(Math.max(MIN_HOURS, deviationsArraySize / 12d),
-                MIN_HOURS_FULL_AUTOSENS) - MIN_HOURS) / (MIN_HOURS_FULL_AUTOSENS - MIN_HOURS);
-        ratio = autosensContrib * (ratio - 1) + 1;
-
-        if (autosensContrib != 1d) {
-            ratioLimit += "(" + deviationsArraySize + " of " + MIN_HOURS_FULL_AUTOSENS * 12 + " values) ";
-        }
-
-        if (ratio != rawRatio) {
-            ratioLimit += "Ratio limited from " + rawRatio + " to " + ratio;
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug(ratioLimit);
-        }
-
-        AutosensResult output = new AutosensResult();
-        output.ratio = Round.roundTo(ratio, 0.01);
-        output.carbsAbsorbed = Round.roundTo(carbsAbsorbed, 0.01);
-        output.pastSensitivity = pastSensitivity;
-        output.ratioLimit = ratioLimit;
-        output.sensResult = sensResult;
-        return output;
-    }
-
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
new file mode 100644
index 0000000000..43e8b89a5d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.sensitivity
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.SensitivityInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.Round
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import kotlin.math.max
+import kotlin.math.min
+
+abstract class AbstractSensitivityPlugin(
+    pluginDescription: PluginDescription,
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper:
+    ResourceHelper,
+    val sp: SP
+) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface {
+
+    abstract override fun detectSensitivity(plugin: IobCobCalculatorPlugin, fromTime: Long, toTime: Long): AutosensResult
+
+    fun fillResult(ratio: Double, carbsAbsorbed: Double, pastSensitivity: String,
+                   ratioLimit: String, sensResult: String, deviationsArraySize: Int): AutosensResult {
+        return fillResult(ratio, carbsAbsorbed, pastSensitivity, ratioLimit, sensResult,
+            deviationsArraySize,
+            SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_min, "0.7")),
+            SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_max, "1.2")))
+    }
+
+    fun fillResult(ratioParam: Double, carbsAbsorbed: Double, pastSensitivity: String,
+                   ratioLimitParam: String, sensResult: String, deviationsArraySize: Int,
+                   ratioMin: Double, ratioMax: Double): AutosensResult {
+        var ratio = ratioParam
+        var ratioLimit = ratioLimitParam
+        val rawRatio = ratio
+        ratio = max(ratio, ratioMin)
+        ratio = min(ratio, ratioMax)
+
+        //If not-excluded data <= MIN_HOURS -> don't do Autosens
+        //If not-excluded data >= MIN_HOURS_FULL_AUTOSENS -> full Autosens
+        //Between MIN_HOURS and MIN_HOURS_FULL_AUTOSENS: gradually increase autosens
+        val autosensContrib = (min(max(SensitivityInterface.MIN_HOURS, deviationsArraySize / 12.0),
+            SensitivityInterface.MIN_HOURS_FULL_AUTOSENS) - SensitivityInterface.MIN_HOURS) / (SensitivityInterface.MIN_HOURS_FULL_AUTOSENS - SensitivityInterface.MIN_HOURS)
+        ratio = autosensContrib * (ratio - 1) + 1
+        if (autosensContrib != 1.0) {
+            ratioLimit += "(" + deviationsArraySize + " of " + SensitivityInterface.MIN_HOURS_FULL_AUTOSENS * 12 + " values) "
+        }
+        if (ratio != rawRatio) {
+            ratioLimit += "Ratio limited from $rawRatio to $ratio"
+            aapsLogger.debug(LTag.AUTOSENS, ratioLimit)
+        }
+        val output = AutosensResult()
+        output.ratio = Round.roundTo(ratio, 0.01)
+        output.carbsAbsorbed = Round.roundTo(carbsAbsorbed, 0.01)
+        output.pastSensitivity = pastSensitivity
+        output.ratioLimit = ratioLimit
+        output.sensResult = sensResult
+        return output
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index 8cfa903fb8..cd10ea6088 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.sensitivity;
 
+import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -17,67 +18,73 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 24.06.2017.
  */
 
+@Singleton
 public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
 
-    static SensitivityAAPSPlugin plugin = null;
+    private SP sp;
+    private ProfileFunction profileFunction;
+    private ResourceHelper resourceHelper;
 
-    public static SensitivityAAPSPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SensitivityAAPSPlugin();
-        return plugin;
-    }
-
-    public SensitivityAAPSPlugin() {
+    @Inject
+    public SensitivityAAPSPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            ProfileFunction profileFunction
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.SENSITIVITY)
-                .pluginName(R.string.sensitivityaaps)
-                .shortName(R.string.sensitivity_shortname)
-                .preferencesId(R.xml.pref_absorption_aaps)
-                .description(R.string.description_sensitivity_aaps)
+                        .mainType(PluginType.SENSITIVITY)
+                        .pluginName(R.string.sensitivityaaps)
+                        .shortName(R.string.sensitivity_shortname)
+                        .preferencesId(R.xml.pref_absorption_aaps)
+                        .description(R.string.description_sensitivity_aaps),
+                injector, aapsLogger, resourceHelper, sp
         );
+        this.sp = sp;
+        this.profileFunction = profileFunction;
     }
 
-    @Override
+    @NonNull @Override
     public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
-        String age = SP.getString(R.string.key_age, "");
+        String age = sp.getString(R.string.key_age, "");
         int defaultHours = 24;
-        if (age.equals(MainApp.gs(R.string.key_adult))) defaultHours = 24;
-        if (age.equals(MainApp.gs(R.string.key_teenage))) defaultHours = 4;
-        if (age.equals(MainApp.gs(R.string.key_child))) defaultHours = 4;
-        int hoursForDetection = SP.getInt(R.string.key_openapsama_autosens_period, defaultHours);
+        if (age.equals(resourceHelper.gs(R.string.key_adult))) defaultHours = 24;
+        if (age.equals(resourceHelper.gs(R.string.key_teenage))) defaultHours = 4;
+        if (age.equals(resourceHelper.gs(R.string.key_child))) defaultHours = 4;
+        int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours);
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
-            log.error("No profile");
+            getAapsLogger().error("No profile");
             return new AutosensResult();
         }
 
         if (autosensDataTable == null || autosensDataTable.size() < 4) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -108,7 +115,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
             }
 
             // reset deviations after profile switch
-            if (ProfileSwitch.isEvent5minBack(profileSwitches, autosensData.time, true)) {
+            if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
                 deviationsArray.clear();
                 pastSensitivity += "(PROFILESWITCH)";
             }
@@ -142,8 +149,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
         String ratioLimit = "";
         String sensResult = "";
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Records: " + index + "   " + pastSensitivity);
+        getAapsLogger().debug(LTag.AUTOSENS, "Records: " + index + "   " + pastSensitivity);
 
         Arrays.sort(deviations);
 
@@ -159,18 +165,16 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
             sensResult = "Sensitivity normal";
         }
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug(sensResult);
+        getAapsLogger().debug(LTag.AUTOSENS, sensResult);
 
         AutosensResult output = fillResult(ratio, current.cob, pastSensitivity, ratioLimit,
                 sensResult, deviationsArray.size());
 
-        if (L.isEnabled(L.AUTOSENS)) {
-            log.debug("Sensitivity to: {}, percentile: {} ratio: {} mealCOB: ",
-                    new Date(toTime).toLocaleString(),
-                    percentile, output.ratio, ratio, current.cob);
-            log.debug("Sensitivity to: deviations " + Arrays.toString(deviations));
-        }
+        getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
+                + DateUtil.dateAndTimeString(toTime) +
+                " ratio: " + output.ratio
+                + " mealCOB: " + current.cob);
+        getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: deviations " + Arrays.toString(deviations));
 
         return output;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
index 6298724514..423be4f548 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.sensitivity;
 
+import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -17,62 +18,65 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 24.06.2017.
  */
-
+@Singleton
 public class SensitivityOref0Plugin extends AbstractSensitivityPlugin {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
 
-    static SensitivityOref0Plugin plugin = null;
+    private ProfileFunction profileFunction;
 
-    public static SensitivityOref0Plugin getPlugin() {
-        if (plugin == null)
-            plugin = new SensitivityOref0Plugin();
-        return plugin;
-    }
-
-    public SensitivityOref0Plugin() {
+    @Inject
+    public SensitivityOref0Plugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            ProfileFunction profileFunction
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.SENSITIVITY)
-                .pluginName(R.string.sensitivityoref0)
-                .shortName(R.string.sensitivity_shortname)
-                .preferencesId(R.xml.pref_absorption_oref0)
-                .description(R.string.description_sensitivity_oref0)
+                        .mainType(PluginType.SENSITIVITY)
+                        .pluginName(R.string.sensitivityoref0)
+                        .shortName(R.string.sensitivity_shortname)
+                        .preferencesId(R.xml.pref_absorption_oref0)
+                        .description(R.string.description_sensitivity_oref0)
+                        .setDefault(),
+                injector, aapsLogger, resourceHelper, sp
         );
+        this.profileFunction = profileFunction;
     }
 
-    @Override
+    @NonNull @Override
     public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
         int hoursForDetection = 24;
 
-        long now = System.currentTimeMillis();
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
-            log.error("No profile");
+            getAapsLogger().error("No profile");
             return new AutosensResult();
         }
 
         if (autosensDataTable == null || autosensDataTable.size() < 4) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -103,7 +107,7 @@ public class SensitivityOref0Plugin extends AbstractSensitivityPlugin {
             }
 
             // reset deviations after profile switch
-            if (ProfileSwitch.isEvent5minBack(profileSwitches, autosensData.time, true)) {
+            if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
                 deviationsArray.clear();
                 pastSensitivity += "(PROFILESWITCH)";
             }
@@ -133,19 +137,17 @@ public class SensitivityOref0Plugin extends AbstractSensitivityPlugin {
 
         double sens = profile.getIsfMgdl();
 
-        double ratio = 1;
+        double ratio;
         String ratioLimit = "";
-        String sensResult = "";
+        String sensResult;
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Records: " + index + "   " + pastSensitivity);
+        getAapsLogger().debug(LTag.AUTOSENS, "Records: " + index + "   " + pastSensitivity);
 
         Arrays.sort(deviations);
 
         for (double i = 0.9; i > 0.1; i = i - 0.02) {
             if (IobCobCalculatorPlugin.percentile(deviations, (i + 0.02)) >= 0 && IobCobCalculatorPlugin.percentile(deviations, i) < 0) {
-                if (L.isEnabled(L.AUTOSENS))
-                    log.debug(Math.round(100 * i) + "% of non-meal deviations negative (target 45%-50%)");
+                getAapsLogger().debug(LTag.AUTOSENS, Math.round(100 * i) + "% of non-meal deviations negative (target 45%-50%)");
             }
         }
         double pSensitive = IobCobCalculatorPlugin.percentile(deviations, 0.50);
@@ -163,17 +165,17 @@ public class SensitivityOref0Plugin extends AbstractSensitivityPlugin {
             sensResult = "Sensitivity normal";
         }
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug(sensResult);
+        getAapsLogger().debug(LTag.AUTOSENS, sensResult);
 
         ratio = 1 + (basalOff / profile.getMaxDailyBasal());
 
         AutosensResult output = fillResult(ratio, current.cob, pastSensitivity, ratioLimit,
                 sensResult, deviationsArray.size());
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Sensitivity to: {} ratio: {} mealCOB: {}",
-                    new Date(toTime).toLocaleString(), output.ratio, current.cob);
+        getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
+                + DateUtil.dateAndTimeString(toTime) +
+                " ratio: " + output.ratio
+                + " mealCOB: " + current.cob);
 
         return output;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 9f9c165c7d..daf141029e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.sensitivity;
 
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -17,36 +17,42 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 19.06.2018.
  */
-
+@Singleton
 public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
 
-    static SensitivityOref1Plugin plugin = null;
+    private ProfileFunction profileFunction;
 
-    public static SensitivityOref1Plugin getPlugin() {
-        if (plugin == null)
-            plugin = new SensitivityOref1Plugin();
-        return plugin;
-    }
-
-    public SensitivityOref1Plugin() {
+    @Inject
+    public SensitivityOref1Plugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            ProfileFunction profileFunction
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.SENSITIVITY)
-                .pluginName(R.string.sensitivityoref1)
-                .shortName(R.string.sensitivity_shortname)
-                .preferencesId(R.xml.pref_absorption_oref1)
-                .description(R.string.description_sensitivity_oref1)
+                        .mainType(PluginType.SENSITIVITY)
+                        .pluginName(R.string.sensitivityoref1)
+                        .shortName(R.string.sensitivity_shortname)
+                        .enableByDefault(true)
+                        .preferencesId(R.xml.pref_absorption_oref1)
+                        .description(R.string.description_sensitivity_oref1),
+                injector, aapsLogger, resourceHelper, sp
         );
+        this.profileFunction = profileFunction;
     }
 
     @Override
@@ -55,24 +61,22 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         // dependency, this should be avoided
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
 
         if (profile == null) {
-            log.error("No profile");
+            getAapsLogger().error("No profile");
             return new AutosensResult();
         }
 
         if (autosensDataTable == null || autosensDataTable.size() < 4) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
         // the current
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -118,7 +122,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 }
 
                 // reset deviations after profile switch
-                if (ProfileSwitch.isEvent5minBack(profileSwitches, autosensData.time, true)) {
+                if (ProfileSwitch.isEvent5minBack(getAapsLogger(),profileSwitches, autosensData.time, true)) {
                     deviationsArray.clear();
                     pastSensitivity += "(PROFILESWITCH)";
                 }
@@ -194,7 +198,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             double sens = profile.getIsfMgdl();
 
             if (L.isEnabled(L.AUTOSENS))
-                log.debug(senstime + "Records: " + index + "   " + pastSensitivity);
+                getAapsLogger().debug(LTag.AUTOSENS,"Records: " + index + "   " + pastSensitivity);
 
             Arrays.sort(deviations);
             double pSensitive = IobCobCalculatorPlugin.percentile(deviations, 0.50);
@@ -213,7 +217,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             }
 
             if (L.isEnabled(L.AUTOSENS))
-                log.debug(sensResult);
+                getAapsLogger().debug(LTag.AUTOSENS,sensResult);
 
             double ratio = 1 + (basalOff / profile.getMaxDailyBasal());
 
@@ -236,7 +240,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 sensResultArray.get(key)+comparison, deviationsHour.get(key).size());
 
         if (L.isEnabled(L.AUTOSENS))
-            log.debug(message+" Sensitivity to: {} ratio: {} mealCOB: {}",
+            getAapsLogger().debug(LTag.AUTOSENS, message+" Sensitivity to: {} ratio: {} mealCOB: {}",
                     new Date(toTime).toLocaleString(), output.ratio, current.cob);
 
         return output;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
index 5d0aac4d4c..5a00a47461 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.sensitivity;
 
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -15,68 +15,73 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 24.06.2017.
  */
-
+@Singleton
 public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin {
-    private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
 
-    private static SensitivityWeightedAveragePlugin plugin = null;
+    private SP sp;
+    private ResourceHelper resourceHelper;
+    private ProfileFunction profileFunction;
 
-    public static SensitivityWeightedAveragePlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SensitivityWeightedAveragePlugin();
-        return plugin;
-    }
-
-    public SensitivityWeightedAveragePlugin() {
+    @Inject
+    public SensitivityWeightedAveragePlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            ProfileFunction profileFunction
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.SENSITIVITY)
-                .pluginName(R.string.sensitivityweightedaverage)
-                .shortName(R.string.sensitivity_shortname)
-                .preferencesId(R.xml.pref_absorption_aaps)
-                .description(R.string.description_sensitivity_weighted_average)
+                        .mainType(PluginType.SENSITIVITY)
+                        .pluginName(R.string.sensitivityweightedaverage)
+                        .shortName(R.string.sensitivity_shortname)
+                        .preferencesId(R.xml.pref_absorption_aaps)
+                        .description(R.string.description_sensitivity_weighted_average),
+                injector, aapsLogger, resourceHelper, sp
         );
+        this.sp = sp;
+        this.resourceHelper = resourceHelper;
+        this.profileFunction = profileFunction;
     }
 
     @Override
     public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
-        String age = SP.getString(R.string.key_age, "");
+        String age = sp.getString(R.string.key_age, "");
         int defaultHours = 24;
-        if (age.equals(MainApp.gs(R.string.key_adult))) defaultHours = 24;
-        if (age.equals(MainApp.gs(R.string.key_teenage))) defaultHours = 4;
-        if (age.equals(MainApp.gs(R.string.key_child))) defaultHours = 4;
-        int hoursForDetection = SP.getInt(R.string.key_openapsama_autosens_period, defaultHours);
+        if (age.equals(resourceHelper.gs(R.string.key_adult))) defaultHours = 24;
+        if (age.equals(resourceHelper.gs(R.string.key_teenage))) defaultHours = 4;
+        if (age.equals(resourceHelper.gs(R.string.key_child))) defaultHours = 4;
+        int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours);
 
         if (autosensDataTable == null || autosensDataTable.size() < 4) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. lastDataTime=" + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
         if (profile == null) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("No profile available");
+            getAapsLogger().debug(LTag.AUTOSENS, "No profile available");
             return new AutosensResult();
         }
 
@@ -112,7 +117,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
             }
 
             // reset deviations after profile switch
-            if (ProfileSwitch.isEvent5minBack(profileSwitches, autosensData.time, true)) {
+            if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
                 data.clear();
                 pastSensitivity += "(PROFILESWITCH)";
             }
@@ -140,12 +145,10 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
         }
 
         if (data.size() == 0) {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
+            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
             return new AutosensResult();
         } else {
-            if (L.isEnabled(L.AUTOSENS))
-                log.debug("Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
+            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
         }
 
         double weightedsum = 0;
@@ -169,8 +172,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
         String ratioLimit = "";
         String sensResult;
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Records: " + index + "   " + pastSensitivity);
+        getAapsLogger().debug(LTag.AUTOSENS, "Records: " + index + "   " + pastSensitivity);
 
         double average = weightedsum / weights;
         double basalOff = average * (60 / 5.0) / sens;
@@ -184,15 +186,15 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
             sensResult = "Sensitivity normal";
         }
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug(sensResult);
+        getAapsLogger().debug(LTag.AUTOSENS, sensResult);
 
         AutosensResult output = fillResult(ratio, current.cob, pastSensitivity, ratioLimit,
                 sensResult, data.size());
 
-        if (L.isEnabled(L.AUTOSENS))
-            log.debug("Sensitivity to: {}  weightedaverage: {} ratio: {} mealCOB: {}", new Date(toTime).toLocaleString(),
-                    average, output.ratio, current.cob);
+        getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
+                + DateUtil.dateAndTimeString(toTime) +
+                " ratio: " + output.ratio
+                + " mealCOB: " + current.cob);
 
         return output;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java
deleted file mode 100644
index b67cadfed4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.T;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-/**
- * Created by mike on 16.10.2017.
- */
-
-public class BGSourceFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-    private RecyclerView recyclerView;
-
-    private final long MILLS_TO_THE_PAST = T.hours(12).msecs();
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        try {
-            View view = inflater.inflate(R.layout.bgsource_fragment, container, false);
-
-            recyclerView = view.findViewById(R.id.bgsource_recyclerview);
-            recyclerView.setHasFixedSize(true);
-            LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-            recyclerView.setLayoutManager(llm);
-
-            long now = System.currentTimeMillis();
-            RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false));
-            recyclerView.setAdapter(adapter);
-
-            return view;
-        } catch (Exception e) {
-            FabricPrivacy.logException(e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGUI(), FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public synchronized void onPause() {
-        disposable.clear();
-        super.onPause();
-    }
-
-    protected void updateGUI() {
-        long now = System.currentTimeMillis();
-        recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false)), true);
-    }
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.BgReadingsViewHolder> {
-
-        List<BgReading> bgReadings;
-
-        RecyclerViewAdapter(List<BgReading> bgReadings) {
-            this.bgReadings = bgReadings;
-        }
-
-        @NonNull
-        @Override
-        public BgReadingsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.bgsource_item, viewGroup, false);
-            return new BgReadingsViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(@NonNull BgReadingsViewHolder holder, int position) {
-            BgReading bgReading = bgReadings.get(position);
-            holder.ns.setVisibility(NSUpload.isIdValid(bgReading._id) ? View.VISIBLE : View.GONE);
-            holder.invalid.setVisibility(!bgReading.isValid ? View.VISIBLE : View.GONE);
-            holder.date.setText(DateUtil.dateAndTimeString(bgReading.date));
-            holder.value.setText(bgReading.valueToUnitsToString(ProfileFunctions.getSystemUnits()));
-            holder.direction.setText(bgReading.directionToSymbol());
-            holder.remove.setTag(bgReading);
-        }
-
-        @Override
-        public int getItemCount() {
-            return bgReadings.size();
-        }
-
-        class BgReadingsViewHolder extends RecyclerView.ViewHolder  {
-            TextView date;
-            TextView value;
-            TextView direction;
-            TextView invalid;
-            TextView ns;
-            TextView remove;
-
-            BgReadingsViewHolder(View itemView) {
-                super(itemView);
-                date = itemView.findViewById(R.id.bgsource_date);
-                value = itemView.findViewById(R.id.bgsource_value);
-                direction = itemView.findViewById(R.id.bgsource_direction);
-                invalid = itemView.findViewById(R.id.invalid_sign);
-                ns = itemView.findViewById(R.id.ns_sign);
-                remove = itemView.findViewById(R.id.bgsource_remove);
-                remove.setOnClickListener(v -> {
-                    final BgReading bgReading = (BgReading) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord) + "\n" + DateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(ProfileFunctions.getSystemUnits()), () -> {
-                        bgReading.isValid = false;
-                        MainApp.getDbHelper().update(bgReading);
-                        updateGUI();
-                    });
-                });
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
new file mode 100644
index 0000000000..b490180059
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -0,0 +1,118 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.plugins.source.BGSourceFragment.RecyclerViewAdapter.BgReadingsViewHolder
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.bgsource_fragment.*
+import javax.inject.Inject
+
+class BGSourceFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    private val disposable = CompositeDisposable()
+    private val MILLS_TO_THE_PAST = T.hours(12).msecs()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.bgsource_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        bgsource_recyclerview.setHasFixedSize(true)
+        bgsource_recyclerview.layoutManager = LinearLayoutManager(view.context)
+        val now = System.currentTimeMillis()
+        bgsource_recyclerview.adapter = RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false))
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    @Synchronized
+    override fun onPause() {
+        disposable.clear()
+        super.onPause()
+    }
+
+    private fun updateGUI() {
+        val now = System.currentTimeMillis()
+        bgsource_recyclerview?.swapAdapter(RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false)), true)
+    }
+
+    inner class RecyclerViewAdapter internal constructor(private var bgReadings: List<BgReading>) : RecyclerView.Adapter<BgReadingsViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): BgReadingsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.bgsource_item, viewGroup, false)
+            return BgReadingsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: BgReadingsViewHolder, position: Int) {
+            val bgReading = bgReadings[position]
+            holder.ns.visibility = if (NSUpload.isIdValid(bgReading._id)) View.VISIBLE else View.GONE
+            holder.invalid.visibility = if (!bgReading.isValid) View.VISIBLE else View.GONE
+            holder.date.text = DateUtil.dateAndTimeString(bgReading.date)
+            holder.value.text = bgReading.valueToUnitsToString(profileFunction.getUnits())
+            holder.direction.text = bgReading.directionToSymbol()
+            holder.remove.tag = bgReading
+        }
+
+        override fun getItemCount(): Int {
+            return bgReadings.size
+        }
+
+        inner class BgReadingsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var date: TextView = itemView.findViewById(R.id.bgsource_date)
+            var value: TextView = itemView.findViewById(R.id.bgsource_value)
+            var direction: TextView = itemView.findViewById(R.id.bgsource_direction)
+            var invalid: TextView = itemView.findViewById(R.id.invalid_sign)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+            var remove: TextView = itemView.findViewById(R.id.bgsource_remove)
+
+            init {
+                remove.setOnClickListener { v: View ->
+                    val bgReading = v.tag as BgReading
+                    activity?.let { activity ->
+                        val text = DateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(profileFunction.getUnits())
+                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                            bgReading.isValid = false
+                            MainApp.getDbHelper().update(bgReading)
+                            updateGUI()
+                        })
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
rename to app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index 633f16cf10..f123b4171a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -3,40 +3,45 @@ package info.nightscout.androidaps.plugins.source
 import android.content.Intent
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.RequestDexcomPermissionActivity
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.interfaces.BgSourceInterface
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.SP
 import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONObject
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object SourceDexcomPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.BGSOURCE)
-        .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginName(R.string.dexcom_app_patched)
-        .shortName(R.string.dexcom_short)
-        .preferencesId(R.xml.pref_bgsource)
-        .description(R.string.description_source_dexcom)), BgSourceInterface {
-
-    private val log = LoggerFactory.getLogger(L.BGSOURCE)
-
-    private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
-            "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
-            "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
-            "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
-
-    const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
+@Singleton
+class DexcomPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val sp: SP,
+    private val mainApp: MainApp,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.dexcom_app_patched)
+    .shortName(R.string.dexcom_short)
+    .preferencesId(R.xml.pref_bgsourcedexcom)
+    .description(R.string.description_source_dexcom)
+    .setDefault(),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
 
     override fun advancedFilteringSupported(): Boolean {
         return true
@@ -44,15 +49,15 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
 
     override fun onStart() {
         super.onStart()
-        if (ContextCompat.checkSelfPermission(MainApp.instance(), PERMISSION) != PackageManager.PERMISSION_GRANTED) {
-            val intent = Intent(MainApp.instance(), RequestDexcomPermissionActivity::class.java)
+        if (ContextCompat.checkSelfPermission(mainApp, PERMISSION) != PackageManager.PERMISSION_GRANTED) {
+            val intent = Intent(mainApp, RequestDexcomPermissionActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            MainApp.instance().startActivity(intent)
+            mainApp.startActivity(intent)
         }
     }
 
     fun findDexcomPackageName(): String? {
-        val packageManager = MainApp.instance().packageManager
+        val packageManager = mainApp.packageManager
         for (packageInfo in packageManager.getInstalledPackages(0)) {
             if (PACKAGE_NAMES.contains(packageInfo.packageName)) return packageInfo.packageName
         }
@@ -72,10 +77,10 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                     bgReading.date = glucoseValue.getLong("timestamp") * 1000
                     bgReading.raw = 0.0
                     if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom$sensorType")) {
-                        if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+                        if (sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
                             NSUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
                         }
-                        if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+                        if (sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
                             NSUpload.sendToXdrip(bgReading)
                         }
                     }
@@ -96,11 +101,18 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                             jsonObject.put("glucoseType", "Finger")
                             jsonObject.put("glucose", meter.getInt("meterValue"))
                             jsonObject.put("units", Constants.MGDL)
+
+                            val careportalEvent = CareportalEvent()
+                            careportalEvent.date = timestamp
+                            careportalEvent.source = Source.USER
+                            careportalEvent.eventType = CareportalEvent.BGCHECK
+                            careportalEvent.json = jsonObject.toString()
+                            MainApp.getDbHelper().createOrUpdate(careportalEvent)
                             NSUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
             }
-            if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
+            if (sp.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
                 intent.extras?.let {
                     val sensorInsertionTime = it.getLong("sensorInsertionTime") * 1000
                     val now = DateUtil.now()
@@ -110,12 +122,26 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                             jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
                             jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
                             jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
+                            val careportalEvent = CareportalEvent()
+                            careportalEvent.date = sensorInsertionTime
+                            careportalEvent.source = Source.USER
+                            careportalEvent.eventType = CareportalEvent.SENSORCHANGE
+                            careportalEvent.json = jsonObject.toString()
+                            MainApp.getDbHelper().createOrUpdate(careportalEvent)
                             NSUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
             }
         } catch (e: Exception) {
-            log.error("Error while processing intent from Dexcom App", e)
+            aapsLogger.error("Error while processing intent from Dexcom App", e)
         }
     }
+
+    companion object {
+        private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
+            "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
+            "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
+            "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
+        const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
new file mode 100644
index 0000000000..49e6ddbab8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
@@ -0,0 +1,122 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.L.isEnabled
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EversensePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    private val sp: SP,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.eversense)
+    .shortName(R.string.eversense_shortname)
+    .preferencesId(R.xml.pref_bgsource)
+    .description(R.string.description_source_eversense),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    override fun advancedFilteringSupported(): Boolean {
+        return false
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        if (isEnabled(L.BGSOURCE)) {
+            if (bundle.containsKey("currentCalibrationPhase")) aapsLogger.debug(LTag.BGSOURCE, "currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"))
+            if (bundle.containsKey("placementModeInProgress")) aapsLogger.debug(LTag.BGSOURCE, "placementModeInProgress: " + bundle.getBoolean("placementModeInProgress"))
+            if (bundle.containsKey("glucoseLevel")) aapsLogger.debug(LTag.BGSOURCE, "glucoseLevel: " + bundle.getInt("glucoseLevel"))
+            if (bundle.containsKey("glucoseTrendDirection")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTrendDirection: " + bundle.getString("glucoseTrendDirection"))
+            if (bundle.containsKey("glucoseTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("glucoseTimestamp")))
+            if (bundle.containsKey("batteryLevel")) aapsLogger.debug(LTag.BGSOURCE, "batteryLevel: " + bundle.getString("batteryLevel"))
+            if (bundle.containsKey("signalStrength")) aapsLogger.debug(LTag.BGSOURCE, "signalStrength: " + bundle.getString("signalStrength"))
+            if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
+            if (bundle.containsKey("isXLVersion")) aapsLogger.debug(LTag.BGSOURCE, "isXLVersion: " + bundle.getBoolean("isXLVersion"))
+            if (bundle.containsKey("transmitterModelNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterModelNumber: " + bundle.getString("transmitterModelNumber"))
+            if (bundle.containsKey("transmitterSerialNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterSerialNumber: " + bundle.getString("transmitterSerialNumber"))
+            if (bundle.containsKey("transmitterAddress")) aapsLogger.debug(LTag.BGSOURCE, "transmitterAddress: " + bundle.getString("transmitterAddress"))
+            if (bundle.containsKey("sensorInsertionTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "sensorInsertionTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("sensorInsertionTimestamp")))
+            if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
+            if (bundle.containsKey("transmitterConnectionState")) aapsLogger.debug(LTag.BGSOURCE, "transmitterConnectionState: " + bundle.getString("transmitterConnectionState"))
+        }
+        if (bundle.containsKey("glucoseLevels")) {
+            val glucoseLevels = bundle.getIntArray("glucoseLevels")
+            val glucoseRecordNumbers = bundle.getIntArray("glucoseRecordNumbers")
+            val glucoseTimestamps = bundle.getLongArray("glucoseTimestamps")
+            if (glucoseLevels != null && glucoseRecordNumbers != null && glucoseTimestamps != null) {
+                if (isEnabled(L.BGSOURCE)) {
+                    aapsLogger.debug(LTag.BGSOURCE, "glucoseLevels" + Arrays.toString(glucoseLevels))
+                    aapsLogger.debug(LTag.BGSOURCE, "glucoseRecordNumbers" + Arrays.toString(glucoseRecordNumbers))
+                    aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamps" + Arrays.toString(glucoseTimestamps))
+                }
+                for (i in glucoseLevels.indices) {
+                    val bgReading = BgReading()
+                    bgReading.value = glucoseLevels[i].toDouble()
+                    bgReading.date = glucoseTimestamps[i]
+                    bgReading.raw = 0.0
+                    val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Eversense")
+                    if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+                        NSUpload.uploadBg(bgReading, "AndroidAPS-Eversense")
+                    }
+                    if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+                        NSUpload.sendToXdrip(bgReading)
+                    }
+                }
+            }
+        }
+        if (bundle.containsKey("calibrationGlucoseLevels")) {
+            val calibrationGlucoseLevels = bundle.getIntArray("calibrationGlucoseLevels")
+            val calibrationTimestamps = bundle.getLongArray("calibrationTimestamps")
+            val calibrationRecordNumbers = bundle.getLongArray("calibrationRecordNumbers")
+            if (calibrationGlucoseLevels != null && calibrationTimestamps != null && calibrationRecordNumbers != null) {
+                if (isEnabled(L.BGSOURCE)) {
+                    aapsLogger.debug(LTag.BGSOURCE, "calibrationGlucoseLevels" + Arrays.toString(calibrationGlucoseLevels))
+                    aapsLogger.debug(LTag.BGSOURCE, "calibrationTimestamps" + Arrays.toString(calibrationTimestamps))
+                    aapsLogger.debug(LTag.BGSOURCE, "calibrationRecordNumbers" + Arrays.toString(calibrationRecordNumbers))
+                }
+                for (i in calibrationGlucoseLevels.indices) {
+                    try {
+                        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(calibrationTimestamps[i]) == null) {
+                            val data = JSONObject()
+                            data.put("enteredBy", "AndroidAPS-Eversense")
+                            data.put("created_at", DateUtil.toISOString(calibrationTimestamps[i]))
+                            data.put("eventType", CareportalEvent.BGCHECK)
+                            data.put("glucoseType", "Finger")
+                            data.put("glucose", calibrationGlucoseLevels[i])
+                            data.put("units", Constants.MGDL)
+                            NSUpload.uploadCareportalEntryToNS(data)
+                        }
+                    } catch (e: JSONException) {
+                        aapsLogger.error("Unhandled exception", e)
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
new file mode 100644
index 0000000000..c2cd1d84e9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.BundleLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GlimpPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.Glimp)
+    .preferencesId(R.xml.pref_bgsource)
+    .description(R.string.description_source_glimp),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    override fun advancedFilteringSupported(): Boolean {
+        return false
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        aapsLogger.debug(LTag.BGSOURCE, "Received Glimp Data: ${BundleLogger.log(bundle)}")
+        val bgReading = BgReading()
+        bgReading.value = bundle.getDouble("mySGV")
+        bgReading.direction = bundle.getString("myTrend")
+        bgReading.date = bundle.getLong("myTimestamp")
+        bgReading.raw = 0.0
+        MainApp.getDbHelper().createIfNotExists(bgReading, "GLIMP")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
new file mode 100644
index 0000000000..4d082c0133
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONArray
+import org.json.JSONException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MM640gPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.MM640g)
+    .description(R.string.description_source_mm640g),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    override fun advancedFilteringSupported(): Boolean {
+        return false
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        val collection = bundle.getString("collection") ?: return
+        if (collection == "entries") {
+            val data = bundle.getString("data")
+            aapsLogger.debug(LTag.BGSOURCE, "Received MM640g Data: $data")
+            if (data != null && data.isNotEmpty()) {
+                try {
+                    val jsonArray = JSONArray(data)
+                    for (i in 0 until jsonArray.length()) {
+                        val jsonObject = jsonArray.getJSONObject(i)
+                        when (val type = jsonObject.getString("type")) {
+                            "sgv" -> {
+                                val bgReading = BgReading()
+                                bgReading.value = jsonObject.getDouble("sgv")
+                                bgReading.direction = jsonObject.getString("direction")
+                                bgReading.date = jsonObject.getLong("date")
+                                bgReading.raw = jsonObject.getDouble("sgv")
+                                MainApp.getDbHelper().createIfNotExists(bgReading, "MM640g")
+                            }
+
+                            else  -> aapsLogger.debug(LTag.BGSOURCE, "Unknown entries type: $type")
+                        }
+                    }
+                } catch (e: JSONException) {
+                    aapsLogger.error("Exception: ", e)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
new file mode 100644
index 0000000000..aa498105a6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
@@ -0,0 +1,84 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
+import info.nightscout.androidaps.utils.JsonHelper.safeGetLong
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONArray
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NSClientSourcePlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val sp: SP
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.nsclientbg)
+    .description(R.string.description_source_ns_client),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    private var lastBGTimeStamp: Long = 0
+    private var isAdvancedFilteringEnabled = false
+
+    override fun advancedFilteringSupported(): Boolean {
+        return isAdvancedFilteringEnabled
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE) && !sp.getBoolean(R.string.key_ns_autobackfill, true)) return
+        val bundles = intent.extras ?: return
+        try {
+            if (bundles.containsKey("sgv")) {
+                val sgvString = bundles.getString("sgv")
+                aapsLogger.debug(LTag.BGSOURCE, "Received NS Data: $sgvString")
+                val sgvJson = JSONObject(sgvString)
+                storeSgv(sgvJson)
+            }
+            if (bundles.containsKey("sgvs")) {
+                val sgvString = bundles.getString("sgvs")
+                aapsLogger.debug(LTag.BGSOURCE, "Received NS Data: $sgvString")
+                val jsonArray = JSONArray(sgvString)
+                for (i in 0 until jsonArray.length()) {
+                    val sgvJson = jsonArray.getJSONObject(i)
+                    storeSgv(sgvJson)
+                }
+            }
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        // Objectives 0
+        sp.putBoolean(R.string.key_ObjectivesbgIsAvailableInNS, true)
+    }
+
+    private fun storeSgv(sgvJson: JSONObject) {
+        val nsSgv = NSSgv(sgvJson)
+        val bgReading = BgReading(nsSgv)
+        MainApp.getDbHelper().createIfNotExists(bgReading, "NS")
+        detectSource(safeGetString(sgvJson, "device", "none"), safeGetLong(sgvJson, "mills"))
+    }
+
+    private fun detectSource(source: String, timeStamp: Long) {
+        if (timeStamp > lastBGTimeStamp) {
+            isAdvancedFilteringEnabled = source.contains("G5 Native") || source.contains("G6 Native") || source.contains("AndroidAPS-DexcomG5") || source.contains("AndroidAPS-DexcomG6")
+            lastBGTimeStamp = timeStamp
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
new file mode 100644
index 0000000000..c33cfaee0f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONArray
+import org.json.JSONException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PoctechPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val sp: SP
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.poctech)
+    .preferencesId(R.xml.pref_bgsource)
+    .description(R.string.description_source_poctech),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    override fun advancedFilteringSupported(): Boolean {
+        return false
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        val bgReading = BgReading()
+        val data = bundle.getString("data")
+        aapsLogger.debug(LTag.BGSOURCE, "Received Poctech Data $data")
+        try {
+            val jsonArray = JSONArray(data)
+            aapsLogger.debug(LTag.BGSOURCE, "Received Poctech Data size:" + jsonArray.length())
+            for (i in 0 until jsonArray.length()) {
+                val json = jsonArray.getJSONObject(i)
+                bgReading.value = json.getDouble("current")
+                bgReading.direction = json.getString("direction")
+                bgReading.date = json.getLong("date")
+                bgReading.raw = json.getDouble("raw")
+                if (safeGetString(json, "units", Constants.MGDL) == "mmol/L") bgReading.value = bgReading.value * Constants.MMOLL_TO_MGDL
+                val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Poctech")
+                if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+                    NSUpload.uploadBg(bgReading, "AndroidAPS-Poctech")
+                }
+                if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+                    NSUpload.sendToXdrip(bgReading)
+                }
+            }
+        } catch (e: JSONException) {
+            aapsLogger.error("Exception: ", e)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index ea6731ca60..27f3fd4b4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.source
 
 import android.content.Intent
 import android.os.Handler
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
@@ -9,29 +10,42 @@ import info.nightscout.androidaps.interfaces.BgSourceInterface
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.isRunningTest
-import org.slf4j.LoggerFactory
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.extensions.isRunningTest
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.math.PI
 import kotlin.math.sin
 
-object RandomBgPlugin : PluginBase(PluginDescription()
-        .mainType(PluginType.BGSOURCE)
-        .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginName(R.string.randombg)
-        .shortName(R.string.randombg_short)
-        .description(R.string.description_source_randombg)), BgSourceInterface {
-
-    private val log = LoggerFactory.getLogger(L.BGSOURCE)
+@Singleton
+class RandomBgPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val virtualPumpPlugin: VirtualPumpPlugin,
+    private val buildHelper: BuildHelper
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.randombg)
+    .shortName(R.string.randombg_short)
+    .description(R.string.description_source_randombg),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
 
     private val loopHandler = Handler()
     private lateinit var refreshLoop: Runnable
 
-    const val interval = 5L // minutes
+    companion object {
+        const val interval = 5L // minutes
+    }
 
     init {
         refreshLoop = Runnable {
@@ -55,7 +69,7 @@ object RandomBgPlugin : PluginBase(PluginDescription()
     }
 
     override fun specialEnableCondition(): Boolean {
-        return VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP) && (MainApp.engineeringMode || isRunningTest())
+        return isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
     }
 
     override fun handleNewData(intent: Intent) {
@@ -65,13 +79,13 @@ object RandomBgPlugin : PluginBase(PluginDescription()
 
         val cal = GregorianCalendar()
         val currentMinute = cal.get(Calendar.MINUTE) + (cal.get(Calendar.HOUR_OF_DAY) % 2) * 60
-        val bgMgdl = min + (max - min) * sin(currentMinute / 120.0 * 2 * PI)
+        val bgMgdl = min + (max - min) + (max - min) * sin(currentMinute / 120.0 * 2 * PI)
 
         val bgReading = BgReading()
         bgReading.value = bgMgdl
         bgReading.date = DateUtil.now()
         bgReading.raw = bgMgdl
         MainApp.getDbHelper().createIfNotExists(bgReading, "RandomBG")
-        log.debug("Generated BG: $bgReading")
+        aapsLogger.debug(LTag.BGSOURCE, "Generated BG: $bgReading")
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java
deleted file mode 100644
index 6f39e3d762..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 28.11.2017.
- */
-
-public class SourceEversensePlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceEversensePlugin plugin = null;
-
-    public static SourceEversensePlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceEversensePlugin();
-        return plugin;
-    }
-
-    private SourceEversensePlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.eversense)
-                .shortName(R.string.eversense_shortname)
-                .preferencesId(R.xml.pref_poctech)
-                .description(R.string.description_source_eversense)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return false;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        if (L.isEnabled(L.BGSOURCE)) {
-            if (bundle.containsKey("currentCalibrationPhase"))
-                log.debug("currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"));
-            if (bundle.containsKey("placementModeInProgress"))
-                log.debug("placementModeInProgress: " + bundle.getBoolean("placementModeInProgress"));
-            if (bundle.containsKey("glucoseLevel"))
-                log.debug("glucoseLevel: " + bundle.getInt("glucoseLevel"));
-            if (bundle.containsKey("glucoseTrendDirection"))
-                log.debug("glucoseTrendDirection: " + bundle.getString("glucoseTrendDirection"));
-            if (bundle.containsKey("glucoseTimestamp"))
-                log.debug("glucoseTimestamp: " + DateUtil.dateAndTimeFullString(bundle.getLong("glucoseTimestamp")));
-            if (bundle.containsKey("batteryLevel"))
-                log.debug("batteryLevel: " + bundle.getString("batteryLevel"));
-            if (bundle.containsKey("signalStrength"))
-                log.debug("signalStrength: " + bundle.getString("signalStrength"));
-            if (bundle.containsKey("transmitterVersionNumber"))
-                log.debug("transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"));
-            if (bundle.containsKey("isXLVersion"))
-                log.debug("isXLVersion: " + bundle.getBoolean("isXLVersion"));
-            if (bundle.containsKey("transmitterModelNumber"))
-                log.debug("transmitterModelNumber: " + bundle.getString("transmitterModelNumber"));
-            if (bundle.containsKey("transmitterSerialNumber"))
-                log.debug("transmitterSerialNumber: " + bundle.getString("transmitterSerialNumber"));
-            if (bundle.containsKey("transmitterAddress"))
-                log.debug("transmitterAddress: " + bundle.getString("transmitterAddress"));
-            if (bundle.containsKey("sensorInsertionTimestamp"))
-                log.debug("sensorInsertionTimestamp: " + DateUtil.dateAndTimeFullString(bundle.getLong("sensorInsertionTimestamp")));
-            if (bundle.containsKey("transmitterVersionNumber"))
-                log.debug("transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"));
-            if (bundle.containsKey("transmitterConnectionState"))
-                log.debug("transmitterConnectionState: " + bundle.getString("transmitterConnectionState"));
-        }
-
-        if (bundle.containsKey("glucoseLevels")) {
-            int[] glucoseLevels = bundle.getIntArray("glucoseLevels");
-            int[] glucoseRecordNumbers = bundle.getIntArray("glucoseRecordNumbers");
-            long[] glucoseTimestamps = bundle.getLongArray("glucoseTimestamps");
-
-            if (L.isEnabled(L.BGSOURCE)) {
-                log.debug("glucoseLevels", Arrays.toString(glucoseLevels));
-                log.debug("glucoseRecordNumbers", Arrays.toString(glucoseRecordNumbers));
-                log.debug("glucoseTimestamps", Arrays.toString(glucoseTimestamps));
-            }
-
-            for (int i = 0; i < glucoseLevels.length; i++) {
-                BgReading bgReading = new BgReading();
-                bgReading.value = glucoseLevels[i];
-                bgReading.date = glucoseTimestamps[i];
-                bgReading.raw = 0;
-                boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Eversense");
-                if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                    NSUpload.uploadBg(bgReading, "AndroidAPS-Eversense");
-                }
-                if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                    NSUpload.sendToXdrip(bgReading);
-                }
-            }
-        }
-
-        if (bundle.containsKey("calibrationGlucoseLevels")) {
-            int[] calibrationGlucoseLevels = bundle.getIntArray("calibrationGlucoseLevels");
-            long[] calibrationTimestamps = bundle.getLongArray("calibrationTimestamps");
-            long[] calibrationRecordNumbers = bundle.getLongArray("calibrationRecordNumbers");
-
-            if (L.isEnabled(L.BGSOURCE)) {
-                log.debug("calibrationGlucoseLevels", Arrays.toString(calibrationGlucoseLevels));
-                log.debug("calibrationTimestamps", Arrays.toString(calibrationTimestamps));
-                log.debug("calibrationRecordNumbers", Arrays.toString(calibrationRecordNumbers));
-            }
-
-            for (int i = 0; i < calibrationGlucoseLevels.length; i++) {
-                try {
-                    if (MainApp.getDbHelper().getCareportalEventFromTimestamp(calibrationTimestamps[i]) == null) {
-                        JSONObject data = new JSONObject();
-                        data.put("enteredBy", "AndroidAPS-Eversense");
-                        data.put("created_at", DateUtil.toISOString(calibrationTimestamps[i]));
-                        data.put("eventType", CareportalEvent.BGCHECK);
-                        data.put("glucoseType", "Finger");
-                        data.put("glucose", calibrationGlucoseLevels[i]);
-                        data.put("units", Constants.MGDL);
-                        NSUpload.uploadCareportalEntryToNS(data);
-                    }
-                } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceGlimpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceGlimpPlugin.java
deleted file mode 100644
index 243fe60070..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceGlimpPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourceGlimpPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceGlimpPlugin plugin = null;
-
-    public static SourceGlimpPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceGlimpPlugin();
-        return plugin;
-    }
-
-    private SourceGlimpPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.Glimp)
-                .description(R.string.description_source_glimp)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return false;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        if (L.isEnabled(L.BGSOURCE))
-            log.debug("Received Glimp Data: " + BundleLogger.log(bundle));
-
-        BgReading bgReading = new BgReading();
-
-        bgReading.value = bundle.getDouble("mySGV");
-        bgReading.direction = bundle.getString("myTrend");
-        bgReading.date = bundle.getLong("myTimestamp");
-        bgReading.raw = 0;
-
-        MainApp.getDbHelper().createIfNotExists(bgReading, "GLIMP");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceMM640gPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceMM640gPlugin.java
deleted file mode 100644
index daccbcedd7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceMM640gPlugin.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourceMM640gPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceMM640gPlugin plugin = null;
-
-    public static SourceMM640gPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceMM640gPlugin();
-        return plugin;
-    }
-
-    private SourceMM640gPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.MM640g)
-                .description(R.string.description_source_mm640g)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return false;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        final String collection = bundle.getString("collection");
-        if (collection == null) return;
-
-        if (collection.equals("entries")) {
-            final String data = bundle.getString("data");
-            if (L.isEnabled(L.BGSOURCE))
-                log.debug("Received MM640g Data: ", data);
-
-            if ((data != null) && (data.length() > 0)) {
-                try {
-                    final JSONArray json_array = new JSONArray(data);
-                    for (int i = 0; i < json_array.length(); i++) {
-                        final JSONObject json_object = json_array.getJSONObject(i);
-                        final String type = json_object.getString("type");
-                        switch (type) {
-                            case "sgv":
-                                BgReading bgReading = new BgReading();
-
-                                bgReading.value = json_object.getDouble("sgv");
-                                bgReading.direction = json_object.getString("direction");
-                                bgReading.date = json_object.getLong("date");
-                                bgReading.raw = json_object.getDouble("sgv");
-
-                                MainApp.getDbHelper().createIfNotExists(bgReading, "MM640g");
-                                break;
-                            default:
-                                if (L.isEnabled(L.BGSOURCE))
-                                    log.debug("Unknown entries type: " + type);
-                        }
-                    }
-                } catch (JSONException e) {
-                    log.error("Exception: ", e);
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceNSClientPlugin.java
deleted file mode 100644
index dd0a2c5e88..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceNSClientPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourceNSClientPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceNSClientPlugin plugin = null;
-
-    public static SourceNSClientPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceNSClientPlugin();
-        return plugin;
-    }
-
-    private long lastBGTimeStamp = 0;
-    private boolean isAdvancedFilteringEnabled = false;
-
-    private SourceNSClientPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.nsclientbg)
-                .description(R.string.description_source_ns_client)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return isAdvancedFilteringEnabled;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE) && !SP.getBoolean(R.string.key_ns_autobackfill, true))
-            return;
-
-        Bundle bundles = intent.getExtras();
-
-        try {
-            if (bundles.containsKey("sgv")) {
-                String sgvstring = bundles.getString("sgv");
-                if (L.isEnabled(L.BGSOURCE))
-                    log.debug("Received NS Data: " + sgvstring);
-
-                JSONObject sgvJson = new JSONObject(sgvstring);
-                storeSgv(sgvJson);
-            }
-
-            if (bundles.containsKey("sgvs")) {
-                String sgvstring = bundles.getString("sgvs");
-                if (L.isEnabled(L.BGSOURCE))
-                    log.debug("Received NS Data: " + sgvstring);
-                JSONArray jsonArray = new JSONArray(sgvstring);
-                for (int i = 0; i < jsonArray.length(); i++) {
-                    JSONObject sgvJson = jsonArray.getJSONObject(i);
-                    storeSgv(sgvJson);
-                }
-            }
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-
-        // Objectives 0
-        SP.putBoolean(R.string.key_ObjectivesbgIsAvailableInNS, true);
-    }
-
-    private void storeSgv(JSONObject sgvJson) {
-        NSSgv nsSgv = new NSSgv(sgvJson);
-        BgReading bgReading = new BgReading(nsSgv);
-        MainApp.getDbHelper().createIfNotExists(bgReading, "NS");
-        SourceNSClientPlugin.getPlugin().detectSource(JsonHelper.safeGetString(sgvJson, "device", "none"), JsonHelper.safeGetLong(sgvJson, "mills"));
-    }
-
-    public void detectSource(String source, long timeStamp) {
-        if (timeStamp > lastBGTimeStamp) {
-            if (source.contains("G5 Native") || source.contains("G6 Native") || source.contains("AndroidAPS-DexcomG5") || source.contains("AndroidAPS-DexcomG6"))
-                isAdvancedFilteringEnabled = true;
-            else
-                isAdvancedFilteringEnabled = false;
-            lastBGTimeStamp = timeStamp;
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourcePoctechPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourcePoctechPlugin.java
deleted file mode 100644
index ceecfb844f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourcePoctechPlugin.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourcePoctechPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourcePoctechPlugin plugin = null;
-
-    public static SourcePoctechPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourcePoctechPlugin();
-        return plugin;
-    }
-
-    private SourcePoctechPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.poctech)
-                .preferencesId(R.xml.pref_poctech)
-                .description(R.string.description_source_poctech)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return false;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        BgReading bgReading = new BgReading();
-
-        String data = bundle.getString("data");
-        if (L.isEnabled(L.BGSOURCE))
-            log.debug("Received Poctech Data", data);
-
-        try {
-            JSONArray jsonArray = new JSONArray(data);
-            if (L.isEnabled(L.BGSOURCE))
-                log.debug("Received Poctech Data size:" + jsonArray.length());
-            for (int i = 0; i < jsonArray.length(); i++) {
-                JSONObject json = jsonArray.getJSONObject(i);
-                bgReading.value = json.getDouble("current");
-                bgReading.direction = json.getString("direction");
-                bgReading.date = json.getLong("date");
-                bgReading.raw = json.getDouble("raw");
-                if (JsonHelper.safeGetString(json, "units", Constants.MGDL).equals("mmol/L"))
-                    bgReading.value = bgReading.value * Constants.MMOLL_TO_MGDL;
-                boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Poctech");
-                if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                    NSUpload.uploadBg(bgReading, "AndroidAPS-Poctech");
-                }
-                if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                    NSUpload.sendToXdrip(bgReading);
-                }
-            }
-
-        } catch (JSONException e) {
-            log.error("Exception: ", e);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceTomatoPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceTomatoPlugin.java
deleted file mode 100644
index 211ec9a5a2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceTomatoPlugin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourceTomatoPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceTomatoPlugin plugin = null;
-
-    public static SourceTomatoPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceTomatoPlugin();
-        return plugin;
-    }
-
-    private SourceTomatoPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.tomato)
-                .preferencesId(R.xml.pref_poctech)
-                .shortName(R.string.tomato_short)
-                .description(R.string.description_source_tomato)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return false;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        BgReading bgReading = new BgReading();
-
-        if (L.isEnabled(L.BGSOURCE))
-            log.debug("Received Tomato Data");
-
-        bgReading.value = bundle.getDouble("com.fanqies.tomatofn.Extras.BgEstimate");
-        bgReading.date = bundle.getLong("com.fanqies.tomatofn.Extras.Time");
-        boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Tomato");
-        if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-            NSUpload.uploadBg(bgReading, "AndroidAPS-Tomato");
-        }
-        if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-            NSUpload.sendToXdrip(bgReading);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceXdripPlugin.java
deleted file mode 100644
index 1acefa724e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceXdripPlugin.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.services.Intents;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.BgSourceInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.BundleLogger;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SourceXdripPlugin extends PluginBase implements BgSourceInterface {
-    private static Logger log = LoggerFactory.getLogger(L.BGSOURCE);
-
-    private static SourceXdripPlugin plugin = null;
-
-    boolean advancedFiltering;
-
-    public static SourceXdripPlugin getPlugin() {
-        if (plugin == null)
-            plugin = new SourceXdripPlugin();
-        return plugin;
-    }
-
-    private SourceXdripPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.BGSOURCE)
-                .fragmentClass(BGSourceFragment.class.getName())
-                .pluginName(R.string.xdrip)
-                .description(R.string.description_source_xdrip)
-        );
-    }
-
-    @Override
-    public boolean advancedFilteringSupported() {
-        return advancedFiltering;
-    }
-
-    @Override
-    public void handleNewData(Intent intent) {
-
-        if (!isEnabled(PluginType.BGSOURCE)) return;
-
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        if (L.isEnabled(L.BGSOURCE))
-            log.debug("Received xDrip data: " + BundleLogger.log(intent.getExtras()));
-
-        BgReading bgReading = new BgReading();
-
-        bgReading.value = bundle.getDouble(Intents.EXTRA_BG_ESTIMATE);
-        bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME);
-        bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP);
-        bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW);
-        String source = bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, "no Source specified");
-        SourceXdripPlugin.getPlugin().setSource(source);
-        MainApp.getDbHelper().createIfNotExists(bgReading, "XDRIP");
-    }
-
-    public void setSource(String source) {
-        this.advancedFiltering = source.contains("G5 Native")||source.contains("G6 Native");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
new file mode 100644
index 0000000000..db4c658614
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
@@ -0,0 +1,55 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TomatoPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val sp: SP
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.tomato)
+    .preferencesId(R.xml.pref_bgsource)
+    .shortName(R.string.tomato_short)
+    .description(R.string.description_source_tomato),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    override fun advancedFilteringSupported(): Boolean {
+        return false
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        val bgReading = BgReading()
+        aapsLogger.debug(LTag.BGSOURCE, "Received Tomato Data")
+        bgReading.value = bundle.getDouble("com.fanqies.tomatofn.Extras.BgEstimate")
+        bgReading.date = bundle.getLong("com.fanqies.tomatofn.Extras.Time")
+        val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Tomato")
+        if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+            NSUpload.uploadBg(bgReading, "AndroidAPS-Tomato")
+        }
+        if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+            NSUpload.sendToXdrip(bgReading)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
new file mode 100644
index 0000000000..aaf38b93b6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Intent
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.BgSourceInterface
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.BundleLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.services.Intents
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class XdripPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger
+) : PluginBase(PluginDescription()
+    .mainType(PluginType.BGSOURCE)
+    .fragmentClass(BGSourceFragment::class.java.name)
+    .pluginName(R.string.xdrip)
+    .description(R.string.description_source_xdrip),
+    aapsLogger, resourceHelper, injector
+), BgSourceInterface {
+
+    private var advancedFiltering = false
+
+    override fun advancedFilteringSupported(): Boolean {
+        return advancedFiltering
+    }
+
+    override fun handleNewData(intent: Intent) {
+        if (!isEnabled(PluginType.BGSOURCE)) return
+        val bundle = intent.extras ?: return
+        aapsLogger.debug(LTag.BGSOURCE, "Received xDrip data: " + BundleLogger.log(intent.extras))
+        val bgReading = BgReading()
+        bgReading.value = bundle.getDouble(Intents.EXTRA_BG_ESTIMATE)
+        bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME)
+        bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP)
+        bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW)
+        val source = bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, "no Source specified")
+        setSource(source)
+        MainApp.getDbHelper().createIfNotExists(bgReading, "XDRIP")
+    }
+
+    private fun setSource(source: String) {
+        advancedFiltering = source.contains("G5 Native") || source.contains("G6 Native")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java
deleted file mode 100644
index f22523160d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments;
-
-import android.content.Intent;
-import androidx.annotation.Nullable;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.T;
-
-import static info.nightscout.androidaps.utils.DateUtil.now;
-
-public class CarbsGenerator {
-    public static void generateCarbs(int amount, long startTime, int duration, @Nullable String notes) {
-        long remainingCarbs = amount;
-        int ticks = (duration * 4); //duration guaranteed to be integer greater zero
-        for (int i = 0; i < ticks; i++){
-            long carbTime = startTime + i * 15 * 60 * 1000;
-            int smallCarbAmount = (int) Math.round((1d * remainingCarbs) / (ticks-i));  //on last iteration (ticks-i) is 1 -> smallCarbAmount == remainingCarbs
-            remainingCarbs -= smallCarbAmount;
-            if (smallCarbAmount > 0)
-                createCarb(smallCarbAmount, carbTime, CareportalEvent.MEALBOLUS, notes);
-        }
-    }
-
-    public static void createCarb(int carbs, long time, String eventType, @Nullable String notes) {
-        DetailedBolusInfo carbInfo = new DetailedBolusInfo();
-        carbInfo.date = time;
-        carbInfo.eventType = eventType;
-        carbInfo.carbs = carbs;
-        carbInfo.context = MainApp.instance();
-        carbInfo.source = Source.USER;
-        carbInfo.notes = notes;
-        if (ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo && carbInfo.date <= now() && carbInfo.date > now()- T.mins(2).msecs()) {
-            ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(carbInfo, 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 {
-            // Don't send to pump if it is in the future or more than 5 minutes in the past
-            // as pumps might return those as as "now" when reading the history.
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(carbInfo, false);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
new file mode 100644
index 0000000000..8dc1fc859d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.treatments
+
+import android.content.Context
+import android.content.Intent
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CarbsGenerator @Inject constructor(
+    private val resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePluginProvider,
+    private val commandQueue: CommandQueueProvider,
+    private val context: Context
+) {
+
+    fun generateCarbs(amount: Int, startTime: Long, duration: Int, notes: String) {
+        var remainingCarbs = amount.toLong()
+        val ticks = duration * 4 //duration guaranteed to be integer greater zero
+        for (i in 0 until ticks) {
+            val carbTime = startTime + i * 15 * 60 * 1000
+            val smallCarbAmount = Math.round(1.0 * remainingCarbs / (ticks - i)).toInt() //on last iteration (ticks-i) is 1 -> smallCarbAmount == remainingCarbs
+            remainingCarbs -= smallCarbAmount.toLong()
+            if (smallCarbAmount > 0) createCarb(smallCarbAmount, carbTime, CareportalEvent.MEALBOLUS, notes)
+        }
+    }
+
+    fun createCarb(carbs: Int, time: Long, eventType: String, notes: String) {
+        val carbInfo = DetailedBolusInfo()
+        carbInfo.date = time
+        carbInfo.eventType = eventType
+        carbInfo.carbs = carbs.toDouble()
+        carbInfo.context = context
+        carbInfo.source = Source.USER
+        carbInfo.notes = notes
+        if (activePlugin.activePump.pumpDescription.storesCarbInfo && carbInfo.date <= DateUtil.now() && carbInfo.date > DateUtil.now() - T.mins(2).msecs()) {
+            commandQueue.bolus(carbInfo, object : Callback() {
+                override fun run() {
+                    if (!result.success) {
+                        val i = Intent(context, ErrorHelperActivity::class.java)
+                        i.putExtra("soundid", R.raw.boluserror)
+                        i.putExtra("status", result.comment)
+                        i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        context.startActivity(i)
+                    }
+                }
+            })
+        } else {
+            // Don't send to pump if it is in the future or more than 5 minutes in the past
+            // as pumps might return those as as "now" when reading the history.
+            activePlugin.activeTreatments.addToHistoryTreatment(carbInfo, false)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
index 19b41a0944..ee99412f77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.treatments;
 
 import android.graphics.Color;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.j256.ormlite.field.DatabaseField;
@@ -9,28 +11,36 @@ import com.j256.ormlite.table.DatabaseTable;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Date;
 import java.util.Objects;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.db.DbObjectBase;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.DbObjectBase;
 import info.nightscout.androidaps.db.Source;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 @DatabaseTable(tableName = Treatment.TABLE_TREATMENTS)
 public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
+    @Inject public DefaultValueHelper defaultValueHelper;
+    @Inject public ResourceHelper resourceHelper;
+    @Inject public ProfileFunction profileFunction;
+    @Inject public ActivePluginProvider activePlugin;
+
     public static final String TABLE_TREATMENTS = "Treatments";
 
     @DatabaseField(id = true)
@@ -64,6 +74,11 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
     public String boluscalc;
 
     public Treatment() {
+        MainApp.instance().androidInjector().inject(this); // TODO it will be removed by new database
+    }
+
+    public Treatment(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
     }
 
     public static Treatment createFromJson(JSONObject json) throws JSONException {
@@ -72,11 +87,11 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
         treatment.date = DateUtil.roundDateToSec(JsonHelper.safeGetLong(json, "mills"));
         if (treatment.date == 0L)
             return null;
-        treatment.carbs = JsonHelper.safeGetDouble(json,"carbs");
-        treatment.insulin = JsonHelper.safeGetDouble(json,"insulin");
+        treatment.carbs = JsonHelper.safeGetDouble(json, "carbs");
+        treatment.insulin = JsonHelper.safeGetDouble(json, "insulin");
         treatment.pumpId = JsonHelper.safeGetLong(json, "pumpId");
         treatment._id = json.getString("_id");
-        treatment.isSMB = JsonHelper.safeGetBoolean(json,"isSMB");
+        treatment.isSMB = JsonHelper.safeGetBoolean(json, "isSMB");
         if (json.has("eventType")) {
             treatment.mealBolus = !json.get("eventType").equals("Correction Bolus");
             double carbs = treatment.carbs;
@@ -93,10 +108,10 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
         return treatment;
     }
 
-    public String toString() {
+    @NonNull public String toString() {
         return "Treatment{" +
                 "date= " + date +
-                ", date= " + new Date(date).toLocaleString() +
+                ", date= " + DateUtil.dateAndTimeString(date) +
                 ", isValid= " + isValid +
                 ", isSMB= " + isSMB +
                 ", _id= " + _id +
@@ -170,11 +185,11 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
 
     public double getIc() {
         JSONObject bw = getBoluscalc();
-         if (bw == null || !bw.has("ic")) {
-             Profile profile = ProfileFunctions.getInstance().getProfile(date);
-             return profile.getIc(date);
+        if (bw == null || !bw.has("ic")) {
+            Profile profile = profileFunction.getProfile(date);
+            return profile.getIc(date);
         }
-         return JsonHelper.safeGetDouble(bw, "ic");
+        return JsonHelper.safeGetDouble(bw, "ic");
     }
 
     /*
@@ -224,13 +239,13 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
 
     @Override
     public double getY() {
-        return isSMB ? OverviewPlugin.INSTANCE.determineLowLine() : yValue;
+        return isSMB ? defaultValueHelper.determineLowLine() : yValue;
     }
 
     @Override
     public String getLabel() {
         String label = "";
-        if (insulin > 0) label += DecimalFormatter.toPumpSupportedBolus(insulin) + "U";
+        if (insulin > 0) label += DecimalFormatter.toPumpSupportedBolus(insulin, activePlugin.getActivePump()) + "U";
         if (carbs > 0)
             label += "~" + DecimalFormatter.to0Decimal(carbs) + "g";
         return label;
@@ -257,11 +272,11 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
     @Override
     public int getColor() {
         if (isSMB)
-            return MainApp.gc(R.color.tempbasal);
+            return resourceHelper.gc(R.color.tempbasal);
         else if (isValid)
             return Color.CYAN;
         else
-            return MainApp.instance().getResources().getColor(android.R.color.holo_red_light);
+            return resourceHelper.gc(android.R.color.holo_red_light);
     }
 
     @Override
@@ -275,7 +290,7 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
         if (!isValid)
             return new Iob();
 
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
+        InsulinInterface insulinInterface = activePlugin.getActiveInsulin();
         return insulinInterface.iobCalcForTreatment(this, time, dia);
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 1331c8eedf..46c16e9772 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -37,6 +37,7 @@ import info.nightscout.androidaps.events.EventNsTreatment;
 import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
@@ -52,7 +53,7 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
-    private static Logger log = LoggerFactory.getLogger(L.DATATREATMENTS);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATATREATMENTS);
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private static final ScheduledExecutorService treatmentEventWorker = Executors.newSingleThreadScheduledExecutor();
@@ -61,7 +62,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
     public TreatmentService() {
         onCreate();
         dbInitialize();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(RxBus.Companion.getINSTANCE()
                 .toObservable(EventNsTreatment.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
@@ -73,7 +74,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     } else { // EventNsTreatment.REMOVE
                         this.deleteNS(payload);
                     }
-                }, FabricPrivacy::logException)
+                }, exception -> FabricPrivacy.getInstance().logException(exception))
         );
     }
 
@@ -160,7 +161,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange(null);
+        scheduleTreatmentChange(null, true);
     }
 
 
@@ -185,11 +186,11 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
             public void run() {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("Firing EventReloadTreatmentData");
-                RxBus.INSTANCE.send(event);
+                RxBus.Companion.getINSTANCE().send(event);
                 if (DatabaseHelper.earliestDataChange != null) {
                     if (L.isEnabled(L.DATATREATMENTS))
                         log.debug("Firing EventNewHistoryData");
-                    RxBus.INSTANCE.send(new EventNewHistoryData(DatabaseHelper.earliestDataChange));
+                    RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(DatabaseHelper.earliestDataChange));
                 }
                 DatabaseHelper.earliestDataChange = null;
                 callback.setPost(null);
@@ -208,18 +209,30 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
     /**
      * Schedule a foodChange Event.
      */
-    public void scheduleTreatmentChange(@Nullable final Treatment treatment) {
-        this.scheduleEvent(new EventReloadTreatmentData(new EventTreatmentChange(treatment)), treatmentEventWorker, new ICallback() {
-            @Override
-            public void setPost(ScheduledFuture<?> post) {
-                scheduledTreatmentEventPost = post;
+    public void scheduleTreatmentChange(@Nullable final Treatment treatment, boolean runImmediately) {
+        if (runImmediately) {
+            if (L.isEnabled(L.DATATREATMENTS))
+                log.debug("Firing EventReloadTreatmentData");
+            RxBus.Companion.getINSTANCE().send(new EventReloadTreatmentData(new EventTreatmentChange(treatment)));
+            if (DatabaseHelper.earliestDataChange != null) {
+                if (L.isEnabled(L.DATATREATMENTS))
+                    log.debug("Firing EventNewHistoryData");
+                RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(DatabaseHelper.earliestDataChange));
             }
+            DatabaseHelper.earliestDataChange = null;
+        } else {
+            this.scheduleEvent(new EventReloadTreatmentData(new EventTreatmentChange(treatment)), treatmentEventWorker, new ICallback() {
+                @Override
+                public void setPost(ScheduledFuture<?> post) {
+                    scheduledTreatmentEventPost = post;
+                }
 
-            @Override
-            public ScheduledFuture<?> getPost() {
-                return scheduledTreatmentEventPost;
-            }
-        });
+                @Override
+                public ScheduledFuture<?> getPost() {
+                    return scheduledTreatmentEventPost;
+                }
+            });
+        }
     }
 
     public List<Treatment> getTreatmentData() {
@@ -294,7 +307,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                         getDao().create(existingTreatment);
                         DatabaseHelper.updateEarliestDataChange(oldDate);
                         DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                        scheduleTreatmentChange(treatment);
+                        scheduleTreatmentChange(treatment, true);
                         return new UpdateReturn(sameSource, false); //updating a pump treatment with another one from the pump is not counted as clash
                     }
                     return new UpdateReturn(equalRePumpHistory, false);
@@ -318,14 +331,14 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     getDao().create(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(oldDate);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(equalRePumpHistory || sameSource, false);
                 }
                 getDao().create(treatment);
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             }
             if (treatment.source == Source.NIGHTSCOUT) {
@@ -343,7 +356,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                             DatabaseHelper.updateEarliestDataChange(oldDate);
                             DatabaseHelper.updateEarliestDataChange(old.date);
                         }
-                        scheduleTreatmentChange(treatment);
+                        scheduleTreatmentChange(treatment, false);
                         return new UpdateReturn(true, true);
                     }
                     if (L.isEnabled(L.DATATREATMENTS))
@@ -366,7 +379,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                                 DatabaseHelper.updateEarliestDataChange(oldDate);
                                 DatabaseHelper.updateEarliestDataChange(old.date);
                             }
-                            scheduleTreatmentChange(treatment);
+                            scheduleTreatmentChange(treatment, false);
                             return new UpdateReturn(true, true);
                         }
                         if (L.isEnabled(L.DATATREATMENTS))
@@ -378,7 +391,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, false);
                 return new UpdateReturn(true, true);
             }
             if (treatment.source == Source.USER) {
@@ -386,7 +399,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             }
         } catch (SQLException e) {
@@ -414,7 +427,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             } else {
 
@@ -428,7 +441,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     }
                     getDao().update(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(true, false);
                 } else {
                     if (MedtronicHistoryData.doubleBolusDebug)
@@ -439,7 +452,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     optionalTreatmentCopy(existingTreatment, treatment, fromNightScout);
                     getDao().create(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(true, false); //updating a pump treatment with another one from the pump is not counted as clash
                 }
             }
@@ -626,9 +639,13 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         if (stored != null) {
             if (L.isEnabled(L.DATATREATMENTS))
                 log.debug("Removing Treatment record from database: " + stored.toString());
-            delete(stored);
+            try {
+                getDao().delete(stored);
+            } catch (SQLException e) {
+                log.error("Unhandled exception", e);
+            }
             DatabaseHelper.updateEarliestDataChange(stored.date);
-            scheduleTreatmentChange(null);
+            this.scheduleTreatmentChange(stored, false);
         }
     }
 
@@ -643,7 +660,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         try {
             getDao().delete(treatment);
             DatabaseHelper.updateEarliestDataChange(treatment.date);
-            this.scheduleTreatmentChange(treatment);
+            this.scheduleTreatmentChange(treatment, true);
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
@@ -656,7 +673,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange(treatment);
+        scheduleTreatmentChange(treatment, true);
     }
 
     /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java
deleted file mode 100644
index 731042c237..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsBolusFragment;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsCareportalFragment;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsExtendedBolusesFragment;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsProfileSwitchFragment;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTempTargetFragment;
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTemporaryBasalsFragment;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class TreatmentsFragment extends Fragment implements View.OnClickListener {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    TextView treatmentsTab;
-    TextView extendedBolusesTab;
-    TextView tempBasalsTab;
-    TextView tempTargetTab;
-    TextView profileSwitchTab;
-    TextView careportalTab;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.treatments_fragment, container, false);
-
-        treatmentsTab = (TextView) view.findViewById(R.id.treatments_treatments);
-        extendedBolusesTab = (TextView) view.findViewById(R.id.treatments_extendedboluses);
-        tempBasalsTab = (TextView) view.findViewById(R.id.treatments_tempbasals);
-        tempTargetTab = (TextView) view.findViewById(R.id.treatments_temptargets);
-        profileSwitchTab = (TextView) view.findViewById(R.id.treatments_profileswitches);
-        careportalTab = (TextView) view.findViewById(R.id.treatments_careportal);
-        treatmentsTab.setOnClickListener(this);
-        extendedBolusesTab.setOnClickListener(this);
-        tempBasalsTab.setOnClickListener(this);
-        tempTargetTab.setOnClickListener(this);
-        profileSwitchTab.setOnClickListener(this);
-        careportalTab.setOnClickListener(this);
-
-        setFragment(new TreatmentsBolusFragment());
-        setBackgroundColorOnSelected(treatmentsTab);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventExtendedBolusChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    @Override
-    public void onClick(View v) {
-
-        switch (v.getId()) {
-            case R.id.treatments_treatments:
-                setFragment(new TreatmentsBolusFragment());
-                setBackgroundColorOnSelected(treatmentsTab);
-                break;
-            case R.id.treatments_extendedboluses:
-                setFragment(new TreatmentsExtendedBolusesFragment());
-                setBackgroundColorOnSelected(extendedBolusesTab);
-                break;
-            case R.id.treatments_tempbasals:
-                setFragment(new TreatmentsTemporaryBasalsFragment());
-                setBackgroundColorOnSelected(tempBasalsTab);
-                break;
-            case R.id.treatments_temptargets:
-                setFragment(new TreatmentsTempTargetFragment());
-                setBackgroundColorOnSelected(tempTargetTab);
-                break;
-            case R.id.treatments_profileswitches:
-                setFragment(new TreatmentsProfileSwitchFragment());
-                setBackgroundColorOnSelected(profileSwitchTab);
-                break;
-            case R.id.treatments_careportal:
-                setFragment(new TreatmentsCareportalFragment());
-                setBackgroundColorOnSelected(careportalTab);
-                break;
-        }
-    }
-
-    private void setFragment(Fragment selectedFragment) {
-        FragmentTransaction ft = getChildFragmentManager().beginTransaction();
-        ft.replace(R.id.treatments_fragment_container, selectedFragment); // f2_container is your FrameLayout container
-        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-        ft.addToBackStack(null);
-        ft.commit();
-    }
-
-    private void setBackgroundColorOnSelected(TextView selected) {
-        treatmentsTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        extendedBolusesTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        tempBasalsTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        tempTargetTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        profileSwitchTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        careportalTab.setBackgroundColor(MainApp.gc(R.color.defaultbackground));
-        selected.setBackgroundColor(MainApp.gc(R.color.tabBgColorSelected));
-    }
-
-    private void updateGui() {
-        if (ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isExtendedBolusCapable
-                || TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory().size() > 0) {
-            extendedBolusesTab.setVisibility(View.VISIBLE);
-        } else {
-            extendedBolusesTab.setVisibility(View.GONE);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.kt
new file mode 100644
index 0000000000..ed60d6ac4b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsFragment.kt
@@ -0,0 +1,108 @@
+package info.nightscout.androidaps.plugins.treatments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.treatments.fragments.*
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.treatments_fragment.*
+import javax.inject.Inject
+
+class TreatmentsFragment : DaggerFragment() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    private val disposable = CompositeDisposable()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.treatments_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        treatments_treatments.setOnClickListener {
+            setFragment(TreatmentsBolusFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        treatments_extendedboluses.setOnClickListener {
+            setFragment(TreatmentsExtendedBolusesFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        treatments_tempbasals.setOnClickListener {
+            setFragment(TreatmentsTemporaryBasalsFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        treatments_temptargets.setOnClickListener {
+            setFragment(TreatmentsTempTargetFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        treatments_profileswitches.setOnClickListener {
+            setFragment(TreatmentsProfileSwitchFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        treatments_careportal.setOnClickListener {
+            setFragment(TreatmentsCareportalFragment())
+            setBackgroundColorOnSelected(it)
+        }
+        setFragment(TreatmentsBolusFragment())
+        setBackgroundColorOnSelected(treatments_treatments)
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        updateGui()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun setFragment(selectedFragment: Fragment) {
+        val ft = childFragmentManager.beginTransaction()
+        ft.replace(R.id.treatments_fragment_container, selectedFragment) // f2_container is your FrameLayout container
+        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+        ft.addToBackStack(null)
+        ft.commit()
+    }
+
+    private fun setBackgroundColorOnSelected(selected: View) {
+        treatments_treatments.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        treatments_extendedboluses.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        treatments_tempbasals.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        treatments_temptargets.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        treatments_profileswitches.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        treatments_careportal.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
+        selected.setBackgroundColor(resourceHelper.gc(R.color.tabBgColorSelected))
+    }
+
+    private fun updateGui() {
+        if (activePlugin.activePump.pumpDescription.isExtendedBolusCapable || treatmentsPlugin.extendedBolusesFromHistory.size() > 0)
+            treatments_extendedboluses?.visibility = View.VISIBLE
+        else
+            treatments_extendedboluses?.visibility = View.GONE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 8ec0b48ffa..9704d82f43 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -1,84 +1,83 @@
 package info.nightscout.androidaps.plugins.treatments;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.OverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileIntervals;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventReloadProfileSwitchData;
 import info.nightscout.androidaps.events.EventReloadTempBasalData;
 import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTempTargetChange;
-import info.nightscout.androidaps.interfaces.InsulinInterface;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-/**
- * Created by mike on 05.08.2016.
- */
+@Singleton
 public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface {
-    private Logger log = LoggerFactory.getLogger(L.DATATREATMENTS);
+
+    private final Context context;
+    private final SP sp;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final ProfileFunction profileFunction;
+    private final ActivePluginProvider activePlugin;
+    private final FabricPrivacy fabricPrivacy;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private static TreatmentsPlugin treatmentsPlugin;
-
-    public static TreatmentsPlugin getPlugin() {
-        if (treatmentsPlugin == null)
-            treatmentsPlugin = new TreatmentsPlugin();
-        return treatmentsPlugin;
-    }
-
-    private TreatmentService service;
+    protected TreatmentService service;
 
     private IobTotal lastTreatmentCalculation;
     private IobTotal lastTempBasalsCalculation;
@@ -89,57 +88,75 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     private final Intervals<TempTarget> tempTargets = new OverlappingIntervals<>();
     private final ProfileIntervals<ProfileSwitch> profiles = new ProfileIntervals<>();
 
-    public TreatmentsPlugin() {
+    @Inject
+    public TreatmentsPlugin(
+            HasAndroidInjector injector,
+            AAPSLogger aapsLogger,
+            RxBusWrapper rxBus,
+            ResourceHelper resourceHelper,
+            Context context,
+            SP sp,
+            ProfileFunction profileFunction,
+            ActivePluginProvider activePlugin,
+            FabricPrivacy fabricPrivacy
+    ) {
         super(new PluginDescription()
-                .mainType(PluginType.TREATMENT)
-                .fragmentClass(TreatmentsFragment.class.getName())
-                .pluginName(R.string.treatments)
-                .shortName(R.string.treatments_shortname)
-                .alwaysEnabled(true)
-                .description(R.string.description_treatments)
+                        .mainType(PluginType.TREATMENT)
+                        .fragmentClass(TreatmentsFragment.class.getName())
+                        .pluginName(R.string.treatments)
+                        .shortName(R.string.treatments_shortname)
+                        .alwaysEnabled(true)
+                        .description(R.string.description_treatments)
+                        .setDefault(),
+                aapsLogger, resourceHelper, injector
         );
-        this.service = new TreatmentService();
+        this.resourceHelper = resourceHelper;
+        this.context = context;
+        this.rxBus = rxBus;
+        this.sp = sp;
+        this.profileFunction = profileFunction;
+        this.activePlugin = activePlugin;
+        this.fabricPrivacy = fabricPrivacy;
     }
 
     @Override
     protected void onStart() {
+        this.service = new TreatmentService();
         initializeData(range());
         super.onStart();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventReloadTreatmentData.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                            if (L.isEnabled(L.DATATREATMENTS))
-                                log.debug("EventReloadTreatmentData");
+                            getAapsLogger().debug(LTag.DATATREATMENTS, "EventReloadTreatmentData");
                             initializeTreatmentData(range());
                             initializeExtendedBolusData(range());
                             updateTotalIOBTreatments();
-                            RxBus.INSTANCE.send(event.getNext());
+                            rxBus.send(event.getNext());
                         },
-                        FabricPrivacy::logException
+                        fabricPrivacy::logException
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventReloadProfileSwitchData.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> initializeProfileSwitchData(range()),
-                        FabricPrivacy::logException
+                        fabricPrivacy::logException
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTempTargetChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> initializeTempTargetData(range()),
-                        FabricPrivacy::logException
+                        fabricPrivacy::logException
                 ));
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventReloadTempBasalData.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                            if (L.isEnabled(L.DATATREATMENTS))
-                                log.debug("EventReloadTempBasalData");
+                            getAapsLogger().debug(LTag.DATATREATMENTS, "EventReloadTempBasalData");
                             initializeTempBasalData(range());
                             updateTotalIOBTempBasals();
                         },
-                        FabricPrivacy::logException
+                        fabricPrivacy::logException
                 ));
     }
 
@@ -155,9 +172,9 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
 
     private long range() {
         double dia = Constants.defaultDIA;
-        if (ConfigBuilderPlugin.getPlugin() != null && ProfileFunctions.getInstance().getProfile() != null)
-            dia = ProfileFunctions.getInstance().getProfile().getDia();
-        return  (long) (60 * 60 * 1000L * (24 + dia));
+        if (profileFunction.getProfile() != null)
+            dia = profileFunction.getProfile().getDia();
+        return (long) (60 * 60 * 1000L * (24 + dia));
     }
 
     public void initializeData(long range) {
@@ -169,8 +186,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     private void initializeTreatmentData(long range) {
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("initializeTreatmentData");
+        getAapsLogger().debug(LTag.DATATREATMENTS, "initializeTreatmentData");
         synchronized (treatments) {
             treatments.clear();
             treatments.addAll(getService().getTreatmentDataFromTime(DateUtil.now() - range, false));
@@ -178,8 +194,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     private void initializeTempBasalData(long range) {
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("initializeTempBasalData");
+        getAapsLogger().debug(LTag.DATATREATMENTS, "initializeTempBasalData");
         synchronized (tempBasals) {
             tempBasals.reset().add(MainApp.getDbHelper().getTemporaryBasalsDataFromTime(DateUtil.now() - range, false));
         }
@@ -187,8 +202,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     private void initializeExtendedBolusData(long range) {
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("initializeExtendedBolusData");
+        getAapsLogger().debug(LTag.DATATREATMENTS, "initializeExtendedBolusData");
         synchronized (extendedBoluses) {
             extendedBoluses.reset().add(MainApp.getDbHelper().getExtendedBolusDataFromTime(DateUtil.now() - range, false));
         }
@@ -196,16 +210,14 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     private void initializeTempTargetData(long range) {
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("initializeTempTargetData");
+        getAapsLogger().debug(LTag.DATATREATMENTS, "initializeTempTargetData");
         synchronized (tempTargets) {
             tempTargets.reset().add(MainApp.getDbHelper().getTemptargetsDataFromTime(DateUtil.now() - range, false));
         }
     }
 
     private void initializeProfileSwitchData(long range) {
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("initializeProfileSwitchData");
+        getAapsLogger().debug(LTag.DATATREATMENTS, "initializeProfileSwitchData");
         synchronized (profiles) {
             profiles.reset().add(MainApp.getDbHelper().getProfileSwitchData(DateUtil.now() - range, false));
         }
@@ -220,22 +232,16 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     public IobTotal getCalculationToTimeTreatments(long time) {
         IobTotal total = new IobTotal(time);
 
-        Profile profile = ProfileFunctions.getInstance().getProfile();
+        Profile profile = profileFunction.getProfile();
         if (profile == null)
             return total;
 
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
-        if (insulinInterface == null)
-            return total;
-
-        PumpInterface pumpInterface = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pumpInterface == null)
-            return total;
+        PumpInterface pumpInterface = activePlugin.getActivePump();
 
         double dia = profile.getDia();
 
         synchronized (treatments) {
-            for (Integer pos = 0; pos < treatments.size(); pos++) {
+            for (int pos = 0; pos < treatments.size(); pos++) {
                 Treatment t = treatments.get(pos);
                 if (!t.isValid) continue;
                 if (t.date > time) continue;
@@ -248,7 +254,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                     // instead of dividing the DIA that only worked on the bilinear curves,
                     // multiply the time the treatment is seen active.
                     long timeSinceTreatment = time - t.date;
-                    long snoozeTime = t.date + (long) (timeSinceTreatment * SP.getDouble(R.string.key_openapsama_bolussnooze_dia_divisor, 2.0));
+                    long snoozeTime = t.date + (long) (timeSinceTreatment * sp.getDouble(R.string.key_openapsama_bolussnooze_dia_divisor, 2.0));
                     Iob bIOB = t.iobCalc(snoozeTime, dia);
                     total.bolussnooze += bIOB.iobContrib;
                 }
@@ -272,57 +278,6 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         lastTreatmentCalculation = getCalculationToTimeTreatments(System.currentTimeMillis());
     }
 
-    @Override
-    public MealData getMealData() {
-        MealData result = new MealData();
-
-        Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (profile == null) return result;
-
-        long now = System.currentTimeMillis();
-        long dia_ago = now - (Double.valueOf(profile.getDia() * T.hours(1).msecs())).longValue();
-
-        double maxAbsorptionHours = Constants.DEFAULT_MAX_ABSORPTION_TIME;
-        if (SensitivityAAPSPlugin.getPlugin().isEnabled(PluginType.SENSITIVITY) || SensitivityWeightedAveragePlugin.getPlugin().isEnabled(PluginType.SENSITIVITY)) {
-            maxAbsorptionHours = SP.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
-        } else {
-            maxAbsorptionHours = SP.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME);
-        }
-        long absorptionTime_ago = now - (Double.valueOf(maxAbsorptionHours * T.hours(1).msecs())).longValue();
-
-        synchronized (treatments) {
-            for (Treatment treatment : treatments) {
-                if (!treatment.isValid)
-                    continue;
-                long t = treatment.date;
-
-                if (t > dia_ago && t <= now) {
-                    if (treatment.insulin > 0 && treatment.mealBolus) {
-                        result.boluses += treatment.insulin;
-                    }
-                }
-
-                if (t > absorptionTime_ago && t <= now) {
-                    if (treatment.carbs >= 1) {
-                        result.carbs += treatment.carbs;
-                        if (t > result.lastCarbTime)
-                            result.lastCarbTime = t;
-                    }
-                }
-            }
-        }
-
-        AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("getMealData()");
-        if (autosensData != null) {
-            result.mealCOB = autosensData.cob;
-            result.slopeFromMinDeviation = autosensData.slopeFromMinDeviation;
-            result.slopeFromMaxDeviation = autosensData.slopeFromMaxDeviation;
-            result.usedMinCarbsImpact = autosensData.usedMinCarbsImpact;
-        }
-        result.lastBolusTime = getLastBolusTime();
-        return result;
-    }
-
     @Override
     public List<Treatment> getTreatmentsFromHistory() {
         synchronized (treatments) {
@@ -344,17 +299,13 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
 
         long time = System.currentTimeMillis();
         synchronized (treatments) {
-            if (MedtronicHistoryData.doubleBolusDebug)
-                log.debug("DoubleBolusDebug: AllTreatmentsInDb: {}", MedtronicUtil.getGsonInstanceCore().toJson(treatments));
+            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: AllTreatmentsInDb: " + MedtronicUtil.getGsonInstanceCore().toJson(treatments));
 
             for (Treatment t : treatments) {
                 if (t.date <= time && t.date >= fromTimestamp)
                     in5minback.add(t);
             }
-
-            if (MedtronicHistoryData.doubleBolusDebug)
-                log.debug("DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={}", fromTimestamp, MedtronicUtil.getGsonInstanceCore().toJson(in5minback));
-
+            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={} " + fromTimestamp + " " + MedtronicUtil.getGsonInstanceCore().toJson(in5minback));
             return in5minback;
         }
     }
@@ -382,12 +333,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             for (Treatment t : treatments) {
                 if (!t.isValid)
                     continue;
-                if (t.date > last && t.insulin > 0 && t.isValid && t.date <= now)
+                if (t.date > last && t.insulin > 0 && t.date <= now)
                     last = t.date;
             }
         }
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("Last bolus time: " + new Date(last).toLocaleString());
+        getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + DateUtil.dateAndTimeString(last));
         return last;
     }
 
@@ -398,12 +348,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             for (Treatment t : treatments) {
                 if (!t.isValid)
                     continue;
-                if (t.date > last && t.insulin > 0 && t.isValid && t.date <= now && isSMB == t.isSMB)
+                if (t.date > last && t.insulin > 0 && t.date <= now && isSMB == t.isSMB)
                     last = t.date;
             }
         }
-        if (L.isEnabled(L.DATATREATMENTS))
-            log.debug("Last manual bolus time: " + new Date(last).toLocaleString());
+        getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + DateUtil.dateAndTimeString(last));
         return last;
     }
 
@@ -442,16 +391,14 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     public IobTotal getCalculationToTimeTempBasals(long time, boolean truncate, long truncateTime) {
         IobTotal total = new IobTotal(time);
 
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
-        if (insulinInterface == null)
-            return total;
+        PumpInterface pumpInterface = activePlugin.getActivePump();
 
         synchronized (tempBasals) {
             for (Integer pos = 0; pos < tempBasals.size(); pos++) {
                 TemporaryBasal t = tempBasals.get(pos);
                 if (t.date > time) continue;
                 IobTotal calc;
-                Profile profile = ProfileFunctions.getInstance().getProfile(t.date);
+                Profile profile = profileFunction.getProfile(t.date);
                 if (profile == null) continue;
                 if (truncate && t.end() > truncateTime) {
                     TemporaryBasal dummyTemp = new TemporaryBasal();
@@ -465,14 +412,14 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                 total.plus(calc);
             }
         }
-        if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
+        if (pumpInterface.isFakingTempsByExtendedBoluses()) {
             IobTotal totalExt = new IobTotal(time);
             synchronized (extendedBoluses) {
-                for (Integer pos = 0; pos < extendedBoluses.size(); pos++) {
+                for (int pos = 0; pos < extendedBoluses.size(); pos++) {
                     ExtendedBolus e = extendedBoluses.get(pos);
                     if (e.date > time) continue;
                     IobTotal calc;
-                    Profile profile = ProfileFunctions.getInstance().getProfile(e.date);
+                    Profile profile = profileFunction.getProfile(e.date);
                     if (profile == null) continue;
                     if (truncate && e.end() > truncateTime) {
                         ExtendedBolus dummyExt = new ExtendedBolus();
@@ -498,16 +445,14 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     public IobTotal getCalculationToTimeTempBasals(long time, long truncateTime, AutosensResult lastAutosensResult, boolean exercise_mode, int half_basal_exercise_target, boolean isTempTarget) {
         IobTotal total = new IobTotal(time);
 
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
-        if (insulinInterface == null)
-            return total;
+        PumpInterface pumpInterface = activePlugin.getActivePump();
 
         synchronized (tempBasals) {
             for (int pos = 0; pos < tempBasals.size(); pos++) {
                 TemporaryBasal t = tempBasals.get(pos);
                 if (t.date > time) continue;
                 IobTotal calc;
-                Profile profile = ProfileFunctions.getInstance().getProfile(t.date);
+                Profile profile = profileFunction.getProfile(t.date);
                 if (profile == null) continue;
                 if (t.end() > truncateTime) {
                     TemporaryBasal dummyTemp = new TemporaryBasal();
@@ -521,14 +466,14 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                 total.plus(calc);
             }
         }
-        if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
+        if (pumpInterface.isFakingTempsByExtendedBoluses()) {
             IobTotal totalExt = new IobTotal(time);
             synchronized (extendedBoluses) {
                 for (int pos = 0; pos < extendedBoluses.size(); pos++) {
                     ExtendedBolus e = extendedBoluses.get(pos);
                     if (e.date > time) continue;
                     IobTotal calc;
-                    Profile profile = ProfileFunctions.getInstance().getProfile(e.date);
+                    Profile profile = profileFunction.getProfile(e.date);
                     if (profile == null) continue;
                     if (e.end() > truncateTime) {
                         ExtendedBolus dummyExt = new ExtendedBolus();
@@ -563,7 +508,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (tb != null)
             return tb;
         ExtendedBolus eb = getExtendedBolusFromHistory(time);
-        if (eb != null && ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
+        if (eb != null && activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
             return new TemporaryBasal(eb);
         return null;
     }
@@ -581,11 +526,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         boolean newRecordCreated = MainApp.getDbHelper().createOrUpdate(extendedBolus);
         if (newRecordCreated) {
             if (extendedBolus.durationInMinutes == 0) {
-                if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
+                if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
                     NSUpload.uploadTempBasalEnd(extendedBolus.date, true, extendedBolus.pumpId);
                 else
                     NSUpload.uploadExtendedBolusEnd(extendedBolus.date, extendedBolus.pumpId);
-            } else if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
+            } else if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
                 NSUpload.uploadTempBasalStartAbsolute(new TemporaryBasal(extendedBolus), extendedBolus.insulin);
             else
                 NSUpload.uploadExtendedBolus(extendedBolus);
@@ -594,6 +539,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     @Override
+    @NonNull
     public Intervals<ExtendedBolus> getExtendedBolusesFromHistory() {
         synchronized (extendedBoluses) {
             return new NonOverlappingIntervals<>(extendedBoluses);
@@ -601,6 +547,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     }
 
     @Override
+    @NonNull
     public NonOverlappingIntervals<TemporaryBasal> getTemporaryBasalsFromHistory() {
         synchronized (tempBasals) {
             return new NonOverlappingIntervals<>(tempBasals);
@@ -625,10 +572,9 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     // return true if new record is created
     @Override
     public boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo, boolean allowUpdate) {
-        boolean medtronicPump = MedtronicUtil.isMedtronicPump();
+        boolean medtronicPump = activePlugin.getActivePump() instanceof MedtronicPumpPlugin;
 
-        if (MedtronicHistoryData.doubleBolusDebug)
-            log.debug("DoubleBolusDebug: addToHistoryTreatment::isMedtronicPump={}", medtronicPump);
+        getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: addToHistoryTreatment::isMedtronicPump={} " + medtronicPump);
 
         Treatment treatment = new Treatment();
         treatment.date = detailedBolusInfo.date;
@@ -639,13 +585,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         treatment.isSMB = detailedBolusInfo.isSMB;
         if (detailedBolusInfo.carbTime == 0)
             treatment.carbs = detailedBolusInfo.carbs;
-        treatment.source = detailedBolusInfo.source;
         treatment.mealBolus = treatment.carbs > 0;
         treatment.boluscalc = detailedBolusInfo.boluscalc != null ? detailedBolusInfo.boluscalc.toString() : null;
         TreatmentService.UpdateReturn creatOrUpdateResult;
 
-        if (medtronicPump && MedtronicHistoryData.doubleBolusDebug)
-            log.debug("DoubleBolusDebug: addToHistoryTreatment::treatment={}", treatment);
+        getAapsLogger().debug(medtronicPump && MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: addToHistoryTreatment::treatment={} " + treatment);
 
         if (!medtronicPump)
             creatOrUpdateResult = getService().createOrUpdate(treatment);
@@ -661,10 +605,8 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             carbsTreatment.pumpId = detailedBolusInfo.pumpId; // but this should never happen
             carbsTreatment.date = detailedBolusInfo.date + detailedBolusInfo.carbTime * 60 * 1000L + 1000L; // add 1 sec to make them different records
             carbsTreatment.carbs = detailedBolusInfo.carbs;
-            carbsTreatment.source = detailedBolusInfo.source;
 
-            if (medtronicPump && MedtronicHistoryData.doubleBolusDebug)
-                log.debug("DoubleBolusDebug: carbTime!=0, creating second treatment. CarbsTreatment={}", carbsTreatment);
+            getAapsLogger().debug(medtronicPump && MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: carbTime!=0, creating second treatment. CarbsTreatment={}" + carbsTreatment);
 
             if (!medtronicPump)
                 getService().createOrUpdate(carbsTreatment);
@@ -676,21 +618,21 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             NSUpload.uploadTreatmentRecord(detailedBolusInfo);
 
         if (!allowUpdate && !creatOrUpdateResult.success) {
-            log.error("Treatment could not be added to DB", new Exception());
+            getAapsLogger().error("Treatment could not be added to DB", new Exception());
 
-            String status = String.format(MainApp.gs(R.string.error_adding_treatment_message), treatment.insulin, (int) treatment.carbs, DateUtil.dateAndTimeString(treatment.date));
+            String status = String.format(resourceHelper.gs(R.string.error_adding_treatment_message), treatment.insulin, (int) treatment.carbs, DateUtil.dateAndTimeString(treatment.date));
 
-            Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+            Intent i = new Intent(context, ErrorHelperActivity.class);
             i.putExtra("soundid", R.raw.error);
-            i.putExtra("title", MainApp.gs(R.string.error_adding_treatment_title));
+            i.putExtra("title", resourceHelper.gs(R.string.error_adding_treatment_title));
             i.putExtra("status", status);
             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            MainApp.instance().startActivity(i);
+            context.startActivity(i);
 
             Bundle bundle = new Bundle();
             bundle.putString(FirebaseAnalytics.Param.ITEM_ID, "TreatmentClash");
             bundle.putString(FirebaseAnalytics.Param.VALUE, status);
-            FabricPrivacy.getInstance().logCustom(bundle);
+            fabricPrivacy.logCustom(bundle);
         }
 
         return newRecordCreated;
@@ -763,10 +705,37 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     @Override
     public void addToHistoryProfileSwitch(ProfileSwitch profileSwitch) {
         //log.debug("Adding new TemporaryBasal record" + profileSwitch.log());
-        RxBus.INSTANCE.send(new EventDismissNotification(Notification.PROFILE_SWITCH_MISSING));
+        rxBus.send(new EventDismissNotification(Notification.PROFILE_SWITCH_MISSING));
         MainApp.getDbHelper().createOrUpdate(profileSwitch);
         NSUpload.uploadProfileSwitch(profileSwitch);
     }
 
+    @Override
+    public void doProfileSwitch(@NotNull final ProfileStore profileStore, @NotNull final String profileName, final int duration, final int percentage, final int timeShift, final long date) {
+        ProfileSwitch profileSwitch = profileFunction.prepareProfileSwitch(profileStore, profileName, duration, percentage, timeShift, date);
+        addToHistoryProfileSwitch(profileSwitch);
+        if (percentage == 90 && duration == 10)
+            sp.putBoolean(R.string.key_objectiveuseprofileswitch, true);
+    }
+
+    @Override
+    public void doProfileSwitch(final int duration, final int percentage, final int timeShift) {
+        ProfileSwitch profileSwitch = getProfileSwitchFromHistory(System.currentTimeMillis());
+        if (profileSwitch != null) {
+            profileSwitch = new ProfileSwitch(getInjector());
+            profileSwitch.date = System.currentTimeMillis();
+            profileSwitch.source = Source.USER;
+            profileSwitch.profileName = profileFunction.getProfileName(System.currentTimeMillis(), false, false);
+            profileSwitch.profileJson = profileFunction.getProfile().getData().toString();
+            profileSwitch.profilePlugin = activePlugin.getActiveProfileInterface().getClass().getName();
+            profileSwitch.durationInMinutes = duration;
+            profileSwitch.isCPP = percentage != 100 || timeShift != 0;
+            profileSwitch.timeshift = timeShift;
+            profileSwitch.percentage = percentage;
+            addToHistoryProfileSwitch(profileSwitch);
+        } else {
+            getAapsLogger().error(LTag.PROFILE, "No profile switch exists");
+        }
+    }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt
deleted file mode 100644
index 63f3b57f65..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.dialogs
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.fragment.app.DialogFragment
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
-import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.StringUtils
-import kotlinx.android.synthetic.main.treatments_wizardinfo_dialog.*
-import org.json.JSONObject
-
-class WizardInfoDialog : DialogFragment() {
-    private var json: JSONObject? = null
-
-    fun setData(json: JSONObject) {
-        this.json = json
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-        isCancelable = true
-        return inflater.inflate(R.layout.treatments_wizardinfo_dialog, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        close.setOnClickListener { dismiss() }
-        val units = ProfileFunctions.getSystemUnits()
-        val bg_string: String
-        if (units.equals(Constants.MGDL)) { bg_string = DecimalFormatter.to0Decimal(JsonHelper.safeGetDouble(json, "bg"))} else { bg_string = DecimalFormatter.to1Decimal(JsonHelper.safeGetDouble(json, "bg"))}
-        // BG
-        treatments_wizard_bg.text = MainApp.gs(R.string.format_bg_isf, bg_string , JsonHelper.safeGetDouble(json, "isf"))
-        treatments_wizard_bginsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulinbg"))
-        treatments_wizard_bgcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "insulinbgused")
-        treatments_wizard_ttcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "ttused")
-        // Trend
-        treatments_wizard_bgtrend.text = JsonHelper.safeGetString(json, "trend")
-        treatments_wizard_bgtrendinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulintrend"))
-        treatments_wizard_bgtrendcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "trendused")
-        // COB
-        treatments_wizard_cob.text = MainApp.gs(R.string.format_cob_ic, JsonHelper.safeGetDouble(json, "cob"), JsonHelper.safeGetDouble(json, "ic"))
-        treatments_wizard_cobinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulincob"))
-        treatments_wizard_cobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "cobused")
-        // Bolus IOB
-        treatments_wizard_bolusiobinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "bolusiob"))
-        treatments_wizard_bolusiobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "bolusiobused")
-        // Basal IOB
-        treatments_wizard_basaliobinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "basaliob"))
-        treatments_wizard_basaliobcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "basaliobused")
-        // Superbolus
-        treatments_wizard_sbinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulinsuperbolus"))
-        treatments_wizard_sbcheckbox.isChecked = JsonHelper.safeGetBoolean(json, "superbolusused")
-        // Carbs
-        treatments_wizard_carbs.text = MainApp.gs(R.string.format_carbs_ic, JsonHelper.safeGetDouble(json, "carbs"), JsonHelper.safeGetDouble(json, "ic"))
-        treatments_wizard_carbsinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulincarbs"))
-        // Correction
-        treatments_wizard_correctioninsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "othercorrection"))
-        // Profile
-        treatments_wizard_profile.text = JsonHelper.safeGetString(json, "profile")
-        // Notes
-        treatments_wizard_notes.text = JsonHelper.safeGetString(json, "notes")
-        // Percentage
-        treatments_wizard_percent_used.text = DecimalFormatter.to0Decimal(JsonHelper.safeGetDouble(json, "percentageCorrection", 100.0)) + "%"
-        // Total
-        treatments_wizard_totalinsulin.text = StringUtils.formatInsulin(JsonHelper.safeGetDouble(json, "insulin"))
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.java
deleted file mode 100644
index dd9e820907..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.fragments;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.series.DataPoint;
-import com.jjoe64.graphview.series.LineGraphSeries;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.utils.Round;
-
-/**
- * Created by Adrian on 15.04.2018.
- */
-
-public class ProfileGraph extends GraphView {
-
-    public ProfileGraph(Context context) {
-        super(context);
-    }
-
-    public ProfileGraph(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public void show(Profile profile) {
-        removeAllSeries();
-
-        LineGraphSeries<DataPoint> basalSeries = null;
-        List<DataPoint> basalArray = new ArrayList<>();
-
-        for (int hour = 0; hour < 24; hour++) {
-            basalArray.add(new DataPoint(hour, profile.getBasalTimeFromMidnight(new Integer(hour*60*60))));
-            basalArray.add(new DataPoint(hour+1, profile.getBasalTimeFromMidnight(new Integer(hour*60*60))));
-        }
-        DataPoint[] basalDataPoints = new DataPoint[basalArray.size()];
-        basalDataPoints = basalArray.toArray(basalDataPoints);
-        addSeries(basalSeries = new LineGraphSeries<>(basalDataPoints));
-        basalSeries.setThickness(8);
-        basalSeries.setDrawBackground(true);
-
-        getViewport().setXAxisBoundsManual(true);
-        getViewport().setMinX(0);
-        getViewport().setMaxX(24);
-
-        getViewport().setYAxisBoundsManual(true);
-        getViewport().setMinY(0);
-        getViewport().setMaxY(Round.ceilTo(profile.getMaxDailyBasal()*1.1, 0.5));
-
-        getGridLabelRenderer().setNumHorizontalLabels(13);
-        getGridLabelRenderer().setVerticalLabelsColor(basalSeries.getColor());
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
new file mode 100644
index 0000000000..a48f5e4118
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.treatments.fragments
+
+import android.content.Context
+import android.util.AttributeSet
+import com.jjoe64.graphview.GraphView
+import com.jjoe64.graphview.series.DataPoint
+import com.jjoe64.graphview.series.LineGraphSeries
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.utils.Round
+import java.util.*
+
+class ProfileGraph : GraphView {
+
+    constructor(context: Context?) : super(context)
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+    fun show(profile: Profile) {
+        removeAllSeries()
+        val basalArray: MutableList<DataPoint> = ArrayList()
+        for (hour in 0..23) {
+            basalArray.add(DataPoint(hour.toDouble(), profile.getBasalTimeFromMidnight(hour * 60 * 60)))
+            basalArray.add(DataPoint((hour + 1).toDouble(), profile.getBasalTimeFromMidnight(hour * 60 * 60)))
+        }
+        val basalDataPoints: Array<DataPoint> = Array(basalArray.size){ i-> basalArray[i]}
+        val basalSeries: LineGraphSeries<DataPoint> = LineGraphSeries(basalDataPoints)
+        addSeries(basalSeries)
+        basalSeries.thickness = 8
+        basalSeries.isDrawBackground = true
+        viewport.isXAxisBoundsManual = true
+        viewport.setMinX(0.0)
+        viewport.setMaxX(24.0)
+        viewport.isYAxisBoundsManual = true
+        viewport.setMinY(0.0)
+        viewport.setMaxY(Round.ceilTo(profile.maxDailyBasal * 1.1, 0.5))
+        gridLabelRenderer.numHorizontalLabels = 13
+        gridLabelRenderer.verticalLabelsColor = basalSeries.color
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
deleted file mode 100644
index 27e35ed456..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.fragments;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.events.EventTreatmentChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.treatments.dialogs.WizardInfoDialog;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-import static info.nightscout.androidaps.utils.DateUtil.now;
-
-public class TreatmentsBolusFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private RecyclerView recyclerView;
-
-    private TextView iobTotal;
-    private TextView activityTotal;
-    private Button deleteFutureTreatments;
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.TreatmentsViewHolder> {
-
-        List<Treatment> treatments;
-
-        RecyclerViewAdapter(List<Treatment> treatments) {
-            this.treatments = treatments;
-        }
-
-        @NonNull
-        @Override
-        public TreatmentsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_bolus_item, viewGroup, false);
-            return new TreatmentsViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(@NonNull TreatmentsViewHolder holder, int position) {
-            Profile profile = ProfileFunctions.getInstance().getProfile();
-            if (profile == null)
-                return;
-            Treatment t = treatments.get(position);
-            holder.date.setText(DateUtil.dateAndTimeString(t.date));
-            holder.insulin.setText(MainApp.gs(R.string.formatinsulinunits, t.insulin));
-            holder.carbs.setText(MainApp.gs(R.string.format_carbs, (int) t.carbs));
-            Iob iob = t.iobCalc(System.currentTimeMillis(), profile.getDia());
-            holder.iob.setText(MainApp.gs(R.string.formatinsulinunits, iob.iobContrib));
-            holder.mealOrCorrection.setText(t.isSMB ? "SMB" : t.mealBolus ? MainApp.gs(R.string.mealbolus) : MainApp.gs(R.string.correctionbous));
-            holder.ph.setVisibility(t.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(NSUpload.isIdValid(t._id) ? View.VISIBLE : View.GONE);
-            holder.invalid.setVisibility(t.isValid ? View.GONE : View.VISIBLE);
-            if (iob.iobContrib != 0)
-                holder.iob.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
-            else
-                holder.iob.setTextColor(holder.carbs.getCurrentTextColor());
-            if (t.date > now())
-                holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorScheduled));
-            else
-                holder.date.setTextColor(holder.carbs.getCurrentTextColor());
-            holder.remove.setTag(t);
-            holder.calculation.setTag(t);
-            holder.calculation.setVisibility(t.getBoluscalc() == null ? View.INVISIBLE : View.VISIBLE);
-        }
-
-        @Override
-        public int getItemCount() {
-            return treatments.size();
-        }
-
-        @Override
-        public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-            super.onAttachedToRecyclerView(recyclerView);
-        }
-
-        public class TreatmentsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-            CardView cv;
-            TextView date;
-            TextView insulin;
-            TextView carbs;
-            TextView iob;
-            TextView mealOrCorrection;
-            TextView remove;
-            TextView calculation;
-            TextView ph;
-            TextView ns;
-            TextView invalid;
-
-            TreatmentsViewHolder(View itemView) {
-                super(itemView);
-                cv = itemView.findViewById(R.id.treatments_cardview);
-                date = itemView.findViewById(R.id.treatments_date);
-                insulin = itemView.findViewById(R.id.treatments_insulin);
-                carbs = itemView.findViewById(R.id.treatments_carbs);
-                iob = itemView.findViewById(R.id.treatments_iob);
-                mealOrCorrection = itemView.findViewById(R.id.treatments_mealorcorrection);
-                ph = itemView.findViewById(R.id.pump_sign);
-                ns = itemView.findViewById(R.id.ns_sign);
-                invalid = itemView.findViewById(R.id.invalid_sign);
-                calculation = itemView.findViewById(R.id.treatments_calculation);
-                calculation.setOnClickListener(this);
-                calculation.setPaintFlags(calculation.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-                remove = itemView.findViewById(R.id.treatments_remove);
-                remove.setOnClickListener(this);
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-
-            @Override
-            public void onClick(View v) {
-                final Treatment treatment = (Treatment) v.getTag();
-                if (treatment == null)
-                    return;
-                switch (v.getId()) {
-                    case R.id.treatments_remove:
-                        OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord),
-                                MainApp.gs(R.string.configbuilder_insulin) + ": " + MainApp.gs(R.string.formatinsulinunits, treatment.insulin) +
-                                        "\n" + MainApp.gs(R.string.carbs) + ": " + MainApp.gs(R.string.format_carbs, (int) treatment.carbs) +
-                                        "\n" + MainApp.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(treatment.date),
-                                (dialog, id) -> {
-                                    final String _id = treatment._id;
-                                    if (treatment.source == Source.PUMP) {
-                                        treatment.isValid = false;
-                                        TreatmentsPlugin.getPlugin().getService().update(treatment);
-                                    } else {
-                                        if (NSUpload.isIdValid(_id)) {
-                                            NSUpload.removeCareportalEntryFromNS(_id);
-                                        } else {
-                                            UploadQueue.removeID("dbAdd", _id);
-                                        }
-                                        TreatmentsPlugin.getPlugin().getService().delete(treatment);
-                                    }
-                                    updateGui();
-                                }, null);
-                        break;
-                    case R.id.treatments_calculation:
-                        FragmentManager manager = getFragmentManager();
-                        // try to fix  https://fabric.io/nightscout3/android/apps/info.nightscout.androidaps/issues/5aca7a1536c7b23527eb4be7?time=last-seven-days
-                        // https://stackoverflow.com/questions/14860239/checking-if-state-is-saved-before-committing-a-fragmenttransaction
-                        if (manager.isStateSaved())
-                            return;
-                        if (treatment.getBoluscalc() != null) {
-                            WizardInfoDialog wizardDialog = new WizardInfoDialog();
-                            wizardDialog.setData(treatment.getBoluscalc());
-                            wizardDialog.show(manager, "WizardInfoDialog");
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.treatments_bolus_fragment, container, false);
-
-        recyclerView = view.findViewById(R.id.treatments_recyclerview);
-        recyclerView.setHasFixedSize(true);
-        LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-        recyclerView.setLayoutManager(llm);
-
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTreatmentsFromHistory());
-        recyclerView.setAdapter(adapter);
-
-        iobTotal = view.findViewById(R.id.treatments_iobtotal);
-        activityTotal = view.findViewById(R.id.treatments_iobactivitytotal);
-
-        Button refreshFromNS = view.findViewById(R.id.treatments_reshreshfromnightscout);
-        refreshFromNS.setOnClickListener(v -> OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.refresheventsfromnightscout) + "?", () -> {
-            TreatmentsPlugin.getPlugin().getService().resetTreatments();
-            RxBus.INSTANCE.send(new EventNSClientRestart());
-        }));
-
-        deleteFutureTreatments = view.findViewById(R.id.treatments_delete_future_treatments);
-        deleteFutureTreatments.setOnClickListener(v -> {
-            OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.overview_treatment_label), MainApp.gs(R.string.deletefuturetreatments) + "?", () -> {
-                final List<Treatment> futureTreatments = TreatmentsPlugin.getPlugin().getService()
-                        .getTreatmentDataFromTime(now() + 1000, true);
-                for (Treatment treatment : futureTreatments) {
-                    final String _id = treatment._id;
-                    if (NSUpload.isIdValid(_id)) {
-                        NSUpload.removeCareportalEntryFromNS(_id);
-                    } else {
-                        UploadQueue.removeID("dbAdd", _id);
-                    }
-                    TreatmentsPlugin.getPlugin().getService().delete(treatment);
-                }
-                updateGui();
-            });
-        });
-
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
-        if (nsUploadOnly)
-            refreshFromNS.setVisibility(View.GONE);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTreatmentChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    private void updateGui() {
-        recyclerView.swapAdapter(new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTreatmentsFromHistory()), false);
-        if (TreatmentsPlugin.getPlugin().getLastCalculationTreatments() != null) {
-            iobTotal.setText(DecimalFormatter.to2Decimal(TreatmentsPlugin.getPlugin().getLastCalculationTreatments().iob) + " " + MainApp.gs(R.string.insulin_unit_shortname));
-            activityTotal.setText(DecimalFormatter.to3Decimal(TreatmentsPlugin.getPlugin().getLastCalculationTreatments().activity) + " " + MainApp.gs(R.string.insulin_unit_shortname));
-        }
-        if (!TreatmentsPlugin.getPlugin().getService().getTreatmentDataFromTime(now() + 1000, true).isEmpty()) {
-            deleteFutureTreatments.setVisibility(View.VISIBLE);
-        } else {
-            deleteFutureTreatments.setVisibility(View.GONE);
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
new file mode 100644
index 0000000000..5ef9bf694f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
@@ -0,0 +1,195 @@
+package info.nightscout.androidaps.plugins.treatments.fragments
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.events.EventTreatmentChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.dialogs.WizardInfoDialog
+import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsBolusFragment.RecyclerViewAdapter.TreatmentsViewHolder
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.treatments_bolus_fragment.*
+import javax.inject.Inject
+
+class TreatmentsBolusFragment : DaggerFragment() {
+    private val disposable = CompositeDisposable()
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.treatments_bolus_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        treatments_recyclerview.setHasFixedSize(true)
+        treatments_recyclerview.layoutManager = LinearLayoutManager(view.context)
+        treatments_recyclerview.adapter = RecyclerViewAdapter(treatmentsPlugin.treatmentsFromHistory)
+        treatments_reshreshfromnightscout.setOnClickListener {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.refresheventsfromnightscout) + "?", Runnable {
+                    treatmentsPlugin.service.resetTreatments()
+                    rxBus.send(EventNSClientRestart())
+                })
+            }
+        }
+        treatments_delete_future_treatments.setOnClickListener {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_treatment_label), resourceHelper.gs(R.string.deletefuturetreatments) + "?", Runnable {
+                    val futureTreatments = treatmentsPlugin.service.getTreatmentDataFromTime(DateUtil.now() + 1000, true)
+                    for (treatment in futureTreatments) {
+                        if (NSUpload.isIdValid(treatment._id))
+                            NSUpload.removeCareportalEntryFromNS(treatment._id)
+                        else
+                            UploadQueue.removeID("dbAdd", treatment._id)
+                        treatmentsPlugin.service.delete(treatment)
+                    }
+                    updateGui()
+                })
+            }
+        }
+        val nsUploadOnly = sp.getBoolean(R.string.key_ns_upload_only, false)
+        if (nsUploadOnly) treatments_reshreshfromnightscout.visibility = View.GONE
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventTreatmentChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    inner class RecyclerViewAdapter internal constructor(var treatments: List<Treatment>) : RecyclerView.Adapter<TreatmentsViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): TreatmentsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.treatments_bolus_item, viewGroup, false)
+            return TreatmentsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: TreatmentsViewHolder, position: Int) {
+            val profile = profileFunction.getProfile() ?: return
+            val t = treatments[position]
+            holder.date.text = DateUtil.dateAndTimeString(t.date)
+            holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, t.insulin)
+            holder.carbs.text = resourceHelper.gs(R.string.format_carbs, t.carbs.toInt())
+            val iob = t.iobCalc(System.currentTimeMillis(), profile.dia)
+            holder.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.iobContrib)
+            holder.mealOrCorrection.text = if (t.isSMB) "SMB" else if (t.mealBolus) resourceHelper.gs(R.string.mealbolus) else resourceHelper.gs(R.string.correctionbous)
+            holder.ph.visibility = if (t.source == Source.PUMP) View.VISIBLE else View.GONE
+            holder.ns.visibility = if (NSUpload.isIdValid(t._id)) View.VISIBLE else View.GONE
+            holder.invalid.visibility = if (t.isValid) View.GONE else View.VISIBLE
+            if (iob.iobContrib != 0.0) holder.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.iob.setTextColor(holder.carbs.currentTextColor)
+            if (t.date > DateUtil.now()) holder.date.setTextColor(resourceHelper.gc(R.color.colorScheduled)) else holder.date.setTextColor(holder.carbs.currentTextColor)
+            holder.remove.tag = t
+            holder.calculation.tag = t
+            holder.calculation.visibility = if (t.getBoluscalc() == null) View.INVISIBLE else View.VISIBLE
+        }
+
+        override fun getItemCount(): Int {
+            return treatments.size
+        }
+
+        inner class TreatmentsViewHolder internal constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var cv: CardView = itemView.findViewById(R.id.treatments_cardview)
+            var date: TextView = itemView.findViewById(R.id.treatments_date)
+            var insulin: TextView = itemView.findViewById(R.id.treatments_insulin)
+            var carbs: TextView = itemView.findViewById(R.id.treatments_carbs)
+            var iob: TextView = itemView.findViewById(R.id.treatments_iob)
+            var mealOrCorrection: TextView = itemView.findViewById(R.id.treatments_mealorcorrection)
+            var remove: TextView = itemView.findViewById(R.id.treatments_remove)
+            var calculation: TextView = itemView.findViewById(R.id.treatments_calculation)
+            var ph: TextView = itemView.findViewById(R.id.pump_sign)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+            var invalid: TextView = itemView.findViewById(R.id.invalid_sign)
+
+            init {
+                calculation.setOnClickListener {
+                    val treatment = it.tag as Treatment
+                    fragmentManager?.let { fragmentManager ->
+                        if (treatment.getBoluscalc() != null) {
+                            val wizardDialog = WizardInfoDialog()
+                            wizardDialog.setData(treatment.getBoluscalc()!!)
+                            wizardDialog.show(fragmentManager, "WizardInfoDialog")
+                        }
+                    }
+                }
+                calculation.paintFlags = calculation.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                remove.setOnClickListener {
+                    val treatment = it.tag as Treatment
+                    activity?.let { activity ->
+                        val text = resourceHelper.gs(R.string.configbuilder_insulin) + ": " +
+                            resourceHelper.gs(R.string.formatinsulinunits, treatment.insulin) + "\n" +
+                            resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, treatment.carbs.toInt()) + "\n" +
+                            resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(treatment.date)
+                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                            if (treatment.source == Source.PUMP) {
+                                treatment.isValid = false
+                                treatmentsPlugin.service.update(treatment)
+                            } else {
+                                if (NSUpload.isIdValid(treatment._id))
+                                    NSUpload.removeCareportalEntryFromNS(treatment._id)
+                                else
+                                    UploadQueue.removeID("dbAdd", treatment._id)
+                                treatmentsPlugin.service.delete(treatment)
+                            }
+                            updateGui()
+                        })
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+    }
+
+    private fun updateGui() {
+        treatments_recyclerview?.swapAdapter(RecyclerViewAdapter(treatmentsPlugin.treatmentsFromHistory), false)
+        if (treatmentsPlugin.lastCalculationTreatments != null) {
+            treatments_iobtotal?.text = resourceHelper.gs(R.string.formatinsulinunits, treatmentsPlugin.lastCalculationTreatments.iob)
+            treatments_iobactivitytotal?.text = resourceHelper.gs(R.string.formatinsulinunits, treatmentsPlugin.lastCalculationTreatments.activity)
+        }
+        if (treatmentsPlugin.service.getTreatmentDataFromTime(DateUtil.now() + 1000, true).isNotEmpty())
+            treatments_delete_future_treatments?.visibility = View.VISIBLE
+        else
+            treatments_delete_future_treatments?.visibility = View.GONE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
deleted file mode 100644
index 5aa4f091d8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.fragments;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.events.EventCareportalEventChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.Translator;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-/**
- * Created by mike on 13/01/17.
- */
-
-public class TreatmentsCareportalFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private RecyclerView recyclerView;
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.CareportalEventsViewHolder> {
-
-        List<CareportalEvent> careportalEventList;
-
-        RecyclerViewAdapter(List<CareportalEvent> careportalEventList) {
-            this.careportalEventList = careportalEventList;
-        }
-
-        @NonNull
-        @Override
-        public CareportalEventsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_careportal_item, viewGroup, false);
-            return new CareportalEventsViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(CareportalEventsViewHolder holder, int position) {
-            CareportalEvent careportalEvent = careportalEventList.get(position);
-            holder.ns.setVisibility(NSUpload.isIdValid(careportalEvent._id) ? View.VISIBLE : View.GONE);
-            holder.date.setText(DateUtil.dateAndTimeString(careportalEvent.date));
-            holder.note.setText(careportalEvent.getNotes());
-            holder.type.setText(Translator.translate(careportalEvent.eventType));
-            holder.remove.setTag(careportalEvent);
-        }
-
-        @Override
-        public int getItemCount() {
-            return careportalEventList.size();
-        }
-
-        @Override
-        public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-            super.onAttachedToRecyclerView(recyclerView);
-        }
-
-        class CareportalEventsViewHolder extends RecyclerView.ViewHolder {
-            CardView cv;
-            TextView date;
-            TextView type;
-            TextView note;
-            TextView remove;
-            TextView ns;
-
-            CareportalEventsViewHolder(View itemView) {
-                super(itemView);
-                cv = itemView.findViewById(R.id.careportal_cardview);
-                date = itemView.findViewById(R.id.careportal_date);
-                type = itemView.findViewById(R.id.careportal_type);
-                note = itemView.findViewById(R.id.careportal_note);
-                ns = itemView.findViewById(R.id.ns_sign);
-                remove = itemView.findViewById(R.id.careportal_remove);
-                remove.setOnClickListener(v -> {
-                    final CareportalEvent careportalEvent = (CareportalEvent) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord),
-                            "\n" + MainApp.gs(R.string.careportal_newnstreatment_eventtype) + ": " + Translator.translate(careportalEvent.eventType) +
-                                    "\n" + MainApp.gs(R.string.careportal_newnstreatment_notes_label) + ": " + careportalEvent.getNotes() +
-                                    "\n" + MainApp.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(careportalEvent.date),
-                            (dialog, id) -> {
-                                final String _id = careportalEvent._id;
-                                if (NSUpload.isIdValid(_id)) {
-                                    NSUpload.removeCareportalEntryFromNS(_id);
-                                } else {
-                                    UploadQueue.removeID("dbAdd", _id);
-                                }
-                                MainApp.getDbHelper().delete(careportalEvent);
-                            }, null);
-                });
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.treatments_careportal_fragment, container, false);
-
-        recyclerView = view.findViewById(R.id.careportal_recyclerview);
-        recyclerView.setHasFixedSize(true);
-        LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-        recyclerView.setLayoutManager(llm);
-
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEvents(false));
-        recyclerView.setAdapter(adapter);
-
-        Button refreshFromNS = view.findViewById(R.id.careportal_refreshfromnightscout);
-        refreshFromNS.setOnClickListener(v ->
-                OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.careportal), MainApp.gs(R.string.refresheventsfromnightscout) + " ?", () -> {
-                    MainApp.getDbHelper().resetCareportalEvents();
-                    RxBus.INSTANCE.send(new EventNSClientRestart());
-                }));
-
-        view.findViewById(R.id.careportal_removeandroidapsstartedevents).setOnClickListener(v ->
-                OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.careportal), MainApp.gs(R.string.careportal_removestartedevents), this::removeAndroidAPSStatedEvents));
-
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
-        if (nsUploadOnly)
-            refreshFromNS.setVisibility(View.GONE);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventCareportalEventChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    private void updateGui() {
-        recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEvents(false)), false);
-    }
-
-    private void removeAndroidAPSStatedEvents() {
-        List<CareportalEvent> events = MainApp.getDbHelper().getCareportalEvents(false);
-        for (int i = 0; i < events.size(); i++) {
-            CareportalEvent careportalEvent = events.get(i);
-            if (careportalEvent.json.contains(MainApp.gs(R.string.androidaps_start))) {
-                final String _id = careportalEvent._id;
-                if (NSUpload.isIdValid(_id)) {
-                    NSUpload.removeCareportalEntryFromNS(_id);
-                } else {
-                    UploadQueue.removeID("dbAdd", _id);
-                }
-                MainApp.getDbHelper().delete(careportalEvent);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
new file mode 100644
index 0000000000..46108c045b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
@@ -0,0 +1,150 @@
+package info.nightscout.androidaps.plugins.treatments.fragments
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.events.EventCareportalEventChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.CareportalEventsViewHolder
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.Translator
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.treatments_careportal_fragment.*
+import javax.inject.Inject
+
+class TreatmentsCareportalFragment : DaggerFragment() {
+    private val disposable = CompositeDisposable()
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.treatments_careportal_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        careportal_recyclerview.setHasFixedSize(true)
+        careportal_recyclerview.layoutManager = LinearLayoutManager(view.context)
+        careportal_recyclerview.adapter = RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEvents(false))
+        careportal_refreshfromnightscout.setOnClickListener {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal), resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", Runnable {
+                    MainApp.getDbHelper().resetCareportalEvents()
+                    rxBus.send(EventNSClientRestart())
+                })
+            }
+        }
+        careportal_removeandroidapsstartedevents.setOnClickListener {
+            activity?.let { activity ->
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal), resourceHelper.gs(R.string.careportal_removestartedevents), Runnable {
+                    val events = MainApp.getDbHelper().getCareportalEvents(false)
+                    for (i in events.indices) {
+                        val careportalEvent = events[i]
+                        if (careportalEvent.json.contains(resourceHelper.gs(R.string.androidaps_start))) {
+                            if (NSUpload.isIdValid(careportalEvent._id))
+                                NSUpload.removeCareportalEntryFromNS(careportalEvent._id)
+                            else
+                                UploadQueue.removeID("dbAdd", careportalEvent._id)
+                            MainApp.getDbHelper().delete(careportalEvent)
+                        }
+                    }
+                }, null)
+            }
+        }
+
+        val nsUploadOnly = sp.getBoolean(R.string.key_ns_upload_only, false)
+        if (nsUploadOnly) careportal_refreshfromnightscout.visibility = View.GONE
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventCareportalEventChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun updateGui() =
+        careportal_recyclerview?.swapAdapter(RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEvents(false)), false)
+
+    inner class RecyclerViewAdapter internal constructor(private var careportalEventList: List<CareportalEvent>) : RecyclerView.Adapter<CareportalEventsViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): CareportalEventsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.treatments_careportal_item, viewGroup, false)
+            return CareportalEventsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: CareportalEventsViewHolder, position: Int) {
+            val careportalEvent = careportalEventList[position]
+            holder.ns.visibility = if (NSUpload.isIdValid(careportalEvent._id)) View.VISIBLE else View.GONE
+            holder.date.text = DateUtil.dateAndTimeString(careportalEvent.date)
+            holder.duration.text = if (careportalEvent.durationInMsec() == 0L) "" else DateUtil.niceTimeScalar(careportalEvent.durationInMsec(), resourceHelper)
+            holder.note.text = careportalEvent.notes
+            holder.type.text = Translator.translate(careportalEvent.eventType)
+            holder.remove.tag = careportalEvent
+        }
+
+        override fun getItemCount(): Int {
+            return careportalEventList.size
+        }
+
+        inner class CareportalEventsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var cv: CardView = itemView.findViewById(R.id.careportal_cardview)
+            var date: TextView = itemView.findViewById(R.id.careportal_date)
+            var duration: TextView = itemView.findViewById(R.id.careportal_duration)
+            var type: TextView = itemView.findViewById(R.id.careportal_type)
+            var note: TextView = itemView.findViewById(R.id.careportal_note)
+            var remove: TextView = itemView.findViewById(R.id.careportal_remove)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+
+            init {
+                remove.setOnClickListener { v: View ->
+                    val careportalEvent = v.tag as CareportalEvent
+                    activity?.let { activity ->
+                        val text = resourceHelper.gs(R.string.careportal_newnstreatment_eventtype) + ": " + Translator.translate(careportalEvent.eventType) + "\n" +
+                            resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + careportalEvent.notes + "\n" +
+                            resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(careportalEvent.date)
+                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                            if (NSUpload.isIdValid(careportalEvent._id))
+                                NSUpload.removeCareportalEntryFromNS(careportalEvent._id)
+                            else
+                                UploadQueue.removeID("dbAdd", careportalEvent._id)
+                            MainApp.getDbHelper().delete(careportalEvent)
+                        }, null)
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java
deleted file mode 100644
index 928e2d30aa..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.fragments;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Intervals;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.events.EventExtendedBolusChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-
-public class TreatmentsExtendedBolusesFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private RecyclerView recyclerView;
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.ExtendedBolusesViewHolder> {
-
-        Intervals<ExtendedBolus> extendedBolusList;
-
-        RecyclerViewAdapter(Intervals<ExtendedBolus> extendedBolusList) {
-            this.extendedBolusList = extendedBolusList;
-        }
-
-        @NonNull
-        @Override
-        public ExtendedBolusesViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_extendedbolus_item, viewGroup, false);
-            return new ExtendedBolusesViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(ExtendedBolusesViewHolder holder, int position) {
-            ExtendedBolus extendedBolus = extendedBolusList.getReversed(position);
-            holder.ph.setVisibility(extendedBolus.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(NSUpload.isIdValid(extendedBolus._id) ? View.VISIBLE : View.GONE);
-            if (extendedBolus.isEndingEvent()) {
-                holder.date.setText(DateUtil.dateAndTimeString(extendedBolus.date));
-                holder.duration.setText(MainApp.gs(R.string.cancel));
-                holder.insulin.setText("");
-                holder.realDuration.setText("");
-                holder.iob.setText("");
-                holder.insulinSoFar.setText("");
-                holder.ratio.setText("");
-            } else {
-                if (extendedBolus.isInProgress()) {
-                    holder.date.setText(DateUtil.dateAndTimeString(extendedBolus.date));
-                } else {
-                    holder.date.setText(DateUtil.dateAndTimeString(extendedBolus.date) + " - " + DateUtil.timeString(extendedBolus.end()));
-                }
-                holder.duration.setText(DecimalFormatter.to0Decimal(extendedBolus.durationInMinutes) + " min");
-                holder.insulin.setText(DecimalFormatter.toPumpSupportedBolus(extendedBolus.insulin) + " U");
-                holder.realDuration.setText(DecimalFormatter.to0Decimal(extendedBolus.getRealDuration()) + " min");
-                IobTotal iob = extendedBolus.iobCalc(System.currentTimeMillis());
-                holder.iob.setText(DecimalFormatter.to2Decimal(iob.iob) + " U");
-                holder.insulinSoFar.setText(DecimalFormatter.to2Decimal(extendedBolus.insulinSoFar()) + " U");
-                holder.ratio.setText(DecimalFormatter.to2Decimal(extendedBolus.absoluteRate()) + " U/h");
-                if (extendedBolus.isInProgress())
-                    holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
-                else
-                    holder.date.setTextColor(holder.insulin.getCurrentTextColor());
-                if (extendedBolus.iobCalc(System.currentTimeMillis()).iob != 0)
-                    holder.iob.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
-                else
-                    holder.iob.setTextColor(holder.insulin.getCurrentTextColor());
-            }
-            holder.remove.setTag(extendedBolus);
-        }
-
-        @Override
-        public int getItemCount() {
-            return extendedBolusList.size();
-        }
-
-        @Override
-        public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-            super.onAttachedToRecyclerView(recyclerView);
-        }
-
-        class ExtendedBolusesViewHolder extends RecyclerView.ViewHolder {
-            CardView cv;
-            TextView date;
-            TextView duration;
-            TextView insulin;
-            TextView realDuration;
-            TextView ratio;
-            TextView insulinSoFar;
-            TextView iob;
-            TextView remove;
-            TextView ph;
-            TextView ns;
-
-            ExtendedBolusesViewHolder(View itemView) {
-                super(itemView);
-                cv = itemView.findViewById(R.id.extendedboluses_cardview);
-                date = itemView.findViewById(R.id.extendedboluses_date);
-                duration = itemView.findViewById(R.id.extendedboluses_duration);
-                insulin = itemView.findViewById(R.id.extendedboluses_insulin);
-                realDuration = itemView.findViewById(R.id.extendedboluses_realduration);
-                ratio = itemView.findViewById(R.id.extendedboluses_ratio);
-                insulinSoFar = itemView.findViewById(R.id.extendedboluses_netinsulin);
-                iob = itemView.findViewById(R.id.extendedboluses_iob);
-                ph = itemView.findViewById(R.id.pump_sign);
-                ns = itemView.findViewById(R.id.ns_sign);
-                remove = itemView.findViewById(R.id.extendedboluses_remove);
-                remove.setOnClickListener(v -> {
-                    final ExtendedBolus extendedBolus = (ExtendedBolus) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord),
-                            MainApp.gs(R.string.extended_bolus)
-                                    + "\n" + MainApp.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(extendedBolus.date), (dialog, id) -> {
-                                final String _id = extendedBolus._id;
-                                if (NSUpload.isIdValid(_id)) {
-                                    NSUpload.removeCareportalEntryFromNS(_id);
-                                } else {
-                                    UploadQueue.removeID("dbAdd", _id);
-                                }
-                                MainApp.getDbHelper().delete(extendedBolus);
-                            }, null);
-                });
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.treatments_extendedbolus_fragment, container, false);
-
-        recyclerView = view.findViewById(R.id.extendedboluses_recyclerview);
-        recyclerView.setHasFixedSize(true);
-        LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-        recyclerView.setLayoutManager(llm);
-
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory());
-        recyclerView.setAdapter(adapter);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventExtendedBolusChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    private void updateGui() {
-        recyclerView.swapAdapter(new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory()), false);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
new file mode 100644
index 0000000000..3ddc7cb734
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -0,0 +1,152 @@
+package info.nightscout.androidaps.plugins.treatments.fragments
+
+import android.annotation.SuppressLint
+import android.content.DialogInterface
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Intervals
+import info.nightscout.androidaps.db.ExtendedBolus
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.treatments_extendedbolus_fragment.*
+import javax.inject.Inject
+
+class TreatmentsExtendedBolusesFragment : DaggerFragment() {
+    private val disposable = CompositeDisposable()
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.treatments_extendedbolus_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        extendedboluses_recyclerview.setHasFixedSize(true)
+        extendedboluses_recyclerview.layoutManager = LinearLayoutManager(view.context)
+        extendedboluses_recyclerview.adapter = RecyclerViewAdapter(activePlugin.activeTreatments.extendedBolusesFromHistory)
+    }
+
+    inner class RecyclerViewAdapter internal constructor(private var extendedBolusList: Intervals<ExtendedBolus>) : RecyclerView.Adapter<ExtendedBolusesViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ExtendedBolusesViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.treatments_extendedbolus_item, viewGroup, false)
+            return ExtendedBolusesViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: ExtendedBolusesViewHolder, position: Int) {
+            val extendedBolus = extendedBolusList.getReversed(position)
+            holder.ph.visibility = if (extendedBolus.source == Source.PUMP) View.VISIBLE else View.GONE
+            holder.ns.visibility = if (NSUpload.isIdValid(extendedBolus._id)) View.VISIBLE else View.GONE
+            if (extendedBolus.isEndingEvent) {
+                holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date)
+                holder.duration.text = resourceHelper.gs(R.string.cancel)
+                holder.insulin.text = ""
+                holder.realDuration.text = ""
+                holder.iob.text = ""
+                holder.insulinSoFar.text = ""
+                holder.ratio.text = ""
+            } else {
+                @SuppressLint("SetTextI18n")
+                if (extendedBolus.isInProgress) holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date)
+                else holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date) + " - " + DateUtil.timeString(extendedBolus.end())
+
+                holder.duration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.durationInMinutes)
+                holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulin)
+                holder.realDuration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.realDuration)
+                val iob = extendedBolus.iobCalc(System.currentTimeMillis())
+                holder.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.iob)
+                holder.insulinSoFar.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulinSoFar())
+                holder.ratio.text = resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.absoluteRate())
+                if (extendedBolus.isInProgress) holder.date.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.date.setTextColor(holder.insulin.currentTextColor)
+                if (extendedBolus.iobCalc(System.currentTimeMillis()).iob != 0.0) holder.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.iob.setTextColor(holder.insulin.currentTextColor)
+            }
+            holder.remove.tag = extendedBolus
+        }
+
+        override fun getItemCount(): Int {
+            return extendedBolusList.size()
+        }
+
+        inner class ExtendedBolusesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var cv: CardView = itemView.findViewById(R.id.extendedboluses_cardview)
+            var date: TextView = itemView.findViewById(R.id.extendedboluses_date)
+            var duration: TextView = itemView.findViewById(R.id.extendedboluses_duration)
+            var insulin: TextView = itemView.findViewById(R.id.extendedboluses_insulin)
+            var realDuration: TextView = itemView.findViewById(R.id.extendedboluses_realduration)
+            var ratio: TextView = itemView.findViewById(R.id.extendedboluses_ratio)
+            var insulinSoFar: TextView = itemView.findViewById(R.id.extendedboluses_netinsulin)
+            var iob: TextView = itemView.findViewById(R.id.extendedboluses_iob)
+            var remove: TextView = itemView.findViewById(R.id.extendedboluses_remove)
+            var ph: TextView = itemView.findViewById(R.id.pump_sign)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+
+            init {
+                remove.setOnClickListener { v: View ->
+                    val extendedBolus = v.tag as ExtendedBolus
+                    context?.let {
+                        showConfirmation(it, resourceHelper.gs(R.string.removerecord),
+                            """
+                ${resourceHelper.gs(R.string.extended_bolus)}
+                ${resourceHelper.gs(R.string.date)}: ${DateUtil.dateAndTimeString(extendedBolus.date)}
+                """.trimIndent(), DialogInterface.OnClickListener { _: DialogInterface, _: Int ->
+                            val id = extendedBolus._id
+                            if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
+                            else UploadQueue.removeID("dbAdd", id)
+                            MainApp.getDbHelper().delete(extendedBolus)
+                        }, null)
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun updateGui() =
+        extendedboluses_recyclerview.swapAdapter(RecyclerViewAdapter(activePlugin.activeTreatments.extendedBolusesFromHistory), false)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index 45d25124de..619a84cc49 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -7,31 +7,43 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate
-import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.toVisibility
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.treatments_profileswitch_fragment.*
+import javax.inject.Inject
 
-class TreatmentsProfileSwitchFragment : Fragment() {
+class TreatmentsProfileSwitchFragment : DaggerFragment() {
     private val disposable = CompositeDisposable()
 
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.treatments_profileswitch_fragment, container, false)
@@ -45,23 +57,22 @@ class TreatmentsProfileSwitchFragment : Fragment() {
 
         profileswitch_refreshfromnightscout.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, MainApp.gs(R.string.refresheventsfromnightscout) + "?", Runnable {
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.refresheventsfromnightscout) + "?", Runnable {
                     MainApp.getDbHelper().resetProfileSwitch()
-                    RxBus.send(EventNSClientRestart())
+                    rxBus.send(EventNSClientRestart())
                 })
             }
         }
-        if (SP.getBoolean(R.string.key_ns_upload_only, false)) profileswitch_refreshfromnightscout.visibility = View.GONE
-
+        if (sp.getBoolean(R.string.key_ns_upload_only, false)) profileswitch_refreshfromnightscout.visibility = View.GONE
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
-        disposable.add(RxBus
+        disposable.add(rxBus
             .toObservable(EventProfileNeedsUpdate::class.java)
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }) { FabricPrivacy.logException(it) }
+            .subscribe({ updateGUI() }) { fabricPrivacy.logException(it) }
         )
         updateGUI()
     }
@@ -86,12 +97,12 @@ class TreatmentsProfileSwitchFragment : Fragment() {
             holder.ns.visibility = NSUpload.isIdValid(profileSwitch._id).toVisibility()
             holder.date.text = DateUtil.dateAndTimeString(profileSwitch.date)
             if (!profileSwitch.isEndingEvent) {
-                holder.duration.text = DecimalFormatter.to0Decimal(profileSwitch.durationInMinutes.toDouble()) + " " + MainApp.gs(R.string.unit_minute_short)
+                holder.duration.text = resourceHelper.gs(R.string.format_mins, profileSwitch.durationInMinutes)
             } else {
                 holder.duration.text = ""
             }
             holder.name.text = profileSwitch.customizedName
-            if (profileSwitch.isInProgress) holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive)) else holder.date.setTextColor(holder.duration.currentTextColor)
+            if (profileSwitch.isInProgress) holder.date.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.date.setTextColor(holder.duration.currentTextColor)
             holder.remove.tag = profileSwitch
             holder.clone.tag = profileSwitch
             holder.name.tag = profileSwitch
@@ -119,9 +130,9 @@ class TreatmentsProfileSwitchFragment : Fragment() {
                 when (v.id) {
                     R.id.profileswitch_remove                        ->
                         activity?.let { activity ->
-                            OKDialog.showConfirmation(activity, MainApp.gs(R.string.removerecord),
-                                MainApp.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
-                                    "\n" + MainApp.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord),
+                                resourceHelper.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
+                                    "\n" + resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 val id = profileSwitch._id
                                 if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
                                 else UploadQueue.removeID("dbAdd", id)
@@ -130,11 +141,11 @@ class TreatmentsProfileSwitchFragment : Fragment() {
                         }
                     R.id.profileswitch_clone                         ->
                         activity?.let { activity ->
-                            OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_profileswitch), MainApp.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.customizedName + "\n" + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.customizedName + "\n" + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 profileSwitch.profileObject?.let {
                                     val nonCustomized = it.convertToNonCustomizedProfile()
-                                    LocalProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(nonCustomized, profileSwitch.customizedName + " " + DateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
-                                    RxBus.send(EventLocalProfileChanged())
+                                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, nonCustomized, profileSwitch.customizedName + " " + DateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
+                                    rxBus.send(EventLocalProfileChanged())
                                 }
                             })
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index 8b73ec8ed2..b396189f2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -10,19 +10,20 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import javax.inject.Inject;
+
+import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventTempTargetChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
@@ -31,7 +32,8 @@ import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
@@ -39,7 +41,13 @@ import io.reactivex.disposables.CompositeDisposable;
  * Created by mike on 13/01/17.
  */
 
-public class TreatmentsTempTargetFragment extends Fragment {
+public class TreatmentsTempTargetFragment extends DaggerFragment {
+    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject ProfileFunction profileFunction;
+    @Inject ResourceHelper resourceHelper;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private RecyclerView recyclerView;
@@ -63,7 +71,7 @@ public class TreatmentsTempTargetFragment extends Fragment {
 
         @Override
         public void onBindViewHolder(TempTargetsViewHolder holder, int position) {
-            String units = ProfileFunctions.getSystemUnits();
+            String units = profileFunction.getUnits();
             TempTarget tempTarget = tempTargetList.getReversed(position);
             holder.ph.setVisibility(tempTarget.source == Source.PUMP ? View.VISIBLE : View.GONE);
             holder.ns.setVisibility(NSUpload.isIdValid(tempTarget._id) ? View.VISIBLE : View.GONE);
@@ -83,9 +91,9 @@ public class TreatmentsTempTargetFragment extends Fragment {
                 holder.reasonColon.setText("");
             }
             if (tempTarget.isInProgress() && tempTarget == currentlyActiveTarget) {
-                holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
+                holder.date.setTextColor(resourceHelper.gc(R.color.colorActive));
             } else if (tempTarget.date > DateUtil.now()) {
-                holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorScheduled));
+                holder.date.setTextColor(resourceHelper.gc(R.color.colorScheduled));
             } else {
                 holder.date.setTextColor(holder.reasonColon.getCurrentTextColor());
             }
@@ -130,8 +138,8 @@ public class TreatmentsTempTargetFragment extends Fragment {
                 remove = itemView.findViewById(R.id.temptargetrange_remove);
                 remove.setOnClickListener(v -> {
                     final TempTarget tempTarget = (TempTarget) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord),
-                            MainApp.gs(R.string.careportal_temporarytarget) + ": " + tempTarget.friendlyDescription(ProfileFunctions.getSystemUnits()) +
+                    OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.removerecord),
+                            resourceHelper.gs(R.string.careportal_temporarytarget) + ": " + tempTarget.friendlyDescription(profileFunction.getUnits()) +
                                     "\n" + DateUtil.dateAndTimeString(tempTarget.date),
                             (dialog, id) -> {
                                 final String _id = tempTarget._id;
@@ -158,17 +166,17 @@ public class TreatmentsTempTargetFragment extends Fragment {
         LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
         recyclerView.setLayoutManager(llm);
 
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTempTargetsFromHistory());
+        RecyclerViewAdapter adapter = new RecyclerViewAdapter(treatmentsPlugin.getTempTargetsFromHistory());
         recyclerView.setAdapter(adapter);
 
         Button refreshFromNS = view.findViewById(R.id.temptargetrange_refreshfromnightscout);
         refreshFromNS.setOnClickListener(v ->
-                OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.refresheventsfromnightscout) + " ?", () -> {
+                OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", () -> {
                     MainApp.getDbHelper().resetTempTargets();
-                    RxBus.INSTANCE.send(new EventNSClientRestart());
+                    rxBus.send(new EventNSClientRestart());
                 }));
 
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean nsUploadOnly = sp.getBoolean(R.string.key_ns_upload_only, true);
         if (nsUploadOnly)
             refreshFromNS.setVisibility(View.GONE);
 
@@ -178,10 +186,10 @@ public class TreatmentsTempTargetFragment extends Fragment {
     @Override
     public synchronized void onResume() {
         super.onResume();
-        disposable.add(RxBus.INSTANCE
+        disposable.add(rxBus
                 .toObservable(EventTempTargetChange.class)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
+                .subscribe(event -> updateGui(), exception -> FabricPrivacy.getInstance().logException(exception))
         );
         updateGui();
     }
@@ -193,6 +201,6 @@ public class TreatmentsTempTargetFragment extends Fragment {
     }
 
     private void updateGui() {
-        recyclerView.swapAdapter(new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTempTargetsFromHistory()), false);
+        recyclerView.swapAdapter(new RecyclerViewAdapter(treatmentsPlugin.getTempTargetsFromHistory()), false);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java
deleted file mode 100644
index 22dd86e381..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.fragments;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Intervals;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventTempBasalChange;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.OKDialog;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-
-public class TreatmentsTemporaryBasalsFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private RecyclerView recyclerView;
-
-    private TextView tempBasalTotalView;
-
-    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.TempBasalsViewHolder> {
-
-        Intervals<TemporaryBasal> tempBasalList;
-
-        RecyclerViewAdapter(Intervals<TemporaryBasal> tempBasalList) {
-            this.tempBasalList = tempBasalList;
-        }
-
-        @NonNull
-        @Override
-        public TempBasalsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_tempbasals_item, viewGroup, false);
-            return new TempBasalsViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(TempBasalsViewHolder holder, int position) {
-            TemporaryBasal tempBasal = tempBasalList.getReversed(position);
-            holder.ph.setVisibility(tempBasal.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(NSUpload.isIdValid(tempBasal._id) ? View.VISIBLE : View.GONE);
-            if (tempBasal.isEndingEvent()) {
-                holder.date.setText(DateUtil.dateAndTimeString(tempBasal.date));
-                holder.duration.setText(MainApp.gs(R.string.cancel));
-                holder.absolute.setText("");
-                holder.percent.setText("");
-                holder.realDuration.setText("");
-                holder.iob.setText("");
-                holder.netInsulin.setText("");
-                holder.netRatio.setText("");
-                holder.extendedFlag.setVisibility(View.GONE);
-                holder.iob.setTextColor(holder.netRatio.getCurrentTextColor());
-            } else {
-                if (tempBasal.isInProgress()) {
-                    holder.date.setText(DateUtil.dateAndTimeString(tempBasal.date));
-                    holder.date.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
-                } else {
-                    holder.date.setText(DateUtil.dateAndTimeRangeString(tempBasal.date, tempBasal.end()));
-                    holder.date.setTextColor(holder.netRatio.getCurrentTextColor());
-                }
-                holder.duration.setText(DecimalFormatter.to0Decimal(tempBasal.durationInMinutes, " min"));
-                if (tempBasal.isAbsolute) {
-                    Profile profile = ProfileFunctions.getInstance().getProfile(tempBasal.date);
-                    if (profile != null) {
-                        holder.absolute.setText(DecimalFormatter.to2Decimal(tempBasal.tempBasalConvertedToAbsolute(tempBasal.date, profile), " U/h"));
-                        holder.percent.setText("");
-                    } else {
-                        holder.absolute.setText(MainApp.gs(R.string.noprofile));
-                        holder.percent.setText("");
-                    }
-                } else {
-                    holder.absolute.setText("");
-                    holder.percent.setText(DecimalFormatter.to0Decimal(tempBasal.percentRate, "%"));
-                }
-                holder.realDuration.setText(DecimalFormatter.to0Decimal(tempBasal.getRealDuration(), " min"));
-                long now = DateUtil.now();
-                IobTotal iob = new IobTotal(now);
-                Profile profile = ProfileFunctions.getInstance().getProfile(now);
-                if (profile != null)
-                    iob = tempBasal.iobCalc(now, profile);
-                holder.iob.setText(DecimalFormatter.to2Decimal(iob.basaliob, " U"));
-                holder.netInsulin.setText(DecimalFormatter.to2Decimal(iob.netInsulin, " U"));
-                holder.netRatio.setText(DecimalFormatter.to2Decimal(iob.netRatio, " U/h"));
-                holder.extendedFlag.setVisibility(View.GONE);
-                if (iob.basaliob != 0)
-                    holder.iob.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
-                else
-                    holder.iob.setTextColor(holder.netRatio.getCurrentTextColor());
-            }
-            holder.remove.setTag(tempBasal);
-        }
-
-        @Override
-        public int getItemCount() {
-            return tempBasalList.size();
-        }
-
-        @Override
-        public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-            super.onAttachedToRecyclerView(recyclerView);
-        }
-
-        class TempBasalsViewHolder extends RecyclerView.ViewHolder {
-            CardView cv;
-            TextView date;
-            TextView duration;
-            TextView absolute;
-            TextView percent;
-            TextView realDuration;
-            TextView netRatio;
-            TextView netInsulin;
-            TextView iob;
-            TextView extendedFlag;
-            TextView remove;
-            TextView ph;
-            TextView ns;
-
-            TempBasalsViewHolder(View itemView) {
-                super(itemView);
-                cv = itemView.findViewById(R.id.tempbasals_cardview);
-                date = itemView.findViewById(R.id.tempbasals_date);
-                duration = itemView.findViewById(R.id.tempbasals_duration);
-                absolute = itemView.findViewById(R.id.tempbasals_absolute);
-                percent = itemView.findViewById(R.id.tempbasals_percent);
-                realDuration = itemView.findViewById(R.id.tempbasals_realduration);
-                netRatio = itemView.findViewById(R.id.tempbasals_netratio);
-                netInsulin = itemView.findViewById(R.id.tempbasals_netinsulin);
-                iob = itemView.findViewById(R.id.tempbasals_iob);
-                extendedFlag = itemView.findViewById(R.id.tempbasals_extendedflag);
-                ph = itemView.findViewById(R.id.pump_sign);
-                ns = itemView.findViewById(R.id.ns_sign);
-                remove = itemView.findViewById(R.id.tempbasals_remove);
-                remove.setOnClickListener(v -> {
-                    final TemporaryBasal tempBasal = (TemporaryBasal) v.getTag();
-                    OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.removerecord),
-                            MainApp.gs(R.string.pump_tempbasal_label) + ": " + tempBasal.toStringFull() +
-                                    "\n" + MainApp.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(tempBasal.date),
-                            ((dialog, id) -> {
-                                final String _id = tempBasal._id;
-                                if (NSUpload.isIdValid(_id)) {
-                                    NSUpload.removeCareportalEntryFromNS(_id);
-                                } else {
-                                    UploadQueue.removeID("dbAdd", _id);
-                                }
-                                MainApp.getDbHelper().delete(tempBasal);
-                            }), null);
-                });
-                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-            }
-
-        }
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.treatments_tempbasals_fragment, container, false);
-
-        recyclerView = view.findViewById(R.id.tempbasals_recyclerview);
-        recyclerView.setHasFixedSize(true);
-        LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
-        recyclerView.setLayoutManager(llm);
-
-        RecyclerViewAdapter adapter = new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTemporaryBasalsFromHistory());
-        recyclerView.setAdapter(adapter);
-
-        tempBasalTotalView = view.findViewById(R.id.tempbasals_totaltempiob);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventTempBasalChange.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAutosensCalculationFinished.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    private void updateGui() {
-        recyclerView.swapAdapter(new RecyclerViewAdapter(TreatmentsPlugin.getPlugin().getTemporaryBasalsFromHistory()), false);
-        IobTotal tempBasalsCalculation = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals();
-        if (tempBasalsCalculation != null)
-            tempBasalTotalView.setText(DecimalFormatter.to2Decimal(tempBasalsCalculation.basaliob, " U"));
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
new file mode 100644
index 0000000000..3cc1d5e88f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -0,0 +1,184 @@
+package info.nightscout.androidaps.plugins.treatments.fragments
+
+import android.content.DialogInterface
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Intervals
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.treatments_tempbasals_fragment.*
+import javax.inject.Inject
+
+class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
+    private val disposable = CompositeDisposable()
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.treatments_tempbasals_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        tempbasals_recyclerview.setHasFixedSize(true)
+        tempbasals_recyclerview.layoutManager = LinearLayoutManager(view.context)
+        tempbasals_recyclerview.adapter = RecyclerViewAdapter(activePlugin.activeTreatments.temporaryBasalsFromHistory)
+    }
+
+    @Synchronized override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGui() }) { fabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    inner class RecyclerViewAdapter internal constructor(private var tempBasalList: Intervals<TemporaryBasal>) : RecyclerView.Adapter<TempBasalsViewHolder>() {
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): TempBasalsViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.treatments_tempbasals_item, viewGroup, false)
+            return TempBasalsViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: TempBasalsViewHolder, position: Int) {
+            val tempBasal = tempBasalList.getReversed(position)
+            holder.ph.visibility = if (tempBasal.source == Source.PUMP) View.VISIBLE else View.GONE
+            holder.ns.visibility = if (NSUpload.isIdValid(tempBasal._id)) View.VISIBLE else View.GONE
+            if (tempBasal.isEndingEvent) {
+                holder.date.text = DateUtil.dateAndTimeString(tempBasal.date)
+                holder.duration.text = resourceHelper.gs(R.string.cancel)
+                holder.absolute.text = ""
+                holder.percent.text = ""
+                holder.realDuration.text = ""
+                holder.iob.text = ""
+                holder.netInsulin.text = ""
+                holder.netRatio.text = ""
+                holder.extendedFlag.visibility = View.GONE
+                holder.iob.setTextColor(holder.netRatio.currentTextColor)
+            } else {
+                if (tempBasal.isInProgress) {
+                    holder.date.text = DateUtil.dateAndTimeString(tempBasal.date)
+                    holder.date.setTextColor(resourceHelper.gc(R.color.colorActive))
+                } else {
+                    holder.date.text = DateUtil.dateAndTimeRangeString(tempBasal.date, tempBasal.end())
+                    holder.date.setTextColor(holder.netRatio.currentTextColor)
+                }
+                holder.duration.text = resourceHelper.gs(R.string.format_mins, tempBasal.durationInMinutes)
+                if (tempBasal.isAbsolute) {
+                    val profile = profileFunction.getProfile(tempBasal.date)
+                    if (profile != null) {
+                        holder.absolute.text = resourceHelper.gs(R.string.pump_basebasalrate, tempBasal.tempBasalConvertedToAbsolute(tempBasal.date, profile))
+                        holder.percent.text = ""
+                    } else {
+                        holder.absolute.text = resourceHelper.gs(R.string.noprofile)
+                        holder.percent.text = ""
+                    }
+                } else {
+                    holder.absolute.text = ""
+                    holder.percent.text = resourceHelper.gs(R.string.format_percent, tempBasal.percentRate)
+                }
+                holder.realDuration.text = resourceHelper.gs(R.string.format_mins, tempBasal.realDuration)
+                val now = DateUtil.now()
+                var iob = IobTotal(now)
+                val profile = profileFunction.getProfile(now)
+                if (profile != null) iob = tempBasal.iobCalc(now, profile)
+                holder.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.basaliob)
+                holder.netInsulin.text = resourceHelper.gs(R.string.formatinsulinunits, iob.netInsulin)
+                holder.netRatio.text = resourceHelper.gs(R.string.pump_basebasalrate, iob.netRatio)
+                holder.extendedFlag.visibility = View.GONE
+                if (iob.basaliob != 0.0) holder.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.iob.setTextColor(holder.netRatio.currentTextColor)
+            }
+            holder.remove.tag = tempBasal
+        }
+
+        override fun getItemCount(): Int {
+            return tempBasalList.size()
+        }
+
+        inner class TempBasalsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            var cv: CardView = itemView.findViewById(R.id.tempbasals_cardview)
+            var date: TextView = itemView.findViewById(R.id.tempbasals_date)
+            var duration: TextView = itemView.findViewById(R.id.tempbasals_duration)
+            var absolute: TextView = itemView.findViewById(R.id.tempbasals_absolute)
+            var percent: TextView = itemView.findViewById(R.id.tempbasals_percent)
+            var realDuration: TextView = itemView.findViewById(R.id.tempbasals_realduration)
+            var netRatio: TextView = itemView.findViewById(R.id.tempbasals_netratio)
+            var netInsulin: TextView = itemView.findViewById(R.id.tempbasals_netinsulin)
+            var iob: TextView = itemView.findViewById(R.id.tempbasals_iob)
+            var extendedFlag: TextView = itemView.findViewById(R.id.tempbasals_extendedflag)
+            var remove: TextView = itemView.findViewById(R.id.tempbasals_remove)
+            var ph: TextView = itemView.findViewById(R.id.pump_sign)
+            var ns: TextView = itemView.findViewById(R.id.ns_sign)
+
+            init {
+                remove.setOnClickListener { v: View ->
+                    val tempBasal = v.tag as TemporaryBasal
+                    context?.let {
+                        showConfirmation(it, resourceHelper.gs(R.string.removerecord),
+                            """
+                ${resourceHelper.gs(R.string.pump_tempbasal_label)}: ${tempBasal.toStringFull()}
+                ${resourceHelper.gs(R.string.date)}: ${DateUtil.dateAndTimeString(tempBasal.date)}
+                """.trimIndent(),
+                            DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
+                                val id = tempBasal._id
+                                if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
+                                else UploadQueue.removeID("dbAdd", id)
+                                MainApp.getDbHelper().delete(tempBasal)
+                            }, null)
+                    }
+                }
+                remove.paintFlags = remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+            }
+        }
+
+    }
+
+    private fun updateGui() {
+        tempbasals_recyclerview?.swapAdapter(RecyclerViewAdapter(activePlugin.activeTreatments.temporaryBasalsFromHistory), false)
+        val tempBasalsCalculation = activePlugin.activeTreatments.lastCalculationTempBasals
+        if (tempBasalsCalculation != null) tempbasals_totaltempiob?.text = resourceHelper.gs(R.string.formatinsulinunits, tempBasalsCalculation.basaliob)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
deleted file mode 100644
index 05efc63aa3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
+++ /dev/null
@@ -1,591 +0,0 @@
-package info.nightscout.androidaps.queue;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-import android.text.Html;
-import android.text.Spanned;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.LinkedList;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.BolusProgressHelperActivity;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventBolusRequested;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.androidaps.queue.commands.CommandBolus;
-import info.nightscout.androidaps.queue.commands.CommandCancelExtendedBolus;
-import info.nightscout.androidaps.queue.commands.CommandCancelTempBasal;
-import info.nightscout.androidaps.queue.commands.CommandExtendedBolus;
-import info.nightscout.androidaps.queue.commands.CommandInsightSetTBROverNotification;
-import info.nightscout.androidaps.queue.commands.CommandLoadEvents;
-import info.nightscout.androidaps.queue.commands.CommandLoadHistory;
-import info.nightscout.androidaps.queue.commands.CommandLoadTDDs;
-import info.nightscout.androidaps.queue.commands.CommandReadStatus;
-import info.nightscout.androidaps.queue.commands.CommandSMBBolus;
-import info.nightscout.androidaps.queue.commands.CommandSetProfile;
-import info.nightscout.androidaps.queue.commands.CommandSetUserSettings;
-import info.nightscout.androidaps.queue.commands.CommandStartPump;
-import info.nightscout.androidaps.queue.commands.CommandStopPump;
-import info.nightscout.androidaps.queue.commands.CommandTempBasalAbsolute;
-import info.nightscout.androidaps.queue.commands.CommandTempBasalPercent;
-
-/**
- * Created by mike on 08.11.2017.
- * <p>
- * DATA FLOW:
- * ---------
- * <p>
- * (request) - > ConfigBuilder.getCommandQueue().bolus(...)
- * <p>
- * app no longer waits for result but passes Callback
- * <p>
- * request is added to queue, if another request of the same type already exists in queue, it's removed prior adding
- * but if request of the same type is currently executed (probably important only for bolus which is running long time), new request is declined
- * new QueueThread is created and started if current if finished
- * CommandReadStatus is added automatically before command if queue is empty
- * <p>
- * biggest change is we don't need exec pump commands in Handler because it's finished immediately
- * command queueing if not realized by stacking in different Handlers and threads anymore but by internal queue with better control
- * <p>
- * QueueThread calls ConfigBuilder#connect which is passed to getActivePump().connect
- * connect should be executed on background and return immediately. afterwards isConnecting() is expected to be true
- * <p>
- * while isConnecting() == true GUI is updated by posting connection progress
- * <p>
- * if connect is successful: isConnected() becomes true, isConnecting() becomes false
- * CommandQueue starts calling execute() of commands. execute() is expected to be blocking (return after finish).
- * callback with result is called after finish automatically
- * if connect failed: isConnected() becomes false, isConnecting() becomes false
- * connect() is called again
- * <p>
- * when queue is empty, disconnect is called
- */
-
-public class CommandQueue {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private final LinkedList<Command> queue = new LinkedList<>();
-    Command performing;
-
-    private QueueThread thread = null;
-
-    private PumpEnactResult executingNowError() {
-        return new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.executingrightnow));
-    }
-
-    public boolean isRunning(Command.CommandType type) {
-        if (performing != null && performing.commandType == type)
-            return true;
-        return false;
-    }
-
-    private synchronized void removeAll(Command.CommandType type) {
-        synchronized (queue) {
-            for (int i = queue.size() - 1; i >= 0; i--) {
-                if (queue.get(i).commandType == type) {
-                    queue.remove(i);
-                }
-            }
-        }
-    }
-
-    private synchronized boolean isLastScheduled(Command.CommandType type) {
-        synchronized (queue) {
-            if (queue.size() > 0 && queue.get(queue.size() - 1).commandType == type) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private synchronized void inject(Command command) {
-        // inject as a first command
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Adding as first: " + command.getClass().getSimpleName() + " - " + command.status());
-        synchronized (queue) {
-            queue.addFirst(command);
-        }
-    }
-
-    private synchronized void add(Command command) {
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Adding: " + command.getClass().getSimpleName() + " - " + command.status());
-        synchronized (queue) {
-            queue.add(command);
-        }
-    }
-
-    synchronized void pickup() {
-        synchronized (queue) {
-            performing = queue.poll();
-        }
-    }
-
-    synchronized void clear() {
-        performing = null;
-        synchronized (queue) {
-            for (int i = 0; i < queue.size(); i++) {
-                queue.get(i).cancel();
-            }
-            queue.clear();
-        }
-    }
-
-    public int size() {
-        return queue.size();
-    }
-
-    Command performing() {
-        return performing;
-    }
-
-    void resetPerforming() {
-        performing = null;
-    }
-
-    // After new command added to the queue
-    // start thread again if not already running
-    protected synchronized void notifyAboutNewCommand() {
-        while (thread != null && thread.getState() != Thread.State.TERMINATED && thread.waitingForDisconnect) {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Waiting for previous thread finish");
-            SystemClock.sleep(500);
-        }
-        if (thread == null || thread.getState() == Thread.State.TERMINATED) {
-            thread = new QueueThread(this);
-            thread.start();
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Starting new thread");
-        } else {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Thread is already running");
-        }
-    }
-
-    public void independentConnect(String reason, Callback callback) {
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Starting new queue");
-        CommandQueue tempCommandQueue = new CommandQueue();
-        tempCommandQueue.readStatus(reason, callback);
-    }
-
-    public synchronized boolean bolusInQueue() {
-        if (isRunning(Command.CommandType.BOLUS)) return true;
-        synchronized (queue) {
-            for (int i = 0; i < queue.size(); i++) {
-                if (queue.get(i).commandType == Command.CommandType.BOLUS) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    // returns true if command is queued
-    public synchronized boolean bolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
-        Command.CommandType type = detailedBolusInfo.isSMB ? Command.CommandType.SMB_BOLUS : Command.CommandType.BOLUS;
-
-        if (type == Command.CommandType.SMB_BOLUS) {
-            if (isRunning(Command.CommandType.BOLUS) || isRunning(Command.CommandType.SMB_BOLUS) || bolusInQueue()) {
-                if (L.isEnabled(L.PUMPQUEUE))
-                    log.debug("Rejecting SMB since a bolus is queue/running");
-                return false;
-            }
-            if (detailedBolusInfo.lastKnownBolusTime < TreatmentsPlugin.getPlugin().getLastBolusTime()) {
-                if (L.isEnabled(L.PUMPQUEUE))
-                    log.debug("Rejecting bolus, another bolus was issued since request time");
-                return false;
-            }
-            removeAll(Command.CommandType.SMB_BOLUS);
-        }
-
-
-        if (type.equals(Command.CommandType.BOLUS) && detailedBolusInfo.carbs > 0 && detailedBolusInfo.insulin == 0) {
-            type = Command.CommandType.CARBS_ONLY_TREATMENT;
-            //Carbs only can be added in parallel as they can be "in the future".
-        } else {
-            if (isRunning(type)) {
-                if (callback != null)
-                    callback.result(executingNowError()).run();
-                return false;
-            }
-
-            // remove all unfinished boluses
-            removeAll(type);
-        }
-
-        // apply constraints
-        detailedBolusInfo.insulin = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
-        detailedBolusInfo.carbs = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>((int) detailedBolusInfo.carbs)).value();
-
-        // add new command to queue
-        if (detailedBolusInfo.isSMB) {
-            add(new CommandSMBBolus(detailedBolusInfo, callback));
-        } else {
-            add(new CommandBolus(detailedBolusInfo, callback, type));
-            if (type.equals(Command.CommandType.BOLUS)) {
-                // Bring up bolus progress dialog (start here, so the dialog is shown when the bolus is requested,
-                // not when the Bolus command is starting. The command closes the dialog upon completion).
-                showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context);
-                // Notify Wear about upcoming bolus
-                RxBus.INSTANCE.send(new EventBolusRequested(detailedBolusInfo.insulin));
-            }
-        }
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    public void stopPump(Callback callback) {
-        add(new CommandStopPump(callback));
-        notifyAboutNewCommand();
-    }
-
-    public void startPump(Callback callback) {
-        add(new CommandStartPump(callback));
-        notifyAboutNewCommand();
-    }
-
-    public void setTBROverNotification(Callback callback, boolean enable) {
-        add(new CommandInsightSetTBROverNotification(callback, enable));
-        notifyAboutNewCommand();
-    }
-
-    public synchronized void cancelAllBoluses() {
-        if (!isRunning(Command.CommandType.BOLUS)) {
-            RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(new PumpEnactResult().success(true).enacted(false)));
-        }
-        removeAll(Command.CommandType.BOLUS);
-        removeAll(Command.CommandType.SMB_BOLUS);
-        new Thread(() -> ConfigBuilderPlugin.getPlugin().getActivePump().stopBolusDelivering()).run();
-    }
-
-    // returns true if command is queued
-    public boolean tempBasalAbsolute(double absoluteRate, int durationInMinutes, boolean enforceNew, Profile profile, Callback callback) {
-        if (!enforceNew && isRunning(Command.CommandType.TEMPBASAL)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        removeAll(Command.CommandType.TEMPBASAL);
-
-        Double rateAfterConstraints = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
-
-        // add new command to queue
-        add(new CommandTempBasalAbsolute(rateAfterConstraints, durationInMinutes, enforceNew, profile, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean tempBasalPercent(Integer percent, int durationInMinutes, boolean enforceNew, Profile profile, Callback callback) {
-        if (!enforceNew && isRunning(Command.CommandType.TEMPBASAL)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        removeAll(Command.CommandType.TEMPBASAL);
-
-        Integer percentAfterConstraints = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
-
-        // add new command to queue
-        add(new CommandTempBasalPercent(percentAfterConstraints, durationInMinutes, enforceNew, profile, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean extendedBolus(double insulin, int durationInMinutes, Callback callback) {
-        if (isRunning(Command.CommandType.EXTENDEDBOLUS)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        Double rateAfterConstraints = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
-
-        // remove all unfinished
-        removeAll(Command.CommandType.EXTENDEDBOLUS);
-
-        // add new command to queue
-        add(new CommandExtendedBolus(rateAfterConstraints, durationInMinutes, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean cancelTempBasal(boolean enforceNew, Callback callback) {
-        if (!enforceNew && isRunning(Command.CommandType.TEMPBASAL)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        removeAll(Command.CommandType.TEMPBASAL);
-
-        // add new command to queue
-        add(new CommandCancelTempBasal(enforceNew, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean cancelExtended(Callback callback) {
-        if (isRunning(Command.CommandType.EXTENDEDBOLUS)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        removeAll(Command.CommandType.EXTENDEDBOLUS);
-
-        // add new command to queue
-        add(new CommandCancelExtendedBolus(callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean setProfile(Profile profile, Callback callback) {
-        if (isThisProfileSet(profile)) {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Correct profile already set");
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).enacted(false)).run();
-            return false;
-        }
-
-        if (!MainApp.isEngineeringModeOrRelease()) {
-            Notification notification = new Notification(Notification.NOT_ENG_MODE_OR_RELEASE, MainApp.gs(R.string.not_eng_mode_or_release), Notification.URGENT);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.not_eng_mode_or_release))).run();
-            return false;
-        }
-
-        // Compare with pump limits
-        Profile.ProfileValue[] basalValues = profile.getBasalValues();
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-        for (Profile.ProfileValue basalValue : basalValues) {
-            if (basalValue.value < pump.getPumpDescription().basalMinimumRate) {
-                Notification notification = new Notification(Notification.BASAL_VALUE_BELOW_MINIMUM, MainApp.gs(R.string.basalvaluebelowminimum), Notification.URGENT);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
-                if (callback != null)
-                    callback.result(new PumpEnactResult().success(false).enacted(false).comment(MainApp.gs(R.string.basalvaluebelowminimum))).run();
-                return false;
-            }
-        }
-
-        RxBus.INSTANCE.send(new EventDismissNotification(Notification.BASAL_VALUE_BELOW_MINIMUM));
-
-        // remove all unfinished
-        removeAll(Command.CommandType.BASALPROFILE);
-
-        // add new command to queue
-        add(new CommandSetProfile(profile, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean readStatus(String reason, Callback callback) {
-        if (isLastScheduled(Command.CommandType.READSTATUS)) {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("READSTATUS " + reason + " ignored as duplicated");
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        //removeAll(Command.CommandType.READSTATUS);
-
-        // add new command to queue
-        add(new CommandReadStatus(reason, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-
-    public synchronized boolean statusInQueue() {
-        if (isRunning(Command.CommandType.READSTATUS))
-            return true;
-        synchronized (queue) {
-            for (int i = 0; i < queue.size(); i++) {
-                if (queue.get(i).commandType == Command.CommandType.READSTATUS) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-    // returns true if command is queued
-    public boolean loadHistory(byte type, Callback callback) {
-        if (isRunning(Command.CommandType.LOADHISTORY)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished 
-        removeAll(Command.CommandType.LOADHISTORY);
-
-        // add new command to queue
-        add(new CommandLoadHistory(type, callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean setUserOptions(Callback callback) {
-        if (isRunning(Command.CommandType.SETUSERSETTINGS)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished
-        removeAll(Command.CommandType.SETUSERSETTINGS);
-
-        // add new command to queue
-        add(new CommandSetUserSettings(callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean loadTDDs(Callback callback) {
-        if (isRunning(Command.CommandType.LOADHISTORY)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished
-        removeAll(Command.CommandType.LOADHISTORY);
-
-        // add new command to queue
-        add(new CommandLoadTDDs(callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    // returns true if command is queued
-    public boolean loadEvents(Callback callback) {
-        if (isRunning(Command.CommandType.LOADEVENTS)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
-
-        // remove all unfinished
-        removeAll(Command.CommandType.LOADEVENTS);
-
-        // add new command to queue
-        add(new CommandLoadEvents(callback));
-
-        notifyAboutNewCommand();
-
-        return true;
-    }
-
-    public Spanned spannedStatus() {
-        String s = "";
-        int line = 0;
-        Command perf = performing;
-        if (perf != null) {
-            s += "<b>" + perf.status() + "</b>";
-            line++;
-        }
-        synchronized (queue) {
-            for (int i = 0; i < queue.size(); i++) {
-                if (line != 0)
-                    s += "<br>";
-                s += queue.get(i).status();
-                line++;
-            }
-        }
-        return Html.fromHtml(s);
-    }
-
-    public boolean isThisProfileSet(Profile profile) {
-        PumpInterface activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        Profile current = ProfileFunctions.getInstance().getProfile();
-        if (activePump != null && current != null) {
-            boolean result = activePump.isThisProfileSet(profile);
-            if (!result) {
-                if (L.isEnabled(L.PUMPQUEUE)) {
-                    log.debug("Current profile: " + current.toString());
-                    log.debug("New profile: " + profile.toString());
-                }
-            }
-            return result;
-        } else return true;
-    }
-
-    protected void showBolusProgressDialog(Double insulin, Context context) {
-        if (context != null) {
-            BolusProgressDialog bolusProgressDialog = new BolusProgressDialog();
-            bolusProgressDialog.setInsulin(insulin);
-            bolusProgressDialog.show(((AppCompatActivity) context).getSupportFragmentManager(), "BolusProgress");
-        } else {
-            Intent i = new Intent();
-            i.putExtra("insulin", insulin);
-            i.setClass(MainApp.instance(), BolusProgressHelperActivity.class);
-            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            MainApp.instance().startActivity(i);
-        }
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
new file mode 100644
index 0000000000..fd93f772aa
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -0,0 +1,529 @@
+package info.nightscout.androidaps.queue
+
+import android.content.Context
+import android.content.Intent
+import android.os.SystemClock
+import android.text.Spanned
+import androidx.appcompat.app.AppCompatActivity
+import dagger.Lazy
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.BolusProgressHelperActivity
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.events.EventBolusRequested
+import info.nightscout.androidaps.events.EventNewBasalProfile
+import info.nightscout.androidaps.events.EventProfileNeedsUpdate
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.queue.commands.*
+import info.nightscout.androidaps.queue.commands.Command.CommandType
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by mike on 08.11.2017.
+ *
+ *
+ * DATA FLOW:
+ * ---------
+ *
+ *
+ * (request) - > ConfigBuilder.getCommandQueue().bolus(...)
+ *
+ *
+ * app no longer waits for result but passes Callback
+ *
+ *
+ * request is added to queue, if another request of the same type already exists in queue, it's removed prior adding
+ * but if request of the same type is currently executed (probably important only for bolus which is running long time), new request is declined
+ * new QueueThread is created and started if current if finished
+ * CommandReadStatus is added automatically before command if queue is empty
+ *
+ *
+ * biggest change is we don't need exec pump commands in Handler because it's finished immediately
+ * command queueing if not realized by stacking in different Handlers and threads anymore but by internal queue with better control
+ *
+ *
+ * QueueThread calls ConfigBuilder#connect which is passed to getActivePump().connect
+ * connect should be executed on background and return immediately. afterwards isConnecting() is expected to be true
+ *
+ *
+ * while isConnecting() == true GUI is updated by posting connection progress
+ *
+ *
+ * if connect is successful: isConnected() becomes true, isConnecting() becomes false
+ * CommandQueue starts calling execute() of commands. execute() is expected to be blocking (return after finish).
+ * callback with result is called after finish automatically
+ * if connect failed: isConnected() becomes false, isConnecting() becomes false
+ * connect() is called again
+ *
+ *
+ * when queue is empty, disconnect is called
+ */
+
+@Singleton
+class CommandQueue @Inject constructor(
+    private val injector: HasAndroidInjector,
+    val aapsLogger: AAPSLogger,
+    val rxBus: RxBusWrapper,
+    val resourceHelper: ResourceHelper,
+    val constraintChecker: ConstraintChecker,
+    val profileFunction: ProfileFunction,
+    val activePlugin: Lazy<ActivePluginProvider>,
+    val context: Context,
+    val sp: SP,
+    private val buildHelper: BuildHelper,
+    val fabricPrivacy: FabricPrivacy
+) : CommandQueueProvider {
+
+    private val disposable = CompositeDisposable()
+
+    private val queue = LinkedList<Command>()
+    private var thread: QueueThread? = null
+
+    var performing: Command? = null
+
+    init {
+        disposable.add(rxBus
+            .toObservable(EventProfileNeedsUpdate::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                aapsLogger.debug(LTag.PROFILE, "onProfileSwitch")
+                profileFunction.getProfile()?.let {
+                    setProfile(it, object : Callback() {
+                        override fun run() {
+                            if (!result.success) {
+                                val i = Intent(context, ErrorHelperActivity::class.java)
+                                i.putExtra("soundid", R.raw.boluserror)
+                                i.putExtra("status", result.comment)
+                                i.putExtra("title", resourceHelper.gs(R.string.failedupdatebasalprofile))
+                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                context.startActivity(i)
+                            }
+                            if (result.enacted) rxBus.send(EventNewBasalProfile())
+                        }
+                    })
+                }
+            }) { exception: Throwable -> fabricPrivacy.logException(exception) }
+        )
+
+    }
+
+    private fun executingNowError(): PumpEnactResult =
+        PumpEnactResult(injector).success(false).enacted(false).comment(resourceHelper.gs(R.string.executingrightnow))
+
+    override fun isRunning(type: CommandType): Boolean = performing?.commandType == type
+
+    @Synchronized
+    private fun removeAll(type: CommandType) {
+        synchronized(queue) {
+            for (i in queue.indices.reversed()) {
+                if (queue[i].commandType == type) {
+                    queue.removeAt(i)
+                }
+            }
+        }
+    }
+
+    @Suppress("SameParameterValue")
+    @Synchronized
+    private fun isLastScheduled(type: CommandType): Boolean {
+        synchronized(queue) {
+            if (queue.size > 0 && queue[queue.size - 1].commandType == type) {
+                return true
+            }
+        }
+        return false
+    }
+
+    @Synchronized
+    private fun add(command: Command) {
+        aapsLogger.debug(LTag.PUMPQUEUE, "Adding: " + command.javaClass.simpleName + " - " + command.status())
+        synchronized(queue) { queue.add(command) }
+    }
+
+    @Synchronized
+    override fun pickup() {
+        synchronized(queue) { performing = queue.poll() }
+    }
+
+    @Synchronized
+    override fun clear() {
+        performing = null
+        synchronized(queue) {
+            for (i in queue.indices) {
+                queue[i].cancel()
+            }
+            queue.clear()
+        }
+    }
+
+    override fun size(): Int = queue.size
+
+    override fun performing(): Command? = performing
+
+    override fun resetPerforming() {
+        performing = null
+    }
+
+    // After new command added to the queue
+    // start thread again if not already running
+    @Synchronized
+    private fun notifyAboutNewCommand() {
+        while (thread != null && thread!!.state != Thread.State.TERMINATED && thread!!.waitingForDisconnect) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Waiting for previous thread finish")
+            SystemClock.sleep(500)
+        }
+        if (thread == null || thread!!.state == Thread.State.TERMINATED) {
+            thread = QueueThread(this, context, aapsLogger, rxBus, activePlugin.get(), resourceHelper, sp)
+            thread!!.start()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Starting new thread")
+        } else {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Thread is already running")
+        }
+    }
+
+    override fun independentConnect(reason: String, callback: Callback?) {
+        aapsLogger.debug(LTag.PUMPQUEUE, "Starting new queue")
+        val tempCommandQueue = CommandQueue(injector, aapsLogger, rxBus, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, buildHelper, fabricPrivacy)
+        tempCommandQueue.readStatus(reason, callback)
+    }
+
+    @Synchronized
+    override fun bolusInQueue(): Boolean {
+        if (isRunning(CommandType.BOLUS)) return true
+        synchronized(queue) {
+            for (i in queue.indices) {
+                if (queue[i].commandType == CommandType.BOLUS) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    // returns true if command is queued
+    @Synchronized
+    override fun bolus(detailedBolusInfo: DetailedBolusInfo, callback: Callback?): Boolean {
+        var type = if (detailedBolusInfo.isSMB) CommandType.SMB_BOLUS else CommandType.BOLUS
+        if (type == CommandType.SMB_BOLUS) {
+            if (isRunning(CommandType.BOLUS) || isRunning(CommandType.SMB_BOLUS) || bolusInQueue()) {
+                aapsLogger.debug(LTag.PUMPQUEUE, "Rejecting SMB since a bolus is queue/running")
+                return false
+            }
+            if (detailedBolusInfo.lastKnownBolusTime < activePlugin.get().activeTreatments.lastBolusTime) {
+                aapsLogger.debug(LTag.PUMPQUEUE, "Rejecting bolus, another bolus was issued since request time")
+                return false
+            }
+            removeAll(CommandType.SMB_BOLUS)
+        }
+        if (type == CommandType.BOLUS && detailedBolusInfo.carbs > 0 && detailedBolusInfo.insulin == 0.0) {
+            type = CommandType.CARBS_ONLY_TREATMENT
+            //Carbs only can be added in parallel as they can be "in the future".
+        } else {
+            if (isRunning(type)) {
+                callback?.result(executingNowError())?.run()
+                return false
+            }
+            // remove all unfinished boluses
+            removeAll(type)
+        }
+        // apply constraints
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        detailedBolusInfo.carbs = constraintChecker.applyCarbsConstraints(Constraint(detailedBolusInfo.carbs.toInt())).value().toDouble()
+        // add new command to queue
+        if (detailedBolusInfo.isSMB) {
+            add(CommandSMBBolus(injector, detailedBolusInfo, callback))
+        } else {
+            add(CommandBolus(injector, detailedBolusInfo, callback, type))
+            if (type == CommandType.BOLUS) { // Bring up bolus progress dialog (start here, so the dialog is shown when the bolus is requested,
+// not when the Bolus command is starting. The command closes the dialog upon completion).
+                showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context)
+                // Notify Wear about upcoming bolus
+                rxBus.send(EventBolusRequested(detailedBolusInfo.insulin))
+            }
+        }
+        notifyAboutNewCommand()
+        return true
+    }
+
+    override fun stopPump(callback: Callback?) {
+        add(CommandStopPump(injector, callback))
+        notifyAboutNewCommand()
+    }
+
+    override fun startPump(callback: Callback?) {
+        add(CommandStartPump(injector, callback))
+        notifyAboutNewCommand()
+    }
+
+    override fun setTBROverNotification(callback: Callback?, enable: Boolean) {
+        add(CommandInsightSetTBROverNotification(injector, enable, callback))
+        notifyAboutNewCommand()
+    }
+
+    @Synchronized
+    override fun cancelAllBoluses() {
+        if (!isRunning(CommandType.BOLUS)) {
+            rxBus.send(EventDismissBolusProgressIfRunning(PumpEnactResult(injector).success(true).enacted(false)))
+        }
+        removeAll(CommandType.BOLUS)
+        removeAll(CommandType.SMB_BOLUS)
+        Thread(Runnable { activePlugin.get().activePump.stopBolusDelivering() }).run()
+    }
+
+    // returns true if command is queued
+    override fun tempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, enforceNew: Boolean, profile: Profile, callback: Callback?): Boolean {
+        if (!enforceNew && isRunning(CommandType.TEMPBASAL)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.TEMPBASAL)
+        val rateAfterConstraints = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        // add new command to queue
+        add(CommandTempBasalAbsolute(injector, rateAfterConstraints, durationInMinutes, enforceNew, profile, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun tempBasalPercent(percent: Int, durationInMinutes: Int, enforceNew: Boolean, profile: Profile, callback: Callback?): Boolean {
+        if (!enforceNew && isRunning(CommandType.TEMPBASAL)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.TEMPBASAL)
+        val percentAfterConstraints = constraintChecker.applyBasalPercentConstraints(Constraint(percent), profile).value()
+        // add new command to queue
+        add(CommandTempBasalPercent(injector, percentAfterConstraints, durationInMinutes, enforceNew, profile, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun extendedBolus(insulin: Double, durationInMinutes: Int, callback: Callback?): Boolean {
+        if (isRunning(CommandType.EXTENDEDBOLUS)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        val rateAfterConstraints = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        // remove all unfinished
+        removeAll(CommandType.EXTENDEDBOLUS)
+        // add new command to queue
+        add(CommandExtendedBolus(injector, rateAfterConstraints, durationInMinutes, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun cancelTempBasal(enforceNew: Boolean, callback: Callback?): Boolean {
+        if (!enforceNew && isRunning(CommandType.TEMPBASAL)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.TEMPBASAL)
+        // add new command to queue
+        add(CommandCancelTempBasal(injector, enforceNew, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun cancelExtended(callback: Callback?): Boolean {
+        if (isRunning(CommandType.EXTENDEDBOLUS)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.EXTENDEDBOLUS)
+        // add new command to queue
+        add(CommandCancelExtendedBolus(injector, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun setProfile(profile: Profile, callback: Callback?): Boolean {
+        if (isThisProfileSet(profile)) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Correct profile already set")
+            callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
+            return false
+        }
+        if (!buildHelper.isEngineeringModeOrRelease()) {
+            val notification = Notification(Notification.NOT_ENG_MODE_OR_RELEASE, resourceHelper.gs(R.string.not_eng_mode_or_release), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(resourceHelper.gs(R.string.not_eng_mode_or_release)))?.run()
+            return false
+        }
+        // Compare with pump limits
+        val basalValues = profile.basalValues
+        for (basalValue in basalValues) {
+            if (basalValue.value < activePlugin.get().activePump.pumpDescription.basalMinimumRate) {
+                val notification = Notification(Notification.BASAL_VALUE_BELOW_MINIMUM, resourceHelper.gs(R.string.basalvaluebelowminimum), Notification.URGENT)
+                rxBus.send(EventNewNotification(notification))
+                callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(resourceHelper.gs(R.string.basalvaluebelowminimum)))?.run()
+                return false
+            }
+        }
+        rxBus.send(EventDismissNotification(Notification.BASAL_VALUE_BELOW_MINIMUM))
+        // remove all unfinished
+        removeAll(CommandType.BASAL_PROFILE)
+        // add new command to queue
+        add(CommandSetProfile(injector, profile, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun readStatus(reason: String, callback: Callback?): Boolean {
+        if (isLastScheduled(CommandType.READSTATUS)) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "READSTATUS $reason ignored as duplicated")
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+
+        // add new command to queue
+        add(CommandReadStatus(injector, reason, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    @Synchronized
+    override fun statusInQueue(): Boolean {
+        if (isRunning(CommandType.READSTATUS)) return true
+        synchronized(queue) {
+            for (i in queue.indices) {
+                if (queue[i].commandType == CommandType.READSTATUS) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    // returns true if command is queued
+    override fun loadHistory(type: Byte, callback: Callback?): Boolean {
+        if (isRunning(CommandType.LOAD_HISTORY)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.LOAD_HISTORY)
+        // add new command to queue
+        add(CommandLoadHistory(injector, type, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun setUserOptions(callback: Callback?): Boolean {
+        if (isRunning(CommandType.SET_USER_SETTINGS)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.SET_USER_SETTINGS)
+        // add new command to queue
+        add(CommandSetUserSettings(injector, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun loadTDDs(callback: Callback?): Boolean {
+        if (isRunning(CommandType.LOAD_HISTORY)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.LOAD_HISTORY)
+        // add new command to queue
+        add(CommandLoadTDDs(injector, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    // returns true if command is queued
+    override fun loadEvents(callback: Callback?): Boolean {
+        if (isRunning(CommandType.LOAD_EVENTS)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAll(CommandType.LOAD_EVENTS)
+        // add new command to queue
+        add(CommandLoadEvents(injector, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    override fun spannedStatus(): Spanned {
+        var s = ""
+        var line = 0
+        val perf = performing
+        if (perf != null) {
+            s += "<b>" + perf.status() + "</b>"
+            line++
+        }
+        synchronized(queue) {
+            for (i in queue.indices) {
+                if (line != 0) s += "<br>"
+                s += queue[i].status()
+                line++
+            }
+        }
+        return HtmlHelper.fromHtml(s)
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        val activePump = activePlugin.get().activePump
+        val current = profileFunction.getProfile()
+        return if (current != null) {
+            val result = activePump.isThisProfileSet(profile)
+            if (!result) {
+                aapsLogger.debug(LTag.PUMPQUEUE, "Current profile: $current")
+                aapsLogger.debug(LTag.PUMPQUEUE, "New profile: $profile")
+            }
+            result
+        } else true
+    }
+
+    private fun showBolusProgressDialog(insulin: Double, ctx: Context?) {
+        if (ctx != null) {
+            val bolusProgressDialog = BolusProgressDialog()
+            bolusProgressDialog.setInsulin(insulin)
+            bolusProgressDialog.show((ctx as AppCompatActivity).supportFragmentManager, "BolusProgress")
+        } else {
+            val i = Intent()
+            i.putExtra("insulin", insulin)
+            i.setClass(context, BolusProgressHelperActivity::class.java)
+            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(i)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index 85823c2c30..e075d169a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -5,84 +5,78 @@ import android.content.Context;
 import android.os.PowerManager;
 import android.os.SystemClock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 09.11.2017.
  */
 
 public class QueueThread extends Thread {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
     private CommandQueue queue;
+    private AAPSLogger aapsLogger;
+    private RxBusWrapper rxBus;
+    private ActivePluginProvider activePlugin;
+    private ResourceHelper resourceHelper;
+    private SP sp;
 
     private boolean connectLogged = false;
     boolean waitingForDisconnect = false;
 
     private PowerManager.WakeLock mWakeLock;
 
-    QueueThread(CommandQueue queue) {
+    QueueThread(CommandQueue queue, Context context, AAPSLogger aapsLogger, RxBusWrapper rxBus, ActivePluginProvider activePlugin, ResourceHelper resourceHelper, SP sp) {
         super();
 
         this.queue = queue;
-        Context context = MainApp.instance().getApplicationContext();
-        if (context != null) {
-            PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-            if (powerManager != null)
-                mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:QueueThread");
-        }
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+        this.activePlugin = activePlugin;
+        this.resourceHelper = resourceHelper;
+        this.sp = sp;
+
+        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        if (powerManager != null)
+            mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:QueueThread");
     }
 
     @Override
     public final void run() {
         if (mWakeLock != null)
             mWakeLock.acquire(T.mins(10).msecs());
-        RxBus.INSTANCE.send(new EventQueueChanged());
+        rxBus.send(new EventQueueChanged());
         long lastCommandTime;
         long connectionStartTime = lastCommandTime = System.currentTimeMillis();
 
         try {
             while (true) {
-                PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-                if (pump == null) {
-                    if (L.isEnabled(L.PUMPQUEUE))
-                        log.debug("pump == null");
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.pumpNotInitialized)));
-                    SystemClock.sleep(1000);
-                    continue;
-                }
                 long secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000;
-
+                PumpInterface pump = activePlugin.getActivePump();
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
-                    RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(null));
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.connectiontimedout)));
-                    if (L.isEnabled(L.PUMPQUEUE))
-                        log.debug("timed out");
+                    rxBus.send(new EventDismissBolusProgressIfRunning(null));
+                    rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.connectiontimedout)));
+                    aapsLogger.debug(LTag.PUMPQUEUE, "timed out");
                     pump.stopConnecting();
 
                     //BLUETOOTH-WATCHDOG
-                    boolean watchdog = SP.getBoolean(R.string.key_btwatchdog, false);
-                    long last_watchdog = SP.getLong(R.string.key_btwatchdog_lastbark, 0L);
+                    boolean watchdog = sp.getBoolean(R.string.key_btwatchdog, false);
+                    long last_watchdog = sp.getLong(R.string.key_btwatchdog_lastbark, 0L);
                     watchdog = watchdog && System.currentTimeMillis() - last_watchdog > (Constants.MIN_WATCHDOG_INTERVAL_IN_SECONDS * 1000);
                     if (watchdog) {
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("BT watchdog - toggeling the phonest bluetooth");
+                        aapsLogger.debug(LTag.PUMPQUEUE, "BT watchdog - toggeling the phonest bluetooth");
                         //write time
-                        SP.putLong(R.string.key_btwatchdog_lastbark, System.currentTimeMillis());
+                        sp.putLong(R.string.key_btwatchdog_lastbark, System.currentTimeMillis());
                         //toggle BT
                         pump.stopConnecting();
                         pump.disconnect("watchdog");
@@ -94,40 +88,36 @@ public class QueueThread extends Thread {
                         SystemClock.sleep(1000);
                         //start over again once after watchdog barked
                         //Notification notification = new Notification(Notification.OLD_NSCLIENT, "Watchdog", Notification.URGENT);
-                        //RxBus.INSTANCE.send(new EventNewNotification(notification));
+                        //rxBus.send(new EventNewNotification(notification));
                         connectionStartTime = lastCommandTime = System.currentTimeMillis();
                         pump.connect("watchdog");
                     } else {
                         queue.clear();
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("no connection possible");
-                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+                        aapsLogger.debug(LTag.PUMPQUEUE, "no connection possible");
+                        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
                         pump.disconnect("Queue empty");
-                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
+                        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
                         return;
                     }
                 }
 
                 if (pump.isHandshakeInProgress()) {
-                    if (L.isEnabled(L.PUMPQUEUE))
-                        log.debug("handshaking " + secondsElapsed);
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, (int) secondsElapsed));
+                    aapsLogger.debug(LTag.PUMPQUEUE, "handshaking " + secondsElapsed);
+                    rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, (int) secondsElapsed));
                     SystemClock.sleep(100);
                     continue;
                 }
 
                 if (pump.isConnecting()) {
-                    if (L.isEnabled(L.PUMPQUEUE))
-                        log.debug("connecting " + secondsElapsed);
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING, (int) secondsElapsed));
+                    aapsLogger.debug(LTag.PUMPQUEUE, "connecting " + secondsElapsed);
+                    rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING, (int) secondsElapsed));
                     SystemClock.sleep(1000);
                     continue;
                 }
 
                 if (!pump.isConnected()) {
-                    if (L.isEnabled(L.PUMPQUEUE))
-                        log.debug("connect");
-                    RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING, (int) secondsElapsed));
+                    aapsLogger.debug(LTag.PUMPQUEUE, "connect");
+                    rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING, (int) secondsElapsed));
                     pump.connect("Connection needed");
                     SystemClock.sleep(1000);
                     continue;
@@ -136,19 +126,17 @@ public class QueueThread extends Thread {
                 if (queue.performing() == null) {
                     if (!connectLogged) {
                         connectLogged = true;
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("connection time " + secondsElapsed + "s");
+                        aapsLogger.debug(LTag.PUMPQUEUE, "connection time " + secondsElapsed + "s");
                     }
                     // Pickup 1st command and set performing variable
                     if (queue.size() > 0) {
                         queue.pickup();
                         if (queue.performing() != null) {
-                            if (L.isEnabled(L.PUMPQUEUE))
-                                log.debug("performing " + queue.performing().status());
-                            RxBus.INSTANCE.send(new EventQueueChanged());
+                            aapsLogger.debug(LTag.PUMPQUEUE, "performing " + queue.performing().status());
+                            rxBus.send(new EventQueueChanged());
                             queue.performing().execute();
                             queue.resetPerforming();
-                            RxBus.INSTANCE.send(new EventQueueChanged());
+                            rxBus.send(new EventQueueChanged());
                             lastCommandTime = System.currentTimeMillis();
                             SystemClock.sleep(100);
                             continue;
@@ -160,17 +148,14 @@ public class QueueThread extends Thread {
                     long secondsFromLastCommand = (System.currentTimeMillis() - lastCommandTime) / 1000;
                     if (secondsFromLastCommand >= 5) {
                         waitingForDisconnect = true;
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("queue empty. disconnect");
-                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
+                        aapsLogger.debug(LTag.PUMPQUEUE, "queue empty. disconnect");
+                        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
                         pump.disconnect("Queue empty");
-                        RxBus.INSTANCE.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("disconnected");
+                        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
+                        aapsLogger.debug(LTag.PUMPQUEUE, "disconnected");
                         return;
                     } else {
-                        if (L.isEnabled(L.PUMPQUEUE))
-                            log.debug("waiting for disconnect");
+                        aapsLogger.debug(LTag.PUMPQUEUE, "waiting for disconnect");
                         SystemClock.sleep(1000);
                     }
                 }
@@ -178,8 +163,7 @@ public class QueueThread extends Thread {
         } finally {
             if (mWakeLock != null && mWakeLock.isHeld())
                 mWakeLock.release();
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("thread end");
+            aapsLogger.debug(LTag.PUMPQUEUE, "thread end");
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java
deleted file mode 100644
index 97a7e68521..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-public abstract class Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    public enum CommandType {
-        BOLUS,
-        SMB_BOLUS,
-        CARBS_ONLY_TREATMENT,
-        TEMPBASAL,
-        EXTENDEDBOLUS,
-        BASALPROFILE,
-        READSTATUS,
-        LOADHISTORY, // TDDs and so far only Dana specific
-        LOADEVENTS, // so far only Dana specific
-        SETUSERSETTINGS, // so far only Dana specific,
-        START_PUMP,
-        STOP_PUMP,
-        INSIGHT_SET_TBR_OVER_ALARM
-    }
-
-    public CommandType commandType;
-    protected Callback callback;
-
-    public abstract void execute();
-
-    public abstract String status();
-
-    public void cancel() {
-        PumpEnactResult result = new PumpEnactResult();
-        result.success = false;
-        result.comment = MainApp.gs(R.string.connectiontimedout);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result cancel");
-        if (callback != null)
-            callback.result(result).run();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
new file mode 100644
index 0000000000..eac1e6d103
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+abstract class Command(
+    val injector: HasAndroidInjector,
+    val commandType: CommandType,
+    val callback: Callback? = null
+) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    enum class CommandType {
+        BOLUS,
+        SMB_BOLUS,
+        CARBS_ONLY_TREATMENT,
+        TEMPBASAL,
+        EXTENDEDBOLUS,
+        BASAL_PROFILE,
+        READSTATUS,
+        LOAD_HISTORY,  // TDDs and so far only Dana specific
+        LOAD_EVENTS,  // so far only Dana specific
+        SET_USER_SETTINGS,  // so far only Dana specific,
+        START_PUMP,
+        STOP_PUMP,
+        INSIGHT_SET_TBR_OVER_ALARM // insight only
+    }
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    abstract fun execute()
+    abstract fun status(): String
+
+    fun cancel() {
+        val result = PumpEnactResult(injector)
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.connectiontimedout)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel")
+        callback?.result(result)?.run()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
deleted file mode 100644
index 5a67759594..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandBolus extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private DetailedBolusInfo detailedBolusInfo;
-
-    public CommandBolus(DetailedBolusInfo detailedBolusInfo, Callback callback, CommandType type) {
-        commandType = type;
-        this.detailedBolusInfo = detailedBolusInfo;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().deliverTreatment(detailedBolusInfo);
-
-        BolusProgressDialog.bolusEnded = true;
-        RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(r));
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    public String status() {
-        return (detailedBolusInfo.insulin > 0 ? "BOLUS " + DecimalFormatter.to1Decimal(detailedBolusInfo.insulin) + "U " : "") +
-                (detailedBolusInfo.carbs > 0 ? "CARBS " + DecimalFormatter.to0Decimal(detailedBolusInfo.carbs) + "g" : "" );
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt
new file mode 100644
index 0000000000..084eb12609
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandBolus(
+    injector: HasAndroidInjector,
+    private val detailedBolusInfo: DetailedBolusInfo,
+    callback: Callback?,
+    type: CommandType
+) : Command(injector, type, callback) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.deliverTreatment(detailedBolusInfo)
+        BolusProgressDialog.bolusEnded = true
+        rxBus.send(EventDismissBolusProgressIfRunning(r))
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String {
+        return (if (detailedBolusInfo.insulin > 0) "BOLUS " + resourceHelper.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin) else "") +
+            if (detailedBolusInfo.carbs > 0) "CARBS " + resourceHelper.gs(R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.java
deleted file mode 100644
index 84ff1942a5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandCancelExtendedBolus extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    public CommandCancelExtendedBolus(Callback callback) {
-        commandType = CommandType.EXTENDEDBOLUS;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().cancelExtendedBolus();
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "CANCEL EXTENDEDBOLUS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.kt
new file mode 100644
index 0000000000..40f9dfb972
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandCancelExtendedBolus constructor(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.EXTENDEDBOLUS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.cancelExtendedBolus()
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "CANCEL EXTENDEDBOLUS"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.java
deleted file mode 100644
index d6ef30ed36..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandCancelTempBasal extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private boolean enforceNew;
-
-    public CommandCancelTempBasal(boolean enforceNew, Callback callback) {
-        commandType = CommandType.TEMPBASAL;
-        this.enforceNew = enforceNew;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().cancelTempBasal(enforceNew);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "CANCEL TEMPBASAL";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.kt
new file mode 100644
index 0000000000..ff7182df9a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandCancelTempBasal(
+    injector: HasAndroidInjector,
+    private val enforceNew: Boolean,
+    callback: Callback?
+) : Command(injector, CommandType.TEMPBASAL, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.cancelTempBasal(enforceNew)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "CANCEL TEMPBASAL"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.java
deleted file mode 100644
index 7609973cf0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandExtendedBolus extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private double insulin;
-    private int durationInMinutes;
-
-    public CommandExtendedBolus(double insulin, int durationInMinutes, Callback callback) {
-        commandType = CommandType.EXTENDEDBOLUS;
-        this.insulin = insulin;
-        this.durationInMinutes = durationInMinutes;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setExtendedBolus(insulin, durationInMinutes);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result rate: " + insulin + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "EXTENDEDBOLUS " + insulin + " U " + durationInMinutes + " min";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.kt
new file mode 100644
index 0000000000..2e81520ee4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandExtendedBolus constructor(
+    injector: HasAndroidInjector,
+    private val insulin: Double,
+    private val durationInMinutes: Int,
+    callback: Callback?
+) : Command(injector, CommandType.EXTENDEDBOLUS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.setExtendedBolus(insulin, durationInMinutes)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result rate: $insulin durationInMinutes: $durationInMinutes success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "EXTENDEDBOLUS $insulin U $durationInMinutes min"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java
deleted file mode 100644
index e65aa31a29..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-public class CommandInsightSetTBROverNotification extends Command {
-
-    private boolean enabled;
-
-    public CommandInsightSetTBROverNotification(Callback callback, boolean enabled) {
-        commandType = CommandType.INSIGHT_SET_TBR_OVER_ALARM;
-        this.callback = callback;
-        this.enabled = enabled;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof LocalInsightPlugin) {
-            PumpEnactResult result = ((LocalInsightPlugin) pump).setTBROverNotification(enabled);
-            if (callback != null) callback.result(result).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "INSIGHTSETTBROVERNOTIFICATION";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.kt
new file mode 100644
index 0000000000..7cf02fed74
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandInsightSetTBROverNotification constructor(
+    injector: HasAndroidInjector,
+    private val enabled: Boolean,
+    callback: Callback?
+) : Command(injector, CommandType.INSIGHT_SET_TBR_OVER_ALARM, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is LocalInsightPlugin) {
+            val result = pump.setTBROverNotification(enabled)
+            callback?.result(result)?.run()
+        }
+    }
+
+    @Suppress("SpellCheckingInspection")
+    override fun status(): String = "INSIGHTSETTBROVERNOTIFICATION"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.java
deleted file mode 100644
index 30791a1831..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 10.11.2017.
- */
-
-public class CommandLoadEvents extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    public CommandLoadEvents(Callback callback) {
-        commandType = CommandType.LOADEVENTS;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof DanaRInterface) {
-            DanaRInterface danaPump = (DanaRInterface) pump;
-            PumpEnactResult r = danaPump.loadEvents();
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-            if (callback != null)
-                callback.result(r).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "LOADEVENTS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
new file mode 100644
index 0000000000..7f09441ecc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.DanaRInterface
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandLoadEvents(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.LOAD_EVENTS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is DanaRInterface) {
+            val danaPump = pump as DanaRInterface
+            val r = danaPump.loadEvents()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
+    }
+
+    override fun status(): String = "LOAD EVENTS"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.java
deleted file mode 100644
index fc6fd49d8f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 10.11.2017.
- */
-
-public class CommandLoadHistory extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private byte type;
-
-    public CommandLoadHistory(byte type, Callback callback) {
-        commandType = CommandType.LOADHISTORY;
-        this.type = type;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof DanaRInterface) {
-            DanaRInterface danaPump = (DanaRInterface) pump;
-            PumpEnactResult r = danaPump.loadHistory(type);
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-            if (callback != null)
-                callback.result(r).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "LOADHISTORY " + type;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
new file mode 100644
index 0000000000..fb7f455ed4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.DanaRInterface
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandLoadHistory(
+    injector: HasAndroidInjector,
+    private val type: Byte,
+    callback: Callback?
+) : Command(injector, CommandType.LOAD_HISTORY, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is DanaRInterface) {
+            val danaPump = pump as DanaRInterface
+            val r = danaPump.loadHistory(type)
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
+            callback?.result(r)?.run()
+        }
+    }
+
+    override fun status(): String = "LOAD HISTORY $type"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.java
deleted file mode 100644
index e70b5f2261..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 10.11.2017.
- */
-
-public class CommandLoadTDDs extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-
-    public CommandLoadTDDs(Callback callback) {
-        commandType = CommandType.LOADHISTORY; //belongs to the history group of commands
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        PumpEnactResult r = pump.loadTDDs();
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "LOADTDDS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.kt
new file mode 100644
index 0000000000..96f1834c35
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandLoadTDDs(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.LOAD_HISTORY, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        val r = pump.loadTDDs()
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "LOAD TDDs"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
deleted file mode 100644
index 070aec809e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.LocalAlertUtils;
-import info.nightscout.androidaps.utils.T;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandReadStatus extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private String reason;
-
-    public CommandReadStatus(String reason, Callback callback) {
-        commandType = CommandType.READSTATUS;
-        this.reason = reason;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        ConfigBuilderPlugin.getPlugin().getActivePump().getPumpStatus();
-        LocalAlertUtils.notifyPumpStatusRead();
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("CommandReadStatus executed. Reason: " + reason);
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        PumpEnactResult result = new PumpEnactResult().success(false);
-        if (pump != null) {
-            long lastConnection = pump.lastDataTime();
-            if (lastConnection > System.currentTimeMillis() - T.mins(1).msecs())
-                result.success(true);
-        }
-        if (callback != null)
-            callback.result(result).run();
-    }
-
-    @Override
-    public String status() {
-        return "READSTATUS " + reason;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.kt
new file mode 100644
index 0000000000..6c2e4ca83f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.LocalAlertUtils
+import info.nightscout.androidaps.utils.T
+import javax.inject.Inject
+
+class CommandReadStatus(
+    injector: HasAndroidInjector,
+    private val reason: String,
+    callback: Callback?
+) : Command(injector, CommandType.READSTATUS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var localAlertUtils: LocalAlertUtils
+
+    override fun execute() {
+        activePlugin.activePump.getPumpStatus()
+        localAlertUtils.notifyPumpStatusRead()
+        aapsLogger.debug(LTag.PUMPQUEUE, "CommandReadStatus executed. Reason: $reason")
+        val pump = activePlugin.activePump
+        val result = PumpEnactResult(injector).success(false)
+        val lastConnection = pump.lastDataTime()
+        if (lastConnection > System.currentTimeMillis() - T.mins(1).msecs()) result.success(true)
+        callback?.result(result)?.run()
+    }
+
+    override fun status(): String = "READSTATUS $reason"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
deleted file mode 100644
index 4586389dc1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.T;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandSMBBolus extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private DetailedBolusInfo detailedBolusInfo;
-
-    public CommandSMBBolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
-        commandType = CommandType.SMB_BOLUS;
-        this.detailedBolusInfo = detailedBolusInfo;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r;
-        long lastBolusTime = TreatmentsPlugin.getPlugin().getLastBolusTime();
-        if (lastBolusTime != 0 && lastBolusTime + T.mins(3).msecs() > DateUtil.now()) {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("SMB requsted but still in 3 min interval");
-            r = new PumpEnactResult().enacted(false).success(false).comment("SMB requsted but still in 3 min interval");
-        } else if (detailedBolusInfo.deliverAt != 0 && detailedBolusInfo.deliverAt + T.mins(1).msecs() > System.currentTimeMillis()) {
-            r = ConfigBuilderPlugin.getPlugin().getActivePump().deliverTreatment(detailedBolusInfo);
-        } else {
-            r = new PumpEnactResult().enacted(false).success(false).comment("SMB request too old");
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("SMB bolus canceled. delivetAt: " + DateUtil.dateAndTimeString(detailedBolusInfo.deliverAt));
-        }
-
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    public String status() {
-        return "SMBBOLUS " + DecimalFormatter.to2Decimal(detailedBolusInfo.insulin) + "U";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
new file mode 100644
index 0000000000..a52a23bd09
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import javax.inject.Inject
+
+class CommandSMBBolus(
+    injector: HasAndroidInjector,
+    private val detailedBolusInfo: DetailedBolusInfo,
+    callback: Callback?
+) : Command(injector, CommandType.SMB_BOLUS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r: PumpEnactResult
+        val lastBolusTime = activePlugin.activeTreatments.lastBolusTime
+        if (lastBolusTime != 0L && lastBolusTime + T.mins(3).msecs() > DateUtil.now()) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "SMB requested but still in 3 min interval")
+            r = PumpEnactResult(injector).enacted(false).success(false).comment("SMB requested but still in 3 min interval")
+        } else if (detailedBolusInfo.deliverAt != 0L && detailedBolusInfo.deliverAt + T.mins(1).msecs() > System.currentTimeMillis()) {
+            r = activePlugin.activePump.deliverTreatment(detailedBolusInfo)
+        } else {
+            r = PumpEnactResult(injector).enacted(false).success(false).comment("SMB request too old")
+            aapsLogger.debug(LTag.PUMPQUEUE, "SMB bolus canceled. deliverAt: " + DateUtil.dateAndTimeString(detailedBolusInfo.deliverAt))
+        }
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "SMB BOLUS ${resourceHelper.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin)}"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java
deleted file mode 100644
index b69f3f4dc7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandSetProfile extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private Profile profile;
-
-    public CommandSetProfile(Profile profile, Callback callback) {
-        commandType = CommandType.BASALPROFILE;
-        this.profile = profile;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        if (ConfigBuilderPlugin.getPlugin().getCommandQueue().isThisProfileSet(profile)) {
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Correct profile already set. profile: " + profile.toString());
-            if (callback != null)
-                callback.result(new PumpEnactResult().success(true).enacted(false)).run();
-            return;
-        }
-
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setNewBasalProfile(profile);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result success: " + r.success + " enacted: " + r.enacted + " profile: " + profile.toString());
-        if (callback != null)
-            callback.result(r).run();
-
-        // Send SMS notification if ProfileSwitch is comming from NS
-        ProfileSwitch profileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
-        if (profileSwitch != null && r.enacted && profileSwitch.source == Source.NIGHTSCOUT) {
-            SmsCommunicatorPlugin smsCommunicatorPlugin = SmsCommunicatorPlugin.INSTANCE;
-            if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL)) {
-                smsCommunicatorPlugin.sendNotificationToAllNumbers(MainApp.gs(R.string.profile_set_ok));
-            }
-        }
-    }
-
-    @Override
-    public String status() {
-        return "SETPROFILE";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt
new file mode 100644
index 0000000000..89521346fe
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandSetProfile constructor(
+    injector: HasAndroidInjector,
+    private val profile: Profile,
+    callback: Callback?
+) : Command(injector, CommandType.BASAL_PROFILE, callback) {
+
+    @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+
+    override fun execute() {
+        if (commandQueue.isThisProfileSet(profile)) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Correct profile already set. profile: $profile")
+            callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
+            return
+        }
+        val r = activePlugin.activePump.setNewBasalProfile(profile)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted} profile: $profile")
+        callback?.result(r)?.run()
+        // Send SMS notification if ProfileSwitch is coming from NS
+        val profileSwitch = activePlugin.activeTreatments.getProfileSwitchFromHistory(System.currentTimeMillis())
+        if (profileSwitch != null && r.enacted && profileSwitch.source == Source.NIGHTSCOUT) {
+            if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL)) {
+                smsCommunicatorPlugin.sendNotificationToAllNumbers(resourceHelper.gs(R.string.profile_set_ok))
+            }
+        }
+    }
+
+    override fun status(): String = "SET PROFILE"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.java
deleted file mode 100644
index 643dbed3ab..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 10.11.2017.
- */
-
-public class CommandSetUserSettings extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    public CommandSetUserSettings(Callback callback) {
-        commandType = CommandType.SETUSERSETTINGS;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof DanaRInterface) {
-            DanaRInterface danaPump = (DanaRInterface) pump;
-            PumpEnactResult r = danaPump.setUserOptions();
-            if (L.isEnabled(L.PUMPQUEUE))
-                log.debug("Result success: " + r.success + " enacted: " + r.enacted);
-            if (callback != null)
-                callback.result(r).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "SETUSERSETTINGS";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
new file mode 100644
index 0000000000..c63d32fc1c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.DanaRInterface
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandSetUserSettings(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.SET_USER_SETTINGS, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is DanaRInterface) {
+            val r = pump.setUserOptions()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
+    }
+
+    override fun status(): String = "SET USER SETTINGS"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java
deleted file mode 100644
index 24694a1778..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-public class CommandStartPump extends Command {
-
-    public CommandStartPump(Callback callback) {
-        commandType = CommandType.START_PUMP;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof LocalInsightPlugin) {
-            PumpEnactResult result = ((LocalInsightPlugin) pump).startPump();
-            if (callback != null) callback.result(result).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "STARTPUMP";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
new file mode 100644
index 0000000000..da911775bf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandStartPump(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.START_PUMP, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is LocalInsightPlugin) {
+            val result = pump.startPump()
+            callback?.result(result)?.run()
+        }
+    }
+
+    override fun status(): String = "START PUMP"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java
deleted file mode 100644
index 6f1cd8ec77..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-public class CommandStopPump extends Command {
-
-    public CommandStopPump(Callback callback) {
-        commandType = CommandType.STOP_PUMP;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        if (pump instanceof LocalInsightPlugin) {
-            PumpEnactResult result = ((LocalInsightPlugin) pump).stopPump();
-            if (callback != null) callback.result(result).run();
-        }
-    }
-
-    @Override
-    public String status() {
-        return "STOPPUMP";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.kt
new file mode 100644
index 0000000000..1f0390e97f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandStopPump(
+    injector: HasAndroidInjector,
+    callback: Callback?
+) : Command(injector, CommandType.STOP_PUMP, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val pump = activePlugin.activePump
+        if (pump is LocalInsightPlugin) {
+            val result = pump.stopPump()
+            callback?.result(result)?.run()
+        }
+    }
+
+    override fun status(): String = "STOP PUMP"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.java
deleted file mode 100644
index 1e36a1ab04..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandTempBasalAbsolute extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private int durationInMinutes;
-    private double absoluteRate;
-    private boolean enforceNew;
-    private Profile profile;
-
-    public CommandTempBasalAbsolute(double absoluteRate, int durationInMinutes, boolean enforceNew, Profile profile, Callback callback) {
-        commandType = CommandType.TEMPBASAL;
-        this.absoluteRate = absoluteRate;
-        this.durationInMinutes = durationInMinutes;
-        this.enforceNew = enforceNew;
-        this.profile = profile;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setTempBasalAbsolute(absoluteRate, durationInMinutes, profile, enforceNew);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result rate: " + absoluteRate + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "TEMPBASAL " + absoluteRate + " U/h " + durationInMinutes + " min";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.kt
new file mode 100644
index 0000000000..488aa3bb7f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandTempBasalAbsolute(
+    injector: HasAndroidInjector,
+    private val absoluteRate: Double,
+    private val durationInMinutes: Int,
+    private val enforceNew: Boolean,
+    private val profile: Profile,
+    callback: Callback?
+) : Command(injector, CommandType.TEMPBASAL, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.setTempBasalAbsolute(absoluteRate, durationInMinutes, profile, enforceNew)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result rate: $absoluteRate durationInMinutes: $durationInMinutes success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "TEMP BASAL $absoluteRate U/h $durationInMinutes min"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.java
deleted file mode 100644
index 68da3b9865..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.queue.commands;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.queue.Callback;
-
-/**
- * Created by mike on 09.11.2017.
- */
-
-public class CommandTempBasalPercent extends Command {
-    private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
-
-    private int durationInMinutes;
-    private int percent;
-    private boolean enforceNew;
-    private Profile profile;
-
-    public CommandTempBasalPercent(int percent, int durationInMinutes, boolean enforceNew, Profile profile, Callback callback) {
-        commandType = CommandType.TEMPBASAL;
-        this.percent = percent;
-        this.durationInMinutes = durationInMinutes;
-        this.enforceNew = enforceNew;
-        this.profile = profile;
-        this.callback = callback;
-    }
-
-    @Override
-    public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setTempBasalPercent(percent, durationInMinutes, profile, enforceNew);
-        if (L.isEnabled(L.PUMPQUEUE))
-            log.debug("Result percent: " + percent + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
-        if (callback != null)
-            callback.result(r).run();
-    }
-
-    @Override
-    public String status() {
-        return "TEMPBASAL " + percent + "% " + durationInMinutes + " min";
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt
new file mode 100644
index 0000000000..2c5fd55041
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandTempBasalPercent(
+    injector: HasAndroidInjector,
+    private val percent: Int,
+    private val durationInMinutes: Int,
+    private val enforceNew: Boolean,
+    private val profile: Profile,
+    callback: Callback?
+) : Command(injector, CommandType.BASAL_PROFILE, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val r = activePlugin.activePump.setTempBasalPercent(percent, durationInMinutes, profile, enforceNew)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result percent: $percent durationInMinutes: $durationInMinutes success: ${r.success} enacted: ${r.enacted}")
+        callback?.result(r)?.run()
+    }
+
+    override fun status(): String = "TEMP BASAL $percent% $durationInMinutes min"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.java
deleted file mode 100644
index 8abfb22953..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-
-import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService;
-
-public class AutoStartReceiver extends BroadcastReceiver {
-    public AutoStartReceiver() {
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            context.startForegroundService(new Intent(context, DummyService.class));
-        else
-            context.startService(new Intent(context, DummyService.class));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.kt
new file mode 100644
index 0000000000..7b2eb03f96
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/AutoStartReceiver.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
+
+class AutoStartReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                context.startForegroundService(Intent(context, DummyService::class.java))
+            else
+                context.startService(Intent(context, DummyService::class.java))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
new file mode 100644
index 0000000000..a3b54e924e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.receivers
+
+import android.bluetooth.BluetoothDevice
+import android.content.Context
+import android.content.Intent
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.events.EventBTChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import javax.inject.Inject
+
+class BTReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var rxBus: RxBusWrapper
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        val device : BluetoothDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE)
+
+        when (intent.action) {
+            BluetoothDevice.ACTION_ACL_CONNECTED ->
+                rxBus.send(EventBTChange(EventBTChange.Change.CONNECT, device.name))
+            BluetoothDevice.ACTION_ACL_DISCONNECTED ->
+                rxBus.send(EventBTChange(EventBTChange.Change.DISCONNECT, device.name))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java
deleted file mode 100644
index cb49d8cf4e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-
-import info.nightscout.androidaps.events.EventChargingState;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-
-public class ChargingStateReceiver extends BroadcastReceiver {
-
-    private static EventChargingState lastEvent;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        EventChargingState event = grabChargingState(context);
-
-        if (event != null)
-            RxBus.INSTANCE.send(event);
-        lastEvent = event;
-    }
-
-    public static EventChargingState grabChargingState(Context context) {
-        BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE);
-
-        if (bm == null)
-            return new EventChargingState(false);
-
-        int status = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_STATUS);
-        boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING
-                || status == BatteryManager.BATTERY_STATUS_FULL;
-
-        EventChargingState event = new EventChargingState(isCharging);
-        return event;
-    }
-
-    static public boolean isCharging() {
-        return lastEvent != null && lastEvent.isCharging();
-    }
-
-    static public EventChargingState getLastEvent() {
-        return lastEvent;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt
new file mode 100644
index 0000000000..f6456fc749
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.events.EventChargingState
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import javax.inject.Inject
+
+class ChargingStateReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var receiverStatusStore: ReceiverStatusStore
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        rxBus.send(grabChargingState(context))
+        aapsLogger.debug(LTag.CORE,  receiverStatusStore.lastChargingEvent!!.toString())
+    }
+
+    private fun grabChargingState(context: Context): EventChargingState {
+        val batteryStatus: Intent? = IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { iFilter ->
+            context.registerReceiver(null, iFilter)
+        }
+        val status: Int = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1) ?: -1
+        val isCharging: Boolean = status == BatteryManager.BATTERY_STATUS_CHARGING
+            || status == BatteryManager.BATTERY_STATUS_FULL
+        return EventChargingState(isCharging).also { receiverStatusStore.lastChargingEvent = it }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
deleted file mode 100644
index 6c2e7c6920..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.content.Context;
-import android.content.Intent;
-import androidx.legacy.content.WakefulBroadcastReceiver;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.services.DataService;
-
-public class DataReceiver extends WakefulBroadcastReceiver {
-    private static Logger log = LoggerFactory.getLogger(L.DATASERVICE);
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (L.isEnabled(L.DATASERVICE))
-            log.debug("onReceive " + intent);
-        startWakefulService(context, new Intent(context, DataService.class)
-                .setAction(intent.getAction())
-                .putExtras(intent));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
new file mode 100644
index 0000000000..b5fd362e57
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import android.content.Intent
+import androidx.legacy.content.*
+import dagger.android.AndroidInjection
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.services.DataService
+import javax.inject.Inject
+
+// We are not ready to switch to JobScheduler
+@Suppress("DEPRECATION")
+open class DataReceiver : WakefulBroadcastReceiver() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        aapsLogger.debug(LTag.DATASERVICE, "onReceive $intent")
+        startWakefulService(context, Intent(context, DataService::class.java)
+            .setAction(intent.action)
+            .putExtras(intent))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 7ca4f962ae..521537e2d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -3,58 +3,77 @@ package info.nightscout.androidaps.receivers
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.app.PendingIntent.CanceledException
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.PowerManager
 import android.os.SystemClock
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.bus.RxBus.send
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.LocalAlertUtils
 import info.nightscout.androidaps.utils.T
-import org.slf4j.LoggerFactory
+import javax.inject.Inject
 import kotlin.math.abs
 
-class KeepAliveReceiver : BroadcastReceiver() {
-    private var lastReadStatus: Long = 0
-    private var lastRun: Long = 0
-    private var lastIobUpload: Long = 0
+class KeepAliveReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var localAlertUtils: LocalAlertUtils
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
 
-    override fun onReceive(context: Context, rIntent: Intent) {
-        if (L.isEnabled(L.CORE))
-            log.debug("KeepAlive received")
+
+    companion object {
+        private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
+        private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
+        private val IOB_UPDATE_FREQUENCY = T.mins(5).msecs()
+
+        private var lastReadStatus: Long = 0
+        private var lastRun: Long = 0
+        private var lastIobUpload: Long = 0
+
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        aapsLogger.debug(LTag.CORE, "KeepAlive received")
         val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
         val wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:KeepAliveReceiver")
         wl.acquire(T.mins(2).msecs())
-        LocalAlertUtils.shortenSnoozeInterval()
-        LocalAlertUtils.checkStaleBGAlert()
+        localAlertUtils.shortenSnoozeInterval()
+        localAlertUtils.checkStaleBGAlert()
         checkPump()
         checkAPS()
         wl.release()
     }
 
-    companion object {
-        private val log = LoggerFactory.getLogger(L.CORE)
-
-        private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
-        private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
-        private val IOB_UPDATE_FREQUENCY = T.mins(5).msecs()
+    class KeepAliveManager @Inject constructor(
+        private val aapsLogger: AAPSLogger,
+        private val localAlertUtils: LocalAlertUtils
+    ) {
 
         //called by MainApp at first app start
-        @JvmStatic
         fun setAlarm(context: Context) {
-            if (L.isEnabled(L.CORE))
-                log.debug("KeepAlive scheduled")
+            aapsLogger.debug(LTag.CORE, "KeepAlive scheduled")
             SystemClock.sleep(5000) // wait for app initialization
-            LocalAlertUtils.shortenSnoozeInterval()
-            LocalAlertUtils.presnoozeAlarms()
+            localAlertUtils.shortenSnoozeInterval()
+            localAlertUtils.presnoozeAlarms()
             val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
             val i = Intent(context, KeepAliveReceiver::class.java)
             val pi = PendingIntent.getBroadcast(context, 0, i, 0)
@@ -66,10 +85,8 @@ class KeepAliveReceiver : BroadcastReceiver() {
             am.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), KEEP_ALIVE_MILLISECONDS, pi)
         }
 
-        @JvmStatic
         fun cancelAlarm(context: Context) {
-            if (L.isEnabled(L.CORE))
-                log.debug("KeepAlive canceled")
+            aapsLogger.debug(LTag.CORE, "KeepAlive canceled")
             val intent = Intent(context, KeepAliveReceiver::class.java)
             val sender = PendingIntent.getBroadcast(context, 0, intent, 0)
             val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
@@ -77,44 +94,46 @@ class KeepAliveReceiver : BroadcastReceiver() {
         }
     }
 
+    // Usually deviceStatus is uploaded through LoopPlugin after every loop cycle.
+    // if there is no BG available, we have to upload anyway to have correct
+    // IOB displayed in NS
     private fun checkAPS() {
-        val usedAPS = ConfigBuilderPlugin.getPlugin().activeAPS
         var shouldUploadStatus = false
-        if (usedAPS == null) shouldUploadStatus = true
-        else if (DateUtil.isOlderThan(usedAPS.lastAPSRun, 5)) shouldUploadStatus = true
+        if (Config.NSCLIENT) return
+        if (Config.PUMPCONTROL) shouldUploadStatus = true
+        else if (!loopPlugin.isEnabled() || iobCobCalculatorPlugin.actualBg() == null)
+            shouldUploadStatus = true
+        else if (DateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
         if (DateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY) && shouldUploadStatus) {
             lastIobUpload = DateUtil.now()
-            NSUpload.uploadDeviceStatus()
+            NSUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump)
         }
     }
 
     private fun checkPump() {
-        val pump = ConfigBuilderPlugin.getPlugin().activePump
-        val profile = ProfileFunctions.getInstance().profile
-        if (pump != null && profile != null) {
-            val lastConnection = pump.lastDataTime()
-            val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
-            val isBasalOutdated = abs(profile.basal - pump.baseBasalRate) > pump.pumpDescription.basalStep
-            if (L.isEnabled(L.CORE))
-                log.debug("Last connection: " + DateUtil.dateAndTimeString(lastConnection))
-            // sometimes keep alive broadcast stops
-            // as as workaround test if readStatus was requested before an alarm is generated
-            if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
-                LocalAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated)
-            }
-            if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().commandQueue.isRunning(Command.CommandType.BASALPROFILE)) {
-                send(EventProfileNeedsUpdate())
-            } else if (isStatusOutdated && !pump.isBusy) {
-                lastReadStatus = System.currentTimeMillis()
-                ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("KeepAlive. Status outdated.", null)
-            } else if (isBasalOutdated && !pump.isBusy) {
-                lastReadStatus = System.currentTimeMillis()
-                ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("KeepAlive. Basal outdated.", null)
-            }
+        val pump = activePlugin.activePump
+        val profile = profileFunction.getProfile() ?: return
+        val lastConnection = pump.lastDataTime()
+        val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
+        val isBasalOutdated = abs(profile.basal - pump.baseBasalRate) > pump.pumpDescription.basalStep
+        aapsLogger.debug(LTag.CORE, "Last connection: " + DateUtil.dateAndTimeString(lastConnection))
+        // sometimes keep alive broadcast stops
+        // as as workaround test if readStatus was requested before an alarm is generated
+        if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
+            localAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated, loopPlugin.isDisconnected)
+        }
+        if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+            rxBus.send(EventProfileNeedsUpdate())
+        } else if (isStatusOutdated && !pump.isBusy) {
+            lastReadStatus = System.currentTimeMillis()
+            commandQueue.readStatus("KeepAlive. Status outdated.", null)
+        } else if (isBasalOutdated && !pump.isBusy) {
+            lastReadStatus = System.currentTimeMillis()
+            commandQueue.readStatus("KeepAlive. Basal outdated.", null)
         }
         if (lastRun != 0L && System.currentTimeMillis() - lastRun > T.mins(10).msecs()) {
-            log.error("KeepAlive fail")
-            FabricPrivacy.getInstance().logCustom("KeepAliveFail")
+            aapsLogger.error(LTag.CORE, "KeepAlive fail")
+            fabricPrivacy.logCustom("KeepAliveFail")
         }
         lastRun = System.currentTimeMillis()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java
deleted file mode 100644
index 3449bf2943..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.services.Intents;
-
-public class NSAlarmReceiver extends BroadcastReceiver {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent == null)
-            return;
-        Bundle bundle = intent.getExtras();
-        String data = bundle.getString("data");
-        JSONObject json = null;
-        try {
-            json = new JSONObject(data);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-            return;
-        }
-        NSAlarm nsAlarm = new NSAlarm(json);
-        switch (intent.getAction()) {
-            case Intents.ACTION_ANNOUNCEMENT:
-            case Intents.ACTION_ALARM:
-            case Intents.ACTION_URGENT_ALARM:
-                Notification notification = new Notification(nsAlarm);
-                if (notification.isEnabled())
-                    RxBus.INSTANCE.send(new EventNewNotification(notification));
-                break;
-            case Intents.ACTION_CLEAR_ALARM:
-                RxBus.INSTANCE.send(new EventDismissNotification(Notification.NSALARM));
-                RxBus.INSTANCE.send(new EventDismissNotification(Notification.NSURGENTALARM));
-                break;
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
deleted file mode 100644
index 19cf12bc8a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.SupplicantState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import androidx.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-
-public class NetworkChangeReceiver extends BroadcastReceiver {
-
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-
-    private static EventNetworkChange lastEvent = null;
-
-    public static final NetworkChangeReceiver instance = new NetworkChangeReceiver();
-
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        EventNetworkChange event = grabNetworkStatus(context);
-        if (event != null)
-            RxBus.INSTANCE.send(event);
-    }
-
-    @Nullable
-    public static EventNetworkChange grabNetworkStatus(final Context context) {
-        EventNetworkChange event = new EventNetworkChange();
-
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (cm == null) return null;
-        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-
-        if (activeNetwork != null) {
-            if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI && activeNetwork.isConnected()) {
-                event.setWifiConnected(true);
-                WifiManager wifiManager = (WifiManager) MainApp.instance().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-                if (wifiManager != null) {
-                    WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-                    if (wifiInfo.getSupplicantState() == SupplicantState.COMPLETED) {
-                        event.setSsid(wifiInfo.getSSID());
-                    }
-                    if (L.isEnabled(L.CORE))
-                        log.debug("NETCHANGE: Wifi connected. SSID: " + event.connectedSsid());
-                }
-            }
-
-            if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE) {
-                event.setMobileConnected(true);
-                event.setRoaming(activeNetwork.isRoaming());
-                if (L.isEnabled(L.CORE))
-                    log.debug("NETCHANGE: Mobile connected. Roaming: " + event.getRoaming());
-            }
-        } else {
-            if (L.isEnabled(L.CORE))
-                log.debug("NETCHANGE: Disconnected.");
-        }
-
-        lastEvent = event;
-        return event;
-    }
-
-    public static boolean isWifiConnected() {
-        return lastEvent != null && lastEvent.getWifiConnected();
-    }
-
-    public static boolean isConnected() {
-        return lastEvent != null && (lastEvent.getWifiConnected() || lastEvent.getMobileConnected());
-    }
-
-    public static EventNetworkChange getLastEvent() {
-        return lastEvent;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
new file mode 100644
index 0000000000..52a8894079
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.wifi.SupplicantState
+import android.net.wifi.WifiManager
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import javax.inject.Inject
+
+class NetworkChangeReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var receiverStatusStore: ReceiverStatusStore
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        rxBus.send(grabNetworkStatus(context, aapsLogger))
+    }
+
+    fun grabNetworkStatus(context: Context, aapsLogger: AAPSLogger): EventNetworkChange {
+        val event = EventNetworkChange()
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val networks: Array<Network> = cm.allNetworks
+        networks.forEach {
+            val capabilities = cm.getNetworkCapabilities(it)
+            event.wifiConnected = event.wifiConnected || (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET))
+            event.mobileConnected = event.mobileConnected || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+            event.vpnConnected = event.vpnConnected || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
+            // if (event.vpnConnected) aapsLogger.debug(LTag.CORE, "NETCHANGE: VPN connected.")
+            if (event.wifiConnected) {
+                val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+                val wifiInfo = wifiManager.connectionInfo
+                if (wifiInfo.supplicantState == SupplicantState.COMPLETED) {
+                    event.ssid = wifiInfo.ssid
+                    // aapsLogger.debug(LTag.CORE, "NETCHANGE: Wifi connected. SSID: ${event.connectedSsid()}")
+                }
+            }
+            if (event.mobileConnected) {
+                event.mobileConnected = true
+                event.roaming = event.roaming || !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
+                event.metered = event.metered || !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+                aapsLogger.debug(LTag.CORE, "NETCHANGE: Mobile connected. Roaming: ${event.roaming} Metered: ${event.metered}")
+            }
+            // aapsLogger.info(LTag.CORE, "Network: $it")
+        }
+
+        aapsLogger.debug(LTag.CORE, event.toString())
+        receiverStatusStore.lastNetworkEvent = event
+        return event
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
new file mode 100644
index 0000000000..a55b95f650
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import android.content.Intent
+import info.nightscout.androidaps.events.EventChargingState
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReceiverStatusStore @Inject constructor(val context: Context, val rxBus: RxBusWrapper) {
+
+    var lastNetworkEvent: EventNetworkChange? = null
+
+    val isWifiConnected: Boolean
+        get() = lastNetworkEvent?.wifiConnected ?: false
+
+    val isConnected: Boolean
+        get() = lastNetworkEvent?.wifiConnected ?: false || lastNetworkEvent?.mobileConnected ?: false
+
+    fun updateNetworkStatus() {
+        context.sendBroadcast(Intent(context, NetworkChangeReceiver::class.java))
+    }
+
+    var lastChargingEvent: EventChargingState? = null
+
+    val isCharging: Boolean
+        get() = lastChargingEvent?.isCharging ?: false
+
+    fun broadcastChargingState() {
+        lastChargingEvent?.let { rxBus.send(it) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.kt
similarity index 70%
rename from app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
rename to app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.kt
index f527375349..ed5b1201cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/SmsReceiver.kt
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.receivers;
+package info.nightscout.androidaps.receivers
 
 /**
  * Forward received SMS intents. This is a separate class, because unlike local broadcasts handled by DataReceiver,
  * receiving SMS requires a special permission in the manifest, which necessitates a separate receiver.
  */
-public class SmsReceiver extends DataReceiver {}
+class SmsReceiver : DataReceiver()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java
deleted file mode 100644
index e74dfec20d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.receivers;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-
-public class TimeDateOrTZChangeReceiver extends BroadcastReceiver {
-
-    private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-
-        PumpInterface activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-        LOG.debug("Date, Time and/or TimeZone changed.");
-
-        if (action != null && activePump != null) {
-            LOG.debug("Date, Time and/or TimeZone changed. Notifying pump driver.");
-            activePump.timeDateOrTimeZoneChanged();
-        }
-    }
-
-
-    public void registerBroadcasts(MainApp mainApp) {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_TIME_CHANGED);
-        filter.addAction(Intent.ACTION_DATE_CHANGED);
-        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
-        mainApp.registerReceiver(this, filter);
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
new file mode 100644
index 0000000000..3aa1c2122d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import android.content.Intent
+import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.PumpInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        val action = intent.action
+        val activePump: PumpInterface = activePlugin.activePump
+        aapsLogger.debug(LTag.PUMP, "Date, Time and/or TimeZone changed.")
+        if (action != null) {
+            aapsLogger.debug(LTag.PUMP, "Date, Time and/or TimeZone changed. Notifying pump driver.")
+            activePump.timeDateOrTimeZoneChanged()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java b/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java
deleted file mode 100644
index 2e9130f7db..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package info.nightscout.androidaps.services;
-
-import android.app.Notification;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.AssetFileDescriptor;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.os.IBinder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin;
-
-public class AlarmSoundService extends Service {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-
-    MediaPlayer player;
-    int resourceId = R.raw.error;
-
-    public AlarmSoundService() {
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (L.isEnabled(L.CORE))
-            log.debug("onCreate");
-        Notification notification = PersistentNotificationPlugin.getPlugin().getLastNotification();
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
-    }
-
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Notification notification = PersistentNotificationPlugin.getPlugin().getLastNotification();
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
-        if (player != null && player.isPlaying())
-            player.stop();
-        if (L.isEnabled(L.CORE))
-            log.debug("onStartCommand");
-        if (intent != null && intent.hasExtra("soundid"))
-            resourceId = intent.getIntExtra("soundid", R.raw.error);
-
-        player = new MediaPlayer();
-        try {
-            AssetFileDescriptor afd = MainApp.sResources.openRawResourceFd(resourceId);
-            if (afd == null)
-                return START_STICKY;
-            player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
-            afd.close();
-            player.setLooping(true); // Set looping
-            AudioManager manager = (AudioManager) this.getSystemService(Context.AUDIO_SERVICE);
-            if (manager == null || !manager.isMusicActive()) {
-                player.setVolume(100, 100);
-            }
-            player.prepare();
-            player.start();
-        } catch (Exception e) {
-            log.error("Unhandled exception", e);
-        }
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        if (player != null) {
-            player.stop();
-            player.release();
-        }
-
-        if (L.isEnabled(L.CORE))
-            log.debug("onDestroy");
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
new file mode 100644
index 0000000000..46b30339cc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.services
+
+import android.content.Context
+import android.content.Intent
+import android.media.AudioManager
+import android.media.MediaPlayer
+import android.os.IBinder
+import dagger.android.DaggerService
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class AlarmSoundService : DaggerService() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var mainApp: MainApp
+
+    private var player: MediaPlayer? = null
+    private var resourceId = R.raw.error
+
+    override fun onBind(intent: Intent): IBinder? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        aapsLogger.debug(LTag.CORE, "onCreate")
+        startForeground(mainApp.notificationId(), mainApp.notification)
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        startForeground(mainApp.notificationId(), mainApp.notification)
+
+        player?.let { if (it.isPlaying) it.stop() }
+
+        aapsLogger.debug(LTag.CORE, "onStartCommand")
+        if (intent.hasExtra("soundid")) resourceId = intent.getIntExtra("soundid", R.raw.error)
+        player = MediaPlayer()
+        try {
+            val afd = resourceHelper.openRawResourceFd(resourceId) ?: return START_STICKY
+            player?.setDataSource(afd.fileDescriptor, afd.startOffset, afd.length)
+            afd.close()
+            player?.isLooping = true // Set looping
+            val manager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            if (!manager.isMusicActive) {
+                player?.setVolume(100f, 100f)
+            }
+            player?.prepare()
+            player?.start()
+        } catch (e: Exception) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return START_STICKY
+    }
+
+    override fun onDestroy() {
+        player?.stop()
+        player?.release()
+        aapsLogger.debug(LTag.CORE, "onDestroy")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index 5907ac8392..9134cccb38 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.services;
 
-import android.app.IntentService;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Telephony;
@@ -8,88 +7,85 @@ import android.provider.Telephony;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+
+import dagger.android.DaggerIntentService;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.events.EventNsFood;
 import info.nightscout.androidaps.events.EventNsTreatment;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
-import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
-import info.nightscout.androidaps.plugins.source.SourceEversensePlugin;
-import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
-import info.nightscout.androidaps.plugins.source.SourceMM640gPlugin;
-import info.nightscout.androidaps.plugins.source.SourceNSClientPlugin;
-import info.nightscout.androidaps.plugins.source.SourcePoctechPlugin;
-import info.nightscout.androidaps.plugins.source.SourceTomatoPlugin;
-import info.nightscout.androidaps.plugins.source.SourceXdripPlugin;
+import info.nightscout.androidaps.plugins.source.DexcomPlugin;
+import info.nightscout.androidaps.plugins.source.EversensePlugin;
+import info.nightscout.androidaps.plugins.source.GlimpPlugin;
+import info.nightscout.androidaps.plugins.source.MM640gPlugin;
+import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin;
+import info.nightscout.androidaps.plugins.source.PoctechPlugin;
+import info.nightscout.androidaps.plugins.source.TomatoPlugin;
+import info.nightscout.androidaps.plugins.source.XdripPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 
-public class DataService extends IntentService {
-    private Logger log = LoggerFactory.getLogger(L.DATASERVICE);
+public class DataService extends DaggerIntentService {
+    @Inject AAPSLogger aapsLogger;
+    @Inject SP sp;
+    @Inject RxBusWrapper rxBus;
+    @Inject SmsCommunicatorPlugin smsCommunicatorPlugin;
+    @Inject DexcomPlugin dexcomPlugin;
+    @Inject EversensePlugin eversensePlugin;
+    @Inject GlimpPlugin glimpPlugin;
+    @Inject MM640gPlugin mm640GPlugin;
+    @Inject NSClientSourcePlugin nsClientSourcePlugin;
+    @Inject PoctechPlugin poctechPlugin;
+    @Inject TomatoPlugin tomatoPlugin;
+    @Inject XdripPlugin xdripPlugin;
+    @Inject NSProfilePlugin nsProfilePlugin;
 
     public DataService() {
         super("DataService");
     }
 
+
     @Override
     protected void onHandleIntent(final Intent intent) {
-        if (L.isEnabled(L.DATASERVICE)) {
-            log.debug("onHandleIntent " + intent);
-            log.debug("onHandleIntent " + BundleLogger.log(intent.getExtras()));
-        }
+        aapsLogger.debug(LTag.DATASERVICE, "onHandleIntent " + intent);
+        aapsLogger.debug(LTag.DATASERVICE, "onHandleIntent " + BundleLogger.log(intent.getExtras()));
 
-        boolean acceptNSData = !SP.getBoolean(R.string.key_ns_upload_only, false);
+
+        boolean acceptNSData = !sp.getBoolean(R.string.key_ns_upload_only, false);
         Bundle bundles = intent.getExtras();
 
         final String action = intent.getAction();
         if (Intents.ACTION_NEW_BG_ESTIMATE.equals(action)) {
-            SourceXdripPlugin.getPlugin().handleNewData(intent);
+            xdripPlugin.handleNewData(intent);
         } else if (Intents.NS_EMULATOR.equals(action)) {
-            SourceMM640gPlugin.getPlugin().handleNewData(intent);
+            mm640GPlugin.handleNewData(intent);
         } else if (Intents.GLIMP_BG.equals(action)) {
-            SourceGlimpPlugin.getPlugin().handleNewData(intent);
+            glimpPlugin.handleNewData(intent);
         } else if (Intents.DEXCOM_BG.equals(action)) {
-            SourceDexcomPlugin.INSTANCE.handleNewData(intent);
+            dexcomPlugin.handleNewData(intent);
         } else if (Intents.POCTECH_BG.equals(action)) {
-            SourcePoctechPlugin.getPlugin().handleNewData(intent);
+            poctechPlugin.handleNewData(intent);
         } else if (Intents.TOMATO_BG.equals(action)) {
-            SourceTomatoPlugin.getPlugin().handleNewData(intent);
+            tomatoPlugin.handleNewData(intent);
         } else if (Intents.EVERSENSE_BG.equals(action)) {
-            SourceEversensePlugin.getPlugin().handleNewData(intent);
+            eversensePlugin.handleNewData(intent);
         } else if (Intents.ACTION_NEW_SGV.equals(action)) {
-            SourceNSClientPlugin.getPlugin().handleNewData(intent);
+            nsClientSourcePlugin.handleNewData(intent);
         } else if (Intents.ACTION_NEW_PROFILE.equals(action)) {
             // always handle Profile if NSProfile is enabled without looking at nsUploadOnly
-            NSProfilePlugin.getPlugin().handleNewData(intent);
-        } else if (Intents.ACTION_NEW_DEVICESTATUS.equals(action)) {
-            NSDeviceStatus.getInstance().handleNewData(intent);
-        } else if (Intents.ACTION_NEW_STATUS.equals(action)) {
-            NSSettingsStatus.getInstance().handleNewData(intent);
-        } else if (Intents.ACTION_NEW_FOOD.equals(action)) {
-            EventNsFood evt = new EventNsFood(EventNsFood.Companion.getADD(), bundles);
-            RxBus.INSTANCE.send(evt);
-        } else if (Intents.ACTION_CHANGED_FOOD.equals(action)) {
-            EventNsFood evt = new EventNsFood(EventNsFood.Companion.getUPDATE(), bundles);
-            RxBus.INSTANCE.send(evt);
-        } else if (Intents.ACTION_REMOVED_FOOD.equals(action)) {
-            EventNsFood evt = new EventNsFood(EventNsFood.Companion.getREMOVE(), bundles);
-            RxBus.INSTANCE.send(evt);
+            nsProfilePlugin.handleNewData(intent);
         } else if (acceptNSData &&
                 (Intents.ACTION_NEW_TREATMENT.equals(action) ||
                         Intents.ACTION_CHANGED_TREATMENT.equals(action) ||
@@ -99,11 +95,10 @@ public class DataService extends IntentService {
         ) {
             handleNewDataFromNSClient(intent);
         } else if (Telephony.Sms.Intents.SMS_RECEIVED_ACTION.equals(action)) {
-            SmsCommunicatorPlugin.INSTANCE.handleNewData(intent);
+            smsCommunicatorPlugin.handleNewData(intent);
         }
 
-        if (L.isEnabled(L.DATASERVICE))
-            log.debug("onHandleIntent exit " + intent);
+        aapsLogger.debug(LTag.DATASERVICE, "onHandleIntent exit " + intent);
         DataReceiver.completeWakefulIntent(intent);
     }
 
@@ -115,8 +110,7 @@ public class DataService extends IntentService {
     private void handleNewDataFromNSClient(Intent intent) {
         Bundle bundles = intent.getExtras();
         if (bundles == null) return;
-        if (L.isEnabled(L.DATASERVICE))
-            log.debug("Got intent: " + intent.getAction());
+        aapsLogger.debug(LTag.DATASERVICE, "Got intent: " + intent.getAction());
 
 
         if (intent.getAction().equals(Intents.ACTION_NEW_TREATMENT) || intent.getAction().equals(Intents.ACTION_CHANGED_TREATMENT)) {
@@ -134,7 +128,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error(LTag.DATASERVICE, "Unhandled exception", e);
             }
         }
 
@@ -155,7 +149,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error(LTag.DATASERVICE, "Unhandled exception", e);
             }
         }
 
@@ -176,7 +170,7 @@ public class DataService extends IntentService {
                     }
                 }
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error(LTag.DATASERVICE, "Unhandled exception", e);
             }
         }
     }
@@ -184,7 +178,7 @@ public class DataService extends IntentService {
     private void handleRemovedTreatmentFromNS(JSONObject json) {
         // new DB model
         EventNsTreatment evtTreatment = new EventNsTreatment(EventNsTreatment.Companion.getREMOVE(), json);
-        RxBus.INSTANCE.send(evtTreatment);
+        rxBus.send(evtTreatment);
         // old DB model
         String _id = JsonHelper.safeGetString(json, "_id");
         MainApp.getDbHelper().deleteTempTargetById(_id);
@@ -201,15 +195,12 @@ public class DataService extends IntentService {
         double carbs = JsonHelper.safeGetDouble(json, "carbs");
         String eventType = JsonHelper.safeGetString(json, "eventType");
         if (eventType == null) {
-            log.debug("Wrong treatment. Ignoring : " + json.toString());
+            aapsLogger.debug(LTag.DATASERVICE, "Wrong treatment. Ignoring : " + json.toString());
             return;
         }
         if (insulin > 0 || carbs > 0) {
             EventNsTreatment evtTreatment = new EventNsTreatment(mode, json);
-            RxBus.INSTANCE.send(evtTreatment);
-        } else if (json.has(DanaRNSHistorySync.DANARSIGNATURE)) {
-            // old DB model
-            MainApp.getDbHelper().updateDanaRHistoryRecordId(json);
+            rxBus.send(evtTreatment);
         } else if (eventType.equals(CareportalEvent.TEMPORARYTARGET)) {
             MainApp.getDbHelper().createTemptargetFromJsonIfNotExists(json);
         } else if (eventType.equals(CareportalEvent.TEMPBASAL)) {
@@ -238,9 +229,9 @@ public class DataService extends IntentService {
             String enteredBy = JsonHelper.safeGetString(json, "enteredBy", "");
             String notes = JsonHelper.safeGetString(json, "notes", "");
             if (date > now - 15 * 60 * 1000L && !notes.isEmpty()
-                    && !enteredBy.equals(SP.getString("careportal_enteredby", "AndroidAPS"))) {
+                    && !enteredBy.equals(sp.getString("careportal_enteredby", "AndroidAPS"))) {
                 Notification announcement = new Notification(Notification.NSANNOUNCEMENT, notes, Notification.ANNOUNCEMENT, 60);
-                RxBus.INSTANCE.send(new EventNewNotification(announcement));
+                rxBus.send(new EventNewNotification(announcement));
             }
         }
     }
@@ -249,8 +240,7 @@ public class DataService extends IntentService {
         NSMbg nsMbg = new NSMbg(mbgJson);
         CareportalEvent careportalEvent = new CareportalEvent(nsMbg);
         MainApp.getDbHelper().createOrUpdate(careportalEvent);
-        if (L.isEnabled(L.DATASERVICE))
-            log.debug("Adding/Updating new MBG: " + careportalEvent.toString());
+        aapsLogger.debug(LTag.DATASERVICE, "Adding/Updating new MBG: " + careportalEvent.toString());
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/services/Intents.java b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
index e4a2d0b33b..f8742bb8b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/Intents.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
@@ -7,22 +7,10 @@ public interface Intents {
     String ACTION_REMOVED_TREATMENT = "info.nightscout.client.REMOVED_TREATMENT";
     String ACTION_NEW_PROFILE = "info.nightscout.client.NEW_PROFILE";
     String ACTION_NEW_SGV = "info.nightscout.client.NEW_SGV";
-    String ACTION_NEW_DEVICESTATUS = "info.nightscout.client.NEW_DEVICESTATUS";
-    String ACTION_NEW_FOOD = "info.nightscout.client.NEW_FOOD";
-    String ACTION_CHANGED_FOOD = "info.nightscout.client.CHANGED_FOOD";
-    String ACTION_REMOVED_FOOD = "info.nightscout.client.REMOVED_FOOD";
     String ACTION_NEW_MBG = "info.nightscout.client.NEW_MBG";
     String ACTION_NEW_CAL = "info.nightscout.client.NEW_CAL";
-    String ACTION_NEW_STATUS = "info.nightscout.client.NEW_STATUS";
-    String ACTION_QUEUE_STATUS = "info.nightscout.client.QUEUE_STATUS";
-    String ACTION_ANNOUNCEMENT = "info.nightscout.client.ANNOUNCEMENT";
-    String ACTION_ALARM = "info.nightscout.client.ALARM";
-    String ACTION_URGENT_ALARM = "info.nightscout.client.URGENT_ALARM";
-    String ACTION_CLEAR_ALARM = "info.nightscout.client.CLEAR_ALARM";
 
     // xDrip -> App
-    String RECEIVER_PERMISSION = "com.eveningoutpost.dexdrip.permissions.RECEIVE_BG_ESTIMATE";
-
     String ACTION_NEW_BG_ESTIMATE = "com.eveningoutpost.dexdrip.BgEstimate";
     String EXTRA_BG_ESTIMATE = "com.eveningoutpost.dexdrip.Extras.BgEstimate";
     String EXTRA_BG_SLOPE = "com.eveningoutpost.dexdrip.Extras.BgSlope";
@@ -46,4 +34,7 @@ public interface Intents {
 
     String POCTECH_BG = "com.china.poctech.data";
     String TOMATO_BG = "com.fanqies.tomatofn.BgEstimate";
+
+    // Broadcast status
+    String AAPS_BROADCAST = "info.nightscout.androidaps.status";
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt b/app/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt
new file mode 100644
index 0000000000..f546abb8cf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.services
+
+import android.location.Location
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by adrian on 2020-01-06.
+ */
+
+@Singleton
+class LastLocationDataContainer @Inject constructor() {
+    var lastLocation: Location? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.java b/app/src/main/java/info/nightscout/androidaps/services/LocationService.java
deleted file mode 100644
index 9600515d6f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/services/LocationService.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package info.nightscout.androidaps.services;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.location.Location;
-import android.location.LocationManager;
-import android.os.Bundle;
-import android.os.IBinder;
-
-import androidx.core.app.ActivityCompat;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventLocationChange;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-public class LocationService extends Service {
-    private static Logger log = LoggerFactory.getLogger(L.LOCATION);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private LocationManager mLocationManager = null;
-    private static final float LOCATION_DISTANCE = 10f;
-
-    private static final long LOCATION_INTERVAL_ACTIVE = T.mins(5).msecs();
-    private static final long LOCATION_INTERVAL_PASSIVE = T.mins(1).msecs(); // this doesn't cost more power
-
-    private static Location mLastLocation;
-
-    private class LocationListener implements android.location.LocationListener {
-
-        LocationListener(String provider) {
-            if (L.isEnabled(L.LOCATION))
-                log.debug("LocationListener " + provider);
-            mLastLocation = new Location(provider);
-        }
-
-        @Override
-        public void onLocationChanged(Location location) {
-            if (L.isEnabled(L.LOCATION))
-                log.debug("onLocationChanged: " + location);
-            mLastLocation.set(location);
-            RxBus.INSTANCE.send(new EventLocationChange(location));
-        }
-
-        @Override
-        public void onProviderDisabled(String provider) {
-            if (L.isEnabled(L.LOCATION))
-                log.debug("onProviderDisabled: " + provider);
-        }
-
-        @Override
-        public void onProviderEnabled(String provider) {
-            if (L.isEnabled(L.LOCATION))
-                log.debug("onProviderEnabled: " + provider);
-        }
-
-        @Override
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-            if (L.isEnabled(L.LOCATION))
-                log.debug("onStatusChanged: " + provider);
-        }
-    }
-
-    LocationListener mLocationListener;
-
-    @Override
-    public IBinder onBind(Intent arg0) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        if (L.isEnabled(L.LOCATION))
-            log.debug("onStartCommand");
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().getLastNotification());
-        return START_STICKY;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().getLastNotification());
-
-        if (L.isEnabled(L.LOCATION))
-            log.debug("onCreate");
-
-        initializeLocationManager();
-
-        try {
-            if (SP.getString(R.string.key_location, "NONE").equals("NETWORK"))
-                mLocationManager.requestLocationUpdates(
-                        LocationManager.NETWORK_PROVIDER,
-                        LOCATION_INTERVAL_ACTIVE,
-                        LOCATION_DISTANCE,
-                        mLocationListener = new LocationListener(LocationManager.NETWORK_PROVIDER)
-                );
-            if (SP.getString(R.string.key_location, "NONE").equals("GPS"))
-                mLocationManager.requestLocationUpdates(
-                        LocationManager.GPS_PROVIDER,
-                        LOCATION_INTERVAL_ACTIVE,
-                        LOCATION_DISTANCE,
-                        mLocationListener = new LocationListener(LocationManager.GPS_PROVIDER)
-                );
-            if (SP.getString(R.string.key_location, "NONE").equals("PASSIVE"))
-                mLocationManager.requestLocationUpdates(
-                        LocationManager.PASSIVE_PROVIDER,
-                        LOCATION_INTERVAL_PASSIVE,
-                        LOCATION_DISTANCE,
-                        mLocationListener = new LocationListener(LocationManager.PASSIVE_PROVIDER)
-                );
-        } catch (java.lang.SecurityException ex) {
-            log.error("fail to request location update, ignore", ex);
-        } catch (IllegalArgumentException ex) {
-            log.error("network provider does not exist, " + ex.getMessage());
-        }
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    if (L.isEnabled(L.CORE)) log.debug("EventAppExit received");
-                    stopSelf();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        if (L.isEnabled(L.LOCATION))
-            log.debug("onDestroy");
-        super.onDestroy();
-        if (mLocationManager != null) {
-            try {
-                if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                    return;
-                }
-                mLocationManager.removeUpdates(mLocationListener);
-            } catch (Exception ex) {
-                log.error("fail to remove location listener, ignore", ex);
-            }
-        }
-        disposable.clear();
-    }
-
-    private void initializeLocationManager() {
-        if (L.isEnabled(L.LOCATION))
-            log.debug("initializeLocationManager - Provider: " + SP.getString(R.string.key_location, "NONE"));
-        if (mLocationManager == null) {
-            mLocationManager = (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
-        }
-    }
-
-    public static Location getLastLocation() {
-        return mLastLocation;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
new file mode 100644
index 0000000000..f94a18c975
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -0,0 +1,148 @@
+package info.nightscout.androidaps.services
+
+import android.Manifest
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Location
+import android.location.LocationManager
+import android.os.Bundle
+import android.os.IBinder
+import androidx.core.app.ActivityCompat
+import com.google.android.gms.location.LocationServices
+import dagger.android.DaggerService
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventLocationChange
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+
+class LocationService : DaggerService() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var mainApp: MainApp
+    @Inject lateinit var lastLocationDataContainer: LastLocationDataContainer
+
+    private val disposable = CompositeDisposable()
+    private var locationManager: LocationManager? = null
+    private var locationListener: LocationListener? = null
+
+    private val LOCATION_INTERVAL_ACTIVE = T.mins(5).msecs()
+    private val LOCATION_INTERVAL_PASSIVE = T.mins(1).msecs() // this doesn't cost more power
+
+    companion object {
+        private const val LOCATION_DISTANCE = 10f
+    }
+
+    inner class LocationListener internal constructor(val provider: String) : android.location.LocationListener {
+
+        init {
+            aapsLogger.debug(LTag.LOCATION, "LocationListener $provider")
+        }
+
+        override fun onLocationChanged(location: Location) {
+            aapsLogger.debug(LTag.LOCATION, "onLocationChanged: $location")
+            lastLocationDataContainer.lastLocation = location
+            rxBus.send(EventLocationChange(location))
+        }
+
+        override fun onProviderDisabled(provider: String) {
+            aapsLogger.debug(LTag.LOCATION, "onProviderDisabled: $provider")
+        }
+
+        override fun onProviderEnabled(provider: String) {
+            aapsLogger.debug(LTag.LOCATION, "onProviderEnabled: $provider")
+        }
+
+        override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+            aapsLogger.debug(LTag.LOCATION, "onStatusChanged: $provider")
+        }
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        startForeground(mainApp.notificationId(), mainApp.notification)
+        return Service.START_STICKY
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        startForeground(mainApp.notificationId(), mainApp.notification)
+
+        // Get last location once until we get regular update
+        LocationServices.getFusedLocationProviderClient(this).lastLocation.addOnSuccessListener {
+            lastLocationDataContainer.lastLocation = it
+        }
+
+        initializeLocationManager()
+
+        try {
+            if (sp.getString(R.string.key_location, "NONE") == "NETWORK") locationManager?.requestLocationUpdates(
+                LocationManager.NETWORK_PROVIDER,
+                LOCATION_INTERVAL_ACTIVE,
+                LOCATION_DISTANCE,
+                LocationListener(LocationManager.NETWORK_PROVIDER).also { locationListener = it }
+            )
+            if (sp.getString(R.string.key_location, "NONE") == "GPS") locationManager?.requestLocationUpdates(
+                LocationManager.GPS_PROVIDER,
+                LOCATION_INTERVAL_ACTIVE,
+                LOCATION_DISTANCE,
+                LocationListener(LocationManager.GPS_PROVIDER).also { locationListener = it }
+            )
+            if (sp.getString(R.string.key_location, "NONE") == "PASSIVE") locationManager?.requestLocationUpdates(
+                LocationManager.PASSIVE_PROVIDER,
+                LOCATION_INTERVAL_PASSIVE,
+                LOCATION_DISTANCE,
+                LocationListener(LocationManager.PASSIVE_PROVIDER).also { locationListener = it }
+            )
+        } catch (ex: SecurityException) {
+            aapsLogger.error(LTag.LOCATION, "fail to request location update, ignore", ex)
+        } catch (ex: IllegalArgumentException) {
+            aapsLogger.error(LTag.LOCATION, "network provider does not exist", ex)
+        }
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                aapsLogger.debug(LTag.LOCATION, "EventAppExit received")
+                stopSelf()
+            }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (locationManager != null) {
+            try {
+                if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                    return
+                }
+                locationManager!!.removeUpdates(locationListener)
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.LOCATION, "fail to remove location listener, ignore", ex)
+            }
+        }
+        disposable.clear()
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    private fun initializeLocationManager() {
+        aapsLogger.debug(LTag.LOCATION, "initializeLocationManager - Provider: " + sp.getString(R.string.key_location, "NONE"))
+        if (locationManager == null) {
+            locationManager = applicationContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
deleted file mode 100644
index a0dff38104..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
+++ /dev/null
@@ -1,495 +0,0 @@
-package info.nightscout.androidaps.setupwizard;
-
-import android.Manifest;
-import android.content.Intent;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.PreferencesActivity;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
-import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.dialogs.ProfileSwitchDialog;
-import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment;
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.setupwizard.elements.SWBreak;
-import info.nightscout.androidaps.setupwizard.elements.SWButton;
-import info.nightscout.androidaps.setupwizard.elements.SWEditNumberWithUnits;
-import info.nightscout.androidaps.setupwizard.elements.SWEditString;
-import info.nightscout.androidaps.setupwizard.elements.SWEditUrl;
-import info.nightscout.androidaps.setupwizard.elements.SWFragment;
-import info.nightscout.androidaps.setupwizard.elements.SWHtmlLink;
-import info.nightscout.androidaps.setupwizard.elements.SWInfotext;
-import info.nightscout.androidaps.setupwizard.elements.SWPlugin;
-import info.nightscout.androidaps.setupwizard.elements.SWRadioButton;
-import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.androidaps.utils.AndroidPermission;
-import info.nightscout.androidaps.utils.LocaleHelper;
-import info.nightscout.androidaps.utils.PasswordProtection;
-import info.nightscout.androidaps.utils.SP;
-
-import static info.nightscout.androidaps.utils.EspressoTestHelperKt.isRunningTest;
-
-public class SWDefinition {
-    private AppCompatActivity activity;
-    private List<SWScreen> screens = new ArrayList<>();
-
-    public void setActivity(AppCompatActivity activity) {
-        this.activity = activity;
-    }
-
-    public AppCompatActivity getActivity() {
-        return activity;
-    }
-
-    List<SWScreen> getScreens() {
-        return screens;
-    }
-
-    private SWDefinition add(SWScreen newScreen) {
-        if (newScreen != null) screens.add(newScreen);
-        return this;
-    }
-
-    SWDefinition() {
-        if (Config.APS)
-            SWDefinitionFull();
-        else if (Config.PUMPCONTROL)
-            SWDefinitionPumpControl();
-        else if (Config.NSCLIENT)
-            SWDefinitionNSClient();
-    }
-
-    private SWScreen screenSetupWizard = new SWScreen(R.string.nav_setupwizard)
-            .add(new SWInfotext()
-                    .label(R.string.welcometosetupwizard));
-
-    private SWScreen screenLanguage = new SWScreen(R.string.language)
-            .skippable(false)
-            .add(new SWRadioButton()
-                    .option(R.array.languagesArray, R.array.languagesValues)
-                    .preferenceId(R.string.key_language).label(R.string.language)
-                    .comment(R.string.setupwizard_language_prompt))
-            .validator(() -> {
-                LocaleHelper.INSTANCE.update(MainApp.instance().getApplicationContext());
-                return SP.contains(R.string.key_language);
-            });
-
-    private SWScreen screenEula = new SWScreen(R.string.end_user_license_agreement)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.end_user_license_agreement_text))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.end_user_license_agreement_i_understand)
-                    .visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
-                    .action(() -> {
-                        SP.putBoolean(R.string.key_i_understand, true);
-                        RxBus.INSTANCE.send(new EventSWUpdate(false));
-                    }))
-            .visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
-            .validator(() -> SP.getBoolean(R.string.key_i_understand, false));
-
-    private SWScreen screenUnits = new SWScreen(R.string.units)
-            .skippable(false)
-            .add(new SWRadioButton()
-                    .option(R.array.unitsArray, R.array.unitsValues)
-                    .preferenceId(R.string.key_units).label(R.string.units)
-                    .comment(R.string.setupwizard_units_prompt))
-            .validator(() -> SP.contains(R.string.key_units));
-
-    private SWScreen displaySettings = new SWScreen(R.string.wear_display_settings)
-            .skippable(false)
-            .add(new SWEditNumberWithUnits(Constants.LOWMARK * Constants.MGDL_TO_MMOLL, 3d, 8d)
-                    .preferenceId(R.string.key_low_mark)
-                    .updateDelay(5)
-                    .label(R.string.low_mark)
-                    .comment(R.string.low_mark_comment))
-            .add(new SWBreak())
-            .add(new SWEditNumberWithUnits(Constants.HIGHMARK * Constants.MGDL_TO_MMOLL, 5d, 20d)
-                    .preferenceId(R.string.key_high_mark)
-                    .updateDelay(5)
-                    .label(R.string.high_mark)
-                    .comment(R.string.high_mark_comment));
-
-    private SWScreen screenPermissionBattery = new SWScreen(R.string.permission)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(String.format(MainApp.gs(R.string.needwhitelisting), MainApp.gs(R.string.app_name))))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.askforpermission)
-                    .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
-                    .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, AndroidPermission.CASE_BATTERY)))
-            .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
-            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)));
-
-    private SWScreen screenPermissionBt = new SWScreen(R.string.permission)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(MainApp.gs(R.string.needlocationpermission)))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.askforpermission)
-                    .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION))
-                    .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION, AndroidPermission.CASE_LOCATION)))
-            .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION))
-            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)));
-
-    private SWScreen screenPermissionStore = new SWScreen(R.string.permission)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(MainApp.gs(R.string.needstoragepermission)))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.askforpermission)
-                    .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                    .action(() -> AndroidPermission.askForPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, AndroidPermission.CASE_STORAGE)))
-            .visibility(() -> AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE))
-            .validator(() -> !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)));
-
-    private SWScreen screenImport = new SWScreen(R.string.nav_import)
-            .add(new SWInfotext()
-                    .label(R.string.storedsettingsfound))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.nav_import)
-                    .action(() -> ImportExportPrefs.importSharedPreferences(getActivity())))
-            .visibility(() -> ImportExportPrefs.file.exists() && !(AndroidPermission.permissionNotGranted(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)));
-
-    private SWScreen screenNsClient = new SWScreen(R.string.nsclientinternal_title)
-            .skippable(true)
-            .add(new SWInfotext()
-                    .label(R.string.nsclientinfotext))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.enable_nsclient)
-                    .action(() -> {
-                        NSClientPlugin.getPlugin().setPluginEnabled(PluginType.GENERAL, true);
-                        NSClientPlugin.getPlugin().setFragmentVisible(PluginType.GENERAL, true);
-                        ConfigBuilderPlugin.getPlugin().processOnEnabledCategoryChanged(NSClientPlugin.getPlugin(), PluginType.GENERAL);
-                        ConfigBuilderPlugin.getPlugin().storeSettings("SetupWizard");
-                        RxBus.INSTANCE.send(new EventConfigBuilderChange());
-                        RxBus.INSTANCE.send(new EventSWUpdate(true));
-                    })
-                    .visibility(() -> !NSClientPlugin.getPlugin().isEnabled(PluginType.GENERAL)))
-            .add(new SWEditUrl()
-                    .preferenceId(R.string.key_nsclientinternal_url)
-                    .updateDelay(5)
-                    .label(R.string.nsclientinternal_url_title)
-                    .comment(R.string.nsclientinternal_url_dialogmessage))
-            .add(new SWEditString()
-                    .validator(text -> text.length() >= 12)
-                    .preferenceId(R.string.key_nsclientinternal_api_secret)
-                    .updateDelay(5)
-                    .label(R.string.nsclientinternal_secret_dialogtitle)
-                    .comment(R.string.nsclientinternal_secret_dialogmessage))
-            .add(new SWBreak())
-            .add(new SWEventListener(this, EventNSClientStatus.class)
-                    .label(R.string.status)
-                    .initialStatus(NSClientPlugin.getPlugin().status)
-            )
-            .add(new SWBreak())
-            .validator(() -> NSClientPlugin.getPlugin().nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth)
-            .visibility(() -> !(NSClientPlugin.getPlugin().nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth));
-
-    private SWScreen screenAge = new SWScreen(R.string.patientage)
-            .skippable(false)
-            .add(new SWBreak())
-            .add(new SWRadioButton()
-                    .option(R.array.ageArray, R.array.ageValues)
-                    .preferenceId(R.string.key_age)
-                    .label(R.string.patientage)
-                    .comment(R.string.patientage_summary))
-            .validator(() -> SP.contains(R.string.key_age));
-
-    private SWScreen screenInsulin = new SWScreen(R.string.configbuilder_insulin)
-            .skippable(false)
-            .add(new SWPlugin()
-                    .option(PluginType.INSULIN, R.string.configbuilder_insulin_description)
-                    .makeVisible(false)
-                    .label(R.string.configbuilder_insulin))
-            .add(new SWBreak())
-            .add(new SWInfotext()
-                    .label(R.string.diawarning))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.insulinsourcesetup)
-                    .action(() -> {
-                        final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin();
-                        if (plugin != null) {
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        }
-                    })
-                    .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin()).getPreferencesId() > 0))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null);
-
-    private SWScreen screenBgSource = new SWScreen(R.string.configbuilder_bgsource)
-            .skippable(false)
-            .add(new SWPlugin()
-                    .option(PluginType.BGSOURCE, R.string.configbuilder_bgsource_description)
-                    .label(R.string.configbuilder_bgsource))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.bgsourcesetup)
-                    .action(() -> {
-                        final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource();
-                        if (plugin != null) {
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        }
-                    })
-                    .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource()).getPreferencesId() > 0))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null);
-
-    private SWScreen screenProfile = new SWScreen(R.string.configbuilder_profile)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.setupwizard_profile_description))
-            .add(new SWBreak())
-            .add(new SWPlugin()
-                    .option(PluginType.PROFILE, R.string.configbuilder_profile_description)
-                    .label(R.string.configbuilder_profile))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null);
-
-    private SWScreen screenNsProfile = new SWScreen(R.string.nsprofile)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.adjustprofileinns))
-            .add(new SWFragment(this)
-                    .add(new NSProfileFragment()))
-            .validator(() -> NSProfilePlugin.getPlugin().getProfile() != null && NSProfilePlugin.getPlugin().getProfile().getDefaultProfile() != null && NSProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid("StartupWizard"))
-            .visibility(() -> NSProfilePlugin.getPlugin().isEnabled(PluginType.PROFILE));
-
-    private SWScreen screenLocalProfile = new SWScreen(R.string.localprofile)
-            .skippable(false)
-            .add(new SWFragment(this)
-                    .add(new LocalProfileFragment()))
-            .validator(() -> LocalProfilePlugin.INSTANCE.getProfile() != null && LocalProfilePlugin.INSTANCE.getProfile().getDefaultProfile() != null && LocalProfilePlugin.INSTANCE.getProfile().getDefaultProfile().isValid("StartupWizard"))
-            .visibility(() -> LocalProfilePlugin.INSTANCE.isEnabled(PluginType.PROFILE));
-
-    private SWScreen screenProfileSwitch = new SWScreen(R.string.careportal_profileswitch)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.profileswitch_ismissing))
-            .add(new SWButton()
-                    .text(R.string.doprofileswitch)
-                    .action(() -> {
-                        new ProfileSwitchDialog().show(getActivity().getSupportFragmentManager(), "SetupWizard");
-                    }))
-            .validator(() -> ProfileFunctions.getInstance().getProfile() != null)
-            .visibility(() -> ProfileFunctions.getInstance().getProfile() == null);
-
-    private SWScreen screenPump = new SWScreen(R.string.configbuilder_pump)
-            .skippable(false)
-            .add(new SWPlugin()
-                    .option(PluginType.PUMP, R.string.configbuilder_pump_description)
-                    .label(R.string.configbuilder_pump))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.pumpsetup)
-                    .action(() -> {
-                        final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump();
-                        if (plugin != null) {
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        }
-                    })
-                    .visibility(() -> (ConfigBuilderPlugin.getPlugin().getActivePump() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump()).getPreferencesId() > 0)))
-            .add(new SWButton()
-                    .text(R.string.readstatus)
-                    .action(() -> ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Clicked connect to pump", null))
-                    .visibility(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null))
-            .add(new SWEventListener(this, EventPumpStatusChanged.class))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null && ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized());
-
-    private SWScreen screenAps = new SWScreen(R.string.configbuilder_aps)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.setupwizard_aps_description))
-            .add(new SWBreak())
-            .add(new SWHtmlLink()
-                    .label("https://openaps.readthedocs.io/en/latest/"))
-            .add(new SWBreak())
-            .add(new SWPlugin()
-                    .option(PluginType.APS, R.string.configbuilder_aps_description)
-                    .label(R.string.configbuilder_aps))
-            .add(new SWButton()
-                    .text(R.string.apssetup)
-                    .action(() -> {
-                        final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS();
-                        if (plugin != null) {
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        }
-                    })
-                    .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS()).getPreferencesId() > 0))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null)
-            .visibility(() -> Config.APS);
-
-    private SWScreen screenApsMode = new SWScreen(R.string.apsmode_title)
-            .skippable(false)
-            .add(new SWRadioButton()
-                    .option(R.array.aps_modeArray, R.array.aps_modeValues)
-                    .preferenceId(R.string.key_aps_mode).label(R.string.apsmode_title)
-                    .comment(R.string.setupwizard_preferred_aps_mode))
-            .validator(() -> SP.contains(R.string.key_aps_mode));
-
-    private SWScreen screenLoop = new SWScreen(R.string.configbuilder_loop)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.setupwizard_loop_description))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.enableloop)
-                    .action(() -> {
-                        LoopPlugin.getPlugin().setPluginEnabled(PluginType.LOOP, true);
-                        LoopPlugin.getPlugin().setFragmentVisible(PluginType.LOOP, true);
-                        ConfigBuilderPlugin.getPlugin().processOnEnabledCategoryChanged(LoopPlugin.getPlugin(), PluginType.LOOP);
-                        ConfigBuilderPlugin.getPlugin().storeSettings("SetupWizard");
-                        RxBus.INSTANCE.send(new EventConfigBuilderChange());
-                        RxBus.INSTANCE.send(new EventSWUpdate(true));
-                    })
-                    .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
-            .validator(() -> LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-            .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && Config.APS);
-
-    private SWScreen screenSensitivity = new SWScreen(R.string.configbuilder_sensitivity)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.setupwizard_sensitivity_description))
-            .add(new SWHtmlLink()
-                    .label(R.string.setupwizard_sensitivity_url))
-            .add(new SWBreak())
-            .add(new SWPlugin()
-                    .option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description)
-                    .label(R.string.configbuilder_sensitivity))
-            .add(new SWBreak())
-            .add(new SWButton()
-                    .text(R.string.sensitivitysetup)
-                    .action(() -> {
-                        final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity();
-                        if (plugin != null) {
-                            PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
-                                Intent i = new Intent(activity, PreferencesActivity.class);
-                                i.putExtra("id", plugin.getPreferencesId());
-                                activity.startActivity(i);
-                            }, null);
-                        }
-                    })
-                    .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity()).getPreferencesId() > 0))
-            .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null);
-
-    private SWScreen getScreenObjectives = new SWScreen(R.string.objectives)
-            .skippable(false)
-            .add(new SWInfotext()
-                    .label(R.string.startobjective))
-            .add(new SWBreak())
-            .add(new SWFragment(this)
-                    .add(new ObjectivesFragment()))
-            .validator(() -> ObjectivesPlugin.INSTANCE.getObjectives().get(ObjectivesPlugin.INSTANCE.getFIRST_OBJECTIVE()).isStarted())
-            .visibility(() -> !ObjectivesPlugin.INSTANCE.getObjectives().get(ObjectivesPlugin.INSTANCE.getFIRST_OBJECTIVE()).isStarted() && Config.APS);
-
-    private void SWDefinitionFull() {
-        // List all the screens here
-        add(screenSetupWizard)
-                .add(screenLanguage)
-                .add(screenEula)
-                .add(isRunningTest() ? null : screenPermissionBattery) // cannot mock ask battery optimalization
-                .add(screenPermissionBt)
-                .add(screenPermissionStore)
-                .add(screenImport)
-                .add(screenUnits)
-                .add(displaySettings)
-                .add(screenNsClient)
-                .add(screenAge)
-                .add(screenInsulin)
-                .add(screenBgSource)
-                .add(screenProfile)
-                .add(screenNsProfile)
-                .add(screenLocalProfile)
-                .add(screenProfileSwitch)
-                .add(screenPump)
-                .add(screenAps)
-                .add(screenApsMode)
-                .add(screenLoop)
-                .add(screenSensitivity)
-                .add(getScreenObjectives)
-        ;
-    }
-
-    private void SWDefinitionPumpControl() {
-        // List all the screens here
-        add(screenSetupWizard)
-                .add(screenLanguage)
-                .add(screenEula)
-                .add(isRunningTest() ? null : screenPermissionBattery) // cannot mock ask battery optimalization
-                .add(screenPermissionBt)
-                .add(screenPermissionStore)
-                .add(screenImport)
-                .add(screenUnits)
-                .add(displaySettings)
-                .add(screenNsClient)
-                .add(screenAge)
-                .add(screenInsulin)
-                .add(screenBgSource)
-                .add(screenProfile)
-                .add(screenNsProfile)
-                .add(screenLocalProfile)
-                .add(screenProfileSwitch)
-                .add(screenPump)
-                .add(screenSensitivity)
-        ;
-    }
-
-    private void SWDefinitionNSClient() {
-        // List all the screens here
-        add(screenSetupWizard)
-                .add(screenLanguage)
-                .add(screenEula)
-                .add(isRunningTest() ? null : screenPermissionBattery) // cannot mock ask battery optimalization
-                .add(screenPermissionStore)
-                .add(screenImport)
-                .add(screenUnits)
-                .add(displaySettings)
-                .add(screenNsClient)
-                .add(screenBgSource)
-                .add(screenAge)
-                .add(screenInsulin)
-                .add(screenSensitivity)
-        ;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
new file mode 100644
index 0000000000..3912b48433
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -0,0 +1,448 @@
+package info.nightscout.androidaps.setupwizard
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.PreferencesActivity
+import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus
+import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService
+import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
+import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
+import info.nightscout.androidaps.setupwizard.elements.*
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import info.nightscout.androidaps.utils.AndroidPermission
+import info.nightscout.androidaps.utils.LocaleHelper.update
+import info.nightscout.androidaps.utils.extensions.isRunningTest
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SWDefinition @Inject constructor(
+    injector: HasAndroidInjector,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    resourceHelper: ResourceHelper,
+    private val sp: SP,
+    private val profileFunction: ProfileFunction,
+    private val localProfilePlugin: LocalProfilePlugin,
+    private val activePlugin: ActivePluginProvider,
+    private val commandQueue: CommandQueueProvider,
+    private val objectivesPlugin: ObjectivesPlugin,
+    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val loopPlugin: LoopPlugin,
+    private val nsClientPlugin: NSClientPlugin,
+    private val nsProfilePlugin: NSProfilePlugin,
+    private val protectionCheck: ProtectionCheck,
+    private val importExportPrefs: ImportExportPrefs,
+    private val androidPermission: AndroidPermission
+) {
+
+    lateinit var activity: AppCompatActivity
+    private val screens: MutableList<SWScreen> = ArrayList()
+
+    fun getScreens(): List<SWScreen> {
+        return screens
+    }
+
+    private fun add(newScreen: SWScreen?): SWDefinition {
+        if (newScreen != null) screens.add(newScreen)
+        return this
+    }
+
+    private val screenSetupWizard = SWScreen(injector, R.string.nav_setupwizard)
+        .add(SWInfotext(injector)
+            .label(R.string.welcometosetupwizard))
+    private val screenLanguage = SWScreen(injector, R.string.language)
+        .skippable(false)
+        .add(SWRadioButton(injector)
+            .option(R.array.languagesArray, R.array.languagesValues)
+            .preferenceId(R.string.key_language).label(R.string.language)
+            .comment(R.string.setupwizard_language_prompt))
+        .validator(SWValidator {
+            update(context)
+            sp.contains(R.string.key_language)
+        })
+    private val screenEula = SWScreen(injector, R.string.end_user_license_agreement)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.end_user_license_agreement_text))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.end_user_license_agreement_i_understand)
+            .visibility(SWValidator { !sp.getBoolean(R.string.key_i_understand, false) })
+            .action(Runnable {
+                sp.putBoolean(R.string.key_i_understand, true)
+                rxBus.send(EventSWUpdate(false))
+            }))
+        .visibility(SWValidator { !sp.getBoolean(R.string.key_i_understand, false) })
+        .validator(SWValidator { sp.getBoolean(R.string.key_i_understand, false) })
+    private val screenUnits = SWScreen(injector, R.string.units)
+        .skippable(false)
+        .add(SWRadioButton(injector)
+            .option(R.array.unitsArray, R.array.unitsValues)
+            .preferenceId(R.string.key_units).label(R.string.units)
+            .comment(R.string.setupwizard_units_prompt))
+        .validator(SWValidator { sp.contains(R.string.key_units) })
+    private val displaySettings = SWScreen(injector, R.string.wear_display_settings)
+        .skippable(false)
+        .add(SWEditNumberWithUnits(injector, Constants.LOWMARK * Constants.MGDL_TO_MMOLL, 3.0, 8.0)
+            .preferenceId(R.string.key_low_mark)
+            .updateDelay(5)
+            .label(R.string.low_mark)
+            .comment(R.string.low_mark_comment))
+        .add(SWBreak(injector))
+        .add(SWEditNumberWithUnits(injector, Constants.HIGHMARK * Constants.MGDL_TO_MMOLL, 5.0, 20.0)
+            .preferenceId(R.string.key_high_mark)
+            .updateDelay(5)
+            .label(R.string.high_mark)
+            .comment(R.string.high_mark_comment))
+    private val screenPermissionBattery = SWScreen(injector, R.string.permission)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(resourceHelper.gs(R.string.needwhitelisting, resourceHelper.gs(R.string.app_name))))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.askforpermission)
+            .visibility(SWValidator { androidPermission.permissionNotGranted(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) })
+            .action(Runnable { androidPermission.askForPermission(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, AndroidPermission.CASE_BATTERY) }))
+        .visibility(SWValidator { androidPermission.permissionNotGranted(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) })
+        .validator(SWValidator { !androidPermission.permissionNotGranted(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) })
+    private val screenPermissionBt = SWScreen(injector, R.string.permission)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(resourceHelper.gs(R.string.needlocationpermission)))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.askforpermission)
+            .visibility(SWValidator { androidPermission.permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION) })
+            .action(Runnable { androidPermission.askForPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION, AndroidPermission.CASE_LOCATION) }))
+        .visibility(SWValidator { androidPermission.permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION) })
+        .validator(SWValidator { !androidPermission.permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION) })
+    private val screenPermissionStore = SWScreen(injector, R.string.permission)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(resourceHelper.gs(R.string.needstoragepermission)))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.askforpermission)
+            .visibility(SWValidator { androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) })
+            .action(Runnable { androidPermission.askForPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE, AndroidPermission.CASE_STORAGE) }))
+        .visibility(SWValidator { androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) })
+        .validator(SWValidator { !androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) })
+    private val screenImport = SWScreen(injector, R.string.nav_import)
+        .add(SWInfotext(injector)
+            .label(R.string.storedsettingsfound))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.nav_import)
+            .action(Runnable { importExportPrefs.importSharedPreferences(activity) }))
+        .visibility(SWValidator { importExportPrefs.prefsFileExists() && !androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) })
+    private val screenNsClient = SWScreen(injector, R.string.nsclientinternal_title)
+        .skippable(true)
+        .add(SWInfotext(injector)
+            .label(R.string.nsclientinfotext))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.enable_nsclient)
+            .action(Runnable {
+                nsClientPlugin.setPluginEnabled(PluginType.GENERAL, true)
+                nsClientPlugin.setFragmentVisible(PluginType.GENERAL, true)
+                configBuilderPlugin.processOnEnabledCategoryChanged(nsClientPlugin, PluginType.GENERAL)
+                configBuilderPlugin.storeSettings("SetupWizard")
+                rxBus.send(EventConfigBuilderChange())
+                rxBus.send(EventSWUpdate(true))
+            })
+            .visibility(SWValidator { !nsClientPlugin.isEnabled(PluginType.GENERAL) }))
+        .add(SWEditUrl(injector)
+            .preferenceId(R.string.key_nsclientinternal_url)
+            .updateDelay(5)
+            .label(R.string.nsclientinternal_url_title)
+            .comment(R.string.nsclientinternal_url_dialogmessage))
+        .add(SWEditString(injector)
+            .validator(SWTextValidator { text: String -> text.length >= 12 })
+            .preferenceId(R.string.key_nsclientinternal_api_secret)
+            .updateDelay(5)
+            .label(R.string.nsclientinternal_secret_dialogtitle)
+            .comment(R.string.nsclientinternal_secret_dialogmessage))
+        .add(SWBreak(injector))
+        .add(SWEventListener(injector, EventNSClientStatus::class.java)
+            .label(R.string.status)
+            .initialStatus(nsClientPlugin.status)
+        )
+        .add(SWBreak(injector))
+        .validator(SWValidator { nsClientPlugin.nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth })
+        .visibility(SWValidator { !(nsClientPlugin.nsClientService != null && NSClientService.isConnected && NSClientService.hasWriteAuth) })
+    private val screenAge = SWScreen(injector, R.string.patientage)
+        .skippable(false)
+        .add(SWBreak(injector))
+        .add(SWRadioButton(injector)
+            .option(R.array.ageArray, R.array.ageValues)
+            .preferenceId(R.string.key_age)
+            .label(R.string.patientage)
+            .comment(R.string.patientage_summary))
+        .validator(SWValidator { sp.contains(R.string.key_age) })
+    private val screenInsulin = SWScreen(injector, R.string.configbuilder_insulin)
+        .skippable(false)
+        .add(SWPlugin(injector)
+            .option(PluginType.INSULIN, R.string.configbuilder_insulin_description)
+            .makeVisible(false)
+            .label(R.string.configbuilder_insulin))
+        .add(SWBreak(injector))
+        .add(SWInfotext(injector)
+            .label(R.string.diawarning))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.insulinsourcesetup)
+            .action(Runnable {
+                val plugin = activePlugin.activeInsulin as PluginBase
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(activity, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    activity.startActivity(i)
+                }, null)
+            })
+            .visibility(SWValidator { (activePlugin.activeInsulin as PluginBase).preferencesId > 0 }))
+    private val screenBgSource = SWScreen(injector, R.string.configbuilder_bgsource)
+        .skippable(false)
+        .add(SWPlugin(injector)
+            .option(PluginType.BGSOURCE, R.string.configbuilder_bgsource_description)
+            .label(R.string.configbuilder_bgsource))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.bgsourcesetup)
+            .action(Runnable {
+                val plugin = activePlugin.activeBgSource as PluginBase
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(activity, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    activity.startActivity(i)
+                }, null)
+            })
+            .visibility(SWValidator { (activePlugin.activeBgSource as PluginBase).preferencesId > 0 }))
+    private val screenProfile = SWScreen(injector, R.string.configbuilder_profile)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.setupwizard_profile_description))
+        .add(SWBreak(injector))
+        .add(SWPlugin(injector)
+            .option(PluginType.PROFILE, R.string.configbuilder_profile_description)
+            .label(R.string.configbuilder_profile))
+    private val screenNsProfile = SWScreen(injector, R.string.nsprofile)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.adjustprofileinns))
+        .add(SWFragment(injector, this)
+            .add(NSProfileFragment()))
+        .validator(SWValidator { nsProfilePlugin.profile != null && nsProfilePlugin.profile!!.getDefaultProfile() != null && nsProfilePlugin.profile!!.getDefaultProfile()!!.isValid("StartupWizard") })
+        .visibility(SWValidator { nsProfilePlugin.isEnabled(PluginType.PROFILE) })
+    private val screenLocalProfile = SWScreen(injector, R.string.localprofile)
+        .skippable(false)
+        .add(SWFragment(injector, this)
+            .add(LocalProfileFragment()))
+        .validator(SWValidator { localProfilePlugin.profile?.getDefaultProfile()?.isValid("StartupWizard") == true })
+        .visibility(SWValidator { localProfilePlugin.isEnabled(PluginType.PROFILE) })
+    private val screenProfileSwitch = SWScreen(injector, R.string.careportal_profileswitch)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.profileswitch_ismissing))
+        .add(SWButton(injector)
+            .text(R.string.doprofileswitch)
+            .action(Runnable { ProfileSwitchDialog().show(activity.supportFragmentManager, "SetupWizard") }))
+        .validator(SWValidator { profileFunction.getProfile() != null })
+        .visibility(SWValidator { profileFunction.getProfile() == null })
+    private val screenPump = SWScreen(injector, R.string.configbuilder_pump)
+        .skippable(false)
+        .add(SWPlugin(injector)
+            .option(PluginType.PUMP, R.string.configbuilder_pump_description)
+            .label(R.string.configbuilder_pump))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.pumpsetup)
+            .action(Runnable {
+                val plugin = activePlugin.activePump as PluginBase
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(activity, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    activity.startActivity(i)
+                }, null)
+            })
+            .visibility(SWValidator { (activePlugin.activePump as PluginBase).preferencesId > 0 }))
+        .add(SWButton(injector)
+            .text(R.string.readstatus)
+            .action(Runnable { commandQueue.readStatus("Clicked connect to pump", null) }))
+        .add(SWEventListener(injector, EventPumpStatusChanged::class.java))
+        .validator(SWValidator { activePlugin.activePump.isInitialized })
+    private val screenAps = SWScreen(injector, R.string.configbuilder_aps)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.setupwizard_aps_description))
+        .add(SWBreak(injector))
+        .add(SWHtmlLink(injector)
+            .label("https://openaps.readthedocs.io/en/latest/"))
+        .add(SWBreak(injector))
+        .add(SWPlugin(injector)
+            .option(PluginType.APS, R.string.configbuilder_aps_description)
+            .label(R.string.configbuilder_aps))
+        .add(SWButton(injector)
+            .text(R.string.apssetup)
+            .action(Runnable {
+                val plugin = activePlugin.activeAPS as PluginBase
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(activity, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    activity.startActivity(i)
+                }, null)
+            })
+            .visibility(SWValidator { (activePlugin.activeAPS as PluginBase).preferencesId > 0 }))
+        .visibility(SWValidator { Config.APS })
+    private val screenApsMode = SWScreen(injector, R.string.apsmode_title)
+        .skippable(false)
+        .add(SWRadioButton(injector)
+            .option(R.array.aps_modeArray, R.array.aps_modeValues)
+            .preferenceId(R.string.key_aps_mode).label(R.string.apsmode_title)
+            .comment(R.string.setupwizard_preferred_aps_mode))
+        .validator(SWValidator { sp.contains(R.string.key_aps_mode) })
+    private val screenLoop = SWScreen(injector, R.string.configbuilder_loop)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.setupwizard_loop_description))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.enableloop)
+            .action(Runnable {
+                loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+                loopPlugin.setFragmentVisible(PluginType.LOOP, true)
+                configBuilderPlugin.processOnEnabledCategoryChanged(loopPlugin, PluginType.LOOP)
+                configBuilderPlugin.storeSettings("SetupWizard")
+                rxBus.send(EventConfigBuilderChange())
+                rxBus.send(EventSWUpdate(true))
+            })
+            .visibility(SWValidator { !loopPlugin.isEnabled(PluginType.LOOP) }))
+        .validator(SWValidator { loopPlugin.isEnabled(PluginType.LOOP) })
+        .visibility(SWValidator { !loopPlugin.isEnabled(PluginType.LOOP) && Config.APS })
+    private val screenSensitivity = SWScreen(injector, R.string.configbuilder_sensitivity)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.setupwizard_sensitivity_description))
+        .add(SWHtmlLink(injector)
+            .label(R.string.setupwizard_sensitivity_url))
+        .add(SWBreak(injector))
+        .add(SWPlugin(injector)
+            .option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description)
+            .label(R.string.configbuilder_sensitivity))
+        .add(SWBreak(injector))
+        .add(SWButton(injector)
+            .text(R.string.sensitivitysetup)
+            .action(Runnable {
+                val plugin = activePlugin.activeSensitivity as PluginBase
+                protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, Runnable {
+                    val i = Intent(activity, PreferencesActivity::class.java)
+                    i.putExtra("id", plugin.preferencesId)
+                    activity.startActivity(i)
+                }, null)
+            })
+            .visibility(SWValidator { (activePlugin.activeSensitivity as PluginBase).preferencesId > 0 }))
+    private val getScreenObjectives = SWScreen(injector, R.string.objectives)
+        .skippable(false)
+        .add(SWInfotext(injector)
+            .label(R.string.startobjective))
+        .add(SWBreak(injector))
+        .add(SWFragment(injector, this)
+            .add(ObjectivesFragment()))
+        .validator(SWValidator { objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].isStarted })
+        .visibility(SWValidator { !objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].isStarted && Config.APS })
+
+    private fun swDefinitionFull() { // List all the screens here
+        add(screenSetupWizard)
+            .add(screenLanguage)
+            .add(screenEula)
+            .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
+            .add(screenPermissionBt)
+            .add(screenPermissionStore)
+            .add(screenImport)
+            .add(screenUnits)
+            .add(displaySettings)
+            .add(screenNsClient)
+            .add(screenAge)
+            .add(screenInsulin)
+            .add(screenBgSource)
+            .add(screenProfile)
+            .add(screenNsProfile)
+            .add(screenLocalProfile)
+            .add(screenProfileSwitch)
+            .add(screenPump)
+            .add(screenAps)
+            .add(screenApsMode)
+            .add(screenLoop)
+            .add(screenSensitivity)
+            .add(getScreenObjectives)
+    }
+
+    private fun swDefinitionPumpControl() { // List all the screens here
+        add(screenSetupWizard)
+            .add(screenLanguage)
+            .add(screenEula)
+            .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
+            .add(screenPermissionBt)
+            .add(screenPermissionStore)
+            .add(screenImport)
+            .add(screenUnits)
+            .add(displaySettings)
+            .add(screenNsClient)
+            .add(screenAge)
+            .add(screenInsulin)
+            .add(screenBgSource)
+            .add(screenProfile)
+            .add(screenNsProfile)
+            .add(screenLocalProfile)
+            .add(screenProfileSwitch)
+            .add(screenPump)
+            .add(screenSensitivity)
+    }
+
+    private fun swDefinitionNSClient() { // List all the screens here
+        add(screenSetupWizard)
+            .add(screenLanguage)
+            .add(screenEula)
+            .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
+            .add(screenPermissionStore)
+            .add(screenImport)
+            .add(screenUnits)
+            .add(displaySettings)
+            .add(screenNsClient)
+            .add(screenBgSource)
+            .add(screenAge)
+            .add(screenInsulin)
+            .add(screenSensitivity)
+    }
+
+    init {
+        if (Config.APS) swDefinitionFull() else if (Config.PUMPCONTROL) swDefinitionPumpControl() else if (Config.NSCLIENT) swDefinitionNSClient()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java
deleted file mode 100644
index 26944effbf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.setupwizard;
-
-import android.content.Context;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.events.EventStatus;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.setupwizard.elements.SWItem;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-
-public class SWEventListener extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWEventListener.class);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private int textLabel = 0;
-    private String status = "";
-    TextView textView;
-    SWDefinition definition;
-
-    SWEventListener(SWDefinition definition, Class clazz) {
-        super(Type.LISTENER);
-        this.definition = definition;
-        disposable.add(RxBus.INSTANCE
-                .toObservable(clazz)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> {
-                    status = ((EventStatus) event).getStatus();
-                    if (textView != null)
-                        textView.setText((textLabel != 0 ? MainApp.gs(textLabel) : "") + " " + status);
-                })
-        );
-
-    }
-
-    public SWEventListener label(int newLabel) {
-        this.textLabel = newLabel;
-        return this;
-    }
-
-    SWEventListener initialStatus(String status) {
-        this.status = status;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        textView = new TextView(context);
-        textView.setId(layout.generateViewId());
-        textView.setText((textLabel != 0 ? MainApp.gs(textLabel) : "") + " " + status);
-        layout.addView(textView);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
new file mode 100644
index 0000000000..9757cbca32
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.setupwizard
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.events.EventStatus
+import info.nightscout.androidaps.setupwizard.elements.SWItem
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+
+class SWEventListener constructor(
+    injector:HasAndroidInjector,
+    clazz: Class<out EventStatus>
+) : SWItem(injector, Type.LISTENER) {
+
+    private val disposable = CompositeDisposable()
+    private var textLabel = 0
+    private var status = ""
+    private var textView: TextView? = null
+
+    // TODO: Adrian how to clear disposable in this case?
+    init {
+        disposable.add(rxBus
+            .toObservable(clazz)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { event: Any ->
+                status = (event as EventStatus).getStatus(resourceHelper)
+                @SuppressLint("SetTextI18n")
+                textView?.text = (if (textLabel != 0) resourceHelper.gs(textLabel) else "") + " " + status
+            }
+        )
+    }
+
+    override fun label(label: Int): SWEventListener {
+        textLabel = label
+        return this
+    }
+
+    fun initialStatus(status: String): SWEventListener {
+        this.status = status
+        return this
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        textView = TextView(context)
+        textView?.id = View.generateViewId()
+        textView?.text = (if (textLabel != 0) resourceHelper.gs(textLabel) else "") + " " + status
+        layout.addView(textView)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java
deleted file mode 100644
index 5c7b10315f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.setupwizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.setupwizard.elements.SWItem;
-
-public class SWScreen {
-
-    int header;
-    List<SWItem> items = new ArrayList<>();
-    SWValidator validator;
-    SWValidator visibility;
-    boolean skippable = false;
-
-    public SWScreen(int header) {
-        this.header = header;
-    }
-
-    public String getHeader() {
-        return MainApp.gs(header);
-    }
-
-    public SWScreen skippable(boolean skippable) {
-        this.skippable = skippable;
-        return this;
-    }
-
-    public SWScreen add(SWItem newItem) {
-        items.add(newItem);
-        return this;
-    }
-
-    public SWScreen validator(SWValidator validator) {
-        this.validator = validator;
-        return this;
-    }
-
-    public SWScreen visibility(SWValidator visibility) {
-        this.visibility = visibility;
-        return this;
-    }
-
-    public void processVisibility() {
-        for (SWItem i : items)
-            i.processVisibility();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt
new file mode 100644
index 0000000000..377aedaed4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.setupwizard
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.elements.SWItem
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class SWScreen(val injector: HasAndroidInjector, private var header: Int) {
+
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var items: MutableList<SWItem> = ArrayList()
+    var validator: SWValidator? = null
+    var visibility: SWValidator? = null
+    var skippable = false
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    fun getHeader(): String {
+        return resourceHelper.gs(header)
+    }
+
+    fun skippable(skippable: Boolean): SWScreen {
+        this.skippable = skippable
+        return this
+    }
+
+    fun add(newItem: SWItem): SWScreen {
+        items.add(newItem)
+        return this
+    }
+
+    fun validator(validator: SWValidator): SWScreen {
+        this.validator = validator
+        return this
+    }
+
+    fun visibility(visibility: SWValidator): SWScreen {
+        this.visibility = visibility
+        return this
+    }
+
+    fun processVisibility() {
+        for (i in items) i.processVisibility()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
deleted file mode 100644
index b74567d027..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package info.nightscout.androidaps.setupwizard;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-
-import java.util.List;
-
-import info.nightscout.androidaps.MainActivity;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
-import info.nightscout.androidaps.events.EventProfileStoreChanged;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus;
-import info.nightscout.androidaps.setupwizard.elements.SWItem;
-import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.androidaps.utils.AndroidPermission;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.LocaleHelper;
-import info.nightscout.androidaps.utils.OKDialog;
-import info.nightscout.androidaps.utils.SP;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class SetupWizardActivity extends NoSplashAppCompatActivity {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    ScrollView scrollView;
-
-    private SWDefinition swDefinition = new SWDefinition();
-    private List<SWScreen> screens = swDefinition.getScreens();
-    private int currentWizardPage = 0;
-    public static final String INTENT_MESSAGE = "WIZZARDPAGE";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LocaleHelper.INSTANCE.update(getApplicationContext());
-        setContentView(R.layout.activity_setupwizard);
-
-        scrollView = findViewById(R.id.sw_scrollview);
-
-        Intent intent = getIntent();
-        currentWizardPage = intent.getIntExtra(SetupWizardActivity.INTENT_MESSAGE, 0);
-        if (screens.size() > 0 && currentWizardPage < screens.size()) {
-            SWScreen currentScreen = screens.get(currentWizardPage);
-
-            //Set screen name
-            TextView screenName = findViewById(R.id.sw_content);
-            screenName.setText(currentScreen.getHeader());
-
-            swDefinition.setActivity(this);
-            //Generate layout first
-            generateLayout();
-            updateButtons();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        swDefinition.setActivity(this);
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPumpStatusChanged.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateButtons(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventNSClientStatus.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateButtons(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventProfileNeedsUpdate.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateButtons(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventProfileStoreChanged.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateButtons(), FabricPrivacy::logException)
-        );
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventSWUpdate.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> {
-                    if (event.getRedraw()) generateLayout();
-                    updateButtons();
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    private void generateLayout() {
-        SWScreen currentScreen = screens.get(currentWizardPage);
-        LinearLayout layout = SWItem.generateLayout(this.findViewById(R.id.sw_content_fields));
-        for (int i = 0; i < currentScreen.items.size(); i++) {
-            SWItem currentItem = currentScreen.items.get(i);
-            currentItem.generateDialog(layout);
-        }
-        scrollView.smoothScrollTo(0, 0);
-    }
-
-    private void updateButtons() {
-        runOnUiThread(() -> {
-            SWScreen currentScreen = screens.get(currentWizardPage);
-            if (currentScreen.validator == null || currentScreen.validator.isValid() || currentScreen.skippable) {
-                if (currentWizardPage == nextPage()) {
-                    findViewById(R.id.finish_button).setVisibility(View.VISIBLE);
-                    findViewById(R.id.next_button).setVisibility(View.GONE);
-                } else {
-                    findViewById(R.id.finish_button).setVisibility(View.GONE);
-                    findViewById(R.id.next_button).setVisibility(View.VISIBLE);
-                }
-            } else {
-                findViewById(R.id.finish_button).setVisibility(View.GONE);
-                findViewById(R.id.next_button).setVisibility(View.GONE);
-            }
-            if (currentWizardPage == 0)
-                findViewById(R.id.previous_button).setVisibility(View.GONE);
-            else
-                findViewById(R.id.previous_button).setVisibility(View.VISIBLE);
-            currentScreen.processVisibility();
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (currentWizardPage == 0)
-            OKDialog.showConfirmation(this, MainApp.gs(R.string.exitwizard), this::finish);
-        else showPreviousPage(null);
-    }
-
-    public void exitPressed(View view) {
-        SP.putBoolean(R.string.key_setupwizard_processed, true);
-        OKDialog.showConfirmation(this, MainApp.gs(R.string.exitwizard), this::finish);
-    }
-
-    public void showNextPage(View view) {
-        this.finish();
-        Intent intent = new Intent(this, SetupWizardActivity.class);
-        intent.putExtra(INTENT_MESSAGE, nextPage());
-        startActivity(intent);
-    }
-
-    public void showPreviousPage(View view) {
-        this.finish();
-        Intent intent = new Intent(this, SetupWizardActivity.class);
-        intent.putExtra(INTENT_MESSAGE, previousPage());
-        startActivity(intent);
-    }
-
-    // Go back to overview
-    public void finishSetupWizard(View view) {
-        SP.putBoolean(R.string.key_setupwizard_processed, true);
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        startActivity(intent);
-        finish();
-    }
-
-    private int nextPage() {
-        int page = currentWizardPage + 1;
-        while (page < screens.size()) {
-            if (screens.get(page).visibility == null || screens.get(page).visibility.isValid())
-                return page;
-            page++;
-        }
-        return Math.min(currentWizardPage, screens.size() - 1);
-    }
-
-    private int previousPage() {
-        int page = currentWizardPage - 1;
-        while (page >= 0) {
-            if (screens.get(page).visibility == null || screens.get(page).visibility.isValid())
-                return page;
-            page--;
-        }
-        return Math.max(currentWizardPage, 0);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (permissions.length != 0) {
-            if (ActivityCompat.checkSelfPermission(this, permissions[0]) == PackageManager.PERMISSION_GRANTED) {
-                switch (requestCode) {
-                    case AndroidPermission.CASE_STORAGE:
-                        //show dialog after permission is granted
-                        OKDialog.show(this, MainApp.gs(R.string.permission), MainApp.gs(R.string.alert_dialog_storage_permission_text));
-                        break;
-                    case AndroidPermission.CASE_LOCATION:
-                    case AndroidPermission.CASE_SMS:
-                    case AndroidPermission.CASE_BATTERY:
-                        break;
-                }
-            }
-        }
-        updateButtons();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == AndroidPermission.CASE_BATTERY)
-            updateButtons();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
new file mode 100644
index 0000000000..44db626b65
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -0,0 +1,215 @@
+package info.nightscout.androidaps.setupwizard
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.core.app.ActivityCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainActivity
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.events.EventProfileNeedsUpdate
+import info.nightscout.androidaps.events.EventProfileStoreChanged
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.setupwizard.elements.SWItem
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import info.nightscout.androidaps.utils.AndroidPermission
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.LocaleHelper.update
+import info.nightscout.androidaps.utils.OKDialog.show
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.activity_setupwizard.*
+import javax.inject.Inject
+import kotlin.math.max
+import kotlin.math.min
+
+class SetupWizardActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+    @Inject lateinit var swDefinition: SWDefinition
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
+    private val disposable = CompositeDisposable()
+    private lateinit var screens: List<SWScreen>
+    private var currentWizardPage = 0
+
+    private val intentMessage = "WIZZARDPAGE"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        update(applicationContext)
+        setContentView(R.layout.activity_setupwizard)
+        screens = swDefinition.getScreens()
+        val intent = intent
+        currentWizardPage = intent.getIntExtra(intentMessage, 0)
+        if (screens.isNotEmpty() && currentWizardPage < screens.size) {
+            val currentScreen = screens[currentWizardPage]
+
+            //Set screen name
+            val screenName = findViewById<TextView>(R.id.sw_content)
+            screenName.text = currentScreen.getHeader()
+            swDefinition.activity = this
+            //Generate layout first
+            generateLayout()
+            updateButtons()
+        }
+    }
+
+    public override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        swDefinition.activity = this
+        disposable.add(rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventNSClientStatus::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventProfileNeedsUpdate::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventProfileStoreChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventSWUpdate::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ event: EventSWUpdate ->
+                if (event.redraw) generateLayout()
+                updateButtons()
+            }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    private fun generateLayout() {
+        val currentScreen = screens[currentWizardPage]
+        val layout = SWItem(injector, SWItem.Type.NONE).generateLayout(findViewById(R.id.sw_content_fields))
+        for (i in currentScreen.items.indices) {
+            val currentItem = currentScreen.items[i]
+            currentItem.generateDialog(layout)
+        }
+        sw_scrollview?.smoothScrollTo(0, 0)
+    }
+
+    private fun updateButtons() {
+        runOnUiThread {
+            val currentScreen = screens[currentWizardPage]
+            if (currentScreen.validator == null || currentScreen.validator!!.isValid || currentScreen.skippable) {
+                if (currentWizardPage == nextPage(null)) {
+                    findViewById<View>(R.id.finish_button).visibility = View.VISIBLE
+                    findViewById<View>(R.id.next_button).visibility = View.GONE
+                } else {
+                    findViewById<View>(R.id.finish_button).visibility = View.GONE
+                    findViewById<View>(R.id.next_button).visibility = View.VISIBLE
+                }
+            } else {
+                findViewById<View>(R.id.finish_button).visibility = View.GONE
+                findViewById<View>(R.id.next_button).visibility = View.GONE
+            }
+            if (currentWizardPage == 0) findViewById<View>(R.id.previous_button).visibility = View.GONE else findViewById<View>(R.id.previous_button).visibility = View.VISIBLE
+            currentScreen.processVisibility()
+        }
+    }
+
+    override fun onBackPressed() {
+        if (currentWizardPage == 0) showConfirmation(this, resourceHelper.gs(R.string.exitwizard), Runnable { finish() }) else showPreviousPage(null)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun exitPressed(view: View?) {
+        sp.putBoolean(R.string.key_setupwizard_processed, true)
+        showConfirmation(this, resourceHelper.gs(R.string.exitwizard), Runnable { finish() })
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun showNextPage(view: View?) {
+        finish()
+        val intent = Intent(this, SetupWizardActivity::class.java)
+        intent.putExtra(intentMessage, nextPage(null))
+        startActivity(intent)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun showPreviousPage(view: View?) {
+        finish()
+        val intent = Intent(this, SetupWizardActivity::class.java)
+        intent.putExtra(intentMessage, previousPage(null))
+        startActivity(intent)
+    }
+
+    // Go back to overview
+    @Suppress("UNUSED_PARAMETER")
+    fun finishSetupWizard(view: View?) {
+        sp.putBoolean(R.string.key_setupwizard_processed, true)
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        startActivity(intent)
+        finish()
+    }
+
+    @Suppress("UNUSED_PARAMETER","SameParameterValue")
+    private fun nextPage(view: View?): Int {
+        var page = currentWizardPage + 1
+        while (page < screens.size) {
+            if (screens[page].visibility == null || screens[page].visibility!!.isValid) return page
+            page++
+        }
+        return min(currentWizardPage, screens.size - 1)
+    }
+
+    @Suppress("UNUSED_PARAMETER","SameParameterValue")
+    private fun previousPage(view: View?): Int {
+        var page = currentWizardPage - 1
+        while (page >= 0) {
+            if (screens[page].visibility == null || screens[page].visibility!!.isValid) return page
+            page--
+        }
+        return max(currentWizardPage, 0)
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (permissions.isNotEmpty()) {
+            if (ActivityCompat.checkSelfPermission(this, permissions[0]) == PackageManager.PERMISSION_GRANTED) {
+                when (requestCode) {
+                    AndroidPermission.CASE_STORAGE                                                              ->                         //show dialog after permission is granted
+                        show(this, resourceHelper.gs(R.string.permission), resourceHelper.gs(R.string.alert_dialog_storage_permission_text))
+
+                    AndroidPermission.CASE_LOCATION, AndroidPermission.CASE_SMS, AndroidPermission.CASE_BATTERY -> {
+                    }
+                }
+            }
+        }
+        updateButtons()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == AndroidPermission.CASE_BATTERY) updateButtons()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
deleted file mode 100644
index c6a9cf3f86..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWValidator;
-
-
-public class SWBreak extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWBreak.class);
-
-    private TextView l;
-    private SWValidator visibilityValidator;
-
-    public SWBreak() {
-        super(Type.TEXT);
-    }
-
-    public SWBreak visibility(SWValidator visibilityValidator) {
-        this.visibilityValidator = visibilityValidator;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        l = new TextView(context);
-        l.setId(View.generateViewId());
-        l.setText("\n");
-        layout.addView(l);
-
-    }
-
-    @Override
-    public void processVisibility() {
-        if (visibilityValidator != null && !visibilityValidator.isValid())
-            l.setVisibility(View.GONE);
-        else
-            l.setVisibility(View.VISIBLE);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.kt
new file mode 100644
index 0000000000..775d5b72d0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWValidator
+
+class SWBreak(injector: HasAndroidInjector) : SWItem(injector, Type.TEXT) {
+    private var l: TextView? = null
+    private var visibilityValidator: SWValidator? = null
+
+    fun visibility(visibilityValidator: SWValidator): SWBreak {
+        this.visibilityValidator = visibilityValidator
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        layout.context
+        l = TextView(layout.context)
+        l?.id = View.generateViewId()
+        l?.text = "\n"
+        layout.addView(l)
+    }
+
+    override fun processVisibility() {
+        if (visibilityValidator != null && !visibilityValidator!!.isValid)
+            l?.visibility = View.GONE
+        else l?.visibility = View.VISIBLE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
deleted file mode 100644
index afa28c1803..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWValidator;
-
-public class SWButton extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWButton.class);
-
-    private Runnable buttonRunnable;
-    private int buttonText;
-    private SWValidator buttonValidator;
-
-    private Button button;
-
-    public SWButton() {
-        super(Type.BUTTON);
-    }
-
-    public SWButton text(int buttonText) {
-        this.buttonText = buttonText;
-        return this;
-    }
-
-    public SWButton action(Runnable buttonRunnable) {
-        this.buttonRunnable = buttonRunnable;
-        return this;
-    }
-
-    public SWButton visibility(SWValidator buttonValidator) {
-        this.buttonValidator = buttonValidator;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        button = new Button(context);
-        button.setText(buttonText);
-        button.setOnClickListener((v) -> {
-            if (buttonRunnable != null)
-                buttonRunnable.run();
-        });
-        processVisibility();
-        layout.addView(button);
-        super.generateDialog(layout);
-    }
-
-    @Override
-    public void processVisibility() {
-        if (buttonValidator != null && !buttonValidator.isValid())
-            button.setVisibility(View.GONE);
-        else
-            button.setVisibility(View.VISIBLE);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.kt
new file mode 100644
index 0000000000..cb8bb567b4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.widget.Button
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWValidator
+
+class SWButton(injector: HasAndroidInjector) : SWItem(injector, Type.BUTTON) {
+    private var buttonRunnable: Runnable? = null
+    private var buttonText = 0
+    private var buttonValidator: SWValidator? = null
+    private var button: Button? = null
+
+    fun text(buttonText: Int): SWButton {
+        this.buttonText = buttonText
+        return this
+    }
+
+    fun action(buttonRunnable: Runnable): SWButton {
+        this.buttonRunnable = buttonRunnable
+        return this
+    }
+
+    fun visibility(buttonValidator: SWValidator): SWButton {
+        this.buttonValidator = buttonValidator
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        button = Button(context)
+        button?.setText(buttonText)
+        button?.setOnClickListener { buttonRunnable?.run() }
+        processVisibility()
+        layout.addView(button)
+        super.generateDialog(layout)
+    }
+
+    override fun processVisibility() {
+        if (buttonValidator != null && !buttonValidator!!.isValid)
+            button!!.visibility = View.GONE
+        else button!!.visibility = View.VISIBLE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
deleted file mode 100644
index d8194cbfc0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.CheckBox;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 5/9/2018.
- */
-
-public class SWCheckbox extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWCheckbox.class);
-
-    int labelsArray;
-    int valuesArray;
-    String label = "";
-    int preferenceID;
-    private CheckBox checkBox;
-
-    public SWCheckbox() {
-        super(Type.CHECKBOX);
-    }
-
-    public SWCheckbox option(String label, int preferenceID) {
-        this.label = label;
-        this.preferenceID = preferenceID;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-        // Get if there is already value in SP
-        Boolean previousValue;
-        previousValue = SP.getBoolean(preferenceId, false);
-        checkBox = new CheckBox(context);
-        checkBox.setText(label);
-        checkBox.setChecked(previousValue);
-        checkBox.setVisibility(View.VISIBLE);
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                ArrayList<PluginBase> pluginsInCategory;
-                pluginsInCategory = MainApp.getSpecificPluginsList(PluginType.PUMP);
-                PluginBase found = null;
-                for (PluginBase p : pluginsInCategory) {
-                    if (p.isEnabled(PluginType.PUMP) && found == null) {
-                        found = p;
-                    } else if (p.isEnabled(PluginType.PUMP)) {
-                        // set others disabled
-                        p.setPluginEnabled(PluginType.PUMP, false);
-                    }
-                }
-                log.debug("Enabled pump plugin:"+found.getClass());
-                save(checkBox.isChecked());
-            }
-        });
-        layout.addView(checkBox);
-        super.generateDialog(layout);
-    }
-    public void save(boolean value){
-        SP.putBoolean(preferenceID, value);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.java
deleted file mode 100644
index 6816b6fa1f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.text.DecimalFormat;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.setupwizard.SWNumberValidator;
-import info.nightscout.androidaps.utils.NumberPicker;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SafeParse;
-
-
-public class SWEditNumberWithUnits extends SWItem {
-
-    private SWNumberValidator validator = new SWNumberValidator() {
-        @Override
-        public boolean isValid(double value) {
-            return value >= min && value <= max;
-        }
-    };
-    private int updateDelay = 0;
-    private double init, min, max;
-
-    public SWEditNumberWithUnits(double defaultMMOL, double minMMOL, double maxMMOL) {
-        super(Type.UNITNUMBER);
-        init = defaultMMOL;
-        min = minMMOL;
-        max = maxMMOL;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        TextWatcher watcher = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (validator != null && validator.isValid(SafeParse.stringToDouble(s.toString())))
-                    save(s.toString(), updateDelay);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        };
-
-        TextView l = new TextView(context);
-        l.setId(View.generateViewId());
-        l.setText(label);
-        l.setTypeface(l.getTypeface(), Typeface.BOLD);
-        layout.addView(l);
-
-        double initValue = SP.getDouble(preferenceId, init);
-        initValue = Profile.toCurrentUnits(initValue);
-
-        NumberPicker numberPicker = new NumberPicker(context);
-        if (ProfileFunctions.getSystemUnits().equals(Constants.MMOL))
-            numberPicker.setParams(initValue, min, max, 0.1d, new DecimalFormat("0.0"), false, null, watcher);
-        else
-            numberPicker.setParams(initValue, min * 18, max * 18, 1d, new DecimalFormat("0"), false, null, watcher);
-
-//        LinearLayout.LayoutParams ll = (LinearLayout.LayoutParams) numberPicker.getLayoutParams();
-//        ll.gravity = Gravity.CENTER;
-//        numberPicker.setLayoutParams(ll);
-        layout.addView(numberPicker);
-
-        TextView c = new TextView(context);
-        c.setId(View.generateViewId());
-        c.setText(comment);
-        c.setTypeface(c.getTypeface(), Typeface.ITALIC);
-        layout.addView(c);
-
-        super.generateDialog(layout);
-    }
-
-    public SWEditNumberWithUnits preferenceId(int preferenceId) {
-        this.preferenceId = preferenceId;
-        return this;
-    }
-
-    public SWEditNumberWithUnits updateDelay(int updateDelay) {
-        this.updateDelay = updateDelay;
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
new file mode 100644
index 0000000000..80ed784fff
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
@@ -0,0 +1,67 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.graphics.Typeface
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.setupwizard.SWNumberValidator
+import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.SafeParse
+import java.text.DecimalFormat
+import javax.inject.Inject
+
+class SWEditNumberWithUnits(injector: HasAndroidInjector, private val init: Double, private val min: Double, private val max: Double) : SWItem(injector, Type.UNITNUMBER) {
+
+    @Inject lateinit var profileFunction: ProfileFunction
+
+    private val validator: SWNumberValidator? = SWNumberValidator { value -> value >= min && value <= max }
+    private var updateDelay = 0
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        val watcher: TextWatcher = object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                if (validator != null && validator.isValid(SafeParse.stringToDouble(s.toString())))
+                    save(s.toString(), updateDelay.toLong())
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        }
+
+        val l = TextView(context)
+        l.id = View.generateViewId()
+        label?.let { l.setText(it) }
+        l.setTypeface(l.typeface, Typeface.BOLD)
+        layout.addView(l)
+        var initValue = sp.getDouble(preferenceId, init)
+        initValue = Profile.toCurrentUnits(profileFunction.getUnits(), initValue)
+        val numberPicker = NumberPicker(context)
+        if (profileFunction.getUnits() == Constants.MMOL) numberPicker.setParams(initValue, min, max, 0.1, DecimalFormat("0.0"), false, null, watcher) else numberPicker.setParams(initValue, min * 18, max * 18, 1.0, DecimalFormat("0"), false, null, watcher)
+
+        layout.addView(numberPicker)
+        val c = TextView(context)
+        c.id = View.generateViewId()
+        comment?.let { c.setText(it) }
+        c.setTypeface(c.typeface, Typeface.ITALIC)
+        layout.addView(c)
+        super.generateDialog(layout)
+    }
+
+    fun preferenceId(preferenceId: Int): SWEditNumberWithUnits {
+        this.preferenceId = preferenceId
+        return this
+    }
+
+    fun updateDelay(updateDelay: Int): SWEditNumberWithUnits {
+        this.updateDelay = updateDelay
+        return this
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
deleted file mode 100644
index b16164c064..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWTextValidator;
-import info.nightscout.androidaps.utils.SP;
-
-
-public class SWEditString extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWEditString.class);
-
-    private SWTextValidator validator = null;
-    private int updateDelay = 0;
-
-    public SWEditString() {
-        super(Type.STRING);
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        TextView l = new TextView(context);
-        l.setId(View.generateViewId());
-        l.setText(label);
-        l.setTypeface(l.getTypeface(), Typeface.BOLD);
-        layout.addView(l);
-
-        TextView c = new TextView(context);
-        c.setId(View.generateViewId());
-        c.setText(comment);
-        c.setTypeface(c.getTypeface(), Typeface.ITALIC);
-        layout.addView(c);
-
-        EditText editText = new EditText(context);
-        editText.setId(View.generateViewId());
-        editText.setInputType(InputType.TYPE_CLASS_TEXT);
-        editText.setMaxLines(1);
-        editText.setText(SP.getString(preferenceId, ""));
-        layout.addView(editText);
-        super.generateDialog(layout);
-
-        editText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (validator != null && validator.isValid(s.toString()))
-                    save(s.toString(), updateDelay);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-    }
-
-    public SWEditString preferenceId(int preferenceId) {
-        this.preferenceId = preferenceId;
-        return this;
-    }
-
-    public SWEditString validator(SWTextValidator validator) {
-        this.validator = validator;
-        return this;
-    }
-
-    public SWEditString updateDelay(int updateDelay) {
-        this.updateDelay = updateDelay;
-        return this;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.kt
new file mode 100644
index 0000000000..ccd48a9e1f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.graphics.Typeface
+import android.text.Editable
+import android.text.InputType
+import android.text.TextWatcher
+import android.view.View
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWTextValidator
+
+class SWEditString(injector: HasAndroidInjector) : SWItem(injector, Type.STRING) {
+
+    private var validator: SWTextValidator? = null
+    private var updateDelay = 0L
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        val l = TextView(context)
+        l.id = View.generateViewId()
+        label?.let { l.setText(it) }
+        l.setTypeface(l.typeface, Typeface.BOLD)
+        layout.addView(l)
+        val c = TextView(context)
+        c.id = View.generateViewId()
+        comment?.let { c.setText(it) }
+        c.setTypeface(c.typeface, Typeface.ITALIC)
+        layout.addView(c)
+        val editText = EditText(context)
+        editText.id = View.generateViewId()
+        editText.inputType = InputType.TYPE_CLASS_TEXT
+        editText.maxLines = 1
+        editText.setText(sp.getString(preferenceId, ""))
+        layout.addView(editText)
+        super.generateDialog(layout)
+        editText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                if (validator != null && validator!!.isValid(s.toString())) save(s.toString(), updateDelay)
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        })
+    }
+
+    fun preferenceId(preferenceId: Int): SWEditString {
+        this.preferenceId = preferenceId
+        return this
+    }
+
+    fun validator(validator: SWTextValidator): SWEditString {
+        this.validator = validator
+        return this
+    }
+
+    fun updateDelay(updateDelay: Long): SWEditString {
+        this.updateDelay = updateDelay
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
deleted file mode 100644
index f35decbf53..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.util.Patterns;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
-import info.nightscout.androidaps.utils.SP;
-
-public class SWEditUrl extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWEditUrl.class);
-
-    private int updateDelay = 0;
-
-    public SWEditUrl() {
-        super(Type.URL);
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        TextView l = new TextView(context);
-        l.setId(View.generateViewId());
-        l.setText(label);
-        l.setTypeface(l.getTypeface(), Typeface.BOLD);
-        layout.addView(l);
-
-        TextView c = new TextView(context);
-        c.setId(View.generateViewId());
-        c.setText(comment);
-        c.setTypeface(c.getTypeface(), Typeface.ITALIC);
-        layout.addView(c);
-
-        EditText editText = new EditText(context);
-        editText.setId(View.generateViewId());
-        editText.setInputType(InputType.TYPE_CLASS_TEXT);
-        editText.setMaxLines(1);
-        editText.setText(SP.getString(preferenceId, ""));
-        layout.addView(editText);
-        super.generateDialog(layout);
-
-        editText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (Patterns.WEB_URL.matcher(s).matches())
-                    save(s.toString(), updateDelay);
-                else
-                    RxBus.INSTANCE.send(new EventSWLabel(MainApp.gs(R.string.error_url_not_valid)));
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-    }
-
-    public SWEditUrl preferenceId(int preferenceId) {
-        this.preferenceId = preferenceId;
-        return this;
-    }
-
-    public SWEditUrl updateDelay(int updateDelay) {
-        this.updateDelay = updateDelay;
-        return this;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt
new file mode 100644
index 0000000000..cc9f38ff43
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt
@@ -0,0 +1,57 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.graphics.Typeface
+import android.text.Editable
+import android.text.InputType
+import android.text.TextWatcher
+import android.util.Patterns
+import android.view.View
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.setupwizard.events.EventSWLabel
+
+class SWEditUrl(injector: HasAndroidInjector) : SWItem(injector, Type.URL) {
+    private var updateDelay = 0L
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        val l = TextView(context)
+        l.id = View.generateViewId()
+        label?.let { l.setText(it) }
+        l.setTypeface(l.typeface, Typeface.BOLD)
+        layout.addView(l)
+        val c = TextView(context)
+        c.id = View.generateViewId()
+        comment?.let { c.setText(it) }
+        c.setTypeface(c.typeface, Typeface.ITALIC)
+        layout.addView(c)
+        val editText = EditText(context)
+        editText.id = View.generateViewId()
+        editText.inputType = InputType.TYPE_CLASS_TEXT
+        editText.maxLines = 1
+        editText.setText(sp.getString(preferenceId, ""))
+        layout.addView(editText)
+        super.generateDialog(layout)
+        editText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                if (Patterns.WEB_URL.matcher(s).matches()) save(s.toString(), updateDelay.toLong()) else rxBus.send(EventSWLabel(resourceHelper.gs(R.string.error_url_not_valid)))
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        })
+    }
+
+    fun preferenceId(preferenceId: Int): SWEditUrl {
+        this.preferenceId = preferenceId
+        return this
+    }
+
+    fun updateDelay(updateDelay: Long): SWEditUrl {
+        this.updateDelay = updateDelay
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
deleted file mode 100644
index 29149e5b81..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import androidx.fragment.app.Fragment;
-
-import android.widget.LinearLayout;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWDefinition;
-
-
-public class SWFragment extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWFragment.class);
-
-    SWDefinition definition;
-    Fragment fragment;
-
-    public SWFragment(SWDefinition definition) {
-        super(Type.FRAGMENT);
-        this.definition = definition;
-    }
-
-    public SWFragment add(Fragment fragment) {
-        this.fragment = fragment;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        definition.getActivity().getSupportFragmentManager().beginTransaction().add(layout.getId(), fragment, fragment.getTag()).commit();
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.kt
new file mode 100644
index 0000000000..d90890f068
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.widget.LinearLayout
+import androidx.fragment.app.Fragment
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWDefinition
+
+class SWFragment(injector:HasAndroidInjector, private var definition: SWDefinition) : SWItem(injector, Type.FRAGMENT) {
+    lateinit var fragment: Fragment
+
+    fun add(fragment: Fragment): SWFragment {
+        this.fragment = fragment
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        definition.activity.supportFragmentManager.beginTransaction().add(layout.id, fragment, fragment.tag).commit()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
deleted file mode 100644
index fd4ffdd524..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.text.util.Linkify;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWValidator;
-
-
-public class SWHtmlLink extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWHtmlLink.class);
-    private String textLabel = null;
-
-    private TextView l;
-    private SWValidator visibilityValidator;
-
-    public SWHtmlLink() {
-        super(Type.HTMLLINK);
-    }
-
-    public SWHtmlLink label(int label) {
-        this.label = label;
-        return this;
-    }
-
-    public SWHtmlLink label(String newLabel){
-        this.textLabel = newLabel;
-        return this;
-    }
-
-    public SWHtmlLink visibility(SWValidator visibilityValidator) {
-        this.visibilityValidator = visibilityValidator;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        l = new TextView(context);
-        l.setId(View.generateViewId());
-        l.setAutoLinkMask(Linkify.ALL);
-        if(textLabel != null)
-            l.setText(textLabel);
-        else
-            l.setText(label);
-        layout.addView(l);
-
-    }
-
-    @Override
-    public void processVisibility() {
-        if (visibilityValidator != null && !visibilityValidator.isValid())
-            l.setVisibility(View.GONE);
-        else
-            l.setVisibility(View.VISIBLE);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.kt
new file mode 100644
index 0000000000..fe5b34241e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.text.util.Linkify
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWValidator
+
+class SWHtmlLink(injector: HasAndroidInjector) : SWItem(injector, Type.HTMLLINK) {
+
+    private var textLabel: String? = null
+    private var l: TextView? = null
+    private var visibilityValidator: SWValidator? = null
+
+    override fun label(@StringRes label: Int): SWHtmlLink {
+        this.label = label
+        return this
+    }
+
+    fun label(newLabel: String): SWHtmlLink {
+        textLabel = newLabel
+        return this
+    }
+
+    fun visibility(visibilityValidator: SWValidator): SWHtmlLink {
+        this.visibilityValidator = visibilityValidator
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        l = TextView(context)
+        l?.id = View.generateViewId()
+        l?.autoLinkMask = Linkify.ALL
+        if (textLabel != null) l?.text = textLabel else l?.setText(label!!)
+        layout.addView(l)
+    }
+
+    override fun processVisibility() {
+        if (visibilityValidator != null && !visibilityValidator!!.isValid) l?.visibility = View.GONE else l?.visibility = View.VISIBLE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
deleted file mode 100644
index 91e5c2da2d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.setupwizard.SWValidator;
-
-
-public class SWInfotext extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWInfotext.class);
-    private String textLabel = null;
-
-    private TextView l;
-    private SWValidator visibilityValidator;
-
-    public SWInfotext() {
-        super(Type.TEXT);
-    }
-
-    public SWInfotext label(int label) {
-        this.label = label;
-        return this;
-    }
-
-    public SWInfotext label(String newLabel){
-        this.textLabel = newLabel;
-        return this;
-    }
-
-    public SWInfotext visibility(SWValidator visibilityValidator) {
-        this.visibilityValidator = visibilityValidator;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        l = new TextView(context);
-        l.setId(View.generateViewId());
-        if(textLabel != null)
-            l.setText(textLabel);
-        else
-            l.setText(label);
-        layout.addView(l);
-
-    }
-
-    @Override
-    public void processVisibility() {
-        if (visibilityValidator != null && !visibilityValidator.isValid())
-            l.setVisibility(View.GONE);
-        else
-            l.setVisibility(View.VISIBLE);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.kt
new file mode 100644
index 0000000000..ca9b3b829f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWValidator
+
+class SWInfotext(injector: HasAndroidInjector) : SWItem(injector, Type.TEXT) {
+    private var textLabel: String? = null
+    private var l: TextView? = null
+    private var visibilityValidator: SWValidator? = null
+
+    override fun label(label: Int): SWInfotext {
+        this.label = label
+        return this
+    }
+
+    fun label(newLabel: String): SWInfotext {
+        textLabel = newLabel
+        return this
+    }
+
+    fun visibility(visibilityValidator: SWValidator): SWInfotext {
+        this.visibilityValidator = visibilityValidator
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        l = TextView(context)
+        l?.id = View.generateViewId()
+        if (textLabel != null) l?.text = textLabel else l?.setText(label!!)
+        layout.addView(l)
+    }
+
+    override fun processVisibility() {
+        if (visibilityValidator != null && !visibilityValidator!!.isValid) l?.visibility = View.GONE else l?.visibility = View.VISIBLE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
deleted file mode 100644
index 734b204ff3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.annotation.StringRes;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.androidaps.utils.SP;
-
-public class SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWItem.class);
-
-    private static final ScheduledExecutorService eventWorker = Executors.newSingleThreadScheduledExecutor();
-    private static ScheduledFuture<?> scheduledEventPost = null;
-
-    public enum Type {
-        NONE,
-        TEXT,
-        HTMLLINK,
-        BREAK,
-        LISTENER,
-        URL,
-        STRING,
-        NUMBER,
-        DECIMALNUMBER,
-        CHECKBOX,
-        RADIOBUTTON,
-        PLUGIN,
-        BUTTON,
-        FRAGMENT,
-        UNITNUMBER
-    }
-
-    Type type;
-    Integer label;
-    Integer comment;
-    int preferenceId;
-
-
-    public SWItem(Type type) {
-        this.type = type;
-    }
-
-    String getLabel() {
-        return MainApp.gs(label);
-    }
-
-    String getComment() {
-        if (comment != null)
-            return MainApp.gs(comment);
-        else
-            return "";
-    }
-
-    Type getType() {
-        return type;
-    }
-
-    public SWItem label(@StringRes int label) {
-        this.label = label;
-        return this;
-    }
-
-    public SWItem comment(@StringRes int comment) {
-        this.comment = comment;
-        return this;
-    }
-
-    public void save(String value, int updateDelay) {
-        SP.putString(preferenceId, value);
-        scheduleChange(updateDelay);
-    }
-
-    public static LinearLayout generateLayout(View view) {
-        LinearLayout layout = (LinearLayout) view;
-        layout.removeAllViews();
-        return layout;
-    }
-
-    public void generateDialog(LinearLayout layout) {
-    }
-
-    public void processVisibility() {
-    }
-
-    private void scheduleChange(int updateDelay) {
-        class PostRunnable implements Runnable {
-            public void run() {
-                if (L.isEnabled(L.CORE))
-                    log.debug("Firing EventPreferenceChange");
-                RxBus.INSTANCE.send(new EventPreferenceChange(preferenceId));
-                RxBus.INSTANCE.send(new EventSWUpdate(false));
-                scheduledEventPost = null;
-            }
-        }
-        // cancel waiting task to prevent sending multiple posts
-        if (scheduledEventPost != null)
-            scheduledEventPost.cancel(false);
-        Runnable task = new PostRunnable();
-        final int sec = updateDelay;
-        scheduledEventPost = eventWorker.schedule(task, sec, TimeUnit.SECONDS);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
new file mode 100644
index 0000000000..374c981a8f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
@@ -0,0 +1,86 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.widget.LinearLayout
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+open class SWItem(val injector: HasAndroidInjector, var type: Type) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: info.nightscout.androidaps.utils.sharedPreferences.SP
+
+    private val eventWorker = Executors.newSingleThreadScheduledExecutor()
+    private var scheduledEventPost: ScheduledFuture<*>? = null
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    enum class Type {
+        NONE, TEXT, HTMLLINK, BREAK, LISTENER, URL, STRING, NUMBER, DECIMALNUMBER, CHECKBOX, RADIOBUTTON, PLUGIN, BUTTON, FRAGMENT, UNITNUMBER
+    }
+
+    var label: Int? = null
+    var comment: Int? = null
+    var preferenceId = 0
+
+    fun getLabel(): String {
+        return label?.let { resourceHelper.gs(it) } ?: ""
+    }
+
+    fun getComment(): String {
+        return comment?.let { resourceHelper.gs(it) } ?: ""
+    }
+
+    open fun label(@StringRes label: Int): SWItem {
+        this.label = label
+        return this
+    }
+
+    fun comment(@StringRes comment: Int): SWItem {
+        this.comment = comment
+        return this
+    }
+
+    fun save(value: String, updateDelay: Long) {
+        sp.putString(preferenceId, value)
+        scheduleChange(updateDelay)
+    }
+
+    fun generateLayout(view: View): LinearLayout {
+        val layout = view as LinearLayout
+        layout.removeAllViews()
+        return layout
+    }
+
+    open fun generateDialog(layout: LinearLayout) {}
+    open fun processVisibility() {}
+
+    private fun scheduleChange(updateDelay: Long) {
+        class PostRunnable : Runnable {
+            override fun run() {
+                aapsLogger.debug(LTag.CORE, "Firing EventPreferenceChange")
+                rxBus.send(EventPreferenceChange(resourceHelper, preferenceId))
+                rxBus.send(EventSWUpdate(false))
+                scheduledEventPost = null
+            }
+        }
+        // cancel waiting task to prevent sending multiple posts
+        scheduledEventPost?.cancel(false)
+        val task: Runnable = PostRunnable()
+        scheduledEventPost = eventWorker.schedule(task, updateDelay, TimeUnit.SECONDS)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
deleted file mode 100644
index e5dde501bc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-
-public class SWPlugin extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWPlugin.class);
-
-    private PluginType pType;
-    private RadioGroup radioGroup;
-    private int pluginDescription;
-
-    private boolean makeVisible = true;
-
-    public SWPlugin() {
-        super(Type.PLUGIN);
-    }
-
-    public SWPlugin option(PluginType pType, int pluginDescription) {
-        this.pType = pType;
-        this.pluginDescription = pluginDescription;
-        return this;
-    }
-
-    public SWPlugin makeVisible(boolean makeVisible) {
-        this.makeVisible = makeVisible;
-        return this;
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-
-        Context context = layout.getContext();
-        radioGroup = new RadioGroup(context);
-        radioGroup.clearCheck();
-
-        ArrayList<PluginBase> pluginsInCategory = MainApp.getSpecificPluginsList(pType);
-
-        radioGroup.setOrientation(LinearLayout.VERTICAL);
-        radioGroup.setVisibility(View.VISIBLE);
-
-        TextView pdesc = new TextView(context);
-        pdesc.setText(pluginDescription);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, 0, 0, 40);
-        pdesc.setLayoutParams(params);
-        layout.addView(pdesc);
-
-        for (int i = 0; i < pluginsInCategory.size(); i++) {
-            RadioButton rdbtn = new RadioButton(context);
-            PluginBase p = pluginsInCategory.get(i);
-            rdbtn.setId(View.generateViewId());
-            rdbtn.setText(p.getName());
-            if (p.isEnabled(pType))
-                rdbtn.setChecked(true);
-            rdbtn.setTag(p);
-            radioGroup.addView(rdbtn);
-            params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.setMargins(80, 0, 0, 0);
-            TextView desc = new TextView(context);
-            desc.setText(p.getDescription());
-            desc.setLayoutParams(params);
-            radioGroup.addView(desc);
-        }
-
-        radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
-            RadioButton rb = group.findViewById(checkedId);
-            PluginBase plugin = (PluginBase) rb.getTag();
-            plugin.setPluginEnabled(pType, rb.isChecked());
-            plugin.setFragmentVisible(pType, rb.isChecked() && makeVisible);
-            ConfigBuilderPlugin.getPlugin().processOnEnabledCategoryChanged(plugin, pType);
-            ConfigBuilderPlugin.getPlugin().storeSettings("SetupWizard");
-            RxBus.INSTANCE.send(new EventConfigBuilderChange());
-            RxBus.INSTANCE.send(new EventSWUpdate(false));
-        });
-        layout.addView(radioGroup);
-        super.generateDialog(layout);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
new file mode 100644
index 0000000000..5d8c1f0f93
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
@@ -0,0 +1,80 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RadioButton
+import android.widget.RadioGroup
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import javax.inject.Inject
+
+class SWPlugin(injector: HasAndroidInjector) : SWItem(injector, Type.PLUGIN) {
+
+    @Inject lateinit var pluginStore: PluginStore
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+
+    private var pType: PluginType? = null
+    private var radioGroup: RadioGroup? = null
+    private var pluginDescription = 0
+    private var makeVisible = true
+
+    fun option(pType: PluginType, pluginDescription: Int): SWPlugin {
+        this.pType = pType
+        this.pluginDescription = pluginDescription
+        return this
+    }
+
+    fun makeVisible(makeVisible: Boolean): SWPlugin {
+        this.makeVisible = makeVisible
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        radioGroup = RadioGroup(context)
+        radioGroup?.clearCheck()
+        val pluginsInCategory = pluginStore.getSpecificPluginsList(pType!!)
+        radioGroup?.orientation = LinearLayout.VERTICAL
+        radioGroup?.visibility = View.VISIBLE
+        val pdesc = TextView(context)
+        pdesc.setText(pluginDescription)
+        var params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        params.setMargins(0, 0, 0, 40)
+        pdesc.layoutParams = params
+        layout.addView(pdesc)
+        for (i in pluginsInCategory.indices) {
+            val rdbtn = RadioButton(context)
+            val p = pluginsInCategory[i]
+            rdbtn.id = View.generateViewId()
+            rdbtn.text = p.name
+            if (p.isEnabled(pType!!)) rdbtn.isChecked = true
+            rdbtn.tag = p
+            radioGroup?.addView(rdbtn)
+            params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            params.setMargins(80, 0, 0, 0)
+            val desc = TextView(context)
+            desc.text = p.description
+            desc.layoutParams = params
+            radioGroup?.addView(desc)
+        }
+        radioGroup?.setOnCheckedChangeListener { group: RadioGroup, checkedId: Int ->
+            val rb = group.findViewById<RadioButton>(checkedId)
+            val plugin = rb.tag as PluginBase
+            plugin.setPluginEnabled(pType!!, rb.isChecked)
+            plugin.setFragmentVisible(pType!!, rb.isChecked && makeVisible)
+            configBuilderPlugin.processOnEnabledCategoryChanged(plugin, pType)
+            configBuilderPlugin.storeSettings("SetupWizard")
+            rxBus.send(EventConfigBuilderChange())
+            rxBus.send(EventSWUpdate(false))
+        }
+        layout.addView(radioGroup)
+        super.generateDialog(layout)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
deleted file mode 100644
index 67ef9c19ae..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.setupwizard.elements;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.SP;
-
-public class SWRadioButton extends SWItem {
-    private static Logger log = LoggerFactory.getLogger(SWRadioButton.class);
-
-    int labelsArray;
-    int valuesArray;
-    private RadioGroup radioGroup;
-
-    public SWRadioButton() {
-        super(Type.RADIOBUTTON);
-    }
-
-    public SWRadioButton option(int labels, int values) {
-        this.labelsArray = labels;
-        this.valuesArray = values;
-        return this;
-    }
-
-    public String[] labels() {
-        return MainApp.sResources.getStringArray(labelsArray);
-    }
-
-    public String[] values() {
-        return MainApp.sResources.getStringArray(valuesArray);
-    }
-
-    @Override
-    public void generateDialog(LinearLayout layout) {
-        Context context = layout.getContext();
-
-        TextView pdesc = new TextView(context);
-        pdesc.setText(getComment());
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, 0, 0, 40);
-        pdesc.setLayoutParams(params);
-        layout.addView(pdesc);
-
-        // Get if there is already value in SP
-        String previousValue = SP.getString(preferenceId, "none");
-        radioGroup = new RadioGroup(context);
-        radioGroup.clearCheck();
-        radioGroup.setOrientation(LinearLayout.VERTICAL);
-        radioGroup.setVisibility(View.VISIBLE);
-
-        for (int i = 0; i < labels().length; i++) {
-            RadioButton rdbtn = new RadioButton(context);
-            rdbtn.setId(View.generateViewId());
-            rdbtn.setText(labels()[i]);
-            if (previousValue.equals(values()[i]))
-                rdbtn.setChecked(true);
-            rdbtn.setTag(i);
-            radioGroup.addView(rdbtn);
-        }
-
-        radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
-            int i = (int) group.findViewById(checkedId).getTag();
-            save(values()[i], 0);
-        });
-        layout.addView(radioGroup);
-
-        super.generateDialog(layout);
-    }
-
-    public SWRadioButton preferenceId(int preferenceId) {
-        this.preferenceId = preferenceId;
-        return this;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt
new file mode 100644
index 0000000000..7201c47342
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RadioButton
+import android.widget.RadioGroup
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+
+class SWRadioButton(injector: HasAndroidInjector) : SWItem(injector, Type.RADIOBUTTON) {
+    private var labelsArray = 0
+    private var valuesArray = 0
+    private var radioGroup: RadioGroup? = null
+
+    fun option(labels: Int, values: Int): SWRadioButton {
+        labelsArray = labels
+        valuesArray = values
+        return this
+    }
+
+    private fun labels(): Array<String> {
+        return resourceHelper.gsa(labelsArray)
+    }
+
+    fun values(): Array<String> {
+        return resourceHelper.gsa(valuesArray)
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        val pdesc = TextView(context)
+        pdesc.text = getComment()
+        val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        params.setMargins(0, 0, 0, 40)
+        pdesc.layoutParams = params
+        layout.addView(pdesc)
+
+        // Get if there is already value in SP
+        val previousValue = sp.getString(preferenceId, "none")
+        radioGroup = RadioGroup(context)
+        radioGroup?.clearCheck()
+        radioGroup?.orientation = LinearLayout.VERTICAL
+        radioGroup?.visibility = View.VISIBLE
+        for (i in labels().indices) {
+            val rdbtn = RadioButton(context)
+            rdbtn.id = View.generateViewId()
+            rdbtn.text = labels()[i]
+            if (previousValue == values()[i]) rdbtn.isChecked = true
+            rdbtn.tag = i
+            radioGroup!!.addView(rdbtn)
+        }
+        radioGroup!!.setOnCheckedChangeListener { group: RadioGroup, checkedId: Int ->
+            val i = group.findViewById<View>(checkedId).tag as Int
+            save(values()[i], 0)
+        }
+        layout.addView(radioGroup)
+        super.generateDialog(layout)
+    }
+
+    fun preferenceId(preferenceId: Int): SWRadioButton {
+        this.preferenceId = preferenceId
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java
deleted file mode 100644
index f0f4ff7628..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.setupwizard.events;
-
-import info.nightscout.androidaps.events.Event;
-
-public class EventSWLabel extends Event {
-    public String label;
-
-    public EventSWLabel(String label) {
-        this.label = label;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.kt
new file mode 100644
index 0000000000..636c94c2bf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.setupwizard.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventSWLabel(var label: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
index c567df7b49..9fee472cf0 100644
--- a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.SP;
 
 /**
@@ -26,7 +27,7 @@ public class TabPageAdapter extends FragmentPagerAdapter {
 
     Context context;
 
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
 
     public TabPageAdapter(FragmentManager fm, Context context) {
         super(fm);
@@ -37,7 +38,7 @@ public class TabPageAdapter extends FragmentPagerAdapter {
     @Nullable
     public Fragment getItem(int position) {
         //Fragment fragment = (Fragment) visibleFragmentList.get(position);
-        return Fragment.instantiate(context, visibleFragmentList.get(position).pluginDescription.getFragmentClass());
+        return Fragment.instantiate(context, visibleFragmentList.get(position).getPluginDescription().getFragmentClass());
     }
 
     public PluginBase getPluginAt(int position) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
index 1b3ba7bec8..31a9f0dc23 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
@@ -4,33 +4,41 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import android.text.Spanned
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import org.slf4j.LoggerFactory
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ActivityMonitor @Inject constructor(
+    private var aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private var sp: SP
+) : Application.ActivityLifecycleCallbacks {
 
-object ActivityMonitor : Application.ActivityLifecycleCallbacks {
-    private val log = LoggerFactory.getLogger(L.CORE)
     override fun onActivityPaused(activity: Activity?) {
         val name = activity?.javaClass?.simpleName ?: return
-        val resumed = SP.getLong("Monitor_" + name + "_" + "resumed", 0)
+        val resumed = sp.getLong("Monitor_" + name + "_" + "resumed", 0)
         if (resumed == 0L) {
-            log.debug("onActivityPaused: $name resumed == 0")
+            aapsLogger.debug(LTag.UI, "onActivityPaused: $name resumed == 0")
             return
         }
         val elapsed = DateUtil.now() - resumed
-        val total = SP.getLong("Monitor_" + name + "_total", 0)
+        val total = sp.getLong("Monitor_" + name + "_total", 0)
         if (total == 0L) {
-            SP.putLong("Monitor_" + name + "_start", DateUtil.now())
+            sp.putLong("Monitor_" + name + "_start", DateUtil.now())
         }
-        SP.putLong("Monitor_" + name + "_total", total + elapsed)
-        log.debug("onActivityPaused: $name elapsed=$elapsed total=${total + elapsed}")
+        sp.putLong("Monitor_" + name + "_total", total + elapsed)
+        aapsLogger.debug(LTag.UI, "onActivityPaused: $name elapsed=$elapsed total=${total + elapsed}")
     }
 
     override fun onActivityResumed(activity: Activity?) {
         val name = activity?.javaClass?.simpleName ?: return
-        log.debug("onActivityResumed: $name")
-        SP.putLong("Monitor_" + name + "_" + "resumed", DateUtil.now())
+        aapsLogger.debug(LTag.UI, "onActivityResumed: $name")
+        sp.putLong("Monitor_" + name + "_" + "resumed", DateUtil.now())
     }
 
     override fun onActivityStarted(activity: Activity?) {
@@ -48,14 +56,15 @@ object ActivityMonitor : Application.ActivityLifecycleCallbacks {
     override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
     }
 
-    fun toText(): String {
-        val keys: Map<String, *> = SP.getAll()
+    private fun toText(): String {
+        val keys: Map<String, *> = sp.getAll()
         var result = ""
         for ((key, value) in keys)
             if (key.startsWith("Monitor") && key.endsWith("total")) {
+                val v = if (value is Long) value else SafeParse.stringToLong(value as String)
                 val activity = key.split("_")[1].replace("Activity", "")
-                val duration = DateUtil.niceTimeScalar(value as Long)
-                val start = SP.getLong(key.replace("total", "start"), 0)
+                val duration = DateUtil.niceTimeScalar(v as Long, resourceHelper)
+                val start = sp.getLong(key.replace("total", "start"), 0)
                 val days = T.msecs(DateUtil.now() - start).days()
                 result += "<b><span style=\"color:yellow\">$activity:</span></b> <b>$duration</b> in <b>$days</b> days<br>"
             }
@@ -63,16 +72,16 @@ object ActivityMonitor : Application.ActivityLifecycleCallbacks {
     }
 
     fun stats(): Spanned {
-        return HtmlHelper.fromHtml("<br><b>" + MainApp.gs(R.string.activitymonitor) + ":</b><br>" + toText())
+        return HtmlHelper.fromHtml("<br><b>" + resourceHelper.gs(R.string.activitymonitor) + ":</b><br>" + toText())
     }
 
     fun reset() {
-        val keys: Map<String, *> = SP.getAll()
+        val keys: Map<String, *> = sp.getAll()
         for ((key, _) in keys)
             if (key.startsWith("Monitor") && key.endsWith("total")) {
-                SP.remove(key)
-                SP.remove(key.replace("total", "start"))
-                SP.remove(key.replace("total", "resumed"))
+                sp.remove(key)
+                sp.remove(key.replace("total", "start"))
+                sp.remove(key.replace("total", "resumed"))
             }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
deleted file mode 100644
index fdee5417a3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.PowerManager;
-import android.provider.Settings;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-
-public class AndroidPermission {
-
-    public static final int CASE_STORAGE = 0x1;
-    public static final int CASE_SMS = 0x2;
-    public static final int CASE_LOCATION = 0x3;
-    public static final int CASE_BATTERY = 0x4;
-    public static final int CASE_PHONE_STATE = 0x5;
-
-    private static boolean permission_battery_optimization_failed = false;
-
-    @SuppressLint("BatteryLife")
-    private static void askForPermission(Activity activity, String[] permission, Integer requestCode) {
-        boolean test = false;
-        boolean testBattery = false;
-        for (String s : permission) {
-            test = test || (ContextCompat.checkSelfPermission(activity, s) != PackageManager.PERMISSION_GRANTED);
-            if (s.equals(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
-                PowerManager powerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
-                String packageName = activity.getPackageName();
-                testBattery = testBattery || !powerManager.isIgnoringBatteryOptimizations(packageName);
-            }
-        }
-        if (test) {
-            ActivityCompat.requestPermissions(activity, permission, requestCode);
-        }
-        if (testBattery) {
-            try {
-                Intent i = new Intent();
-                i.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                i.setData(Uri.parse("package:" + activity.getPackageName()));
-                activity.startActivityForResult(i, CASE_BATTERY);
-            } catch (ActivityNotFoundException e) {
-                permission_battery_optimization_failed = true;
-                OKDialog.show(activity, MainApp.gs(R.string.permission), MainApp.gs(R.string.alert_dialog_permission_battery_optimization_failed), activity::recreate);
-            }
-        }
-    }
-
-    public static void askForPermission(Activity activity, String permission, Integer requestCode) {
-        String[] permissions = {permission};
-        askForPermission(activity, permissions, requestCode);
-    }
-
-    public static boolean permissionNotGranted(Context context, String permission) {
-        boolean selfCheck = ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
-        if (permission.equals(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
-            if (!permission_battery_optimization_failed) {
-                PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                String packageName = context.getPackageName();
-                selfCheck = selfCheck && powerManager.isIgnoringBatteryOptimizations(packageName);
-            }
-        }
-        return !selfCheck;
-    }
-
-    public static synchronized void notifyForSMSPermissions(Activity activity) {
-        if (SmsCommunicatorPlugin.INSTANCE.isEnabled(PluginType.GENERAL)) {
-            if (permissionNotGranted(activity, Manifest.permission.RECEIVE_SMS)) {
-                NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_SMS, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.URGENT);
-                notification.action(R.string.request, () -> AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.RECEIVE_SMS,
-                        Manifest.permission.SEND_SMS,
-                        Manifest.permission.RECEIVE_MMS}, AndroidPermission.CASE_SMS));
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
-            } else
-                RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_SMS));
-            // Following is a bug in Android 8
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
-                if (permissionNotGranted(activity, Manifest.permission.READ_PHONE_STATE)) {
-                    NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_PHONESTATE, MainApp.gs(R.string.smscommunicator_missingphonestatepermission), Notification.URGENT);
-                    notification.action(R.string.request, () ->
-                            AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.READ_PHONE_STATE}, AndroidPermission.CASE_PHONE_STATE));
-                    RxBus.INSTANCE.send(new EventNewNotification(notification));
-                } else
-                    RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_PHONESTATE));
-            }
-        }
-    }
-
-    public static synchronized void notifyForBatteryOptimizationPermission(Activity activity) {
-        if (permissionNotGranted(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
-            NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_BATTERY, String.format(MainApp.gs(R.string.needwhitelisting), MainApp.gs(R.string.app_name)), Notification.URGENT);
-            notification.action(R.string.request, () -> AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}, AndroidPermission.CASE_BATTERY));
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_BATTERY));
-    }
-
-    public static synchronized void notifyForStoragePermission(Activity activity) {
-        if (permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_STORAGE, MainApp.gs(R.string.needstoragepermission), Notification.URGENT);
-            notification.action(R.string.request, () -> AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE}, AndroidPermission.CASE_STORAGE));
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_STORAGE));
-    }
-
-    public static synchronized void notifyForLocationPermissions(Activity activity) {
-        if (permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION)) {
-            NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_LOCATION, MainApp.gs(R.string.needlocationpermission), Notification.URGENT);
-            notification.action(R.string.request, () -> AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, AndroidPermission.CASE_LOCATION));
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_LOCATION));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
new file mode 100644
index 0000000000..583aa2bf25
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
@@ -0,0 +1,163 @@
+package info.nightscout.androidaps.utils
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.utils.OKDialog.show
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AndroidPermission @Inject constructor(
+    val resourceHelper: ResourceHelper,
+    val rxBus: RxBusWrapper,
+    val injector: HasAndroidInjector
+) {
+
+    companion object {
+        const val CASE_STORAGE = 0x1
+        const val CASE_SMS = 0x2
+        const val CASE_LOCATION = 0x3
+        const val CASE_BATTERY = 0x4
+        const val CASE_PHONE_STATE = 0x5
+        const val CASE_SYSTEM_WINDOW = 0x6
+    }
+
+    private var permission_battery_optimization_failed = false
+
+    @SuppressLint("BatteryLife")
+    private fun askForPermission(activity: Activity, permission: Array<String>, requestCode: Int) {
+        var test = false
+        var testBattery = false
+        for (s in permission) {
+            test = test || ContextCompat.checkSelfPermission(activity, s) != PackageManager.PERMISSION_GRANTED
+            if (s == Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) {
+                val powerManager = activity.getSystemService(Context.POWER_SERVICE) as PowerManager
+                val packageName = activity.packageName
+                testBattery = testBattery || !powerManager.isIgnoringBatteryOptimizations(packageName)
+            }
+        }
+        if (test) {
+            ActivityCompat.requestPermissions(activity, permission, requestCode)
+        }
+        if (testBattery) {
+            try {
+                val i = Intent()
+                i.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                i.data = Uri.parse("package:" + activity.packageName)
+                activity.startActivityForResult(i, CASE_BATTERY)
+            } catch (e: ActivityNotFoundException) {
+                permission_battery_optimization_failed = true
+                show(activity, resourceHelper.gs(R.string.permission), resourceHelper.gs(R.string.alert_dialog_permission_battery_optimization_failed), Runnable { activity.recreate() })
+            }
+        }
+    }
+
+    fun askForPermission(activity: Activity, permission: String, requestCode: Int) {
+        val permissions = arrayOf(permission)
+        askForPermission(activity, permissions, requestCode)
+    }
+
+    fun permissionNotGranted(context: Context, permission: String): Boolean {
+        var selfCheck = ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+        if (permission == Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) {
+            if (!permission_battery_optimization_failed) {
+                val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+                val packageName = context.packageName
+                selfCheck = selfCheck && powerManager.isIgnoringBatteryOptimizations(packageName)
+            }
+        }
+        return !selfCheck
+    }
+
+    @Synchronized
+    fun notifyForSMSPermissions(activity: Activity, smsCommunicatorPlugin: SmsCommunicatorPlugin) {
+        if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL)) {
+            if (permissionNotGranted(activity, Manifest.permission.RECEIVE_SMS)) {
+                val notification = NotificationWithAction(injector, Notification.PERMISSION_SMS, resourceHelper.gs(R.string.smscommunicator_missingsmspermission), Notification.URGENT)
+                notification.action(R.string.request, Runnable {
+                    askForPermission(activity, arrayOf(Manifest.permission.RECEIVE_SMS,
+                        Manifest.permission.SEND_SMS,
+                        Manifest.permission.RECEIVE_MMS), CASE_SMS)
+                })
+                rxBus.send(EventNewNotification(notification))
+            } else rxBus.send(EventDismissNotification(Notification.PERMISSION_SMS))
+            // Following is a bug in Android 8
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
+                if (permissionNotGranted(activity, Manifest.permission.READ_PHONE_STATE)) {
+                    val notification = NotificationWithAction(injector, Notification.PERMISSION_PHONESTATE, resourceHelper.gs(R.string.smscommunicator_missingphonestatepermission), Notification.URGENT)
+                    notification.action(R.string.request, Runnable { askForPermission(activity, arrayOf(Manifest.permission.READ_PHONE_STATE), CASE_PHONE_STATE) })
+                    rxBus.send(EventNewNotification(notification))
+                } else rxBus.send(EventDismissNotification(Notification.PERMISSION_PHONESTATE))
+            }
+        }
+    }
+
+    @Synchronized
+    fun notifyForBatteryOptimizationPermission(activity: Activity) {
+        if (permissionNotGranted(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_BATTERY, String.format(resourceHelper.gs(R.string.needwhitelisting), resourceHelper.gs(R.string.app_name)), Notification.URGENT)
+            notification.action(R.string.request, Runnable { askForPermission(activity, arrayOf(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS), CASE_BATTERY) })
+            rxBus.send(EventNewNotification(notification))
+        } else rxBus.send(EventDismissNotification(Notification.PERMISSION_BATTERY))
+    }
+
+    @Synchronized fun notifyForStoragePermission(activity: Activity) {
+        if (permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_STORAGE, resourceHelper.gs(R.string.needstoragepermission), Notification.URGENT)
+            notification.action(R.string.request, Runnable {
+                askForPermission(activity, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE), CASE_STORAGE)
+            })
+            rxBus.send(EventNewNotification(notification))
+        } else rxBus.send(EventDismissNotification(Notification.PERMISSION_STORAGE))
+    }
+
+    @Synchronized fun notifyForLocationPermissions(activity: Activity) {
+        if (permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION)) {
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_LOCATION, resourceHelper.gs(R.string.needlocationpermission), Notification.URGENT)
+            notification.action(R.string.request, Runnable { askForPermission(activity, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), CASE_LOCATION) })
+            rxBus.send(EventNewNotification(notification))
+        } else rxBus.send(EventDismissNotification(Notification.PERMISSION_LOCATION))
+    }
+
+    @Synchronized fun notifyForSystemWindowPermissions(activity: Activity) {
+        // Check if Android Q or higher
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            if (!Settings.canDrawOverlays(activity)) {
+                val notification = NotificationWithAction(injector, Notification.PERMISSION_SYSTEM_WINDOW, resourceHelper.gs(R.string.needsystemwindowpermission), Notification.URGENT)
+                notification.action(R.string.request, Runnable {
+                    // Check if Android Q or higher
+                    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                        // Show alert dialog to the user saying a separate permission is needed
+                        // Launch the settings activity if the user prefers
+                        val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:" + activity.packageName))
+                        activity.startActivity(intent)
+                    }
+                })
+                rxBus.send(EventNewNotification(notification))
+            } else rxBus.send(EventDismissNotification(Notification.PERMISSION_SYSTEM_WINDOW))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
index bc000a95b9..b346125e6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
@@ -8,13 +8,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 20.02.2017.
  */
 
 public class BatteryLevel {
-    private static Logger log = LoggerFactory.getLogger(BatteryLevel.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(BatteryLevel.class);
     static public int lastUploadedLevel = 0;
 
     static public int getBatteryLevel() {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
deleted file mode 100644
index 6d71a80ba1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
+++ /dev/null
@@ -1,348 +0,0 @@
-package info.nightscout.androidaps.utils
-
-import android.content.Context
-import android.content.Intent
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.ErrorHelperActivity
-import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.db.TempTarget
-import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.interfaces.PumpInterface
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBus
-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.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.queue.Callback
-import org.json.JSONException
-import org.json.JSONObject
-import org.slf4j.LoggerFactory
-import java.util.*
-import kotlin.math.abs
-
-class BolusWizard @JvmOverloads constructor(val profile: Profile,
-                                            val profileName: String,
-                                            val tempTarget: TempTarget?,
-                                            val carbs: Int,
-                                            val cob: Double,
-                                            val bg: Double,
-                                            val correction: Double,
-                                            private val percentageCorrection: Double = 100.0,
-                                            private val useBg: Boolean,
-                                            private val useCob: Boolean,
-                                            private val includeBolusIOB: Boolean,
-                                            private val includeBasalIOB: Boolean,
-                                            private val useSuperBolus: Boolean,
-                                            private val useTT: Boolean,
-                                            private val useTrend: Boolean,
-                                            val notes: String = "",
-                                            private val carbTime: Int = 0
-) {
-
-    private val log = LoggerFactory.getLogger(L.CORE)
-
-    // Intermediate
-    var sens = 0.0
-        private set
-
-    var ic = 0.0
-        private set
-
-    var glucoseStatus: GlucoseStatus? = null
-        private set
-
-    private var targetBGLow = 0.0
-
-    private var targetBGHigh = 0.0
-
-    private var bgDiff = 0.0
-
-    var insulinFromBG = 0.0
-        private set
-
-    var insulinFromCarbs = 0.0
-        private set
-
-    var insulinFromBolusIOB = 0.0
-        private set
-
-    var insulinFromBasalsIOB = 0.0
-        private set
-
-    var insulinFromCorrection = 0.0
-        private set
-
-    var insulinFromSuperBolus = 0.0
-        private set
-
-    var insulinFromCOB = 0.0
-        private set
-
-    var insulinFromTrend = 0.0
-        private set
-
-    var trend = 0.0
-        private set
-
-    private var accepted = false
-
-    // Result
-    var calculatedTotalInsulin: Double = 0.0
-        private set
-
-    var totalBeforePercentageAdjustment: Double = 0.0
-        private set
-
-    var carbsEquivalent: Double = 0.0
-        private set
-
-    var insulinAfterConstraints: Double = 0.0
-        private set
-
-    init {
-        doCalc()
-    }
-
-    private fun doCalc() {
-
-        // Insulin from BG
-        sens = Profile.fromMgdlToUnits(profile.isfMgdl, ProfileFunctions.getSystemUnits())
-        targetBGLow = Profile.fromMgdlToUnits(profile.targetLowMgdl, ProfileFunctions.getSystemUnits())
-        targetBGHigh = Profile.fromMgdlToUnits(profile.targetHighMgdl, ProfileFunctions.getSystemUnits())
-        if (useTT && tempTarget != null) {
-            targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, ProfileFunctions.getSystemUnits())
-            targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, ProfileFunctions.getSystemUnits())
-        }
-        if (useBg && bg > 0) {
-            bgDiff = when {
-                bg in targetBGLow..targetBGHigh -> 0.0
-                bg <= targetBGLow               -> bg - targetBGLow
-                else                            -> bg - targetBGHigh
-            }
-            insulinFromBG = bgDiff / sens
-        }
-
-        // Insulin from 15 min trend
-        glucoseStatus = GlucoseStatus.getGlucoseStatusData()
-        glucoseStatus?.let {
-            if (useTrend) {
-                trend = it.short_avgdelta
-                insulinFromTrend = Profile.fromMgdlToUnits(trend, ProfileFunctions.getSystemUnits()) * 3 / sens
-            }
-        }
-
-        // Insulin from carbs
-        ic = profile.ic
-        insulinFromCarbs = carbs / ic
-        insulinFromCOB = if (useCob) (cob / ic) else 0.0
-
-        // Insulin from IOB
-        // IOB calculation
-        val treatments = TreatmentsPlugin.getPlugin()
-        treatments.updateTotalIOBTreatments()
-        val bolusIob = treatments.lastCalculationTreatments.round()
-        treatments.updateTotalIOBTempBasals()
-        val basalIob = treatments.lastCalculationTempBasals.round()
-
-        insulinFromBolusIOB = if (includeBolusIOB) -bolusIob.iob else 0.0
-        insulinFromBasalsIOB = if (includeBasalIOB) -basalIob.basaliob else 0.0
-
-        // Insulin from correction
-        insulinFromCorrection = correction
-
-        // Insulin from superbolus for 2h. Get basal rate now and after 1h
-        if (useSuperBolus) {
-            insulinFromSuperBolus = profile.basal
-            var timeAfter1h = System.currentTimeMillis()
-            timeAfter1h += T.hours(1).msecs()
-            insulinFromSuperBolus += profile.getBasal(timeAfter1h)
-        }
-
-        // Total
-        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB
-
-        // Percentage adjustment
-        totalBeforePercentageAdjustment = calculatedTotalInsulin
-        if (calculatedTotalInsulin > 0) {
-            calculatedTotalInsulin = calculatedTotalInsulin * percentageCorrection / 100.0
-        }
-
-        if (calculatedTotalInsulin < 0) {
-            carbsEquivalent = (-calculatedTotalInsulin) * ic
-            calculatedTotalInsulin = 0.0
-        }
-
-        val bolusStep = ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription?.bolusStep
-            ?: 0.1
-        calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep)
-
-        insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(calculatedTotalInsulin)).value()
-
-        log.debug(this.toString())
-    }
-
-    private fun nsJSON(): JSONObject {
-        val boluscalcJSON = JSONObject()
-        try {
-            boluscalcJSON.put("profile", profileName)
-            boluscalcJSON.put("notes", notes)
-            boluscalcJSON.put("eventTime", DateUtil.toISOString(Date()))
-            boluscalcJSON.put("targetBGLow", targetBGLow)
-            boluscalcJSON.put("targetBGHigh", targetBGHigh)
-            boluscalcJSON.put("isf", sens)
-            boluscalcJSON.put("ic", ic)
-            boluscalcJSON.put("iob", -(insulinFromBolusIOB + insulinFromBasalsIOB))
-            boluscalcJSON.put("bolusiob", insulinFromBolusIOB)
-            boluscalcJSON.put("basaliob", insulinFromBasalsIOB)
-            boluscalcJSON.put("bolusiobused", includeBolusIOB)
-            boluscalcJSON.put("basaliobused", includeBasalIOB)
-            boluscalcJSON.put("bg", bg)
-            boluscalcJSON.put("insulinbg", insulinFromBG)
-            boluscalcJSON.put("insulinbgused", useBg)
-            boluscalcJSON.put("bgdiff", bgDiff)
-            boluscalcJSON.put("insulincarbs", insulinFromCarbs)
-            boluscalcJSON.put("carbs", carbs)
-            boluscalcJSON.put("cob", cob)
-            boluscalcJSON.put("cobused", useCob)
-            boluscalcJSON.put("insulincob", insulinFromCOB)
-            boluscalcJSON.put("othercorrection", correction)
-            boluscalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
-            boluscalcJSON.put("insulintrend", insulinFromTrend)
-            boluscalcJSON.put("insulin", calculatedTotalInsulin)
-            boluscalcJSON.put("superbolusused", useSuperBolus)
-            boluscalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
-            boluscalcJSON.put("trendused", useTrend)
-            boluscalcJSON.put("insulintrend", insulinFromTrend)
-            boluscalcJSON.put("trend", trend)
-            boluscalcJSON.put("ttused", useTT)
-            boluscalcJSON.put("percentageCorrection", percentageCorrection)
-        } catch (e: JSONException) {
-            log.error("Unhandled exception", e)
-        }
-        return boluscalcJSON
-    }
-
-    private fun confirmMessageAfterConstraints(pump: PumpInterface): String {
-
-        var confirmMessage = ""
-        if (insulinAfterConstraints > 0) {
-            val pct = if (percentageCorrection != 100.0) " (" + percentageCorrection.toInt() + "%)" else ""
-            confirmMessage += "<br/>" + MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + pct + "</font>"
-        }
-        if (carbs > 0) {
-            var timeShift = ""
-            if (carbTime > 0) {
-                timeShift += " ( +" + MainApp.gs(R.string.mins, carbTime) + " )"
-            } else if (carbTime < 0) {
-                timeShift += " ( -" + MainApp.gs(R.string.mins, carbTime) + " )"
-            }
-            confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + carbs + "g" + timeShift + "</font>"
-        }
-        if (insulinFromCOB > 0) {
-            confirmMessage += "<br/>" + MainApp.gs(R.string.insulinFromCob, MainApp.gc(R.color.cobAlert), insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG)
-            val absorptionRate = IobCobCalculatorPlugin.getPlugin().slowAbsorptionPercentage(60)
-            if (absorptionRate > .25)
-                confirmMessage += "<br/>" + MainApp.gs(R.string.slowabsorptiondetected, MainApp.gc(R.color.cobAlert), (absorptionRate * 100).toInt())
-        }
-        if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) {
-            confirmMessage += "<br/>" + MainApp.gs(R.string.bolusconstraintappliedwarning, MainApp.gc(R.color.warning), calculatedTotalInsulin, insulinAfterConstraints)
-        }
-
-        return confirmMessage
-    }
-
-    fun confirmAndExecute(context: Context) {
-        val profile = ProfileFunctions.getInstance().profile ?: return
-        val pump = ConfigBuilderPlugin.getPlugin().activePump ?: return
-
-        if (calculatedTotalInsulin > 0.0 || carbs > 0.0) {
-            if (accepted) {
-                log.debug("guarding: already accepted")
-                return
-            }
-            accepted = true
-
-            val confirmMessage = confirmMessageAfterConstraints(pump)
-
-            OKDialog.showConfirmation(context, MainApp.gs(R.string.boluswizard), HtmlHelper.fromHtml(confirmMessage), Runnable {
-                if (insulinAfterConstraints > 0 || carbs > 0) {
-                    if (useSuperBolus) {
-                        val loopPlugin = LoopPlugin.getPlugin()
-                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                            loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
-                            RxBus.send(EventRefreshOverview("WizardDialog"))
-                        }
-
-                        val pump1 = ConfigBuilderPlugin.getPlugin().activePump
-
-                        if (pump1?.pumpDescription?.tempBasalStyle == PumpDescription.ABSOLUTE) {
-                            ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(0.0, 120, true, profile, object : Callback() {
-                                override fun run() {
-                                    if (!result.success) {
-                                        val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
-                                        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)
-                                    }
-                                }
-                            })
-                        } else {
-
-                            ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(0, 120, true, profile, object : Callback() {
-                                override fun run() {
-                                    if (!result.success) {
-                                        val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
-                                        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)
-                                    }
-                                }
-                            })
-                        }
-                    }
-                    val detailedBolusInfo = DetailedBolusInfo()
-                    detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD
-                    detailedBolusInfo.insulin = insulinAfterConstraints
-                    detailedBolusInfo.carbs = carbs.toDouble()
-                    detailedBolusInfo.context = context
-                    detailedBolusInfo.glucose = bg
-                    detailedBolusInfo.glucoseType = "Manual"
-                    detailedBolusInfo.carbTime = carbTime
-                    detailedBolusInfo.boluscalc = nsJSON()
-                    detailedBolusInfo.source = Source.USER
-                    detailedBolusInfo.notes = notes
-                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription?.storesCarbInfo == true) {
-                        ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
-                            override fun run() {
-                                if (!result.success) {
-                                    val i = Intent(MainApp.instance(), ErrorHelperActivity::class.java)
-                                    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)
-                    }
-                }
-            })
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt b/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
new file mode 100644
index 0000000000..745f4449ee
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
@@ -0,0 +1,142 @@
+package info.nightscout.androidaps.utils
+
+import org.spongycastle.util.encoders.Base64
+import java.nio.ByteBuffer
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.security.spec.KeySpec
+import javax.crypto.Cipher
+import javax.crypto.Mac
+import javax.crypto.SecretKey
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+private val HEX_CHARS = "0123456789abcdef"
+private val HEX_CHARS_ARRAY = "0123456789abcdef".toCharArray()
+
+fun String.hexStringToByteArray() : ByteArray {
+
+    val upperCased = this.toLowerCase()
+    val result = ByteArray(length / 2)
+    for (i in 0 until length step 2) {
+        val firstIndex = HEX_CHARS.indexOf(upperCased[i]);
+        val secondIndex = HEX_CHARS.indexOf(upperCased[i + 1]);
+
+        val octet = firstIndex.shl(4).or(secondIndex)
+        result.set(i.shr(1), octet.toByte())
+    }
+
+    return result
+}
+
+fun ByteArray.toHex() : String{
+    val result = StringBuffer()
+
+    forEach {
+        val octet = it.toInt()
+        val firstIndex = (octet and 0xF0).ushr(4)
+        val secondIndex = octet and 0x0F
+        result.append(HEX_CHARS_ARRAY[firstIndex])
+        result.append(HEX_CHARS_ARRAY[secondIndex])
+    }
+
+    return result.toString()
+}
+
+object CryptoUtil {
+
+    private const val IV_LENGTH_BYTE = 12
+    private const val TAG_LENGTH_BIT = 128
+    private const val AES_KEY_SIZE_BIT = 256
+    private const val PBKDF2_ITERATIONS = 50000 // check delays it cause on real device
+    private const val SALT_SIZE_BYTE = 32
+
+    private val secureRandom: SecureRandom = SecureRandom()
+
+    fun sha256(source: String): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+        val hashRaw = digest.digest(source.toByteArray())
+        return hashRaw.toHex()
+    }
+
+    fun hmac256(str: String, secret: String): String? {
+        val sha256_HMAC = Mac.getInstance("HmacSHA256")
+        val secretKey = SecretKeySpec(secret.toByteArray(), "HmacSHA256")
+        sha256_HMAC.init(secretKey)
+        return sha256_HMAC.doFinal(str.toByteArray()).toHex()
+    }
+
+    private fun prepCipherKey(passPhrase: String, salt:ByteArray, iterationCount:Int = PBKDF2_ITERATIONS, keyStrength:Int = AES_KEY_SIZE_BIT): SecretKeySpec {
+        val factory: SecretKeyFactory = SecretKeyFactory.getInstance("PBKDF2withHmacSHA1")
+        val spec: KeySpec = PBEKeySpec(passPhrase.toCharArray(), salt, iterationCount, keyStrength)
+        val tmp: SecretKey = factory.generateSecret(spec)
+        return SecretKeySpec(tmp.getEncoded(), "AES")
+    }
+
+    fun mineSalt(len :Int = SALT_SIZE_BYTE): ByteArray {
+        val salt = ByteArray(len)
+        secureRandom.nextBytes(salt)
+        return salt
+    }
+
+    fun encrypt(passPhrase: String, salt:ByteArray, rawData: String ): String? {
+        val iv: ByteArray?
+        val encrypted: ByteArray?
+        return try {
+            iv = ByteArray(IV_LENGTH_BYTE)
+            secureRandom.nextBytes(iv)
+            val cipherEnc: Cipher = Cipher.getInstance("AES/GCM/NoPadding")
+            cipherEnc.init(Cipher.ENCRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv))
+            encrypted = cipherEnc.doFinal(rawData.toByteArray())
+            val byteBuffer: ByteBuffer = ByteBuffer.allocate(1 + iv.size + encrypted.size)
+            byteBuffer.put(iv.size.toByte())
+            byteBuffer.put(iv)
+            byteBuffer.put(encrypted)
+            String(Base64.encode(byteBuffer.array()))
+        } catch (e: Exception) {
+           null
+        }
+    }
+
+    fun decrypt(passPhrase: String, salt:ByteArray, encryptedData: String): String? {
+        val iv: ByteArray?
+        val encrypted: ByteArray?
+        return try {
+            val byteBuffer = ByteBuffer.wrap(Base64.decode(encryptedData))
+            val ivLength = byteBuffer.get().toInt()
+            iv = ByteArray(ivLength)
+            byteBuffer[iv]
+            encrypted = ByteArray(byteBuffer.remaining())
+            byteBuffer[encrypted]
+            val cipherDec: Cipher = Cipher.getInstance("AES/GCM/NoPadding")
+            cipherDec.init(Cipher.DECRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv))
+            val dec = cipherDec.doFinal(encrypted)
+            String(dec)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun checkPassword(password: String, referenceHash: String): Boolean {
+        return if (referenceHash.startsWith("hmac:")) {
+            val hashSegments = referenceHash.split(":")
+            if (hashSegments.size != 3)
+                return false
+            return hmac256(password, hashSegments[1]) == hashSegments[2]
+        } else {
+            password == referenceHash
+        }
+    }
+
+    fun hashPassword(password: String): String {
+        return if (!password.startsWith("hmac:")) {
+            val salt = mineSalt().toHex()
+            return "hmac:${salt}:${hmac256(password, salt)}"
+        } else {
+            password
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index b03d8cb43f..82fabc52b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
  * The Class DateUtil. A simple wrapper around SimpleDateFormat to ease the handling of iso date string &lt;-&gt; date obj
@@ -107,6 +108,28 @@ public class DateUtil {
         return retval;
     }
 
+    public static long toTodayTime(String hh_colon_mm) {
+        Pattern p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM| PM|AM|PM|)");
+        Matcher m = p.matcher(hh_colon_mm);
+        long retval = 0;
+
+        if (m.find()) {
+            int hours = SafeParse.stringToInt(m.group(1));
+            int minutes = SafeParse.stringToInt(m.group(2));
+            if ((m.group(3).equals(" a.m.") || m.group(3).equals(" AM") || m.group(3).equals("AM")) && m.group(1).equals("12"))
+                hours -= 12;
+            if ((m.group(3).equals(" p.m.") || m.group(3).equals(" PM") || m.group(3).equals("PM")) && !(m.group(1).equals("12")))
+                hours += 12;
+            Calendar c = Calendar.getInstance();
+            c.set(Calendar.HOUR_OF_DAY, hours);
+            c.set(Calendar.MINUTE, minutes);
+            c.set(Calendar.SECOND, 0);
+            c.set(Calendar.MILLISECOND, 0);
+            retval = c.getTimeInMillis();
+        }
+        return retval;
+    }
+
     public static String dateString(Date date) {
         DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
         return df.format(date);
@@ -141,6 +164,14 @@ public class DateUtil {
         return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
     }
 
+    public static String timeStringWithSeconds(long mills) {
+        String format = "hh:mm:ssa";
+        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+            format = "HH:mm:ss";
+        }
+        return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
+    }
+
     public static String timeFullString(long mills) {
         return new DateTime(mills).toString(DateTimeFormat.fullTime());
     }
@@ -158,13 +189,18 @@ public class DateUtil {
         return dateString(mills) + " " + timeString(mills);
     }
 
+    public static String dateAndTimeAndSecondsString(long mills) {
+        if (mills == 0) return "";
+        return dateString(mills) + " " + timeStringWithSeconds(mills);
+    }
+
     public static String dateAndTimeFullString(long mills) {
         return dateString(mills) + " " + timeFullString(mills);
     }
 
-    public static String minAgo(long time) {
+    public static String minAgo(ResourceHelper resourceHelper, long time) {
         int mins = (int) ((now() - time) / 1000 / 60);
-        return MainApp.gs(R.string.minago, mins);
+        return resourceHelper.gs(R.string.minago, mins);
     }
 
     public static String minAgoShort(long time) {
@@ -172,9 +208,9 @@ public class DateUtil {
         return (mins > 0 ? "+" : "") + mins.toString();
     }
 
-    public static String hourAgo(long time) {
+    public static String hourAgo(long time, ResourceHelper resourceHelper) {
         double hours = (now() - time) / 1000d / 60 / 60;
-        return MainApp.gs(R.string.hoursago, hours);
+        return resourceHelper.gs(R.string.hoursago, hours);
     }
 
     private static LongSparseArray<String> timeStrings = new LongSparseArray<>();
@@ -189,19 +225,19 @@ public class DateUtil {
     }
 
 
-    public static String timeFrameString(long timeInMillis) {
+    public static String timeFrameString(long timeInMillis, ResourceHelper resourceHelper) {
         long remainingTimeMinutes = timeInMillis / (1000 * 60);
         long remainingTimeHours = remainingTimeMinutes / 60;
         remainingTimeMinutes = remainingTimeMinutes % 60;
-        return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + MainApp.gs(R.string.shorthour) + " ") : "") + remainingTimeMinutes + "')";
+        return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + resourceHelper.gs(R.string.shorthour) + " ") : "") + remainingTimeMinutes + "')";
     }
 
-    public static String sinceString(long timestamp) {
-        return timeFrameString(System.currentTimeMillis() - timestamp);
+    public static String sinceString(long timestamp, ResourceHelper resourceHelper) {
+        return timeFrameString(System.currentTimeMillis() - timestamp, resourceHelper);
     }
 
-    public static String untilString(long timestamp) {
-        return timeFrameString(timestamp - System.currentTimeMillis());
+    public static String untilString(long timestamp, ResourceHelper resourceHelper) {
+        return timeFrameString(timestamp - System.currentTimeMillis(), resourceHelper);
     }
 
     public static long now() {
@@ -234,26 +270,26 @@ public class DateUtil {
         return TimeZone.getDefault().getOffset(timestamp) / 60000;
     }
 
-    public static String niceTimeScalar(long t) {
-        String unit = MainApp.gs(R.string.unit_second);
+    public static String niceTimeScalar(long t, ResourceHelper resourceHelper) {
+        String unit = resourceHelper.gs(R.string.unit_second);
         t = t / 1000;
-        if (t != 1) unit = MainApp.gs(R.string.unit_seconds);
+        if (t != 1) unit = resourceHelper.gs(R.string.unit_seconds);
         if (t > 59) {
-            unit = MainApp.gs(R.string.unit_minute);
+            unit = resourceHelper.gs(R.string.unit_minute);
             t = t / 60;
-            if (t != 1) unit = MainApp.gs(R.string.unit_minutes);
+            if (t != 1) unit = resourceHelper.gs(R.string.unit_minutes);
             if (t > 59) {
-                unit = MainApp.gs(R.string.unit_hour);
+                unit = resourceHelper.gs(R.string.unit_hour);
                 t = t / 60;
-                if (t != 1) unit = MainApp.gs(R.string.unit_hours);
+                if (t != 1) unit = resourceHelper.gs(R.string.unit_hours);
                 if (t > 24) {
-                    unit = MainApp.gs(R.string.unit_day) + "\"";
+                    unit = resourceHelper.gs(R.string.unit_day) + "\"";
                     t = t / 24;
-                    if (t != 1) unit = MainApp.gs(R.string.unit_days) + "\"";
+                    if (t != 1) unit = resourceHelper.gs(R.string.unit_days) + "\"";
                     if (t > 28) {
-                        unit = MainApp.gs(R.string.unit_week) + "\"";
+                        unit = resourceHelper.gs(R.string.unit_week) + "\"";
                         t = t / 7;
-                        if (t != 1) unit = MainApp.gs(R.string.unit_weeks) + "\"";
+                        if (t != 1) unit = resourceHelper.gs(R.string.unit_weeks) + "\"";
                     }
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
index 66464ed1c5..c4ddfc39a4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils;
 
 import java.text.DecimalFormat;
 
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 
 /**
  * Created by mike on 11.07.2016.
@@ -45,14 +45,14 @@ public class DecimalFormatter {
         return format3dec.format(value) + unit;
     }
 
-    public static String toPumpSupportedBolus(double value) {
-        return ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep <= 0.051
+    public static String toPumpSupportedBolus(double value, PumpInterface pump) {
+        return pump.getPumpDescription().bolusStep <= 0.051
                 ? to2Decimal(value)
                 : to1Decimal(value);
     }
 
-    public static DecimalFormat pumpSupportedBolusFormat() {
-        return ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep <= 0.051
+    public static DecimalFormat pumpSupportedBolusFormat(PumpInterface pump) {
+        return pump.getPumpDescription().bolusStep <= 0.051
                 ? new DecimalFormat("0.00")
                 : new DecimalFormat("0.0");
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
index 7b40d5d35b..6f7e49c9bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
@@ -3,16 +3,24 @@ package info.nightscout.androidaps.utils
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+open class DefaultValueHelper @Inject constructor(
+    private val sp: SP,
+    private val profileFunction: ProfileFunction
+) {
 
-object DefaultValueHelper {
     /**
      * returns the corresponding EatingSoon TempTarget based on the given units (MMOL / MGDL)
      *
      * @param units
      * @return
      */
-    fun getDefaultEatingSoonTT(units: String): Double {
+    private fun getDefaultEatingSoonTT(units: String): Double {
         return if (Constants.MMOL == units) Constants.defaultEatingSoonTTmmol else Constants.defaultEatingSoonTTmgdl
     }
 
@@ -22,7 +30,7 @@ object DefaultValueHelper {
      * @param units
      * @return
      */
-    fun getDefaultActivityTT(units: String): Double {
+    private fun getDefaultActivityTT(units: String): Double {
         return if (Constants.MMOL == units) Constants.defaultActivityTTmmol else Constants.defaultActivityTTmgdl
     }
 
@@ -32,7 +40,7 @@ object DefaultValueHelper {
      * @param units
      * @return
      */
-    fun getDefaultHypoTT(units: String): Double {
+    private fun getDefaultHypoTT(units: String): Double {
         return if (Constants.MMOL == units) Constants.defaultHypoTTmmol else Constants.defaultHypoTTmgdl
     }
 
@@ -41,17 +49,15 @@ object DefaultValueHelper {
      *
      * @return
      */
-    @JvmStatic
     fun determineEatingSoonTT(): Double {
-        val units = ProfileFunctions.getSystemUnits()
-        var value = SP.getDouble(R.string.key_eatingsoon_target, getDefaultEatingSoonTT(units))
-        value = Profile.toCurrentUnits(value)
+        val units = profileFunction.getUnits()
+        var value = sp.getDouble(R.string.key_eatingsoon_target, getDefaultEatingSoonTT(units))
+        value = Profile.toCurrentUnits(profileFunction, value)
         return if (value > 0) value else getDefaultEatingSoonTT(units)
     }
 
-    @JvmStatic
     fun determineEatingSoonTTDuration(): Int {
-        val value = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration)
+        val value = sp.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration)
         return if (value > 0) value else Constants.defaultEatingSoonTTDuration
     }
 
@@ -60,17 +66,15 @@ object DefaultValueHelper {
      *
      * @return
      */
-    @JvmStatic
     fun determineActivityTT(): Double {
-        val units = ProfileFunctions.getSystemUnits()
-        var value = SP.getDouble(R.string.key_activity_target, getDefaultActivityTT(units))
-        value = Profile.toCurrentUnits(value)
+        val units = profileFunction.getUnits()
+        var value = sp.getDouble(R.string.key_activity_target, getDefaultActivityTT(units))
+        value = Profile.toCurrentUnits(profileFunction, value)
         return if (value > 0) value else getDefaultActivityTT(units)
     }
 
-    @JvmStatic
     fun determineActivityTTDuration(): Int {
-        val value = SP.getInt(R.string.key_activity_duration, Constants.defaultActivityTTDuration)
+        val value = sp.getInt(R.string.key_activity_duration, Constants.defaultActivityTTDuration)
         return if (value > 0) value else Constants.defaultActivityTTDuration
     }
 
@@ -79,17 +83,32 @@ object DefaultValueHelper {
      *
      * @return
      */
-    @JvmStatic
     fun determineHypoTT(): Double {
-        val units = ProfileFunctions.getSystemUnits()
-        var value = SP.getDouble(R.string.key_hypo_target, getDefaultHypoTT(units))
-        value = Profile.toCurrentUnits(value)
+        val units = profileFunction.getUnits()
+        var value = sp.getDouble(R.string.key_hypo_target, getDefaultHypoTT(units))
+        value = Profile.toCurrentUnits(profileFunction, value)
         return if (value > 0) value else getDefaultHypoTT(units)
     }
 
-    @JvmStatic
     fun determineHypoTTDuration(): Int {
-        val value = SP.getInt(R.string.key_hypo_duration, Constants.defaultHypoTTDuration)
+        val value = sp.getInt(R.string.key_hypo_duration, Constants.defaultHypoTTDuration)
         return if (value > 0) value else Constants.defaultHypoTTDuration
     }
+
+    var bgTargetLow = 80.0
+    var bgTargetHigh = 180.0
+
+    fun determineHighLine(): Double {
+        var highLineSetting = sp.getDouble(R.string.key_high_mark, bgTargetHigh)
+        if (highLineSetting < 1) highLineSetting = Constants.HIGHMARK
+        highLineSetting = Profile.toCurrentUnits(profileFunction, highLineSetting)
+        return highLineSetting
+    }
+
+    fun determineLowLine(): Double {
+        var lowLineSetting = sp.getDouble(R.string.key_low_mark, bgTargetLow)
+        if (lowLineSetting < 1) lowLineSetting = Constants.LOWMARK
+        lowLineSetting = Profile.toCurrentUnits(profileFunction, lowLineSetting)
+        return lowLineSetting
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt
deleted file mode 100644
index 7288e6679f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.utils
-
-@Synchronized
-fun isRunningTest(): Boolean {
-    return try {
-        Class.forName("androidx.test.espresso.Espresso")
-        true
-    } catch (e: ClassNotFoundException) {
-        false
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java
deleted file mode 100644
index 355623f38d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import android.os.Bundle;
-
-import com.crashlytics.android.Crashlytics;
-import com.google.firebase.analytics.FirebaseAnalytics;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin;
-
-/**
- * Created by jamorham on 21/02/2018.
- * <p>
- * Some users do not wish to be tracked, Fabric Answers and Crashlytics do not provide an easy way
- * to disable them and make calls from a potentially invalid singleton reference. This wrapper
- * emulates the methods but ignores the request if the instance is null or invalid.
- */
-
-public class FabricPrivacy {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
-
-    private static volatile FabricPrivacy instance;
-
-
-    public static FabricPrivacy getInstance() {
-        if (instance == null) {
-            initSelf();
-        }
-        return instance;
-    }
-
-    private static synchronized void initSelf() {
-        if (instance == null) {
-            instance = new FabricPrivacy();
-        }
-    }
-
-    // Crashlytics logException
-    public static void logException(Throwable throwable) {
-        try {
-            final Crashlytics crashlytics = Crashlytics.getInstance();
-            crashlytics.core.logException(throwable);
-        } catch (NullPointerException | IllegalStateException e) {
-            if (L.isEnabled(L.CORE))
-                log.debug("Ignoring opted out non-initialized log: " + throwable);
-        }
-    }
-
-    // Crashlytics log
-    public static void log(String msg) {
-        try {
-            final Crashlytics crashlytics = Crashlytics.getInstance();
-            crashlytics.core.log(msg);
-        } catch (NullPointerException | IllegalStateException e) {
-            if (L.isEnabled(L.CORE))
-                log.debug("Ignoring opted out non-initialized log: " + msg);
-        }
-    }
-
-    // Crashlytics log
-    public static void log(int priority, String tag, String msg) {
-        try {
-            final Crashlytics crashlytics = Crashlytics.getInstance();
-            crashlytics.core.log(priority, tag, msg);
-        } catch (NullPointerException | IllegalStateException e) {
-            if (L.isEnabled(L.CORE))
-                log.debug("Ignoring opted out non-initialized log: " + msg);
-        }
-    }
-
-    public static boolean fabricEnabled() {
-        return SP.getBoolean("enable_fabric", true);
-    }
-
-    // Analytics logCustom
-    public void logCustom(Bundle event) {
-        try {
-            if (fabricEnabled()) {
-                MainApp.getFirebaseAnalytics().logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, event);
-            } else {
-                if (L.isEnabled(L.CORE))
-                    log.debug("Ignoring recently opted-out event: " + event.toString());
-            }
-        } catch (NullPointerException | IllegalStateException e) {
-            if (L.isEnabled(L.CORE))
-                log.debug("Ignoring opted-out non-initialized event: " + event.toString());
-        }
-    }
-
-    // Analytics logCustom
-    public void logCustom(String event) {
-        try {
-            if (fabricEnabled()) {
-                MainApp.getFirebaseAnalytics().logEvent(event, new Bundle());
-            } else {
-                if (L.isEnabled(L.CORE))
-                    log.debug("Ignoring recently opted-out event: " + event);
-            }
-        } catch (NullPointerException | IllegalStateException e) {
-            if (L.isEnabled(L.CORE))
-                log.debug("Ignoring opted-out non-initialized event: " + event);
-        }
-    }
-
-    public static void setUserStats() {
-        if (!fabricEnabled()) return;
-
-        String closedLoopEnabled = MainApp.getConstraintChecker().isClosedLoopAllowed().value() ? "CLOSED_LOOP_ENABLED" : "CLOSED_LOOP_DISABLED";
-        // Size is limited to 36 chars
-        String remote = BuildConfig.REMOTE.toLowerCase()
-                .replace("https://", "")
-                .replace("http://", "")
-                .replace(".git", "")
-                .replace(".com/", ":")
-                .replace(".org/", ":")
-                .replace(".net/", ":");
-
-        MainApp.getFirebaseAnalytics().setUserProperty("Mode", BuildConfig.APPLICATION_ID + "-" + closedLoopEnabled);
-        MainApp.getFirebaseAnalytics().setUserProperty("Language", LocaleHelper.INSTANCE.currentLanguage());
-        MainApp.getFirebaseAnalytics().setUserProperty("Version", BuildConfig.VERSION);
-        MainApp.getFirebaseAnalytics().setUserProperty("HEAD", BuildConfig.HEAD);
-        MainApp.getFirebaseAnalytics().setUserProperty("Remote", remote);
-        List<String> hashes = SignatureVerifierPlugin.getPlugin().shortHashes();
-        if (hashes.size() >= 1)
-            MainApp.getFirebaseAnalytics().setUserProperty("Hash", hashes.get(0));
-
-        if (ConfigBuilderPlugin.getPlugin().getActivePump() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("Pump", ConfigBuilderPlugin.getPlugin().getActivePump().getClass().getSimpleName());
-        if (ConfigBuilderPlugin.getPlugin().getActiveAPS() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("Aps", ConfigBuilderPlugin.getPlugin().getActiveAPS().getClass().getSimpleName());
-        if (ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("BgSource", ConfigBuilderPlugin.getPlugin().getActiveBgSource().getClass().getSimpleName());
-        if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("Profile", ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getSimpleName());
-        if (ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("Sensitivity", ConfigBuilderPlugin.getPlugin().getActiveSensitivity().getClass().getSimpleName());
-        if (ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null)
-            MainApp.getFirebaseAnalytics().setUserProperty("Insulin", ConfigBuilderPlugin.getPlugin().getActiveInsulin().getClass().getSimpleName());
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
new file mode 100644
index 0000000000..19d25e008b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
@@ -0,0 +1,143 @@
+package info.nightscout.androidaps.utils
+
+import android.os.Bundle
+import com.crashlytics.android.Crashlytics
+import com.google.firebase.analytics.FirebaseAnalytics
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Some users do not wish to be tracked, Fabric Answers and Crashlytics do not provide an easy way
+ * to disable them and make calls from a potentially invalid singleton reference. This wrapper
+ * emulates the methods but ignores the request if the instance is null or invalid.
+ */
+@Singleton
+class FabricPrivacy @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val constraintChecker: ConstraintChecker,
+    private val mainApp: MainApp,
+    private val signatureVerifierPlugin: SignatureVerifierPlugin,
+    private val activePlugin: ActivePluginProvider
+) {
+
+    init {
+        instance = this
+    }
+
+    companion object {
+        private lateinit var instance: FabricPrivacy
+
+        @JvmStatic
+        @Deprecated("use dagger")
+        fun getInstance(): FabricPrivacy = instance
+    }
+
+    // Analytics logCustom
+    fun logCustom(event: Bundle) {
+        try {
+            if (fabricEnabled()) {
+                mainApp.firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, event)
+            } else {
+                aapsLogger.debug(LTag.CORE, "Ignoring recently opted-out event: $event")
+            }
+        } catch (e: NullPointerException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted-out non-initialized event: $event")
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted-out non-initialized event: $event")
+        }
+    }
+
+    // Analytics logCustom
+    fun logCustom(event: String) {
+        try {
+            if (fabricEnabled()) {
+                mainApp.firebaseAnalytics.logEvent(event, Bundle())
+            } else {
+                aapsLogger.debug(LTag.CORE, "Ignoring recently opted-out event: $event")
+            }
+        } catch (e: NullPointerException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted-out non-initialized event: $event")
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted-out non-initialized event: $event")
+        }
+    }
+
+    // Crashlytics logException
+    fun logException(throwable: Throwable) {
+        try {
+            val crashlytics = Crashlytics.getInstance()
+            crashlytics.core.logException(throwable)
+        } catch (e: NullPointerException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $throwable")
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $throwable")
+        }
+    }
+
+    // Crashlytics log
+    fun log(msg: String) {
+        try {
+            val crashlytics = Crashlytics.getInstance()
+            crashlytics.core.log(msg)
+        } catch (e: NullPointerException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
+        }
+    }
+
+    // Crashlytics log
+    fun log(priority: Int, tag: String?, msg: String) {
+        try {
+            val crashlytics = Crashlytics.getInstance()
+            crashlytics.core.log(priority, tag, msg)
+        } catch (e: NullPointerException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
+        }
+    }
+
+    fun fabricEnabled(): Boolean {
+        return sp.getBoolean(R.string.key_enable_fabric, true)
+    }
+
+    fun setUserStats() {
+        if (!fabricEnabled()) return
+        val closedLoopEnabled = if (constraintChecker.isClosedLoopAllowed().value()) "CLOSED_LOOP_ENABLED" else "CLOSED_LOOP_DISABLED"
+        // Size is limited to 36 chars
+        val remote = BuildConfig.REMOTE.toLowerCase(Locale.getDefault())
+            .replace("https://", "")
+            .replace("http://", "")
+            .replace(".git", "")
+            .replace(".com/", ":")
+            .replace(".org/", ":")
+            .replace(".net/", ":")
+        mainApp.firebaseAnalytics.setUserProperty("Mode", BuildConfig.APPLICATION_ID + "-" + closedLoopEnabled)
+        mainApp.firebaseAnalytics.setUserProperty("Language", sp.getString(R.string.key_language, Locale.getDefault().language))
+        mainApp.firebaseAnalytics.setUserProperty("Version", BuildConfig.VERSION)
+        mainApp.firebaseAnalytics.setUserProperty("HEAD", BuildConfig.HEAD)
+        mainApp.firebaseAnalytics.setUserProperty("Remote", remote)
+        val hashes: List<String> = signatureVerifierPlugin.shortHashes()
+        if (hashes.isNotEmpty()) mainApp.firebaseAnalytics.setUserProperty("Hash", hashes[0])
+        activePlugin.activePump.let { mainApp.firebaseAnalytics.setUserProperty("Pump", it::class.java.simpleName) }
+        if (!Config.NSCLIENT && !Config.PUMPCONTROL)
+            activePlugin.activeAPS.let { mainApp.firebaseAnalytics.setUserProperty("Aps", it::class.java.simpleName) }
+        activePlugin.activeBgSource.let { mainApp.firebaseAnalytics.setUserProperty("BgSource", it::class.java.simpleName) }
+        mainApp.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
+        activePlugin.activeSensitivity.let { mainApp.firebaseAnalytics.setUserProperty("Sensitivity", it::class.java.simpleName) }
+        activePlugin.activeInsulin.let { mainApp.firebaseAnalytics.setUserProperty("Insulin", it::class.java.simpleName) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
deleted file mode 100644
index 8b80c4c6fc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-
-/**
- * Created by mike on 22.02.2017.
- */
-
-public class HardLimits {
-    private static Logger log = LoggerFactory.getLogger(HardLimits.class);
-
-    final static int CHILD = 0;
-    final static int TEENAGE = 1;
-    final static int ADULT = 2;
-    final static int RESISTANTADULT = 3;
-
-    final static double[] MAXBOLUS = {5d, 10d, 17d, 25d};
-
-    // Very Hard Limits Ranges
-    // First value is the Lowest and second value is the Highest a Limit can define
-    public static final int[] VERY_HARD_LIMIT_MIN_BG = {72, 180};
-    public static final int[] VERY_HARD_LIMIT_MAX_BG = {90, 270};
-    public static final int[] VERY_HARD_LIMIT_TARGET_BG = {80, 200};
-    // Very Hard Limits Ranges for Temp Targets
-    public static final int[] VERY_HARD_LIMIT_TEMP_MIN_BG = {72, 180};
-    public static final int[] VERY_HARD_LIMIT_TEMP_MAX_BG = {72, 270};
-    public static final int[] VERY_HARD_LIMIT_TEMP_TARGET_BG = {72, 200};
-
-    public static final double MINDIA = 2;
-    public static final double MAXDIA = 7;
-
-    public static final double MINIC = 2;
-    public static final double MAXIC = 100;
-
-    public static final double MINISF = 2; // mgdl
-    public static final double MAXISF = 720; // mgdl
-
-    public static final double[] MAXIOB_AMA = {3, 5, 7, 12};
-    public static final double[] MAXIOB_SMB = {3, 7, 12, 25};
-
-    public static final double[] MAXBASAL = {2, 5, 10, 12};
-
-
-    private static int loadAge() {
-        String sp_age = SP.getString(R.string.key_age, "");
-        int age;
-
-        if (sp_age.equals(MainApp.gs(R.string.key_child)))
-            age = CHILD;
-        else if (sp_age.equals(MainApp.gs(R.string.key_teenage)))
-            age = TEENAGE;
-        else if (sp_age.equals(MainApp.gs(R.string.key_adult)))
-            age = ADULT;
-        else if (sp_age.equals(MainApp.gs(R.string.key_resistantadult)))
-            age = RESISTANTADULT;
-        else age = ADULT;
-
-        return age;
-    }
-
-    public static double maxBolus() {
-        return MAXBOLUS[loadAge()];
-    }
-
-    public static double maxIobAMA() {
-        return MAXIOB_AMA[loadAge()];
-    }
-
-    public static double maxIobSMB() {
-        return MAXIOB_SMB[loadAge()];
-    }
-
-    public static double maxBasal() {
-        return MAXBASAL[loadAge()];
-    }
-
-    // safety checks
-    public static boolean checkOnlyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
-        return value.equals(verifyHardLimits(value, valueName, lowLimit, highLimit));
-    }
-
-    public static Double verifyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
-        Double newvalue = value;
-        if (newvalue < lowLimit || newvalue > highLimit) {
-            newvalue = Math.max(newvalue, lowLimit);
-            newvalue = Math.min(newvalue, highLimit);
-            String msg = String.format(MainApp.gs(R.string.valueoutofrange), valueName);
-            msg += ".\n";
-            msg += String.format(MainApp.gs(R.string.valuelimitedto), value, newvalue);
-            log.error(msg);
-            NSUpload.uploadError(msg);
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), msg, R.raw.error);
-        }
-        return newvalue;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
new file mode 100644
index 0000000000..48eba49112
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.utils
+
+import android.content.Context
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HardLimits @Inject constructor(
+    val aapsLogger: AAPSLogger,
+    val rxBus: RxBusWrapper,
+    val sp: SP,
+    val resourceHelper: ResourceHelper,
+    val context: Context
+) {
+
+    val CHILD = 0
+    val TEENAGE = 1
+    val ADULT = 2
+    val RESISTANTADULT = 3
+    val MAXBOLUS = doubleArrayOf(5.0, 10.0, 17.0, 25.0)
+
+    // Very Hard Limits Ranges
+    // First value is the Lowest and second value is the Highest a Limit can define
+    val VERY_HARD_LIMIT_MIN_BG = intArrayOf(72, 180)
+    val VERY_HARD_LIMIT_MAX_BG = intArrayOf(90, 270)
+    val VERY_HARD_LIMIT_TARGET_BG = intArrayOf(80, 200)
+
+    // Very Hard Limits Ranges for Temp Targets
+    val VERY_HARD_LIMIT_TEMP_MIN_BG = intArrayOf(72, 180)
+    val VERY_HARD_LIMIT_TEMP_MAX_BG = intArrayOf(72, 270)
+    val VERY_HARD_LIMIT_TEMP_TARGET_BG = intArrayOf(72, 200)
+    val MINDIA = 2.0
+    val MAXDIA = 7.0
+    val MINIC = 2.0
+    val MAXIC = 100.0
+    val MINISF = 2.0 // mgdl
+    val MAXISF = 720.0 // mgdl
+    val MAXIOB_AMA = doubleArrayOf(3.0, 5.0, 7.0, 12.0)
+    val MAXIOB_SMB = doubleArrayOf(3.0, 7.0, 12.0, 25.0)
+    val MAXBASAL = doubleArrayOf(2.0, 5.0, 10.0, 12.0)
+
+    private fun loadAge(): Int {
+        val sp_age = sp.getString(R.string.key_age, "")
+        val age: Int
+        age = if (sp_age == resourceHelper.gs(R.string.key_child)) CHILD
+        else if (sp_age == resourceHelper.gs(R.string.key_teenage)) TEENAGE
+        else if (sp_age == resourceHelper.gs(R.string.key_adult)) ADULT
+        else if (sp_age == resourceHelper.gs(R.string.key_resistantadult)) RESISTANTADULT
+        else ADULT
+        return age
+    }
+
+    fun maxBolus(): Double {
+        return MAXBOLUS[loadAge()]
+    }
+
+    fun maxIobAMA(): Double {
+        return MAXIOB_AMA[loadAge()]
+    }
+
+    fun maxIobSMB(): Double {
+        return MAXIOB_SMB[loadAge()]
+    }
+
+    fun maxBasal(): Double {
+        return MAXBASAL[loadAge()]
+    }
+
+    // safety checks
+    fun checkOnlyHardLimits(value: Double, valueName: String?, lowLimit: Double, highLimit: Double): Boolean {
+        return value == verifyHardLimits(value, valueName, lowLimit, highLimit)
+    }
+
+    fun verifyHardLimits(value: Double, valueName: String?, lowLimit: Double, highLimit: Double): Double {
+        var newvalue = value
+        if (newvalue < lowLimit || newvalue > highLimit) {
+            newvalue = Math.max(newvalue, lowLimit)
+            newvalue = Math.min(newvalue, highLimit)
+            var msg = String.format(resourceHelper.gs(R.string.valueoutofrange), valueName)
+            msg += ".\n"
+            msg += String.format(resourceHelper.gs(R.string.valuelimitedto), value, newvalue)
+            aapsLogger.error(msg)
+            NSUpload.uploadError(msg)
+            ToastUtils.showToastInUiThread(context, rxBus, msg, R.raw.error)
+        }
+        return newvalue
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
index 6205beee21..9b754ac47a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
@@ -12,11 +12,13 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Iterator;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
 /**
  * Created by mike on 11.07.2016.
  */
 public class JSONFormatter {
-    private static Logger log = LoggerFactory.getLogger(JSONFormatter.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(JSONFormatter.class);
 
     public static Spanned format(final String jsonString) {
         final JsonVisitor visitor = new JsonVisitor(1, '\t');
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
index 484f679345..6a16f47125 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
@@ -4,6 +4,7 @@ import org.json.JSONException
 import org.json.JSONObject
 
 object JsonHelper {
+
     @JvmStatic
     fun safeGetObject(json: JSONObject?, fieldName: String, defaultValue: Any): Any {
         var result = defaultValue
@@ -76,6 +77,18 @@ object JsonHelper {
         return result
     }
 
+    @JvmStatic
+    fun safeGetDoubleAllowNull(json: JSONObject?, fieldName: String): Double? {
+        var result: Double? = null
+        if (json != null && json.has(fieldName)) {
+            try {
+                result = json.getDouble(fieldName)
+            } catch (ignored: JSONException) {
+            }
+        }
+        return result
+    }
+
     @JvmStatic
     fun safeGetDouble(json: JSONObject?, fieldName: String, defaultValue: Double): Double {
         var result = defaultValue
@@ -89,8 +102,12 @@ object JsonHelper {
     }
 
     @JvmStatic
-    fun safeGetInt(json: JSONObject?, fieldName: String): Int {
-        var result = 0
+    fun safeGetInt(json: JSONObject?, fieldName: String): Int =
+        safeGetInt(json, fieldName, 0)
+
+    @JvmStatic
+    fun safeGetInt(json: JSONObject?, fieldName: String, defaultValue: Int): Int {
+        var result = defaultValue
         if (json != null && json.has(fieldName)) {
             try {
                 result = json.getInt(fieldName)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java
deleted file mode 100644
index 282ad1aa55..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-
-/**
- * Created by adrian on 17/12/17.
- */
-
-public class LocalAlertUtils {
-    private static Logger log = LoggerFactory.getLogger(LocalAlertUtils.class);
-
-    public static long missedReadingsThreshold() {
-        return T.mins(SP.getInt(MainApp.gs(R.string.key_missed_bg_readings_threshold), 30)).msecs();
-    }
-
-    private static long pumpUnreachableThreshold() {
-        return T.mins(SP.getInt(MainApp.gs(R.string.key_pump_unreachable_threshold), 30)).msecs();
-    }
-
-    public static void checkPumpUnreachableAlarm(long lastConnection, boolean isStatusOutdated) {
-        boolean alarmTimeoutExpired = lastConnection + pumpUnreachableThreshold() < System.currentTimeMillis();
-        boolean nextAlarmOccurrenceReached = SP.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis();
-
-        if (Config.APS && SP.getBoolean(MainApp.gs(R.string.key_enable_pump_unreachable_alert), true)
-                && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !LoopPlugin.getPlugin().isDisconnected()) {
-            log.debug("Generating pump unreachable alarm. lastConnection: " + DateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated);
-            Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.gs(R.string.pump_unreachable), Notification.URGENT);
-            n.soundId = R.raw.alarm;
-            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold());
-            RxBus.INSTANCE.send(new EventNewNotification(n));
-            if (SP.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-                NSUpload.uploadError(n.text);
-            }
-        }
-        if (!isStatusOutdated && !alarmTimeoutExpired)
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PUMP_UNREACHABLE));
-    }
-
-    /*Presnoozes the alarms with 5 minutes if no snooze exists.
-     * Call only at startup!
-     */
-    public static void presnoozeAlarms() {
-        if (SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
-            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
-        }
-        if (SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis()) {
-            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
-        }
-    }
-
-    public static void shortenSnoozeInterval() {
-        //shortens alarm times in case of setting changes or future data
-        long nextMissedReadingsAlarm = SP.getLong("nextMissedReadingsAlarm", 0L);
-        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm);
-        SP.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm);
-
-        long nextPumpDisconnectedAlarm = SP.getLong("nextPumpDisconnectedAlarm", 0L);
-        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm);
-        SP.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm);
-    }
-
-    public static void notifyPumpStatusRead() {
-        //TODO: persist the actual time the pump is read and simplify the whole logic when to alarm
-
-        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-        final Profile profile = ProfileFunctions.getInstance().getProfile();
-        if (pump != null && profile != null) {
-            long lastConnection = pump.lastDataTime();
-            long earliestAlarmTime = lastConnection + pumpUnreachableThreshold();
-            if (SP.getLong("nextPumpDisconnectedAlarm", 0l) < earliestAlarmTime) {
-                SP.putLong("nextPumpDisconnectedAlarm", earliestAlarmTime);
-            }
-        }
-    }
-
-    public static void checkStaleBGAlert() {
-        BgReading bgReading = DatabaseHelper.lastBg();
-        if (SP.getBoolean(MainApp.gs(R.string.key_enable_missed_bg_readings_alert), false)
-                && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
-                && SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
-            Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.gs(R.string.missed_bg_readings), Notification.URGENT);
-            n.soundId = R.raw.alarm;
-            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold());
-            RxBus.INSTANCE.send(new EventNewNotification(n));
-            if (SP.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-                NSUpload.uploadError(n.text);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
new file mode 100644
index 0000000000..070c1b0c51
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -0,0 +1,106 @@
+package info.nightscout.androidaps.utils
+
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by adrian on 17/12/17.
+ */
+@Singleton
+class LocalAlertUtils @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val activePlugin: ActivePluginProvider,
+    private val profileFunction: ProfileFunction,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin
+) {
+
+    fun missedReadingsThreshold(): Long {
+        return T.mins(sp.getInt(resourceHelper.gs(R.string.key_missed_bg_readings_threshold), 30).toLong()).msecs()
+    }
+
+    private fun pumpUnreachableThreshold(): Long {
+        return T.mins(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold), 30).toLong()).msecs()
+    }
+
+    fun checkPumpUnreachableAlarm(lastConnection: Long, isStatusOutdated: Boolean, isDisconnected: Boolean) {
+        val alarmTimeoutExpired = lastConnection + pumpUnreachableThreshold() < System.currentTimeMillis()
+        val nextAlarmOccurrenceReached = sp.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis()
+        if (Config.APS && sp.getBoolean(resourceHelper.gs(R.string.key_enable_pump_unreachable_alert), true)
+            && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !isDisconnected) {
+            aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + DateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
+            val n = Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT)
+            n.soundId = R.raw.alarm
+            sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
+            rxBus.send(EventNewNotification(n))
+            if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
+                NSUpload.uploadError(n.text)
+            }
+        }
+        if (!isStatusOutdated && !alarmTimeoutExpired) rxBus.send(EventDismissNotification(Notification.PUMP_UNREACHABLE))
+    }
+
+    /*Presnoozes the alarms with 5 minutes if no snooze exists.
+     * Call only at startup!
+     */
+    fun presnoozeAlarms() {
+        if (sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()) {
+            sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5 * 60 * 1000)
+        }
+        if (sp.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis()) {
+            sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + 5 * 60 * 1000)
+        }
+    }
+
+    fun shortenSnoozeInterval() { //shortens alarm times in case of setting changes or future data
+        var nextMissedReadingsAlarm = sp.getLong("nextMissedReadingsAlarm", 0L)
+        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm)
+        sp.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm)
+        var nextPumpDisconnectedAlarm = sp.getLong("nextPumpDisconnectedAlarm", 0L)
+        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm)
+        sp.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm)
+    }
+
+    fun notifyPumpStatusRead() { //TODO: persist the actual time the pump is read and simplify the whole logic when to alarm
+        val pump = activePlugin.activePump
+        val profile = profileFunction.getProfile()
+        if (profile != null) {
+            val lastConnection = pump.lastDataTime()
+            val earliestAlarmTime = lastConnection + pumpUnreachableThreshold()
+            if (sp.getLong("nextPumpDisconnectedAlarm", 0L) < earliestAlarmTime) {
+                sp.putLong("nextPumpDisconnectedAlarm", earliestAlarmTime)
+            }
+        }
+    }
+
+    fun checkStaleBGAlert() {
+        val bgReading: BgReading? = iobCobCalculatorPlugin.lastBg()
+        if (sp.getBoolean(resourceHelper.gs(R.string.key_enable_missed_bg_readings_alert), false)
+            && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis() && sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()) {
+            val n = Notification(Notification.BG_READINGS_MISSED, resourceHelper.gs(R.string.missed_bg_readings), Notification.URGENT)
+            n.soundId = R.raw.alarm
+            sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold())
+            rxBus.send(EventNewNotification(n))
+            if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
+                NSUpload.uploadError(n.text)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.kt
index 447d076d93..62da88a15d 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.kt
@@ -4,16 +4,19 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.os.Build
 import android.os.LocaleList
+import androidx.preference.PreferenceManager
 import info.nightscout.androidaps.R
 import java.util.*
 
-
 object LocaleHelper {
-    fun currentLanguage(): String =
-            SP.getString(R.string.key_language, Locale.getDefault().language)
+    private fun currentLanguage(context: Context): String =
+        PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.key_language), "en")
+            ?: "en"
+    // injection not possible because of use in attachBaseContext
+    //SP.getString(R.string.key_language, Locale.getDefault().language)
 
-    private fun currentLocale(): Locale {
-        val language = currentLanguage()
+    private fun currentLocale(context: Context): Locale {
+        val language = currentLanguage(context)
         var locale = Locale(language)
         if (language.contains("_")) {
             // language with country like pt_BR defined in arrays.xml
@@ -26,7 +29,7 @@ object LocaleHelper {
 
     @Suppress("DEPRECATION")
     fun update(context: Context) {
-        val locale = currentLocale()
+        val locale = currentLocale(context)
         Locale.setDefault(locale)
         val resources = context.resources
         val configuration = resources.configuration
@@ -39,7 +42,7 @@ object LocaleHelper {
     fun wrap(ctx: Context): ContextWrapper {
         val res = ctx.resources
         val configuration = res.configuration
-        val newLocale = currentLocale()
+        val newLocale = currentLocale(ctx)
         val context = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             configuration.setLocale(newLocale)
             val localeList = LocaleList(newLocale)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
index 235bb9c6e9..501f6147e7 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
@@ -21,6 +21,17 @@ public class MidnightTime {
         return c.getTimeInMillis();
     }
 
+    public static long calcPlusMinutes(int minutes) {
+        int h = minutes / 60;
+        int m = minutes % 60;
+        Calendar c = Calendar.getInstance();
+        c.set(Calendar.HOUR_OF_DAY, h);
+        c.set(Calendar.MINUTE, m);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        return c.getTimeInMillis();
+    }
+
     public static long calc(long time) {
         Long m;
         synchronized (times) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
index b91236ba25..7ffabaec82 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
@@ -25,13 +25,14 @@ import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 28.06.2016.
  */
 public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         View.OnTouchListener, View.OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(NumberPicker.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(NumberPicker.class);
 
     public interface OnValueChangedListener {
         void onValueChanged(double value);
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
index 3265280c48..cae1a3cde3 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
@@ -24,12 +24,13 @@ import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 28.06.2016.
  */
 public class NumberPickerVertical extends NumberPicker {
-    private static Logger log = LoggerFactory.getLogger(NumberPickerVertical.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(NumberPickerVertical.class);
 
     public NumberPickerVertical(Context context) {
         super(context);
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
index 1d22c380ca..186b81ae36 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
@@ -1,33 +1,26 @@
 package info.nightscout.androidaps.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
-import android.os.Handler
 import android.os.SystemClock
 import android.text.Spanned
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.view.ContextThemeWrapper
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
 
 object OKDialog {
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun show(context: Context, title: String, message: String, runnable: Runnable? = null) {
         var notEmptytitle = title
-        if (notEmptytitle.isEmpty()) notEmptytitle = MainApp.gs(R.string.message)
-        val titleLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = notEmptytitle
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(context, R.style.AppTheme))
-            .setCustomTitle(titleLayout)
+        if (notEmptytitle.isEmpty()) notEmptytitle = context.getString(R.string.message)
+
+        AlertDialogHelper.Builder(context)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, notEmptytitle))
             .setMessage(message)
-            .setPositiveButton(MainApp.gs(R.string.ok)) { dialog: DialogInterface, _: Int ->
+            .setPositiveButton(context.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
                 runOnUiThread(runnable)
@@ -36,23 +29,17 @@ object OKDialog {
             .setCanceledOnTouchOutside(false)
     }
 
-    fun runOnUiThread(theRunnable: Runnable?) {
-        val mainHandler = Handler(MainApp.instance().applicationContext.mainLooper)
-        theRunnable?.let { mainHandler.post(it) }
-    }
-
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun show(activity: Activity, title: String, message: Spanned, runnable: Runnable? = null) {
         var notEmptytitle = title
-        if (notEmptytitle.isEmpty()) notEmptytitle = MainApp.gs(R.string.message)
-        val titleLayout = activity.layoutInflater.inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = notEmptytitle
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(activity, R.style.AppTheme))
-            .setCustomTitle(titleLayout)
+        if (notEmptytitle.isEmpty()) notEmptytitle = activity.getString(R.string.message)
+
+        AlertDialogHelper.Builder(activity)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, notEmptytitle))
             .setMessage(message)
-            .setPositiveButton(MainApp.gs(R.string.ok)) { dialog: DialogInterface, _: Int ->
+            .setPositiveButton(activity.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
                 runnable?.let { activity.runOnUiThread(it) }
@@ -62,26 +49,22 @@ object OKDialog {
     }
 
     @JvmStatic
-    @JvmOverloads
     fun showConfirmation(activity: Activity, message: String, ok: Runnable?) {
-        showConfirmation(activity, MainApp.gs(R.string.confirmation), message, ok, null)
+        showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
     }
 
     @JvmStatic
-    @JvmOverloads
     fun showConfirmation(activity: Activity, message: Spanned, ok: Runnable?) {
-        showConfirmation(activity, MainApp.gs(R.string.confirmation), message, ok, null)
+        showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
     }
 
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(activity: Activity, title: String, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
-        val titleLayout = activity.layoutInflater.inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(activity, R.style.AppTheme))
+        AlertDialogHelper.Builder(activity)
             .setMessage(message)
-            .setCustomTitle(titleLayout)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
@@ -97,14 +80,12 @@ object OKDialog {
             .setCanceledOnTouchOutside(false)
     }
 
+    @SuppressLint("InflateParams")
     @JvmStatic
     fun showConfirmation(activity: Activity, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
-        val titleLayout = activity.layoutInflater.inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(activity, R.style.AppTheme))
+        AlertDialogHelper.Builder(activity)
             .setMessage(message)
-            .setCustomTitle(titleLayout)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
@@ -122,18 +103,16 @@ object OKDialog {
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
-        showConfirmation(context, MainApp.gs(R.string.confirmation), message, ok, cancel)
+        showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel)
     }
 
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
-        val titleLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(context, R.style.AppTheme))
+        AlertDialogHelper.Builder(context)
             .setMessage(message)
-            .setCustomTitle(titleLayout)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
@@ -152,18 +131,16 @@ object OKDialog {
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, message: String, ok: Runnable?, cancel: Runnable? = null) {
-        showConfirmation(context, MainApp.gs(R.string.confirmation), message, ok, cancel)
+        showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel)
     }
 
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
-        val titleLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(context, R.style.AppTheme))
+        AlertDialogHelper.Builder(context)
             .setMessage(message)
-            .setCustomTitle(titleLayout)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
@@ -178,15 +155,13 @@ object OKDialog {
             .setCanceledOnTouchOutside(false)
     }
 
+    @SuppressLint("InflateParams")
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: DialogInterface.OnClickListener?, cancel: DialogInterface.OnClickListener? = null) {
-        val titleLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_custom, null)
-        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
-        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(R.drawable.ic_check_while_48dp)
-        AlertDialog.Builder(ContextThemeWrapper(context, R.style.AppTheme))
+        AlertDialogHelper.Builder(context)
             .setMessage(message)
-            .setCustomTitle(titleLayout)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, which: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java b/app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java
deleted file mode 100644
index 6c4348bb03..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-/**
- * Created by mike on 14.02.2017.
- */
-
-public class PasswordProtection {
-    static public boolean isLocked(String preference) {
-        final String password = SP.getString(preference, "");
-        return !password.equals("");
-    }
-
-    static public void QueryPassword(final Context context, int stringID, String preference, final Runnable ok, final Runnable fail) {
-        final String password = SP.getString(preference, "");
-        if (password.equals("")) {
-            if (ok != null) ok.run();
-            return;
-        }
-        View promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null);
-
-        View titleLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_custom, null);
-        ((TextView) titleLayout.findViewById(R.id.alertdialog_title)).setText(R.string.confirmation);
-        ((ImageView) titleLayout.findViewById(R.id.alertdialog_icon)).setImageResource(R.drawable.ic_check_while_48dp);
-
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
-        alertDialogBuilder.setView(promptsView);
-        alertDialogBuilder.setCustomTitle(titleLayout);
-
-        final TextView label = promptsView.findViewById(R.id.passwordprompt_text);
-        label.setText(MainApp.gs(stringID));
-        final EditText userInput = promptsView.findViewById(R.id.passwordprompt_pass);
-
-        // set dialog message
-        alertDialogBuilder
-                .setCancelable(false)
-                .setPositiveButton(android.R.string.ok,
-                        (dialog, id) -> {
-                            String enteredPassword = userInput.getText().toString();
-                            if (password.equals(enteredPassword)) {
-                                if (ok != null) ok.run();
-                            } else {
-                                ToastUtils.showToastInUiThread(context, MainApp.gs(R.string.wrongpassword));
-                                if (fail != null) fail.run();
-                            }
-                        })
-                .setNegativeButton(android.R.string.cancel,
-                        (dialog, id) -> dialog.cancel());
-
-        AlertDialog alertDialog = alertDialogBuilder.create();
-        alertDialog.show();
-        alertDialog.setCanceledOnTouchOutside(false);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
index 05eed9e97d..b23f664261 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
@@ -2,15 +2,25 @@ package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+
 /**
  * Created by mike on 29.01.2017.
  */
 
 public class Profiler {
-    public Profiler(){}
+    public Profiler() {
+    }
 
+    @Deprecated
     static public void log(Logger log, String function, long start) {
         long msec = System.currentTimeMillis() - start;
         log.debug(">>> " + function + " <<< executed in " + msec + " miliseconds");
     }
+
+    static public void log(AAPSLogger log, LTag lTag, String function, long start) {
+        long msec = System.currentTimeMillis() - start;
+        log.debug(lTag, ">>> " + function + " <<< executed in " + msec + " miliseconds");
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SP.java b/app/src/main/java/info/nightscout/androidaps/utils/SP.java
index 191fd9421b..b3c581fee1 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SP.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SP.java
@@ -14,30 +14,37 @@ import info.nightscout.androidaps.MainApp;
 public class SP {
     private static SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
 
+    @Deprecated
     static public Map<String, ?> getAll() {
         return sharedPreferences.getAll();
     }
 
+    @Deprecated
     static public void clear() {
         sharedPreferences.edit().clear().apply();
     }
 
+    @Deprecated
     static public boolean contains(String key) {
         return sharedPreferences.contains(key);
     }
 
+    @Deprecated
     static public boolean contains(int resourceId) {
         return sharedPreferences.contains(MainApp.gs(resourceId));
     }
 
+    @Deprecated
     static public String getString(int resourceID, String defaultValue) {
         return sharedPreferences.getString(MainApp.gs(resourceID), defaultValue);
     }
 
+    @Deprecated
     static public String getString(String key, String defaultValue) {
         return sharedPreferences.getString(key, defaultValue);
     }
 
+    @Deprecated
     static public boolean getBoolean(int resourceID, Boolean defaultValue) {
         try {
             return sharedPreferences.getBoolean(MainApp.gs(resourceID), defaultValue);
@@ -46,6 +53,7 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public boolean getBoolean(String key, Boolean defaultValue) {
         try {
             return sharedPreferences.getBoolean(key, defaultValue);
@@ -54,14 +62,17 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public Double getDouble(int resourceID, Double defaultValue) {
         return SafeParse.stringToDouble(sharedPreferences.getString(MainApp.gs(resourceID), defaultValue.toString()));
     }
 
+    @Deprecated
     static public Double getDouble(String key, Double defaultValue) {
         return SafeParse.stringToDouble(sharedPreferences.getString(key, defaultValue.toString()));
     }
 
+    @Deprecated
     static public int getInt(int resourceID, Integer defaultValue) {
         try {
             return sharedPreferences.getInt(MainApp.gs(resourceID), defaultValue);
@@ -70,6 +81,7 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public int getInt(String key, Integer defaultValue) {
         try {
             return sharedPreferences.getInt(key, defaultValue);
@@ -78,6 +90,7 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public long getLong(int resourceID, Long defaultValue) {
         try {
             return sharedPreferences.getLong(MainApp.gs(resourceID), defaultValue);
@@ -86,6 +99,7 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public long getLong(String key, Long defaultValue) {
         try {
             return sharedPreferences.getLong(key, defaultValue);
@@ -94,51 +108,63 @@ public class SP {
         }
     }
 
+    @Deprecated
     static public void putBoolean(String key, boolean value) {
         sharedPreferences.edit().putBoolean(key, value).apply();
     }
 
+    @Deprecated
     static public void putBoolean(int resourceID, boolean value) {
         sharedPreferences.edit().putBoolean(MainApp.gs(resourceID), value).apply();
     }
 
+    @Deprecated
     static public void putDouble(String key, double value) {
         sharedPreferences.edit().putString(key, Double.toString(value)).apply();
     }
 
+    @Deprecated
     static public void putLong(String key, long value) {
         sharedPreferences.edit().putLong(key, value).apply();
     }
 
+    @Deprecated
     static public void putLong(int resourceID, long value) {
         sharedPreferences.edit().putLong(MainApp.gs(resourceID), value).apply();
     }
 
+    @Deprecated
     static public void putInt(String key, int value) {
         sharedPreferences.edit().putInt(key, value).apply();
     }
 
+    @Deprecated
     static public void putInt(int resourceID, int value) {
         sharedPreferences.edit().putInt(MainApp.gs(resourceID), value).apply();
     }
 
+    @Deprecated
     static public void incInt(int resourceID) {
         int value = SP.getInt(resourceID, 0) + 1;
         sharedPreferences.edit().putInt(MainApp.gs(resourceID), value).apply();
     }
 
+    @Deprecated
     static public void putString(int resourceID, String value) {
         sharedPreferences.edit().putString(MainApp.gs(resourceID), value).apply();
     }
 
+    @Deprecated
     static public void putString(String key, String value) {
         sharedPreferences.edit().putString(key, value).apply();
     }
 
+    @Deprecated
     static public void remove(int resourceID) {
         sharedPreferences.edit().remove(MainApp.gs(resourceID)).apply();
     }
 
+    @Deprecated
     static public void remove(String key) {
         sharedPreferences.edit().remove(key).apply();
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
new file mode 100644
index 0000000000..fa79caaf2b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.utils;
+
+import android.app.backup.BackupAgentHelper;
+import android.app.backup.SharedPreferencesBackupHelper;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import info.nightscout.androidaps.MainApp;
+
+public class SPBackupAgent extends BackupAgentHelper {
+
+    // API 24
+    //static final String PREFS = PreferenceManager.getDefaultSharedPreferencesName(MainApp.instance().getApplicationContext());
+    static final String PREFS = MainApp.instance().getApplicationContext().getPackageName() + "_preferences";
+
+    static final String PREFS_BACKUP_KEY = "SP";
+
+    @Override
+    public void onCreate() {
+        SharedPreferencesBackupHelper helper =
+                new SharedPreferencesBackupHelper(this, PREFS);
+        addHelper(PREFS_BACKUP_KEY, helper);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
index 5ee2a66177..4e1ee5ceae 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
 /**
  * Created by mike on 23.06.2016.
  */
 public class SafeParse {
-    private static Logger log = LoggerFactory.getLogger(SafeParse.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(SafeParse.class);
     public static Double stringToDouble(String input) {
         Double result = 0d;
         input = input.replace(",", ".");
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
index 74500ebdbc..4ca57f3ad4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
@@ -10,12 +10,14 @@ import android.view.View;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
 /**
  * Created by mike on 22.12.2017.
  */
 
 public class SingleClickButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(SingleClickButton.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(SingleClickButton.class);
 
     Context context;
     OnClickListener listener = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
index 60de82a93c..2c28d3e212 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
@@ -25,6 +25,7 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * {@hide}
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.logging.L;
  * </pre>
  */
 public class SntpClient {
-    private static Logger log = LoggerFactory.getLogger(L.CORE);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
 
     //private static final int REFERENCE_TIME_OFFSET = 16;
     private static final int ORIGINATE_TIME_OFFSET = 24;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
index 74e8da7c9d..ebd31dea17 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
@@ -8,10 +8,6 @@ import info.nightscout.androidaps.R;
  */
 public class StringUtils {
 
-    private StringUtils() {
-        // this constructor is private, since this class should not get instantiated
-    }
-
     public static String removeSurroundingQuotes(String string) {
         if (string.length() >= 2 && string.charAt(0) == '"'
                 && string.charAt(string.length() - 1) == '"') {
@@ -24,8 +20,4 @@ public class StringUtils {
     public static boolean emptyString(final String str) {
         return str == null || str.length() == 0;
     }
-
-    public static String formatInsulin(double insulin) {
-        return String.format(MainApp.gs(R.string.formatinsulinunits), insulin);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 0143377bb2..892f9b2667 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -29,13 +29,14 @@ import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 29.12.2016.
  */
 
 public class TimeListEdit {
-    private static Logger log = LoggerFactory.getLogger(TimeListEdit.class);
+    private static Logger log = StacktraceLoggerWrapper.getLogger(TimeListEdit.class);
 
     private final int ONEHOURINSECONDS = 60 * 60;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
index fe596d8f08..26062011f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
@@ -1,34 +1,103 @@
 package info.nightscout.androidaps.utils;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.view.ContextThemeWrapper;
+
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 
 
 public class ToastUtils {
+
+    public static class Long {
+
+        public static void warnToast(final Context ctx, final String string) {
+            graphicalToast(ctx, string, R.drawable.ic_toast_warn, false);
+        }
+
+        public static void infoToast(final Context ctx, final String string) {
+            graphicalToast(ctx, string, R.drawable.ic_toast_info,false);
+        }
+
+        public static void okToast(final Context ctx, final String string) {
+            graphicalToast(ctx, string, R.drawable.ic_toast_check,false);
+        }
+
+        public static void errorToast(final Context ctx, final String string) {
+            graphicalToast(ctx, string, R.drawable.ic_toast_error,false);
+        }
+    }
+
     public static void showToastInUiThread(final Context ctx, final int stringId) {
         showToastInUiThread(ctx, MainApp.gs(stringId));
     }
 
-    public static void showToastInUiThread(final Context ctx, final String string) {
-        Handler mainThread = new Handler(Looper.getMainLooper());
-        mainThread.post(() -> Toast.makeText(ctx, string, Toast.LENGTH_SHORT).show());
+    public static void warnToast(final Context ctx, final String string) {
+        graphicalToast(ctx, string, R.drawable.ic_toast_warn, true);
     }
 
-    public static void showToastInUiThread(final Context ctx,
+    public static void infoToast(final Context ctx, final String string) {
+        graphicalToast(ctx, string, R.drawable.ic_toast_info, true);
+    }
+
+    public static void okToast(final Context ctx, final String string) {
+        graphicalToast(ctx, string, R.drawable.ic_toast_check, true);
+    }
+
+    public static void errorToast(final Context ctx, final String string) {
+        graphicalToast(ctx, string, R.drawable.ic_toast_error, true);
+    }
+
+    public static void graphicalToast(final Context ctx, final String string, @DrawableRes int iconId) {
+        graphicalToast(ctx, string, iconId, true);
+    }
+
+    @SuppressLint("InflateParams")
+    public static void graphicalToast(final Context ctx, final String string, @DrawableRes int iconId, boolean isShort) {
+        Handler mainThread = new Handler(Looper.getMainLooper());
+        mainThread.post(() -> {
+            View toastRoot =LayoutInflater.from(new ContextThemeWrapper(ctx, R.style.AppTheme)).inflate(R.layout.toast, null);
+            TextView toastMessage = toastRoot.findViewById(android.R.id.message);
+            toastMessage.setText(string);
+
+            ImageView toastIcon = toastRoot.findViewById(android.R.id.icon);
+            toastIcon.setImageResource(iconId);
+
+            Toast toast = new Toast(ctx);
+            toast.setDuration(isShort ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG);
+            toast.setView(toastRoot);
+            toast.show();
+        });
+    }
+
+    public static void showToastInUiThread(final Context ctx, final String string) {
+        Handler mainThread = new Handler(Looper.getMainLooper());
+        mainThread.post(() -> {
+            Toast.makeText(ctx, string, Toast.LENGTH_SHORT).show();
+        });
+    }
+
+    public static void showToastInUiThread(final Context ctx, final RxBusWrapper rxBus,
                                            final String string, int soundID) {
 
         showToastInUiThread(ctx, string);
         playSound(ctx, soundID);
         Notification notification = new Notification(Notification.TOAST_ALARM, string, Notification.URGENT);
-        RxBus.INSTANCE.send(new EventNewNotification(notification));
+        rxBus.send(new EventNewNotification(notification));
     }
 
     private static void playSound(final Context ctx, final int soundID) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/UIUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/UIUtils.kt
index 99c4a4af31..ad57e519da 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/UIUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/UIUtils.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.utils
 
+import android.os.Handler
 import android.view.View
+import info.nightscout.androidaps.MainApp
 
 /**
  * Created by adrian on 2019-12-20.
@@ -8,3 +10,7 @@ import android.view.View
 
 fun Boolean.toVisibility() = if (this) View.VISIBLE else View.GONE
 
+fun runOnUiThread(theRunnable: Runnable?) {
+    val mainHandler = Handler(MainApp.instance().applicationContext.mainLooper)
+    theRunnable?.let { mainHandler.post(it) }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
deleted file mode 100644
index 4354ccd528..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.services.Intents;
-
-/**
- * Created by mike on 10.02.2017.
- */
-
-public class XdripCalibrations {
-    private static Logger log = LoggerFactory.getLogger(XdripCalibrations.class);
-
-    public static void confirmAndSendCalibration(final Double bg, final Context parentContext) {
-        if (parentContext != null) {
-            String confirmMessage = String.format(MainApp.gs(R.string.send_calibration), bg);
-            OKDialog.showConfirmation(parentContext, confirmMessage, () -> sendIntent(bg));
-        }
-    }
-
-    public static boolean sendIntent(Double bg) {
-        Context context = MainApp.instance().getApplicationContext();
-        Bundle bundle = new Bundle();
-        bundle.putDouble("glucose_number", bg);
-        bundle.putString("units", ProfileFunctions.getSystemUnits().equals(Constants.MGDL) ? "mgdl" : "mmol");
-        bundle.putLong("timestamp", System.currentTimeMillis());
-        Intent intent = new Intent(Intents.ACTION_REMOTE_CALIBRATION);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        context.sendBroadcast(intent);
-        List<ResolveInfo> q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(intent, 0);
-        if (q.size() < 1) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.xdripnotinstalled));
-            log.debug(MainApp.gs(R.string.xdripnotinstalled));
-            return false;
-        } else {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.calibrationsent));
-            log.debug(MainApp.gs(R.string.calibrationsent));
-            return true;
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
new file mode 100644
index 0000000000..9c32ccadef
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.utils
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.services.Intents
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class XdripCalibrations @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val profileFunction: ProfileFunction
+) {
+
+    fun sendIntent(bg: Double): Boolean {
+        val bundle = Bundle()
+        bundle.putDouble("glucose_number", bg)
+        bundle.putString("units", if (profileFunction.getUnits() == Constants.MGDL) "mgdl" else "mmol")
+        bundle.putLong("timestamp", System.currentTimeMillis())
+        val intent = Intent(Intents.ACTION_REMOTE_CALIBRATION)
+        intent.putExtras(bundle)
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+        context.sendBroadcast(intent)
+        val q = context.packageManager.queryBroadcastReceivers(intent, 0)
+        return if (q.size < 1) {
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.xdripnotinstalled))
+            aapsLogger.debug(resourceHelper.gs(R.string.xdripnotinstalled))
+            false
+        } else {
+            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.calibrationsent))
+            aapsLogger.debug(resourceHelper.gs(R.string.calibrationsent))
+            true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
new file mode 100644
index 0000000000..afc5491652
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.utils.alertDialogs
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.view.ContextThemeWrapper
+import info.nightscout.androidaps.R
+
+object AlertDialogHelper {
+
+    @Suppress("FunctionName")
+    fun Builder(context: Context, @StyleRes themeResId: Int = R.style.AppTheme) =
+        AlertDialog.Builder(ContextThemeWrapper(context, themeResId))
+
+    fun buildCustomTitle(context: Context, title: String,
+                         @DrawableRes iconResource: Int = R.drawable.ic_check_while_48dp,
+                         @StyleRes themeResId: Int = R.style.AppTheme,
+                         @LayoutRes layoutResource: Int = R.layout.dialog_alert_custom): View? {
+        val titleLayout = LayoutInflater.from(ContextThemeWrapper(context, themeResId)).inflate(layoutResource, null)
+        (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
+        (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(iconResource)
+        return titleLayout
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
new file mode 100644
index 0000000000..d5b6900386
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
@@ -0,0 +1,138 @@
+package info.nightscout.androidaps.utils.alertDialogs
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.DialogInterface
+import android.graphics.Color
+import android.os.SystemClock
+import android.view.LayoutInflater
+import android.view.View
+import android.webkit.WebView
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TableLayout
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.annotation.StyleRes
+import androidx.appcompat.view.ContextThemeWrapper
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs
+import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.runOnUiThread
+import java.util.*
+
+object PrefImportSummaryDialog {
+
+    @SuppressLint("InflateParams")
+    fun showSummary(context: Context, importOk: Boolean, importPossible: Boolean, prefs: Prefs, ok: (() -> Unit)?, cancel: (() -> Unit)? = null) {
+
+        @StyleRes val theme: Int = if (importOk) R.style.AppTheme else {
+            if (importPossible) R.style.AppThemeWarningDialog else R.style.AppThemeErrorDialog
+        }
+
+        @StringRes val messageRes: Int = if (importOk) R.string.check_preferences_before_import else {
+            if (importPossible) R.string.check_preferences_dangerous_import else R.string.check_preferences_cannot_import
+        }
+
+        @DrawableRes val headerIcon: Int = if (importOk) R.drawable.ic_header_import else {
+            if (importPossible) R.drawable.ic_header_warning else R.drawable.ic_header_error
+        }
+
+        val themedCtx = ContextThemeWrapper(context, theme)
+
+        val innerLayout = LayoutInflater.from(themedCtx).inflate(R.layout.dialog_alert_import_summary, null)
+        val table = (innerLayout.findViewById<View>(R.id.summary_table) as TableLayout)
+        val detailsBtn = (innerLayout.findViewById<View>(R.id.summary_details_btn) as Button)
+
+        var idx = 0
+        val details = LinkedList<String>()
+
+
+        for ((metaKey, metaEntry) in prefs.metadata) {
+            val rowLayout = LayoutInflater.from(themedCtx).inflate(R.layout.import_summary_item, null)
+            val label = (rowLayout.findViewById<View>(R.id.summary_text) as TextView)
+            label.setText(metaKey.formatForDisplay(context, metaEntry.value))
+            (rowLayout.findViewById<View>(R.id.summary_icon) as ImageView).setImageResource(metaKey.icon)
+            (rowLayout.findViewById<View>(R.id.status_icon) as ImageView).setImageResource(metaEntry.status.icon)
+
+            if (metaEntry.status == PrefsStatus.WARN) label.setTextColor(themedCtx.getColor(R.color.metadataTextWarning))
+            else if (metaEntry.status == PrefsStatus.ERROR) label.setTextColor(themedCtx.getColor(R.color.metadataTextError))
+
+            if (metaEntry.info != null) {
+                details.add("<b>${context.getString(metaKey.label)}</b>: ${metaEntry.value}<br/><i style=\"color:silver\">${metaEntry.info}</i>")
+                rowLayout.isClickable = true
+                rowLayout.setOnClickListener {
+                    val msg = "[${context.getString(metaKey.label)}] ${metaEntry.info}"
+                    when (metaEntry.status) {
+                        PrefsStatus.WARN  -> ToastUtils.Long.warnToast(context, msg)
+                        PrefsStatus.ERROR -> ToastUtils.Long.errorToast(context, msg)
+                        else              -> ToastUtils.Long.infoToast(context, msg)
+                    }
+                }
+            } else {
+                rowLayout.isClickable = true
+                rowLayout.setOnClickListener { ToastUtils.Long.infoToast(context, context.getString(metaKey.label)) }
+            }
+
+            table.addView(rowLayout, idx++)
+        }
+
+        if (details.size > 0) {
+            detailsBtn.visibility = View.VISIBLE
+            detailsBtn.setOnClickListener {
+                val detailsLayout = LayoutInflater.from(context).inflate(R.layout.import_summary_details, null)
+                val wview = detailsLayout.findViewById<View>(R.id.details_webview) as WebView
+                wview.loadData("<!doctype html><html><head><meta charset=\"utf-8\"><style>body { color: white; }</style></head><body>" + details.joinToString("<hr>"), "text/html; charset=utf-8", "utf-8");
+                wview.setBackgroundColor(Color.TRANSPARENT);
+                wview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
+
+                AlertDialogHelper.Builder(context, R.style.AppTheme)
+                    .setCustomTitle(AlertDialogHelper.buildCustomTitle(
+                        context,
+                        context.getString(R.string.check_preferences_details_title),
+                        R.drawable.ic_header_log,
+                        R.style.AppTheme))
+                    .setView(detailsLayout)
+                    .setPositiveButton(android.R.string.ok) { dialogInner: DialogInterface, _: Int ->
+                        dialogInner.dismiss()
+                    }
+                    .show()
+            }
+        }
+
+        val builder = AlertDialogHelper.Builder(context, theme)
+            .setMessage(context.getString(messageRes))
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.nav_import), headerIcon, theme))
+            .setView(innerLayout)
+
+            .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (cancel != null) {
+                    runOnUiThread(Runnable {
+                        cancel()
+                    })
+                }
+            }
+
+        if (importPossible) {
+            builder.setPositiveButton(
+                if (importOk) R.string.check_preferences_import_btn else R.string.check_preferences_import_anyway_btn
+            ) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (ok != null) {
+                    runOnUiThread(Runnable {
+                        ok()
+                    })
+                }
+            }
+        }
+
+        val dialog = builder.show()
+        dialog.setCanceledOnTouchOutside(false)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
new file mode 100644
index 0000000000..9c1fbf37aa
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.utils.alertDialogs
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.DialogInterface
+import android.os.SystemClock
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.runOnUiThread
+
+object TwoMessagesAlertDialog {
+
+    @SuppressLint("InflateParams")
+    fun showAlert(context: Context, title: String, message: String, secondMessage: String, ok: (() -> Unit)?, cancel: (() -> Unit)? = null, @DrawableRes icon: Int? = null) {
+
+        val secondMessageLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_two_messages, null)
+        (secondMessageLayout.findViewById<View>(R.id.password_prompt_title) as TextView).text = secondMessage
+
+        val dialog = AlertDialogHelper.Builder(context)
+            .setMessage(message)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title, icon
+                ?: R.drawable.ic_check_while_48dp))
+            .setView(secondMessageLayout)
+            .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (ok != null) {
+                    runOnUiThread(Runnable {
+                        ok()
+                    })
+                }
+            }
+            .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (cancel != null) {
+                    runOnUiThread(Runnable {
+                        cancel()
+                    })
+                }
+            }
+            .show()
+        dialog.setCanceledOnTouchOutside(false)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
new file mode 100644
index 0000000000..cd0654f3bf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.utils.alertDialogs
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.DialogInterface
+import android.os.SystemClock
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.runOnUiThread
+
+// if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead
+
+object WarningDialog {
+
+    @SuppressLint("InflateParams")
+    @JvmStatic
+    @JvmOverloads
+    fun showWarning(context: Context, title: String, message: String, @StringRes positiveButton: Int = -1, ok: (() -> Unit)? = null, cancel: (() -> Unit)? = null) {
+
+        val builder = AlertDialogHelper.Builder(context, R.style.AppThemeWarningDialog)
+            .setMessage(message)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title, R.drawable.ic_header_warning, R.style.AppThemeWarningDialog))
+            .setNegativeButton(R.string.dismiss) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (cancel != null) {
+                    runOnUiThread(Runnable {
+                        cancel()
+                    })
+                }
+            }
+
+        if (positiveButton != -1) {
+            builder.setPositiveButton(positiveButton) { dialog: DialogInterface, _: Int ->
+                dialog.dismiss()
+                SystemClock.sleep(100)
+                if (ok != null) {
+                    runOnUiThread(Runnable {
+                        ok()
+                    })
+                }
+            }
+        }
+
+        val dialog = builder.show()
+        dialog.setCanceledOnTouchOutside(true)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
new file mode 100644
index 0000000000..f1cec2109f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.utils.buildHelper
+
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BuildHelper @Inject constructor() {
+
+    private var devBranch = false
+    private var engineeringMode = false
+
+    init {
+        val extFilesDir = LoggerUtils.getLogDirectory()
+        val engineeringModeSemaphore = File(extFilesDir, "engineering_mode")
+
+        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile
+        devBranch = BuildConfig.VERSION.contains("-") || BuildConfig.VERSION.matches(Regex(".*[a-zA-Z]+.*"))
+    }
+
+    fun isEngineeringModeOrRelease(): Boolean =
+        if (!Config.APS) true else engineeringMode || !devBranch
+
+    fun isEngineeringMode(): Boolean =
+        if (!Config.APS) true else engineeringMode || !devBranch
+
+    fun isDev(): Boolean = devBranch
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CompositeDisposablePlusAssign.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
similarity index 78%
rename from app/src/main/java/info/nightscout/androidaps/utils/CompositeDisposablePlusAssign.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
index 1f2fb892e5..8a485896ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/CompositeDisposablePlusAssign.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.extensions
 
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/DaysToMillis.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/DaysToMillis.kt
new file mode 100644
index 0000000000..f9fae16b4f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/DaysToMillis.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.utils.extensions
+
+import java.util.concurrent.TimeUnit
+
+fun Long.daysToMillis() = TimeUnit.DAYS.toMillis(this)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/DoubleToSignedString.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/DoubleToSignedString.kt
new file mode 100644
index 0000000000..af942b871e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/DoubleToSignedString.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.utils.extensions
+
+import info.nightscout.androidaps.interfaces.PumpInterface
+import info.nightscout.androidaps.utils.DecimalFormatter
+
+fun Double.toSignedString(pump: PumpInterface): String {
+    val formatted = DecimalFormatter.toPumpSupportedBolus(this, pump)
+    return if (this > 0) "+$formatted" else formatted
+}
+
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/EspressoTestHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/EspressoTestHelper.kt
new file mode 100644
index 0000000000..fae622497a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/EspressoTestHelper.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.utils.extensions
+
+@Synchronized
+fun isRunningTest(): Boolean {
+    return try {
+        Class.forName("androidx.test.espresso.Espresso")
+        true
+    } catch (e: ClassNotFoundException) {
+        false
+    }
+}
+
+@Synchronized
+fun isRunningRealPumpTest(): Boolean {
+    return try {
+        Class.forName("info.nightscout.androidaps.RealPumpTest")
+        true
+    } catch (e: ClassNotFoundException) {
+        false
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt b/app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
new file mode 100644
index 0000000000..47d38be3d1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.utils.protection
+
+import androidx.biometric.BiometricConstants
+import androidx.biometric.BiometricPrompt
+import androidx.fragment.app.FragmentActivity
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.ToastUtils
+import java.util.concurrent.Executors
+
+object BiometricCheck {
+    fun biometricPrompt(activity: FragmentActivity, title: Int, ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) {
+        val executor = Executors.newSingleThreadExecutor()
+
+        val biometricPrompt = BiometricPrompt(activity, executor, object : BiometricPrompt.AuthenticationCallback() {
+            override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                super.onAuthenticationError(errorCode, errString)
+                when (errorCode) {
+                    BiometricConstants.ERROR_UNABLE_TO_PROCESS,
+                    BiometricConstants.ERROR_TIMEOUT,
+                    BiometricConstants.ERROR_CANCELED,
+                    BiometricConstants.ERROR_LOCKOUT,
+                    BiometricConstants.ERROR_VENDOR,
+                    BiometricConstants.ERROR_LOCKOUT_PERMANENT,
+                    BiometricConstants.ERROR_USER_CANCELED   -> {
+                        ToastUtils.showToastInUiThread(activity.baseContext, errString.toString())
+                        fail?.run()
+                    }
+
+                    BiometricConstants.ERROR_NEGATIVE_BUTTON ->
+                        cancel?.run()
+                    BiometricConstants.ERROR_NO_SPACE,
+                    BiometricConstants.ERROR_HW_UNAVAILABLE,
+                    BiometricConstants.ERROR_HW_NOT_PRESENT,
+                    BiometricConstants.ERROR_NO_DEVICE_CREDENTIAL,
+                    BiometricConstants.ERROR_NO_BIOMETRICS   ->
+                        // call ok, because it's not possible to bypass it when biometrics fail
+                        // ok?.run()
+                        // changed to fail as you can use PIN instead with setDeviceCredentialAllowed enabled
+                        fail?.run()
+                }
+            }
+
+            override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                super.onAuthenticationSucceeded(result)
+                // Called when a biometric is recognized.
+                ok?.run()
+            }
+
+            override fun onAuthenticationFailed() {
+                super.onAuthenticationFailed()
+                // Called when a biometric is valid but not recognized.
+                fail?.run()
+            }
+        })
+
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle(activity.getString(title))
+            .setDescription(activity.getString(R.string.biometric_title))
+//            .setNegativeButtonText(activity.getString(R.string.cancel)) // not possible with setDeviceCredentialAllowed
+            .setDeviceCredentialAllowed(true)
+            .build()
+
+        biometricPrompt.authenticate(promptInfo)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
new file mode 100644
index 0000000000..1907ac01b5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@@ -0,0 +1,107 @@
+package info.nightscout.androidaps.utils.protection
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.EditText
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.CryptoUtil
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+// since androidx.autofill.HintConstants are not available
+val AUTOFILL_HINT_NEW_PASSWORD = "newPassword"
+
+@Singleton
+class PasswordCheck @Inject constructor(val sp: SP) {
+
+    @SuppressLint("InflateParams")
+    fun queryPassword(context: Context, @StringRes labelId: Int, @StringRes preference: Int, ok: ( (String) -> Unit)?, cancel: (()->Unit)? = null, fail: (()->Unit)? = null) {
+        val password = sp.getString(preference, "")
+        if (password == "") {
+                ok?.invoke("")
+            return
+        }
+
+        val promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null)
+        val alertDialogBuilder = AlertDialogHelper.Builder(context)
+        alertDialogBuilder.setView(promptsView)
+
+        val userInput = promptsView.findViewById<View>(R.id.passwordprompt_pass) as EditText
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val autoFillHintPasswordKind = context.getString(preference)
+            userInput.setAutofillHints(View.AUTOFILL_HINT_PASSWORD, "aaps_${autoFillHintPasswordKind}")
+            userInput.importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES
+        }
+
+        alertDialogBuilder
+            .setCancelable(false)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
+            .setPositiveButton(context.getString(R.string.ok)) { _, _ ->
+                val enteredPassword = userInput.text.toString()
+                if (CryptoUtil.checkPassword(enteredPassword, password)) ok?.invoke(enteredPassword)
+                else {
+                    ToastUtils.errorToast(context, context.getString(R.string.wrongpassword))
+                    fail?.invoke()
+                }
+            }
+            .setNegativeButton(context.getString(R.string.cancel)
+            ) { dialog, _ ->
+                cancel?.invoke()
+                dialog.cancel()
+            }
+
+        alertDialogBuilder.create().show()
+    }
+
+    @SuppressLint("InflateParams")
+    fun setPassword(context: Context, @StringRes labelId: Int, @StringRes preference: Int, ok: ( (String) -> Unit)? = null, cancel: (()->Unit)? = null, clear: (()->Unit)? = null) {
+        val promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null)
+        val alertDialogBuilder = AlertDialogHelper.Builder(context)
+        alertDialogBuilder.setView(promptsView)
+
+        val userInput = promptsView.findViewById<View>(R.id.passwordprompt_pass) as EditText
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val autoFillHintPasswordKind = context.getString(preference)
+            userInput.setAutofillHints(AUTOFILL_HINT_NEW_PASSWORD, "aaps_${autoFillHintPasswordKind}")
+            userInput.importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES
+        }
+
+        alertDialogBuilder
+            .setCancelable(false)
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
+            .setPositiveButton(context.getString(R.string.ok)) { _, _ ->
+                val enteredPassword = userInput.text.toString()
+                if (enteredPassword.isNotEmpty()) {
+                    sp.putString(preference, CryptoUtil.hashPassword(enteredPassword))
+                    ToastUtils.okToast(context, context.getString(R.string.password_set))
+                    ok?.invoke(enteredPassword)
+                } else {
+                    if (sp.contains(preference)) {
+                        sp.remove(preference)
+                        ToastUtils.graphicalToast(context, context.getString(R.string.password_cleared), R.drawable.ic_toast_delete_confirm)
+                        clear?.invoke()
+                    } else {
+                        ToastUtils.warnToast(context, context.getString(R.string.password_not_changed))
+                        cancel?.invoke()
+                    }
+                }
+
+            }
+            .setNegativeButton(context.getString(R.string.cancel)
+            ) { dialog, _ ->
+                ToastUtils.infoToast(context, context.getString(R.string.password_not_changed))
+                cancel?.invoke()
+                dialog.cancel()
+            }
+
+        alertDialogBuilder.create().show()
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt b/app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
new file mode 100644
index 0000000000..a1cca9116e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.utils.protection
+
+import androidx.fragment.app.FragmentActivity
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProtectionCheck @Inject constructor(
+    val sp: SP,
+    val passwordCheck: PasswordCheck
+) {
+
+    enum class Protection {
+        PREFERENCES,
+        APPLICATION,
+        BOLUS
+    }
+
+    enum class ProtectionType {
+        NONE,
+        BIOMETRIC,
+        MASTER_PASSWORD,
+        CUSTOM_PASSWORD
+    }
+
+    private val passwordsResourceIDs = listOf(
+        R.string.key_settings_password,
+        R.string.key_application_password,
+        R.string.key_bolus_password)
+
+    private val protectionTypeResourceIDs = listOf(
+        R.string.key_settings_protection,
+        R.string.key_application_protection,
+        R.string.key_bolus_protection)
+
+    private val titleResourceIDs = listOf(
+        R.string.settings_password,
+        R.string.application_password,
+        R.string.bolus_password)
+
+    fun isLocked(protection: Protection): Boolean {
+        return when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {
+            ProtectionType.NONE      -> false
+            ProtectionType.BIOMETRIC -> true
+            ProtectionType.MASTER_PASSWORD  -> sp.getString(R.string.key_master_password, "") != ""
+            ProtectionType.CUSTOM_PASSWORD  -> sp.getString(passwordsResourceIDs[protection.ordinal], "") != ""
+        }
+    }
+
+    @JvmOverloads
+    fun queryProtection(activity: FragmentActivity, protection: Protection,
+                        ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) {
+        when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {
+            ProtectionType.NONE      ->
+                ok?.run()
+            ProtectionType.BIOMETRIC ->
+                BiometricCheck.biometricPrompt(activity, titleResourceIDs[protection.ordinal], ok, cancel, fail)
+            ProtectionType.MASTER_PASSWORD  ->
+                passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, { ok?.run() }, { cancel?.run() }, { fail?.run() })
+            ProtectionType.CUSTOM_PASSWORD  ->
+                passwordCheck.queryPassword(activity, titleResourceIDs[protection.ordinal], passwordsResourceIDs[protection.ordinal], { ok?.run() }, { cancel?.run() }, { fail?.run() })
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt
new file mode 100644
index 0000000000..1045f4b5b8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.utils.resources
+
+import android.content.res.AssetFileDescriptor
+import android.graphics.Bitmap
+import android.util.DisplayMetrics
+import androidx.annotation.*
+
+interface ResourceHelper {
+    fun gs(@StringRes id: Int): String
+    fun gs(@StringRes id: Int, vararg args: Any?): String
+    fun gq(@PluralsRes id: Int, quantity: Int, vararg args: Any?): String
+    fun gc(@ColorRes id: Int): Int
+    fun gb(@BoolRes id :Int) : Boolean
+    fun gcs(@ColorRes id: Int): String
+    fun gsa(@ArrayRes id:Int): Array<String>
+    fun openRawResourceFd(@RawRes id : Int) : AssetFileDescriptor?
+
+    fun getIcon() : Int
+    fun getNotificationIcon() : Int
+    fun decodeResource(id : Int) : Bitmap
+    fun getDisplayMetrics(): DisplayMetrics
+    fun dpToPx(dp: Int): Int
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt b/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt
new file mode 100644
index 0000000000..c62130f421
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.utils.resources
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.AssetFileDescriptor
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.DisplayMetrics
+import androidx.annotation.ArrayRes
+import androidx.annotation.BoolRes
+import androidx.annotation.ColorRes
+import androidx.annotation.PluralsRes
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import javax.inject.Inject
+
+/**
+ * Created by adrian on 2019-12-23.
+ */
+class ResourceHelperImplementation @Inject constructor(private val context: Context) : ResourceHelper {
+
+    override fun gs(@StringRes id: Int): String = context.getString(id)
+
+    override fun gs(@StringRes id: Int, vararg args: Any?): String = context.getString(id, *args)
+
+    override fun gq(@PluralsRes id: Int, quantity: Int, vararg args: Any?): String =
+        context.resources.getQuantityString(id, quantity, *args)
+
+    override fun gc(@ColorRes id: Int): Int = ContextCompat.getColor(context, id)
+
+    override fun gb(@BoolRes id: Int): Boolean = context.resources.getBoolean(id)
+
+    @SuppressLint("ResourceType")
+    override fun gcs(@ColorRes id: Int): String =
+        gs(id).replace("#ff", "#")
+
+    override fun gsa(@ArrayRes id: Int): Array<String> =
+        context.resources.getStringArray(id)
+
+    override fun openRawResourceFd(id: Int): AssetFileDescriptor =
+        context.resources.openRawResourceFd(id)
+
+    override fun getIcon(): Int {
+        return when {
+            Config.NSCLIENT    -> R.mipmap.ic_yellowowl
+            Config.PUMPCONTROL -> R.mipmap.ic_pumpcontrol
+            else               -> R.mipmap.ic_launcher
+        }
+    }
+
+    override fun getNotificationIcon(): Int {
+        return when {
+            Config.NSCLIENT    -> R.drawable.ic_notif_nsclient
+            Config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
+            else               -> R.drawable.ic_notif_aaps
+        }
+    }
+
+    override fun decodeResource(id: Int): Bitmap =
+        BitmapFactory.decodeResource(context.resources, id)
+
+    override fun getDisplayMetrics():DisplayMetrics =
+        context.resources.getDisplayMetrics()
+
+    override fun dpToPx(dp: Int): Int {
+        val scale = context.resources.displayMetrics.density
+        return (dp * scale + 0.5f).toInt()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt b/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt
new file mode 100644
index 0000000000..de7b20f403
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.utils.sharedPreferences
+
+import androidx.annotation.StringRes
+
+/**
+ * Created by adrian on 2019-12-23.
+ */
+
+interface SP {
+
+    fun getAll(): Map<String, *>
+    fun clear()
+    fun contains(key: String): Boolean
+    fun contains(resourceId: Int): Boolean
+    fun remove(@StringRes resourceID: Int)
+    fun remove(key: String)
+    fun getString(@StringRes resourceID: Int, defaultValue: String): String
+    fun getStringOrNull(@StringRes resourceID: Int, defaultValue: String?): String?
+    fun getStringOrNull(key: String, defaultValue: String?): String?
+    fun getString(key: String, defaultValue: String): String
+    fun getBoolean(@StringRes resourceID: Int, defaultValue: Boolean): Boolean
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean
+    fun getDouble(@StringRes resourceID: Int, defaultValue: Double): Double
+    fun getDouble(key: String, defaultValue: Double): Double
+    fun getInt(@StringRes resourceID: Int, defaultValue: Int): Int
+    fun getInt(key: String, defaultValue: Int): Int
+    fun getLong(@StringRes resourceID: Int, defaultValue: Long): Long
+    fun getLong(key: String, defaultValue: Long): Long
+    fun putBoolean(key: String, value: Boolean)
+    fun putBoolean(@StringRes resourceID: Int, value: Boolean)
+    fun putDouble(key: String, value: Double)
+    fun putLong(key: String, value: Long)
+    fun putLong(@StringRes resourceID: Int, value: Long)
+    fun putInt(key: String, value: Int)
+    fun putInt(@StringRes resourceID: Int, value: Int)
+    fun incInt(@StringRes resourceID: Int)
+    fun putString(@StringRes resourceID: Int, value: String)
+    fun putString(key: String, value: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt b/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
new file mode 100644
index 0000000000..f05582ab5b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
@@ -0,0 +1,128 @@
+package info.nightscout.androidaps.utils.sharedPreferences
+
+import android.content.SharedPreferences
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by mike on 17.02.2017.
+ */
+@Singleton
+class SPImplementation @Inject constructor(
+    private val sharedPreferences: SharedPreferences,
+    private val resourceHelper: ResourceHelper) : SP {
+
+    override fun getAll(): Map<String, *> = sharedPreferences.all
+
+    override fun clear() = sharedPreferences.edit().clear().apply()
+
+    override fun contains(key: String): Boolean = sharedPreferences.contains(key)
+
+    override fun contains(resourceId: Int): Boolean = sharedPreferences.contains(resourceHelper.gs(resourceId))
+
+    override fun remove(resourceID: Int) =
+        sharedPreferences.edit().remove(resourceHelper.gs(resourceID)).apply()
+
+    override fun remove(key: String) =
+        sharedPreferences.edit().remove(key).apply()
+
+    override fun getString(resourceID: Int, defaultValue: String): String =
+        sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue) ?: defaultValue
+
+    override fun getStringOrNull(resourceID: Int, defaultValue: String?): String? =
+        sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue) ?: defaultValue
+
+    override fun getStringOrNull(key: String, defaultValue: String?): String? =
+        sharedPreferences.getString(key, defaultValue)
+
+    override fun getString(key: String, defaultValue: String): String =
+        sharedPreferences.getString(key, defaultValue) ?: defaultValue
+
+    override fun getBoolean(resourceID: Int, defaultValue: Boolean): Boolean {
+        return try {
+            sharedPreferences.getBoolean(resourceHelper.gs(resourceID), defaultValue)
+        } catch (e: Exception) {
+            defaultValue
+        }
+    }
+
+    override fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return try {
+            sharedPreferences.getBoolean(key, defaultValue)
+        } catch (e: Exception) {
+            defaultValue
+        }
+    }
+
+    override fun getDouble(resourceID: Int, defaultValue: Double): Double =
+        SafeParse.stringToDouble(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+
+    override fun getDouble(key: String, defaultValue: Double): Double =
+        SafeParse.stringToDouble(sharedPreferences.getString(key, defaultValue.toString()))
+
+    override fun getInt(resourceID: Int, defaultValue: Int): Int {
+        return try {
+            sharedPreferences.getInt(resourceHelper.gs(resourceID), defaultValue)
+        } catch (e: Exception) {
+            SafeParse.stringToInt(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+        }
+    }
+
+    override fun getInt(key: String, defaultValue: Int): Int {
+        return try {
+            sharedPreferences.getInt(key, defaultValue)
+        } catch (e: Exception) {
+            SafeParse.stringToInt(sharedPreferences.getString(key, defaultValue.toString()))
+        }
+    }
+
+    override fun getLong(resourceID: Int, defaultValue: Long): Long {
+        return try {
+            sharedPreferences.getLong(resourceHelper.gs(resourceID), defaultValue)
+        } catch (e: Exception) {
+            SafeParse.stringToLong(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+        }
+    }
+
+    override fun getLong(key: String, defaultValue: Long): Long {
+        return try {
+            sharedPreferences.getLong(key, defaultValue)
+        } catch (e: Exception) {
+            SafeParse.stringToLong(sharedPreferences.getString(key, defaultValue.toString()))
+        }
+    }
+
+    override fun putBoolean(key: String, value: Boolean) = sharedPreferences.edit().putBoolean(key, value).apply()
+
+    override fun putBoolean(resourceID: Int, value: Boolean) =
+        sharedPreferences.edit().putBoolean(resourceHelper.gs(resourceID), value).apply()
+
+    override fun putDouble(key: String, value: Double) =
+        sharedPreferences.edit().putString(key, value.toString()).apply()
+
+    override fun putLong(key: String, value: Long) =
+        sharedPreferences.edit().putLong(key, value).apply()
+
+    override fun putLong(resourceID: Int, value: Long) =
+        sharedPreferences.edit().putLong(resourceHelper.gs(resourceID), value).apply()
+
+    override fun putInt(key: String, value: Int) =
+        sharedPreferences.edit().putInt(key, value).apply()
+
+    override fun putInt(resourceID: Int, value: Int) =
+        sharedPreferences.edit().putInt(resourceHelper.gs(resourceID), value).apply()
+
+    override fun incInt(resourceID: Int) {
+        val value = getInt(resourceID, 0) + 1
+        sharedPreferences.edit().putInt(resourceHelper.gs(resourceID), value).apply()
+    }
+
+    override fun putString(resourceID: Int, value: String) =
+        sharedPreferences.edit().putString(resourceHelper.gs(resourceID), value).apply()
+
+    override fun putString(key: String, value: String) =
+        sharedPreferences.edit().putString(key, value).apply()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TIR.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
similarity index 58%
rename from app/src/main/java/info/nightscout/androidaps/utils/TIR.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
index 5f2ea9bbaf..f6db77e09f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TIR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
@@ -1,7 +1,8 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.stats
 
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.roundToInt
 
 class TIR(val date: Long, val lowThreshold: Double, val highThreshold: Double) {
@@ -20,7 +21,7 @@ class TIR(val date: Long, val lowThreshold: Double, val highThreshold: Double) {
     fun inRangePct() = if (count > 0) (inRange.toDouble() / count * 100.0).roundToInt() else 0
     fun abovePct() = if (count > 0) (above.toDouble() / count * 100.0).roundToInt() else 0
 
-    fun toText(): String = MainApp.gs(R.string.tirformat, DateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
+    fun toText(resourceHelper: ResourceHelper): String = resourceHelper.gs(R.string.tirformat, DateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
 
-    fun toText(days: Int): String = MainApp.gs(R.string.tirformat, "%02d".format(days) + " " + MainApp.gs(R.string.days), belowPct(), inRangePct(), abovePct())
+    fun toText(resourceHelper: ResourceHelper, days: Int): String = resourceHelper.gs(R.string.tirformat, "%02d".format(days) + " " + resourceHelper.gs(R.string.days), belowPct(), inRangePct(), abovePct())
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/utils/TddCalculator.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 0210247eb3..247d4c22d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -1,21 +1,46 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.stats
 
 import android.text.Spanned
 import android.util.LongSparseArray
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.TDD
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import org.slf4j.LoggerFactory
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
 
-object TddCalculator : TreatmentsPlugin() {
-    private val log = LoggerFactory.getLogger(L.DATATREATMENTS)
+class TddCalculator @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    val mainApp: MainApp,
+    val sp: SP,
+    val activePlugin: ActivePluginProvider,
+    val profileFunction: ProfileFunction,
+    fabricPrivacy: FabricPrivacy
+) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, mainApp, sp, profileFunction, activePlugin, fabricPrivacy) {
+
+    init {
+        service = TreatmentService() // plugin is not started
+    }
 
     fun calculate(days: Long): LongSparseArray<TDD> {
         val range = T.days(days + 1).msecs()
-        val startTime = MidnightTime.calc(DateUtil.now()) - T.days(days).msecs()
+        val startTime = MidnightTime.calc(DateUtil.now() - T.days(days).msecs())
         val endTime = MidnightTime.calc(DateUtil.now())
         initializeData(range)
 
@@ -33,7 +58,7 @@ object TddCalculator : TreatmentsPlugin() {
             val midnight = MidnightTime.calc(t)
             val tdd = result[midnight] ?: TDD(midnight, 0.0, 0.0, 0.0)
             val tbr = getTempBasalFromHistory(t)
-            val profile = ProfileFunctions.getInstance().getProfile(t) ?: continue
+            val profile = profileFunction.getProfile(t) ?: continue
             val absoluteRate = tbr?.tempBasalConvertedToAbsolute(t, profile) ?: profile.getBasal(t)
             tdd.basal += absoluteRate / 60.0 * 5.0
             result.put(midnight, tdd)
@@ -42,11 +67,11 @@ object TddCalculator : TreatmentsPlugin() {
             val tdd = result.valueAt(i)
             tdd.total = tdd.bolus + tdd.basal
         }
-        log.debug(result.toString())
+        aapsLogger.debug(LTag.CORE, result.toString())
         return result
     }
 
-    fun averageTDD(tdds: LongSparseArray<TDD>): TDD {
+    private fun averageTDD(tdds: LongSparseArray<TDD>): TDD {
         val totalTdd = TDD()
         for (i in 0 until tdds.size()) {
             val tdd = tdds.valueAt(i)
@@ -64,14 +89,14 @@ object TddCalculator : TreatmentsPlugin() {
         val tdds = calculate(7)
         val averageTdd = averageTDD(tdds)
         return HtmlHelper.fromHtml(
-            "<b>" + MainApp.gs(R.string.tdd) + ":</b><br>" +
+            "<b>" + resourceHelper.gs(R.string.tdd) + ":</b><br>" +
                 toText(tdds) +
-                "<b>" + MainApp.gs(R.string.average) + ":</b><br>" +
+                "<b>" + resourceHelper.gs(R.string.average) + ":</b><br>" +
                 averageTdd.toText(tdds.size())
         )
     }
 
-    fun toText(tdds: LongSparseArray<TDD>): String {
+    private fun toText(tdds: LongSparseArray<TDD>): String {
         var t = ""
         for (i in 0 until tdds.size()) {
             t += "${tdds.valueAt(i).toText()}<br>"
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TirCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
similarity index 61%
rename from app/src/main/java/info/nightscout/androidaps/utils/TirCalculator.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
index 4e41f9a331..f1f13cbf0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TirCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.stats
 
 import android.text.Spanned
 import android.util.LongSparseArray
@@ -6,12 +6,24 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
 
-object TirCalculator {
+@Singleton
+class TirCalculator @Inject constructor(
+    private val resourceHelper: ResourceHelper,
+    private val profileFunction: ProfileFunction
+){
     fun calculate(days: Long, lowMgdl: Double, highMgdl: Double): LongSparseArray<TIR> {
         if (lowMgdl < 39) throw RuntimeException("Low below 39")
         if (lowMgdl > highMgdl) throw RuntimeException("Low > High")
-        val startTime = MidnightTime.calc(DateUtil.now()) - T.days(days).msecs()
+        val startTime = MidnightTime.calc(DateUtil.now() - T.days(days).msecs())
         val endTime = MidnightTime.calc(DateUtil.now())
 
         val bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(startTime, endTime, true)
@@ -63,21 +75,21 @@ object TirCalculator {
         val tit30 = calculate(30, lowTitMgdl, highTitMgdl)
         val averageTit30 = averageTIR(tit30)
         return HtmlHelper.fromHtml(
-            "<br><b>" + MainApp.gs(R.string.tir) + ":</b><br>" +
-                toText(tir7) +
-                "<br><b>" + MainApp.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(lowTirMgdl) + "-" + Profile.toCurrentUnitsString(highTirMgdl) + "):</b><br>" +
-                averageTir7.toText(tir7.size()) + "<br>" +
-                averageTir30.toText(tir30.size()) +
-                "<br><b>" + MainApp.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(lowTitMgdl) + "-" + Profile.toCurrentUnitsString(highTitMgdl) + "):</b><br>" +
-                averageTit7.toText(tit7.size()) + "<br>" +
-                averageTit30.toText(tit30.size())
+            "<br><b>" + resourceHelper.gs(R.string.tir) + ":</b><br>" +
+                toText(resourceHelper, tir7) +
+                "<br><b>" + resourceHelper.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
+                averageTir7.toText(resourceHelper, tir7.size()) + "<br>" +
+                averageTir30.toText(resourceHelper, tir30.size()) +
+                "<br><b>" + resourceHelper.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTitMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTitMgdl) + "):</b><br>" +
+                averageTit7.toText(resourceHelper, tit7.size()) + "<br>" +
+                averageTit30.toText(resourceHelper, tit30.size())
         )
     }
 
-    fun toText(tirs: LongSparseArray<TIR>): String {
+    fun toText(resourceHelper: ResourceHelper, tirs: LongSparseArray<TIR>): String {
         var t = ""
         for (i in 0 until tirs.size()) {
-            t += "${tirs.valueAt(i).toText()}<br>"
+            t += "${tirs.valueAt(i).toText(resourceHelper)}<br>"
         }
         return t
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/storage/FileStrorage.kt b/app/src/main/java/info/nightscout/androidaps/utils/storage/FileStrorage.kt
new file mode 100644
index 0000000000..40be1e65c3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/storage/FileStrorage.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.utils.storage
+
+import java.io.File
+import javax.inject.Singleton
+
+@Singleton
+class FileStorage : Storage {
+
+    override fun getFileContents(file: File): String {
+        return file.readText()
+    }
+
+    override fun putFileContents(file: File, contents: String) {
+        file.writeText(contents)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/storage/Storage.kt b/app/src/main/java/info/nightscout/androidaps/utils/storage/Storage.kt
new file mode 100644
index 0000000000..475cd2675e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/storage/Storage.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.utils.storage
+
+import java.io.File
+
+// This may seems unnecessary abstraction - but it will simplify testing
+interface Storage {
+
+    fun getFileContents(file: File) : String
+    fun putFileContents(file: File, contents: String)
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
new file mode 100644
index 0000000000..4c15100edd
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
@@ -0,0 +1,244 @@
+package info.nightscout.androidaps.utils.textValidator
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.widget.EditText
+import com.google.android.material.textfield.TextInputLayout
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.textValidator.validators.*
+
+class DefaultEditTextValidator : EditTextValidator {
+    protected var mValidator: MultiValidator? = null
+    protected var testErrorString: String? = null
+    protected var emptyAllowed = false
+    protected lateinit var editTextView: EditText
+    protected var testType: Int
+    protected var classType: String? = null
+    protected var customRegexp: String? = null
+    protected var customFormat: String? = null
+    protected var emptyErrorStringActual: String? = null
+    protected var emptyErrorStringDef: String? = null
+    protected var minLength = 0
+    protected var minNumber = 0
+    protected var maxNumber = 0
+    protected var floatminNumber = 0f
+    protected var floatmaxNumber = 0f
+    private var tw: TextWatcher? = null
+    private var defaultEmptyErrorString: String? = null
+
+    @Suppress("unused")
+    constructor(editTextView: EditText, context: Context) {
+        testType = EditTextValidator.TEST_NOCHECK
+        setEditText(editTextView)
+        resetValidators(context)
+    }
+
+    constructor(editTextView: EditText, typedArray: TypedArray, context: Context) {
+        emptyAllowed = typedArray.getBoolean(R.styleable.FormEditText_emptyAllowed, false)
+        testType = typedArray.getInt(R.styleable.FormEditText_testType, EditTextValidator.TEST_NOCHECK)
+        testErrorString = typedArray.getString(R.styleable.FormEditText_testErrorString)
+        classType = typedArray.getString(R.styleable.FormEditText_classType)
+        customRegexp = typedArray.getString(R.styleable.FormEditText_customRegexp)
+        emptyErrorStringDef = typedArray.getString(R.styleable.FormEditText_emptyErrorString)
+        customFormat = typedArray.getString(R.styleable.FormEditText_customFormat)
+        if (testType == EditTextValidator.TEST_MIN_LENGTH)
+            minLength = typedArray.getInt(R.styleable.FormEditText_minLength, 0)
+        if (testType == EditTextValidator.TEST_NUMERIC_RANGE) {
+            minNumber = typedArray.getInt(R.styleable.FormEditText_minNumber, Int.MIN_VALUE)
+            maxNumber = typedArray.getInt(R.styleable.FormEditText_maxNumber, Int.MAX_VALUE)
+        }
+        if (testType == EditTextValidator.TEST_FLOAT_NUMERIC_RANGE) {
+            floatminNumber = typedArray.getFloat(R.styleable.FormEditText_floatminNumber, Float.MIN_VALUE)
+            floatmaxNumber = typedArray.getFloat(R.styleable.FormEditText_floatmaxNumber, Float.MAX_VALUE)
+        }
+        typedArray.recycle()
+        setEditText(editTextView)
+        resetValidators(context)
+    }
+
+    @Throws(IllegalArgumentException::class)
+    override fun addValidator(theValidator: Validator) {
+        requireNotNull(theValidator) { "theValidator argument should not be null" }
+        mValidator!!.enqueue(theValidator)
+    }
+
+    private fun setEditText(editText: EditText) {
+        //editTextView?.removeTextChangedListener(textWatcher)
+        editTextView = editText
+        editText.addTextChangedListener(textWatcher)
+    }
+
+    override fun getTextWatcher(): TextWatcher {
+        if (tw == null) {
+            tw = object : TextWatcher {
+                override fun afterTextChanged(s: Editable) {
+                    testValidity()
+                }
+
+                override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                    if (!TextUtils.isEmpty(s) && isErrorShown) {
+                        try {
+                            val textInputLayout = editTextView.parent as TextInputLayout
+                            textInputLayout.isErrorEnabled = false
+                        } catch (e: Throwable) {
+                            editTextView.error = null
+                        }
+                    }
+                }
+            }
+        }
+        return tw!!
+    }
+
+    override fun isEmptyAllowed(): Boolean {
+        return emptyAllowed
+    }
+
+    override fun resetValidators(context: Context) {
+        // its possible the context may have changed so re-get the defaultEmptyErrorString
+        defaultEmptyErrorString = context.getString(R.string.error_field_must_not_be_empty)
+        setEmptyErrorString(emptyErrorStringDef)
+        mValidator = AndValidator()
+        val toAdd: Validator
+        when (testType) {
+            EditTextValidator.TEST_NOCHECK             -> toAdd = DummyValidator()
+            EditTextValidator.TEST_ALPHA               -> toAdd = AlphaValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_standard_letters_are_allowed) else testErrorString)
+            EditTextValidator.TEST_ALPHANUMERIC        -> toAdd = AlphaNumericValidator(
+                if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_this_field_cannot_contain_special_character) else testErrorString)
+            EditTextValidator.TEST_NUMERIC             -> toAdd = NumericValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_allowed) else testErrorString)
+            EditTextValidator.TEST_NUMERIC_RANGE       -> toAdd = NumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, Integer.toString(minNumber), Integer.toString(maxNumber)) else testErrorString, minNumber, maxNumber)
+            EditTextValidator.TEST_FLOAT_NUMERIC_RANGE -> toAdd = FloatNumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, java.lang.Float.toString(floatminNumber), java.lang.Float.toString(floatmaxNumber)) else testErrorString, floatminNumber, floatmaxNumber)
+            EditTextValidator.TEST_REGEXP              -> toAdd = RegexpValidator(testErrorString, customRegexp)
+            EditTextValidator.TEST_CREDITCARD          -> toAdd = CreditCardValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_creditcard_number_not_valid) else testErrorString)
+            EditTextValidator.TEST_EMAIL               -> toAdd = EmailValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_email_address_not_valid) else testErrorString)
+            EditTextValidator.TEST_PHONE               -> toAdd = PhoneValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_phone_not_valid) else testErrorString)
+            EditTextValidator.TEST_MULTI_PHONE         -> toAdd = MultiPhoneValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_phone_not_valid) else testErrorString)
+            EditTextValidator.TEST_PIN_STRENGTH        -> toAdd = PinStrengthValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_pin_not_valid) else testErrorString)
+            EditTextValidator.TEST_DOMAINNAME          -> toAdd = DomainValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_domain_not_valid) else testErrorString)
+            EditTextValidator.TEST_IPADDRESS           -> toAdd = IpAddressValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_ip_not_valid) else testErrorString)
+            EditTextValidator.TEST_WEBURL              -> toAdd = WebUrlValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_url_not_valid) else testErrorString)
+            EditTextValidator.TEST_HTTPS_URL           -> toAdd = HttpsUrlValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_url_not_valid) else testErrorString)
+            EditTextValidator.TEST_PERSONNAME          -> toAdd = PersonNameValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_notvalid_personname) else testErrorString)
+            EditTextValidator.TEST_PERSONFULLNAME      -> toAdd = PersonFullNameValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_notvalid_personfullname) else testErrorString)
+            EditTextValidator.TEST_MIN_LENGTH          -> toAdd = MinDigitLengthValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_not_a_minimum_length) else testErrorString, minLength)
+
+            EditTextValidator.TEST_CUSTOM              -> {
+                // must specify the fully qualified class name & an error message
+                if (classType == null)
+                    throw RuntimeException("Trying to create a custom validator but no classType has been specified.")
+                if (TextUtils.isEmpty(testErrorString))
+                    throw RuntimeException(String.format("Trying to create a custom validator (%s) but no error string specified.", classType))
+
+                val customValidatorClass: Class<out Validator> = try {
+                    this.javaClass.classLoader?.loadClass(classType)?.let {
+                        if (!Validator::class.java.isAssignableFrom(it)) {
+                            throw RuntimeException(String.format("Custom validator (%s) does not extend %s", classType, Validator::class.java.name))
+                        }
+                        @Suppress("Unchecked_Cast")
+                        it as Class<out Validator>
+                    }!!
+                } catch (e: ClassNotFoundException) {
+                    throw RuntimeException(String.format("Unable to load class for custom validator (%s).", classType))
+                }
+                toAdd = try {
+                    customValidatorClass.getConstructor(String::class.java).newInstance(testErrorString)
+                } catch (e: Exception) {
+                    throw RuntimeException(String.format("Unable to construct custom validator (%s) with argument: %s", classType,
+                        testErrorString))
+                }
+            }
+
+            EditTextValidator.TEST_DATE                -> toAdd = DateValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_date_not_valid) else testErrorString, customFormat)
+            else                                       -> toAdd = DummyValidator()
+        }
+        val tmpValidator: MultiValidator
+        if (!emptyAllowed) { // If the xml tells us that this is a required field, we will add the EmptyValidator.
+            tmpValidator = AndValidator()
+            tmpValidator.enqueue(EmptyValidator(emptyErrorStringActual))
+            tmpValidator.enqueue(toAdd)
+        } else {
+            tmpValidator = OrValidator(toAdd.errorMessage, NotValidator(null, EmptyValidator(null)), toAdd)
+        }
+        addValidator(tmpValidator)
+    }
+
+    @Suppress("unused")
+    fun setClassType(classType: String?, testErrorString: String?, context: Context) {
+        testType = EditTextValidator.TEST_CUSTOM
+        this.classType = classType
+        this.testErrorString = testErrorString
+        resetValidators(context)
+    }
+
+    @Suppress("unused")
+    fun setCustomRegexp(customRegexp: String?, context: Context) {
+        testType = EditTextValidator.TEST_REGEXP
+        this.customRegexp = customRegexp
+        resetValidators(context)
+    }
+
+    @Suppress("unused")
+    fun setEmptyAllowed(emptyAllowed: Boolean, context: Context) {
+        this.emptyAllowed = emptyAllowed
+        resetValidators(context)
+    }
+
+    fun setEmptyErrorString(emptyErrorString: String?) {
+        emptyErrorStringActual = if (!TextUtils.isEmpty(emptyErrorString)) {
+            emptyErrorString
+        } else {
+            defaultEmptyErrorString
+        }
+    }
+
+    @Suppress("unused")
+    fun setTestErrorString(testErrorString: String?, context: Context) {
+        this.testErrorString = testErrorString
+        resetValidators(context)
+    }
+
+    @Suppress("unused")
+    fun setTestType(testType: Int, context: Context) {
+        this.testType = testType
+        resetValidators(context)
+    }
+
+    override fun testValidity(): Boolean {
+        return testValidity(true)
+    }
+
+    override fun testValidity(showUIError: Boolean): Boolean {
+        val isValid = mValidator?.isValid(editTextView) ?: false
+        if (!isValid && showUIError) {
+            showUIError()
+        }
+        return isValid
+    }
+
+    override fun showUIError() {
+        mValidator?.let { mValidator ->
+            if (mValidator.hasErrorMessage()) {
+                try {
+                    val parent = editTextView.parent as TextInputLayout
+                    parent.isErrorEnabled = true
+                    parent.error = mValidator.errorMessage
+                } catch (e: Throwable) {
+                    editTextView.error = mValidator.errorMessage
+                }
+            }
+        }
+    }
+
+    // might sound like a bug. but there's no way to know if the error is shown (not with public api)
+    val isErrorShown: Boolean
+        get() = try {
+            editTextView.parent as TextInputLayout
+            true // might sound like a bug. but there's no way to know if the error is shown (not with public api)
+        } catch (e: Throwable) {
+            !TextUtils.isEmpty(editTextView.error)
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java
new file mode 100644
index 0000000000..0c93c0d5f3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.utils.textValidator;
+
+import android.content.Context;
+import android.text.TextWatcher;
+import android.widget.EditText;
+
+import info.nightscout.androidaps.utils.textValidator.validators.Validator;
+
+/**
+ * Interface for encapsulating validation of an EditText control
+ */
+public interface EditTextValidator {
+    /**
+     * Add a validator to this FormEditText. The validator will be added in the
+     * queue of the current validators.
+     *
+     * @param theValidator
+     * @throws IllegalArgumentException if the validator is null
+     */
+    void addValidator(Validator theValidator)
+            throws IllegalArgumentException;
+
+    /**
+     * This should be used with {@link #addTextChangedListener(TextWatcher)}. It
+     * fixes the non-hiding error popup behaviour.
+     */
+    TextWatcher getTextWatcher();
+
+    boolean isEmptyAllowed();
+
+    /**
+     * Resets the {@link Validator}s
+     */
+    void resetValidators(Context context);
+
+    /**
+     * Calling *testValidity()* will cause the EditText to go through
+     * customValidators and call {@link #Validator.isValid(EditText)}
+     * Same as {@link #testValidity(boolean)} with first parameter true
+     *
+     * @return true if the validity passes false otherwise.
+     */
+    boolean testValidity();
+
+    /**
+     * Calling *testValidity()* will cause the EditText to go through
+     * customValidators and call {@link #Validator.isValid(EditText)}
+     *
+     * @param showUIError determines if this call should show the UI error.
+     * @return true if the validity passes false otherwise.
+     */
+    boolean testValidity(boolean showUIError);
+
+    void showUIError();
+
+    int TEST_REGEXP = 0;
+
+    int TEST_NUMERIC = 1;
+
+    int TEST_ALPHA = 2;
+
+    int TEST_ALPHANUMERIC = 3;
+
+    int TEST_EMAIL = 4;
+
+    int TEST_CREDITCARD = 5;
+
+    int TEST_PHONE = 6;
+
+    int TEST_DOMAINNAME = 7;
+
+    int TEST_IPADDRESS = 8;
+
+    int TEST_WEBURL = 9;
+
+    int TEST_NOCHECK = 10;
+
+    int TEST_CUSTOM = 11;
+
+    int TEST_PERSONNAME = 12;
+
+    int TEST_PERSONFULLNAME = 13;
+
+    int TEST_DATE = 14;
+
+    int TEST_NUMERIC_RANGE = 15;
+
+    int TEST_FLOAT_NUMERIC_RANGE = 16;
+
+    int TEST_HTTPS_URL = 17;
+
+    int TEST_MIN_LENGTH = 18;
+
+    int TEST_MULTI_PHONE = 19;
+
+    int TEST_PIN_STRENGTH = 20;
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
new file mode 100644
index 0000000000..190a3bea73
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.utils.textValidator
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.core.content.res.TypedArrayUtils
+import androidx.preference.EditTextPreference
+import androidx.preference.EditTextPreference.OnBindEditTextListener
+import androidx.preference.PreferenceViewHolder
+import info.nightscout.androidaps.R
+
+class ValidatingEditTextPreference(ctx: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int)
+    : EditTextPreference(ctx, attrs, defStyleAttr, defStyleRes) {
+
+    init {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.FormEditText, 0, 0)
+        val onBindEditTextListener = OnBindEditTextListener { editText ->
+            editTextValidator = DefaultEditTextValidator(editText, typedArray, context)
+        }
+        setOnBindEditTextListener(onBindEditTextListener)
+    }
+
+    constructor(ctx: Context, attrs: AttributeSet, defStyle: Int)
+        : this(ctx, attrs, defStyle, 0)
+
+    constructor(ctx: Context, attrs: AttributeSet)
+        : this(ctx, attrs, TypedArrayUtils.getAttr(ctx, R.attr.editTextPreferenceStyle,
+        R.attr.editTextPreferenceStyle))
+
+    private lateinit var editTextValidator: EditTextValidator
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        super.onBindViewHolder(holder)
+        holder?.isDividerAllowedAbove = false
+        holder?.isDividerAllowedBelow = false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt
new file mode 100644
index 0000000000..8730ffee0b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+class AlphaNumericValidator(message: String?) : RegexpValidator(message, "[a-zA-Z0-9\u00C0-\u00FF \\./-\\?]*") 
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt
new file mode 100644
index 0000000000..e5dccc096b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+class AlphaValidator(message: String?) : RegexpValidator(message, "[A-z\u00C0-\u00ff \\./-\\?]*")
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt
new file mode 100644
index 0000000000..b9e9746b6a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * The AND validator checks if all of the passed validators is returning true.<br></br>
+ * Note: the message that will be shown is the one of the first failing validator
+ */
+class AndValidator : MultiValidator {
+
+    constructor(vararg validators: Validator?) : super(null, *validators)
+    constructor() : super(null)
+
+    override fun isValid(editText: EditText): Boolean {
+        for (v in validators) {
+            if (!v.isValid(editText)) {
+                errorMessage = v.errorMessage
+                return false
+            }
+        }
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt
new file mode 100644
index 0000000000..932614483d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * This validator takes care of validating the edittext. The input will be valid only if the number is a valid credit card.
+ */
+class CreditCardValidator(_customErrorMessage: String?) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return try {
+            validateCardNumber(editText.text.toString())
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    companion object {
+        /**
+         * Validates the credit card number using the Luhn algorithm
+         *
+         * @param cardNumber the credit card number
+         * @return
+         */
+        @Throws(NumberFormatException::class)
+        fun validateCardNumber(cardNumber: String): Boolean {
+            var sum = 0
+            var digit: Int
+            var addend: Int
+            var doubled = false
+            for (i in cardNumber.length - 1 downTo 0) {
+                digit = cardNumber.substring(i, i + 1).toInt()
+                if (doubled) {
+                    addend = digit * 2
+                    if (addend > 9) {
+                        addend -= 9
+                    }
+                } else {
+                    addend = digit
+                }
+                sum += addend
+                doubled = !doubled
+            }
+            return sum % 10 == 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt
new file mode 100644
index 0000000000..a54f4c1242
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.annotation.SuppressLint
+import android.text.TextUtils
+import android.widget.EditText
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
+
+class DateValidator(_customErrorMessage: String?, _format: String?) : Validator(_customErrorMessage) {
+    private val formats: Array<String> = if (_format == null || TextUtils.isEmpty(_format))
+        arrayOf("DefaultDate", "DefaultTime", "DefaultDateTime")
+    else
+        _format.split(";").toTypedArray()
+
+    @SuppressLint("SimpleDateFormat")
+    override fun isValid(editText: EditText): Boolean {
+        if (TextUtils.isEmpty(editText.text)) return true
+        val value = editText.text.toString()
+        for (_format in formats) {
+            val format: DateFormat = when {
+                "DefaultDate".equals(_format, ignoreCase = true)     -> {
+                    SimpleDateFormat.getDateInstance()
+                }
+
+                "DefaultTime".equals(_format, ignoreCase = true)     -> {
+                    SimpleDateFormat.getTimeInstance()
+                }
+
+                "DefaultDateTime".equals(_format, ignoreCase = true) -> {
+                    SimpleDateFormat.getDateTimeInstance()
+                }
+
+                else                                                 -> {
+                    SimpleDateFormat(_format)
+                }
+            }
+            var date: Date?
+            date = try {
+                format.parse(value)
+            } catch (e: ParseException) {
+                return false
+            }
+            if (date != null) {
+                return true
+            }
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt
new file mode 100644
index 0000000000..7274e1ec9b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * Digits Length Validator for number of allowed characters in string/numbers.
+ * Range is [min;max[
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ * @author Emanuele Tessore <me></me>@emanueletessore.com>
+ *
+ *
+ * By reading this you'll get smarter. We'd love to know how many people got smarter thanks to this clever class
+ * Please send **us** an email with the following subject: "42 is the answer to ultimate question of life..."
+ */
+abstract class DigitLengthRangeValidator(message: String?, private val min: Int, private val max: Int) : Validator(message) {
+
+    override fun isValid(editText: EditText): Boolean {
+        val length = editText.text.toString().length
+        return length >= min && length < max
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt
new file mode 100644
index 0000000000..e8b1aae4b4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.util.Patterns
+
+class DomainValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.DOMAIN_NAME)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt
new file mode 100644
index 0000000000..31ebda7da7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * This is a dummy validator. It just returns true on each input.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class DummyValidator : Validator(null) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt
new file mode 100644
index 0000000000..0bb335644a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.util.Patterns
+
+/**
+ * This validates an email using regexps.
+ * Note that if an email passes the validation with this validator it doesn't mean it's a valid email - it means it's a valid email <storng>format
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+</storng> */
+class EmailValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.EMAIL_ADDRESS)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt
new file mode 100644
index 0000000000..33bd9358ba
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.text.TextUtils
+import android.widget.EditText
+
+/**
+ * A simple validator that validates the field only if the field is not empty.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class EmptyValidator(message: String?) : Validator(message) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return TextUtils.getTrimmedLength(editText.text) > 0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt
new file mode 100644
index 0000000000..d574233f43
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * A validator that returns true only if the input field contains only numbers
+ * and the number is within the given range.
+ *
+ * @author Said Tahsin Dane <tasomaniac></tasomaniac>@gmail.com>
+ */
+class FloatNumericRangeValidator(_customErrorMessage: String?, private val floatMin: Float, private val floatMax: Float) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return try {
+            val value = editText.text.toString().toFloat()
+            value in floatMin..floatMax
+        } catch (e: NumberFormatException) {
+            false
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt
new file mode 100644
index 0000000000..947ad9cd6c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+class HttpsUrlValidator(_customErrorMessage: String?) : WebUrlValidator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean =
+        super.isValid(editText) && editText.text.startsWith("https://", ignoreCase = true)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt
new file mode 100644
index 0000000000..9fea08e453
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.util.Patterns
+
+/**
+ * Validates the ipaddress. The regexp was taken from the android source code.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class IpAddressValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.IP_ADDRESS) 
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt
new file mode 100644
index 0000000000..0042e6ada8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+class MinDigitLengthValidator(message: String?, private val min: Int) : Validator(message) {
+
+    override fun isValid(editText: EditText): Boolean {
+        val length = editText.text.toString().length
+        return length >= min
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
new file mode 100644
index 0000000000..3baba5240d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.util.Patterns
+import android.widget.EditText
+
+class MultiPhoneValidator(val _customErrorMessage: String?) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        val substrings = editText.text.split(";").toTypedArray()
+        for (number in substrings) {
+            if (!PatternValidator(_customErrorMessage, Patterns.PHONE).isValid(number))
+                return false
+        }
+        return substrings.isNotEmpty()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt
new file mode 100644
index 0000000000..ef18c004fc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import java.util.*
+
+/**
+ * Abstract class for a multivalidator.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ * @see AndValidator
+ *
+ * @see OrValidator
+ */
+abstract class MultiValidator : Validator {
+
+    protected val validators: MutableList<Validator>
+
+    constructor(message: String?, vararg validators: Validator?) : super(message) {
+        this.validators = ArrayList<Validator>(Arrays.asList(*validators))
+    }
+
+    constructor(message: String?) : super(message) {
+        validators = ArrayList()
+    }
+
+    fun enqueue(newValidator: Validator) {
+        validators.add(newValidator)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt
new file mode 100644
index 0000000000..36446c6fa4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * It's a validator that applies the "NOT" logical operator to the validator passed in the constructor.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class NotValidator(errorMessage: String?, private val v: Validator) : Validator(errorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return !v.isValid(editText)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt
new file mode 100644
index 0000000000..b17daac54a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * A validator that returns true only if the input field contains only numbers
+ * and the number is within the given range.
+ *
+ * @author Said Tahsin Dane <tasomaniac></tasomaniac>@gmail.com>
+ */
+class NumericRangeValidator(_customErrorMessage: String?, private val min: Int, private val max: Int) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return try {
+            val value = editText.text.toString().toInt()
+            value in min..max
+        } catch (e: NumberFormatException) {
+            false
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt
new file mode 100644
index 0000000000..9c70faa622
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.text.TextUtils
+import android.widget.EditText
+
+/**
+ * A validator that returns true only if the input field contains only numbers.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class NumericValidator(_customErrorMessage: String?) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return TextUtils.isDigitsOnly(editText.text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt
new file mode 100644
index 0000000000..49e3d09dc9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * The or validator checks if one of passed validators is returning true.<br></br>
+ * Note: the message that will be shown is the one passed to the Constructor
+ *
+ * @author Andrea B.
+ */
+class OrValidator(message: String?, vararg validators: Validator?) : MultiValidator(message, *validators) {
+
+    override fun isValid(editText: EditText): Boolean {
+        for (v in validators) {
+            if (v.isValid(editText)) {
+                return true // Remember :) We're acting like an || operator.
+            }
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt
new file mode 100644
index 0000000000..58685555be
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+import java.util.regex.Pattern
+
+/**
+ * Base class for regexp based validators.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ * @see DomainValidator
+ *
+ * @see EmailValidator
+ *
+ * @see IpAddressValidator
+ *
+ * @see PhoneValidator
+ *
+ * @see WebUrlValidator
+ *
+ * @see RegexpValidator
+ */
+open class PatternValidator(_customErrorMessage: String?, val pattern: Pattern) : Validator(_customErrorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return pattern.matcher(editText.text).matches()
+    }
+
+    fun isValid(text: String): Boolean {
+        return pattern.matcher(text).matches()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt
new file mode 100644
index 0000000000..b31402506e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+class PersonFullNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}- ]+")
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt
new file mode 100644
index 0000000000..2b53db13c8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+class PersonNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}-]+")
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt
new file mode 100644
index 0000000000..31c99bf14c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.os.Build
+import android.util.Patterns
+import java.util.regex.Pattern
+
+/**
+ * It validates phone numbers.
+ * Regexp was taken from the android source code.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class PhoneValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.PHONE)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
new file mode 100644
index 0000000000..35907e33ff
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+class PinStrengthValidator(val _customErrorMessage: String?) : Validator(_customErrorMessage) {
+
+    val regex = "[0-9]{3,6}".toRegex()
+
+    override fun isValid(editText: EditText): Boolean {
+        return try {
+            val value = editText.text.toString()
+            if (!regex.matches(value))
+                return false
+
+            var last = ' '
+            var rising = true
+            var falling = true
+            var same = true
+            value.forEachIndexed { i, c ->
+                if (i > 0) {
+                    if (last != c) {
+                        same = false
+                    }
+
+                    if (last.toInt() + 1 != c.toInt()) {
+                        falling = false
+                    }
+
+                    if (last.toInt() != c.toInt() + 1) {
+                        rising = false
+                    }
+                }
+                last = c
+            }
+
+            !rising && !falling && !same
+        } catch (e: NumberFormatException) {
+            false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
new file mode 100644
index 0000000000..56f7278f35
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import java.util.regex.Pattern
+
+/**
+ * Used for validating the user input using a regexp.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+open class RegexpValidator(message: String?, _regexp: String?) : PatternValidator(message, Pattern.compile(_regexp))
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt
new file mode 100644
index 0000000000..41733d9e5d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.text.TextUtils
+import android.widget.EditText
+
+/**
+ * A simple validator that validates the field only if the value is the same as another one.
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+class SameValueValidator(private val otherEditText: EditText, errorMessage: String?) : Validator(errorMessage) {
+
+    override fun isValid(editText: EditText): Boolean {
+        return TextUtils.equals(editText.text, otherEditText.text)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt
new file mode 100644
index 0000000000..65f7c28152
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.widget.EditText
+
+/**
+ * Validator abstract class. To be used with FormEditText
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+abstract class Validator(var errorMessage: String?) {
+
+    /**
+     * Should check if the EditText is valid.
+     *
+     * @param the edittext under evaluation
+     * @return true if the edittext is valid, false otherwise
+     */
+    abstract fun isValid(editText: EditText): Boolean
+
+    fun hasErrorMessage(): Boolean {
+        return errorMessage != null
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt
new file mode 100644
index 0000000000..bc1312df1b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.utils.textValidator.validators
+
+import android.util.Patterns
+
+/**
+ * Validates a web url in the format:
+ * scheme + authority + path
+ *
+ * @author Andrea Baccega <me></me>@andreabaccega.com>
+ */
+open class WebUrlValidator(_customErrorMessage: String?) : PatternValidator(_customErrorMessage, Patterns.WEB_URL)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
new file mode 100644
index 0000000000..c586da6af7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -0,0 +1,383 @@
+package info.nightscout.androidaps.utils.wizard
+
+import android.content.Context
+import android.content.Intent
+import android.text.Spanned
+import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.Round
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+import kotlin.math.abs
+
+class BolusWizard @Inject constructor(
+    val injector: HasAndroidInjector
+) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var context: Context
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    init {
+        injector.androidInjector().inject(this)
+    }
+
+    // Intermediate
+    var sens = 0.0
+        private set
+    var ic = 0.0
+        private set
+    var glucoseStatus: GlucoseStatus? = null
+        private set
+    private var targetBGLow = 0.0
+    private var targetBGHigh = 0.0
+    private var bgDiff = 0.0
+    var insulinFromBG = 0.0
+        private set
+    var insulinFromCarbs = 0.0
+        private set
+    var insulinFromBolusIOB = 0.0
+        private set
+    var insulinFromBasalsIOB = 0.0
+        private set
+    var insulinFromCorrection = 0.0
+        private set
+    var insulinFromSuperBolus = 0.0
+        private set
+    var insulinFromCOB = 0.0
+        private set
+    var insulinFromTrend = 0.0
+        private set
+    var trend = 0.0
+        private set
+
+    private var accepted = false
+
+    // Result
+    var calculatedTotalInsulin: Double = 0.0
+        private set
+    var totalBeforePercentageAdjustment: Double = 0.0
+        private set
+    var carbsEquivalent: Double = 0.0
+        private set
+    var insulinAfterConstraints: Double = 0.0
+        private set
+
+    // Input
+    lateinit var profile: Profile
+    lateinit var profileName: String
+    var tempTarget: TempTarget? = null
+    var carbs: Int = 0
+    var cob: Double = 0.0
+    var bg: Double = 0.0
+    var correction: Double = 0.0
+    private var percentageCorrection: Double = 0.0
+    private var useBg: Boolean = false
+    private var useCob: Boolean = false
+    private var includeBolusIOB: Boolean = false
+    private var includeBasalIOB: Boolean = false
+    private var useSuperBolus: Boolean = false
+    private var useTT: Boolean = false
+    private var useTrend: Boolean = false
+    var notes: String = ""
+    var carbTime: Int = 0
+
+    @JvmOverloads
+    fun doCalc(profile: Profile,
+               profileName: String,
+               tempTarget: TempTarget?,
+               carbs: Int,
+               cob: Double,
+               bg: Double,
+               correction: Double,
+               percentageCorrection: Double = 100.0,
+               useBg: Boolean,
+               useCob: Boolean,
+               includeBolusIOB: Boolean,
+               includeBasalIOB: Boolean,
+               useSuperBolus: Boolean,
+               useTT: Boolean,
+               useTrend: Boolean,
+               notes: String = "",
+               carbTime: Int = 0
+    ): BolusWizard {
+
+        this.profile = profile
+        this.profileName = profileName
+        this.tempTarget = tempTarget
+        this.carbs = carbs
+        this.cob = cob
+        this.bg = bg
+        this.correction = correction
+        this.percentageCorrection = percentageCorrection
+        this.useBg = useBg
+        this.useCob = useCob
+        this.includeBolusIOB = includeBolusIOB
+        this.includeBasalIOB = includeBasalIOB
+        this.useSuperBolus = useSuperBolus
+        this.useTT = useTT
+        this.useTrend = useTrend
+        this.notes = notes
+        this.carbTime = carbTime
+
+        // Insulin from BG
+        sens = Profile.fromMgdlToUnits(profile.isfMgdl, profileFunction.getUnits())
+        targetBGLow = Profile.fromMgdlToUnits(profile.targetLowMgdl, profileFunction.getUnits())
+        targetBGHigh = Profile.fromMgdlToUnits(profile.targetHighMgdl, profileFunction.getUnits())
+        if (useTT && tempTarget != null) {
+            targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, profileFunction.getUnits())
+            targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, profileFunction.getUnits())
+        }
+        if (useBg && bg > 0) {
+            bgDiff = when {
+                bg in targetBGLow..targetBGHigh -> 0.0
+                bg <= targetBGLow               -> bg - targetBGLow
+                else                            -> bg - targetBGHigh
+            }
+            insulinFromBG = bgDiff / sens
+        }
+
+        // Insulin from 15 min trend
+        glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+        glucoseStatus?.let {
+            if (useTrend) {
+                trend = it.short_avgdelta
+                insulinFromTrend = Profile.fromMgdlToUnits(trend, profileFunction.getUnits()) * 3 / sens
+            }
+        }
+
+        // Insulin from carbs
+        ic = profile.ic
+        insulinFromCarbs = carbs / ic
+        insulinFromCOB = if (useCob) (cob / ic) else 0.0
+
+        // Insulin from IOB
+        // IOB calculation
+        activePlugin.activeTreatments.updateTotalIOBTreatments()
+        val bolusIob = activePlugin.activeTreatments.lastCalculationTreatments.round()
+        activePlugin.activeTreatments.updateTotalIOBTempBasals()
+        val basalIob = activePlugin.activeTreatments.lastCalculationTempBasals.round()
+
+        insulinFromBolusIOB = if (includeBolusIOB) -bolusIob.iob else 0.0
+        insulinFromBasalsIOB = if (includeBasalIOB) -basalIob.basaliob else 0.0
+
+        // Insulin from correction
+        insulinFromCorrection = correction
+
+        // Insulin from superbolus for 2h. Get basal rate now and after 1h
+        if (useSuperBolus) {
+            insulinFromSuperBolus = profile.basal
+            var timeAfter1h = System.currentTimeMillis()
+            timeAfter1h += T.hours(1).msecs()
+            insulinFromSuperBolus += profile.getBasal(timeAfter1h)
+        }
+
+        // Total
+        calculatedTotalInsulin = insulinFromBG + insulinFromTrend + insulinFromCarbs + insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCorrection + insulinFromSuperBolus + insulinFromCOB
+
+        // Percentage adjustment
+        totalBeforePercentageAdjustment = calculatedTotalInsulin
+        if (calculatedTotalInsulin > 0) {
+            calculatedTotalInsulin = calculatedTotalInsulin * percentageCorrection / 100.0
+        }
+
+        if (calculatedTotalInsulin < 0) {
+            carbsEquivalent = (-calculatedTotalInsulin) * ic
+            calculatedTotalInsulin = 0.0
+        }
+
+        val bolusStep = activePlugin.activePump.pumpDescription.bolusStep
+        calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep)
+
+        insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(calculatedTotalInsulin)).value()
+
+        aapsLogger.debug(this.toString())
+        return this
+    }
+
+    private fun nsJSON(): JSONObject {
+        val bolusCalcJSON = JSONObject()
+        try {
+            bolusCalcJSON.put("profile", profileName)
+            bolusCalcJSON.put("notes", notes)
+            bolusCalcJSON.put("eventTime", DateUtil.toISOString(Date()))
+            bolusCalcJSON.put("targetBGLow", targetBGLow)
+            bolusCalcJSON.put("targetBGHigh", targetBGHigh)
+            bolusCalcJSON.put("isf", sens)
+            bolusCalcJSON.put("ic", ic)
+            bolusCalcJSON.put("iob", -(insulinFromBolusIOB + insulinFromBasalsIOB))
+            bolusCalcJSON.put("bolusiob", insulinFromBolusIOB)
+            bolusCalcJSON.put("basaliob", insulinFromBasalsIOB)
+            bolusCalcJSON.put("bolusiobused", includeBolusIOB)
+            bolusCalcJSON.put("basaliobused", includeBasalIOB)
+            bolusCalcJSON.put("bg", bg)
+            bolusCalcJSON.put("insulinbg", insulinFromBG)
+            bolusCalcJSON.put("insulinbgused", useBg)
+            bolusCalcJSON.put("bgdiff", bgDiff)
+            bolusCalcJSON.put("insulincarbs", insulinFromCarbs)
+            bolusCalcJSON.put("carbs", carbs)
+            bolusCalcJSON.put("cob", cob)
+            bolusCalcJSON.put("cobused", useCob)
+            bolusCalcJSON.put("insulincob", insulinFromCOB)
+            bolusCalcJSON.put("othercorrection", correction)
+            bolusCalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
+            bolusCalcJSON.put("insulintrend", insulinFromTrend)
+            bolusCalcJSON.put("insulin", calculatedTotalInsulin)
+            bolusCalcJSON.put("superbolusused", useSuperBolus)
+            bolusCalcJSON.put("insulinsuperbolus", insulinFromSuperBolus)
+            bolusCalcJSON.put("trendused", useTrend)
+            bolusCalcJSON.put("insulintrend", insulinFromTrend)
+            bolusCalcJSON.put("trend", trend)
+            bolusCalcJSON.put("ttused", useTT)
+            bolusCalcJSON.put("percentageCorrection", percentageCorrection)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return bolusCalcJSON
+    }
+
+    private fun confirmMessageAfterConstraints(pump: PumpInterface): Spanned {
+
+        val actions: LinkedList<String> = LinkedList()
+        if (insulinAfterConstraints > 0) {
+            val pct = if (percentageCorrection != 100.0) " (" + percentageCorrection.toInt() + "%)" else ""
+            actions.add(resourceHelper.gs(R.string.bolus) + ": " + "<font color='" + resourceHelper.gc(R.color.bolus) + "'>" + resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraints) + pct + "</font>")
+        }
+        if (carbs > 0) {
+            var timeShift = ""
+            if (carbTime > 0) {
+                timeShift += " ( +" + resourceHelper.gs(R.string.mins, carbTime) + " )"
+            } else if (carbTime < 0) {
+                timeShift += " ( -" + resourceHelper.gs(R.string.mins, carbTime) + " )"
+            }
+            actions.add(resourceHelper.gs(R.string.carbs) + ": " + "<font color='" + resourceHelper.gc(R.color.carbs) + "'>" + carbs + "g" + timeShift + "</font>")
+        }
+        if (insulinFromCOB > 0) {
+            actions.add(resourceHelper.gs(R.string.insulinFromCob, resourceHelper.gc(R.color.cobAlert), insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG))
+            val absorptionRate = iobCobCalculatorPlugin.slowAbsorptionPercentage(60)
+            if (absorptionRate > .25)
+                actions.add(resourceHelper.gs(R.string.slowabsorptiondetected, resourceHelper.gc(R.color.cobAlert), (absorptionRate * 100).toInt()))
+        }
+        if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) {
+            actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), calculatedTotalInsulin, insulinAfterConstraints))
+        }
+
+        return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))
+    }
+
+    fun confirmAndExecute(context: Context) {
+        val profile = profileFunction.getProfile() ?: return
+        val pump = activePlugin.activePump
+
+        if (calculatedTotalInsulin > 0.0 || carbs > 0.0) {
+            if (accepted) {
+                aapsLogger.debug(LTag.UI, "guarding: already accepted")
+                return
+            }
+            accepted = true
+
+            val confirmMessage = confirmMessageAfterConstraints(pump)
+
+            OKDialog.showConfirmation(context, resourceHelper.gs(R.string.boluswizard), confirmMessage, Runnable {
+                if (insulinAfterConstraints > 0 || carbs > 0) {
+                    if (useSuperBolus) {
+                        aapsLogger.debug("USER ENTRY: SUPERBOLUS TBR")
+                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                            loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
+                            rxBus.send(EventRefreshOverview("WizardDialog"))
+                        }
+
+                        if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
+                            commandQueue.tempBasalAbsolute(0.0, 120, true, profile, object : Callback() {
+                                override fun run() {
+                                    if (!result.success) {
+                                        val i = Intent(context, ErrorHelperActivity::class.java)
+                                        i.putExtra("soundid", R.raw.boluserror)
+                                        i.putExtra("status", result.comment)
+                                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        context.startActivity(i)
+                                    }
+                                }
+                            })
+                        } else {
+
+                            commandQueue.tempBasalPercent(0, 120, true, profile, object : Callback() {
+                                override fun run() {
+                                    if (!result.success) {
+                                        val i = Intent(context, ErrorHelperActivity::class.java)
+                                        i.putExtra("soundid", R.raw.boluserror)
+                                        i.putExtra("status", result.comment)
+                                        i.putExtra("title", resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        context.startActivity(i)
+                                    }
+                                }
+                            })
+                        }
+                    }
+                    val detailedBolusInfo = DetailedBolusInfo()
+                    detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD
+                    detailedBolusInfo.insulin = insulinAfterConstraints
+                    detailedBolusInfo.carbs = carbs.toDouble()
+                    detailedBolusInfo.context = context
+                    detailedBolusInfo.glucose = bg
+                    detailedBolusInfo.glucoseType = "Manual"
+                    detailedBolusInfo.carbTime = carbTime
+                    detailedBolusInfo.boluscalc = nsJSON()
+                    detailedBolusInfo.source = Source.USER
+                    detailedBolusInfo.notes = notes
+                    aapsLogger.debug("USER ENTRY: BOLUS insulin $insulinAfterConstraints carbs: $carbs")
+                    if (detailedBolusInfo.insulin > 0 || pump.pumpDescription.storesCarbInfo) {
+                        commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                            override fun run() {
+                                if (!result.success) {
+                                    val i = Intent(context, ErrorHelperActivity::class.java)
+                                    i.putExtra("soundid", R.raw.boluserror)
+                                    i.putExtra("status", result.comment)
+                                    i.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror))
+                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    context.startActivity(i)
+                                }
+                            }
+                        })
+                    } else {
+                        activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
+                    }
+                }
+            })
+        }
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizard.kt
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/data/QuickWizard.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizard.kt
index f8bca8c450..14380bfb72 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizard.kt
@@ -1,20 +1,28 @@
-package info.nightscout.androidaps.data
+package info.nightscout.androidaps.utils.wizard
 
-import info.nightscout.androidaps.utils.SP
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class QuickWizard @Inject constructor(
+    private val sp: SP,
+    private val injector: HasAndroidInjector
+) {
 
-object QuickWizard {
     private var storage = JSONArray()
 
     init {
-        setData(JSONArray(SP.getString("QuickWizard", "[]")))
+        setData(JSONArray(sp.getString("QuickWizard", "[]")))
     }
 
     fun getActive(): QuickWizardEntry? {
         for (i in 0 until storage.length()) {
-            val entry = QuickWizardEntry(storage.get(i) as JSONObject, i)
-            if (entry.isActive) return entry
+            val entry = QuickWizardEntry(injector).from(storage.get(i) as JSONObject, i)
+            if (entry.isActive()) return entry
         }
         return null
     }
@@ -24,17 +32,16 @@ object QuickWizard {
     }
 
     fun save() {
-        SP.putString("QuickWizard", storage.toString())
+        sp.putString("QuickWizard", storage.toString())
     }
 
     fun size(): Int = storage.length()
 
     operator fun get(position: Int): QuickWizardEntry =
-        QuickWizardEntry(storage.get(position) as JSONObject, position)
-
+        QuickWizardEntry(injector).from(storage.get(position) as JSONObject, position)
 
     fun newEmptyItem(): QuickWizardEntry {
-        return QuickWizardEntry()
+        return QuickWizardEntry(injector)
     }
 
     fun addOrUpdate(newItem: QuickWizardEntry) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
new file mode 100644
index 0000000000..f24f3d72f4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
@@ -0,0 +1,148 @@
+package info.nightscout.androidaps.utils.wizard
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper.safeGetInt
+import info.nightscout.androidaps.utils.JsonHelper.safeGetString
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+
+class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjector) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var sp: SP
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    lateinit var storage: JSONObject
+    var position: Int = -1
+
+    companion object {
+        const val YES = 0
+        const val NO = 1
+        private const val POSITIVE_ONLY = 2
+        private const val NEGATIVE_ONLY = 3
+    }
+
+    init {
+        injector.androidInjector().inject(this)
+        val emptyData = "{\"buttonText\":\"\",\"carbs\":0,\"validFrom\":0,\"validTo\":86340}"
+        try {
+            storage = JSONObject(emptyData)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+    }
+
+    /*
+        {
+            buttonText: "Meal",
+            carbs: 36,
+            validFrom: 8 * 60 * 60, // seconds from midnight
+            validTo: 9 * 60 * 60,   // seconds from midnight
+            useBG: 0,
+            useCOB: 0,
+            useBolusIOB: 0,
+            useBasalIOB: 0,
+            useTrend: 0,
+            useSuperBolus: 0,
+            useTemptarget: 0
+        }
+     */
+    fun from(entry: JSONObject, position: Int): QuickWizardEntry {
+        storage = entry
+        this.position = position
+        return this
+    }
+
+    fun isActive(): Boolean = Profile.secondsFromMidnight() >= validFrom() && Profile.secondsFromMidnight() <= validTo()
+
+    fun doCalc(profile: Profile, profileName: String, lastBG: BgReading, _synchronized: Boolean): BolusWizard {
+        val tempTarget = treatmentsPlugin.tempTargetFromHistory
+        //BG
+        var bg = 0.0
+        if (useBG() == YES) {
+            bg = lastBG.valueToUnits(profileFunction.getUnits())
+        }
+        // COB
+        var cob = 0.0
+        if (useCOB() == YES) {
+            val cobInfo = iobCobCalculatorPlugin.getCobInfo(_synchronized, "QuickWizard COB")
+            if (cobInfo.displayCob != null) cob = cobInfo.displayCob
+        }
+        // Bolus IOB
+        var bolusIOB = false
+        if (useBolusIOB() == YES) {
+            bolusIOB = true
+        }
+        // Basal IOB
+        treatmentsPlugin.updateTotalIOBTempBasals()
+        val basalIob = treatmentsPlugin.lastCalculationTempBasals.round()
+        var basalIOB = false
+        if (useBasalIOB() == YES) {
+            basalIOB = true
+        } else if (useBasalIOB() == POSITIVE_ONLY && basalIob.iob > 0) {
+            basalIOB = true
+        } else if (useBasalIOB() == NEGATIVE_ONLY && basalIob.iob < 0) {
+            basalIOB = true
+        }
+        // SuperBolus
+        var superBolus = false
+        if (useSuperBolus() == YES && sp.getBoolean(R.string.key_usesuperbolus, false)) {
+            superBolus = true
+        }
+        if (loopPlugin.isEnabled(loopPlugin.getType()) && loopPlugin.isSuperBolus) superBolus = false
+        // Trend
+        val glucoseStatus = GlucoseStatus(injector).getGlucoseStatusData()
+        var trend = false
+        if (useTrend() == YES) {
+            trend = true
+        } else if (useTrend() == POSITIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta > 0) {
+            trend = true
+        } else if (useTrend() == NEGATIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta < 0) {
+            trend = true
+        }
+        val percentage = sp.getDouble(R.string.key_boluswizard_percentage, 100.0)
+        return BolusWizard(injector).doCalc(profile, profileName, tempTarget, carbs(), cob, bg, 0.0, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, "QuickWizard")
+    }
+
+    fun buttonText(): String = safeGetString(storage, "buttonText", "")
+
+    fun carbs(): Int = safeGetInt(storage, "carbs")
+
+    fun validFromDate(): Date = DateUtil.toDate(validFrom())
+
+    fun validToDate(): Date = DateUtil.toDate(validTo())
+
+    fun validFrom(): Int = safeGetInt(storage, "validFrom")
+
+    fun validTo(): Int = safeGetInt(storage, "validTo")
+
+    fun useBG(): Int = safeGetInt(storage, "useBG", YES)
+
+    fun useCOB(): Int = safeGetInt(storage, "useCOB", NO)
+
+    fun useBolusIOB(): Int = safeGetInt(storage, "useBolusIOB", YES)
+
+    fun useBasalIOB(): Int = safeGetInt(storage, "useBasalIOB", YES)
+
+    fun useTrend(): Int = safeGetInt(storage, "useTrend", NO)
+
+    fun useSuperBolus(): Int = safeGetInt(storage, "useSuperBolus", NO)
+
+    fun useTempTarget(): Int = safeGetInt(storage, "useTempTarget", NO)
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/alert_border_error.xml b/app/src/main/res/drawable/alert_border_error.xml
new file mode 100644
index 0000000000..d1bcae1348
--- /dev/null
+++ b/app/src/main/res/drawable/alert_border_error.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="PrivateResource"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape
+        android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/background_floating_material_dark" />
+        <stroke android:color="@color/errorAlertBackground" android:width="3dp" />
+    </shape></inset>
+
diff --git a/app/src/main/res/drawable/alert_border_warning.xml b/app/src/main/res/drawable/alert_border_warning.xml
new file mode 100644
index 0000000000..c73a9517a5
--- /dev/null
+++ b/app/src/main/res/drawable/alert_border_warning.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="PrivateResource"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape
+        android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/background_floating_material_dark" />
+        <stroke android:color="@color/warningAlertBackground" android:width="3dp" />
+    </shape></inset>
+
diff --git a/app/src/main/res/drawable/ic_header_error.xml b/app/src/main/res/drawable/ic_header_error.xml
new file mode 100644
index 0000000000..09c29c1558
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_error.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.8"
+        android:scaleY="0.8">
+        <path
+            android:fillColor="#000"
+            android:pathData="M8.27,3L3,8.27V15.73L8.27,21H15.73C17.5,19.24 21,15.73 21,15.73V8.27L15.73,3M9.1,5H14.9L19,9.1V14.9L14.9,19H9.1L5,14.9V9.1M9.12,7.71L7.71,9.12L10.59,12L7.71,14.88L9.12,16.29L12,13.41L14.88,16.29L16.29,14.88L13.41,12L16.29,9.12L14.88,7.71L12,10.59" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_export.xml b/app/src/main/res/drawable/ic_header_export.xml
new file mode 100644
index 0000000000..d59103ab07
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_export.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.66"
+        android:scaleY="0.66">
+        <path
+            android:fillColor="#000"
+            android:pathData="M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_import.xml b/app/src/main/res/drawable/ic_header_import.xml
new file mode 100644
index 0000000000..e929fad69b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_import.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.66"
+        android:scaleY="0.66">
+        <path
+            android:fillColor="#000"
+            android:pathData="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_key.xml b/app/src/main/res/drawable/ic_header_key.xml
new file mode 100644
index 0000000000..416cc50bd3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_key.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.66"
+        android:scaleY="0.66">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M22 18V22H18V19H15V16H12L9.74 13.74C9.19 13.91 8.61 14 8 14A6 6 0 0 1 2 8A6 6 0 0 1 8 2A6 6 0 0 1 14 8C14 8.61 13.91 9.19 13.74 9.74L22 18M7 5A2 2 0 0 0 5 7A2 2 0 0 0 7 9A2 2 0 0 0 9 7A2 2 0 0 0 7 5Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_log.xml b/app/src/main/res/drawable/ic_header_log.xml
new file mode 100644
index 0000000000..6ef0e68d81
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_log.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.8"
+        android:scaleY="0.8">
+        <path
+            android:fillColor="#000"
+            android:pathData="M15,20A1,1 0 0,0 16,19V4H8A1,1 0 0,0 7,5V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H20V5A1,1 0 0,0 19,4A1,1 0 0,0 18,5V9L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H13A2,2 0 0,0 15,20M9,6H14V8H9V6M9,10H14V12H9V10M9,14H14V16H9V14Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_warning.xml b/app/src/main/res/drawable/ic_header_warning.xml
new file mode 100644
index 0000000000..3d7afd8ef3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_warning.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="#000"
+            android:pathData="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_key.xml b/app/src/main/res/drawable/ic_key.xml
new file mode 100644
index 0000000000..4d4a6fa28d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_key.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <path
+        android:pathData="M22 18V22H18V19H15V16H12L9.74 13.74C9.19 13.91 8.61 14 8 14A6 6 0 0 1 2 8A6 6 0 0 1 8 2A6 6 0 0 1 14 8C14 8.61 13.91 9.19 13.74 9.74L22 18M7 5A2 2 0 0 0 5 7A2 2 0 0 0 7 9A2 2 0 0 0 9 7A2 2 0 0 0 7 5Z"
+        android:fillColor="#ffffff" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_date.xml b/app/src/main/res/drawable/ic_meta_date.xml
new file mode 100644
index 0000000000..190392aaa1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_date.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M15,13H16.5V15.82L18.94,17.23L18.19,18.53L15,16.69V13M19,8H5V19H9.67C9.24,18.09 9,17.07 9,16A7,7 0 0,1 16,9C17.07,9 18.09,9.24 19,9.67V8M5,21C3.89,21 3,20.1 3,19V5C3,3.89 3.89,3 5,3H6V1H8V3H16V1H18V3H19A2,2 0 0,1 21,5V11.1C22.24,12.36 23,14.09 23,16A7,7 0 0,1 16,23C14.09,23 12.36,22.24 11.1,21H5M16,11.15A4.85,4.85 0 0,0 11.15,16C11.15,18.68 13.32,20.85 16,20.85A4.85,4.85 0 0,0 20.85,16C20.85,13.32 18.68,11.15 16,11.15Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_encryption.xml b/app/src/main/res/drawable/ic_meta_encryption.xml
new file mode 100644
index 0000000000..597b35a77a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_encryption.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M21,11C21,16.55 17.16,21.74 12,23C6.84,21.74 3,16.55 3,11V5L12,1L21,5V11M12,21C15.75,20 19,15.54 19,11.22V6.3L12,3.18L5,6.3V11.22C5,15.54 8.25,20 12,21M14.8,11V9.5C14.8,8.1 13.4,7 12,7C10.6,7 9.2,8.1 9.2,9.5V11C8.6,11 8,11.6 8,12.2V15.7C8,16.4 8.6,17 9.2,17H14.7C15.4,17 16,16.4 16,15.8V12.3C16,11.6 15.4,11 14.8,11M13.5,11H10.5V9.5C10.5,8.7 11.2,8.2 12,8.2C12.8,8.2 13.5,8.7 13.5,9.5V11Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_error.xml b/app/src/main/res/drawable/ic_meta_error.xml
new file mode 100644
index 0000000000..e5d213f774
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_error.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/metadataTextError"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.27,3L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3M8.41,7L12,10.59L15.59,7L17,8.41L13.41,12L17,15.59L15.59,17L12,13.41L8.41,17L7,15.59L10.59,12L7,8.41" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_flavour.xml b/app/src/main/res/drawable/ic_meta_flavour.xml
new file mode 100644
index 0000000000..a7fe7f3471
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_flavour.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,10.84 21.79,9.69 21.39,8.61L19.79,10.21C19.93,10.8 20,11.4 20,12A8,8 0 0,1 12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4C12.6,4 13.2,4.07 13.79,4.21L15.4,2.6C14.31,2.21 13.16,2 12,2M19,2L15,6V7.5L12.45,10.05C12.3,10 12.15,10 12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12C14,11.85 14,11.7 13.95,11.55L16.5,9H18L22,5H19V2M12,6A6,6 0 0,0 6,12A6,6 0 0,0 12,18A6,6 0 0,0 18,12H16A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8V6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_format.xml b/app/src/main/res/drawable/ic_meta_format.xml
new file mode 100644
index 0000000000..2023a4934d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_format.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M6 2C4.89 2 4 2.9 4 4V20C4 21.11 4.89 22 6 22H12V20H6V4H13V9H18V12H20V8L14 2M18 14C17.87 14 17.76 14.09 17.74 14.21L17.55 15.53C17.25 15.66 16.96 15.82 16.7 16L15.46 15.5C15.35 15.5 15.22 15.5 15.15 15.63L14.15 17.36C14.09 17.47 14.11 17.6 14.21 17.68L15.27 18.5C15.25 18.67 15.24 18.83 15.24 19C15.24 19.17 15.25 19.33 15.27 19.5L14.21 20.32C14.12 20.4 14.09 20.53 14.15 20.64L15.15 22.37C15.21 22.5 15.34 22.5 15.46 22.5L16.7 22C16.96 22.18 17.24 22.35 17.55 22.47L17.74 23.79C17.76 23.91 17.86 24 18 24H20C20.11 24 20.22 23.91 20.24 23.79L20.43 22.47C20.73 22.34 21 22.18 21.27 22L22.5 22.5C22.63 22.5 22.76 22.5 22.83 22.37L23.83 20.64C23.89 20.53 23.86 20.4 23.77 20.32L22.7 19.5C22.72 19.33 22.74 19.17 22.74 19C22.74 18.83 22.73 18.67 22.7 18.5L23.76 17.68C23.85 17.6 23.88 17.47 23.82 17.36L22.82 15.63C22.76 15.5 22.63 15.5 22.5 15.5L21.27 16C21 15.82 20.73 15.65 20.42 15.53L20.23 14.21C20.22 14.09 20.11 14 20 14M19 17.5C19.83 17.5 20.5 18.17 20.5 19C20.5 19.83 19.83 20.5 19 20.5C18.16 20.5 17.5 19.83 17.5 19C17.5 18.17 18.17 17.5 19 17.5Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_model.xml b/app/src/main/res/drawable/ic_meta_model.xml
new file mode 100644
index 0000000000..eca3e69c59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_model.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13 7H11V9H13V7M13 11H11V17H13V11M17 1H7C5.9 1 5 1.9 5 3V21C5 22.1 5.9 23 7 23H17C18.1 23 19 22.1 19 21V3C19 1.9 18.1 1 17 1M17 19H7V5H17V19Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_name.xml b/app/src/main/res/drawable/ic_meta_name.xml
new file mode 100644
index 0000000000..ad120e037a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_name.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M22,3H2C0.91,3.04 0.04,3.91 0,5V19C0.04,20.09 0.91,20.96 2,21H22C23.09,20.96 23.96,20.09 24,19V5C23.96,3.91 23.09,3.04 22,3M22,19H2V5H22V19M14,17V15.75C14,14.09 10.66,13.25 9,13.25C7.34,13.25 4,14.09 4,15.75V17H14M9,7A2.5,2.5 0 0,0 6.5,9.5A2.5,2.5 0 0,0 9,12A2.5,2.5 0 0,0 11.5,9.5A2.5,2.5 0 0,0 9,7M14,7V8H20V7H14M14,9V10H20V9H14M14,11V12H18V11H14" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_ok.xml b/app/src/main/res/drawable/ic_meta_ok.xml
new file mode 100644
index 0000000000..663897c160
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_ok.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/toastOk"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_meta_version.xml b/app/src/main/res/drawable/ic_meta_version.xml
new file mode 100644
index 0000000000..ddf95f2fa9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_version.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M2,10.96C1.5,10.68 1.35,10.07 1.63,9.59L3.13,7C3.24,6.8 3.41,6.66 3.6,6.58L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.66,6.72 20.82,6.88 20.91,7.08L22.36,9.6C22.64,10.08 22.47,10.69 22,10.96L21,11.54V16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V10.96C2.7,11.13 2.32,11.14 2,10.96M12,4.15V4.15L12,10.85V10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V12.69L14,15.59C13.67,15.77 13.3,15.76 13,15.6V19.29L19,15.91M13.85,13.36L20.13,9.73L19.55,8.72L13.27,12.35L13.85,13.36Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_meta_warning.xml b/app/src/main/res/drawable/ic_meta_warning.xml
new file mode 100644
index 0000000000..9cf5ce2c36
--- /dev/null
+++ b/app/src/main/res/drawable/ic_meta_warning.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/metadataTextWarning"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_check.xml b/app/src/main/res/drawable/ic_toast_check.xml
new file mode 100644
index 0000000000..26b9f05b49
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toast_check.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastOk"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_delete_confirm.xml b/app/src/main/res/drawable/ic_toast_delete_confirm.xml
new file mode 100644
index 0000000000..de6371045a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toast_delete_confirm.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastInfo"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_error.xml b/app/src/main/res/drawable/ic_toast_error.xml
new file mode 100644
index 0000000000..fb49272c0a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toast_error.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastError"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_info.xml b/app/src/main/res/drawable/ic_toast_info.xml
new file mode 100644
index 0000000000..9d54be6827
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toast_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastInfo"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_warn.xml b/app/src/main/res/drawable/ic_toast_warn.xml
new file mode 100644
index 0000000000..8864b16500
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toast_warn.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/toastWarn"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toast_border_ok.xml b/app/src/main/res/drawable/toast_border_ok.xml
new file mode 100644
index 0000000000..1c62848b31
--- /dev/null
+++ b/app/src/main/res/drawable/toast_border_ok.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="PrivateResource">
+    <corners android:radius="18dp" />
+    <solid android:color="@color/background_floating_material_dark" />
+    <stroke
+        android:width="3dp"
+        android:color="@color/toastBorder" />
+</shape>
+
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index bbf0bb59c6..77a5ab00dd 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -190,6 +190,34 @@
                 app:layout_gravity="fill"
                 app:layout_row="3" />
 
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/actions_note"
+                style="@style/ButtonSmallFontStyle"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:drawableTop="@drawable/icon_cp_note"
+                android:paddingLeft="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/careportal_note"
+                app:layout_column="0"
+                app:layout_columnWeight="1"
+                app:layout_gravity="fill"
+                app:layout_row="4" />
+
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/actions_exercise"
+                style="@style/ButtonSmallFontStyle"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:drawableTop="@drawable/icon_cp_exercise"
+                android:paddingLeft="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/careportal_exercise"
+                app:layout_column="1"
+                app:layout_columnWeight="1"
+                app:layout_gravity="fill"
+                app:layout_row="4" />
+
         </androidx.gridlayout.widget.GridLayout>
 
         <include
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index 45433fc4eb..2c2c5b8cd2 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.activities.HistoryBrowseActivity">
+    tools:context="info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_logsetting.xml b/app/src/main/res/layout/activity_logsetting.xml
index feee7bd38a..2f226e726d 100644
--- a/app/src/main/res/layout/activity_logsetting.xml
+++ b/app/src/main/res/layout/activity_logsetting.xml
@@ -1,21 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".plugins.general.maintenance.activities.LogSettingActivity">
 
-    <Button
-        android:id="@+id/logsettings_reset"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="15dp"
-        android:text="@string/resettodefaults" />
+        android:orientation="vertical">
 
-    <ScrollView
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/carbs"
+            app:srcCompat="@mipmap/ic_launcher" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/nav_logsettings"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="5dp" />
 
         <LinearLayout
             android:id="@+id/logsettings_placeholder"
@@ -23,6 +52,34 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
-    </ScrollView>
+        <LinearLayout
+            android:id="@+id/done_background"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:orientation="horizontal"
+            android:background="@android:color/transparent"
+            android:gravity="end"
+            android:layout_gravity="center_vertical"
+            android:paddingBottom="8dp">
 
-</LinearLayout>
\ No newline at end of file
+            <Button
+                android:id="@+id/logsettings_reset"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="8dp"
+                style="@style/mdtp_ActionButton.Text"
+                android:text="@string/resettodefaults" />
+
+            <Button
+                android:id="@+id/ok"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                style="@style/mdtp_ActionButton.Text"
+                android:text="@string/mdtp_ok" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_smscommunicator_otp.xml b/app/src/main/res/layout/activity_smscommunicator_otp.xml
new file mode 100644
index 0000000000..6c52185bfb
--- /dev/null
+++ b/app/src/main/res/layout/activity_smscommunicator_otp.xml
@@ -0,0 +1,104 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <LinearLayout
+            android:id="@+id/smscommunicator_otp_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/section_header_label"
+                android:text="@string/smscommunicator_otp_step1_install_header" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5sp"
+                android:layout_marginBottom="5sp"
+                android:paddingStart="15sp"
+                android:paddingEnd="15sp"
+                android:text="@string/smscommunicator_otp_install_info" />
+
+            <TextView
+                style="@style/section_header_label"
+                android:text="@string/smscommunicator_otp_step2_provisioning_header" />
+
+            <ImageView
+                android:id="@+id/smscommunicator_otp_provisioning"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:scaleType="center" />
+
+            <TextView
+                style="@style/warning_label"
+                android:text="" />
+
+            <TextView
+                style="@style/section_header_label"
+                android:text="@string/smscommunicator_otp_step3_test_header" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:paddingEnd="5dp"
+                    android:text="@string/smscommunicator_otp_verify_label" />
+
+                <EditText
+                    android:id="@+id/smscommunicator_otp_verify_edit"
+                    android:layout_width="140sp"
+                    android:layout_height="wrap_content"
+                    android:hint="000 000 000"
+                    android:inputType="number"
+                    android:maxLength="12"
+                    android:textAlignment="center"
+                    android:textSize="19sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/smscommunicator_otp_verify_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="15dp"
+                    android:paddingEnd="5dp" />
+
+            </LinearLayout>
+
+            <TextView
+                style="@style/section_header_label"
+                android:text="@string/smscommunicator_otp_reset_header" />
+
+            <TextView
+                style="@style/warning_label"
+                android:text="@string/smscommunicator_otp_reset_warning" />
+
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/actions_smscommunicator_otp_reset"
+                style="?android:attr/buttonStyle"
+                android:layout_width="fill_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="3dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="3dp"
+                android:text="@string/smscommunicator_otp_reset_btn"
+                android:textColor="@color/colorTreatmentButton" />
+
+        </LinearLayout>
+    </ScrollView>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/stats_activity.xml b/app/src/main/res/layout/activity_stats.xml
similarity index 72%
rename from app/src/main/res/layout/stats_activity.xml
rename to app/src/main/res/layout/activity_stats.xml
index 83cf37918b..bd720bc5fc 100644
--- a/app/src/main/res/layout/stats_activity.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -12,27 +12,40 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/activity_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
 
             <ImageView
-                android:id="@+id/imageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:paddingStart="10dp"
+                android:contentDescription="@string/carbs"
                 app:srcCompat="@mipmap/ic_launcher" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/header"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:text="@string/statistics"
-                android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
-        </LinearLayout>
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/spacer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="5dp" />
 
         <TextView
             android:id="@+id/stats_tdds"
@@ -55,13 +68,13 @@
             android:layout_marginStart="10dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:id="@+id/done_background"
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:orientation="horizontal"
             android:background="@android:color/transparent"
-            android:gravity="end|right"
+            android:gravity="end"
             android:layout_gravity="center_vertical"
             android:paddingBottom="8dp">
 
@@ -69,7 +82,6 @@
                 android:id="@+id/stats_reset"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_marginRight="8dp"
                 android:layout_marginEnd="8dp"
                 style="@style/mdtp_ActionButton.Text"
                 android:text="@string/reset" />
@@ -78,10 +90,10 @@
                 android:id="@+id/ok"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="16dp"
                 android:layout_marginEnd="16dp"
                 style="@style/mdtp_ActionButton.Text"
                 android:text="@string/mdtp_ok" />
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 7f642c6fab..d4f79965a5 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -16,12 +16,6 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include
-                android:id="@+id/careportal_stats"
-                layout="@layout/careportal_stats_fragment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
             <TextView
                 android:id="@+id/profileview_noprofile"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/careportal_stats_fragment_short.xml b/app/src/main/res/layout/careportal_stats_fragment_short.xml
deleted file mode 100644
index 630b5cff5f..0000000000
--- a/app/src/main/res/layout/careportal_stats_fragment_short.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="2sp"
-    android:paddingRight="2sp"
-    tools:context=".plugins.general.careportal.CareportalFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:background="?android:attr/colorControlHighlight"
-            android:layout_height="26dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="match_parent"
-                android:src="@drawable/icon_cp_age_sensor"
-                android:gravity="center_vertical"
-                android:paddingStart="2dp"
-                android:paddingEnd="1dp"
-                android:scaleType="centerInside"/>
-
-            <TextView
-                android:id="@+id/careportal_sensorage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingStart="1dp"
-                android:paddingEnd="2dp"
-                android:textSize="14sp" />
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:src="@drawable/icon_cp_age_insulin"
-                android:gravity="center_vertical"
-                android:paddingStart="2dp"
-                android:paddingEnd="1dp"
-                android:scaleType="centerInside"/>
-
-            <TextView
-                android:id="@+id/careportal_insulinage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingStart="1dp"
-                android:paddingEnd="2dp"
-                android:textSize="14sp" />
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:src="@drawable/icon_cp_age_canula"
-                android:gravity="center_vertical"
-                android:paddingStart="2dp"
-                android:paddingEnd="1dp"
-                android:scaleType="centerInside"/>
-
-            <TextView
-                android:id="@+id/careportal_canulaage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingStart="1dp"
-                android:paddingEnd="2dp"
-                android:textSize="14sp" />
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:src="@drawable/icon_cp_age_battery"
-                android:gravity="center_vertical"
-                android:paddingStart="2dp"
-                android:paddingEnd="1dp"
-                android:scaleType="centerInside"/>
-
-            <TextView
-                android:id="@+id/careportal_pbage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingStart="1dp"
-                android:paddingEnd="1dp"
-                android:textSize="14sp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/danar_historyactivity.xml b/app/src/main/res/layout/danar_historyactivity.xml
index 2693384c10..ea371daedb 100644
--- a/app/src/main/res/layout/danar_historyactivity.xml
+++ b/app/src/main/res/layout/danar_historyactivity.xml
@@ -77,7 +77,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/danar_history_recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/danar_history_reload"
         android:layout_below="@+id/danar_history_status" />
 
     <Button
diff --git a/app/src/main/res/layout/dialog_alert_custom.xml b/app/src/main/res/layout/dialog_alert_custom.xml
index eea5fc6882..f006387d28 100644
--- a/app/src/main/res/layout/dialog_alert_custom.xml
+++ b/app/src/main/res/layout/dialog_alert_custom.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Loading this view directly, without proper Theme, will likely result in crash due to lack of ?dialog... attribute definitions
+  Please use AlertDialogHelper or wrap inflater context with ContextThemeWrapper(context, R.style.AppTheme)
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,14 +12,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@color/dialog_title_background"
+        android:background="?dialogTitleBackground"
         android:orientation="horizontal"
         android:padding="5dp">
 
         <ImageView
             android:id="@+id/alertdialog_icon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:tint="?dialogTitleIconTint" />
 
         <TextView
             android:id="@+id/alertdialog_title"
@@ -23,10 +28,13 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="50dp"
+            android:layout_toEndOf="@id/alertdialog_icon"
             android:textAlignment="center"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?dialogTitleColor" />
+
     </RelativeLayout>
 
     <LinearLayout
@@ -36,5 +44,4 @@
         android:orientation="horizontal"
         android:padding="5dp" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_alert_import_summary.xml b/app/src/main/res/layout/dialog_alert_import_summary.xml
new file mode 100644
index 0000000000..fb6e5a0708
--- /dev/null
+++ b/app/src/main/res/layout/dialog_alert_import_summary.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="10dp">
+
+    <TableLayout
+        android:id="@+id/summary_table"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:stretchColumns="2" />
+
+    <Button
+        android:id="@+id/summary_details_btn"
+        style="?android:attr/buttonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="3dp"
+        android:text="@string/check_preferences_details_btn"
+        android:textColor="@color/colorTreatmentButton"
+        android:visibility="gone" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_alert_two_messages.xml b/app/src/main/res/layout/dialog_alert_two_messages.xml
new file mode 100644
index 0000000000..e155b6f215
--- /dev/null
+++ b/app/src/main/res/layout/dialog_alert_two_messages.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/password_prompt_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="@string/password_preferences_decrypt_prompt"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/colorAccent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bolusprogress.xml b/app/src/main/res/layout/dialog_bolusprogress.xml
index b8e8377827..e2da43a067 100644
--- a/app/src/main/res/layout/dialog_bolusprogress.xml
+++ b/app/src/main/res/layout/dialog_bolusprogress.xml
@@ -15,6 +15,7 @@
         android:padding="5dp">
 
         <ImageView
+            android:id="@+id/header_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_trending_flat_white_48dp" />
@@ -28,6 +29,7 @@
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:textAlignment="center"
+            android:layout_toEndOf="@id/header_icon"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 8376b2c776..500b118afa 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -113,6 +113,40 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/action_care_duration_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:width="120dp"
+                android:padding="10dp"
+                android:text="@string/careportal_newnstreatment_duration_label"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="bold" />
+
+            <info.nightscout.androidaps.utils.NumberPicker
+                android:id="@+id/actions_care_duration"
+                android:layout_width="130dp"
+                android:layout_height="40dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:minWidth="45dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/unit_minute_short"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
         <include layout="@layout/notes" />
 
         <include layout="@layout/datetime" />
diff --git a/app/src/main/res/layout/treatments_wizardinfo_dialog.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
similarity index 92%
rename from app/src/main/res/layout/treatments_wizardinfo_dialog.xml
rename to app/src/main/res/layout/dialog_wizardinfo.xml
index d6ba1bfc58..3ce946ab0d 100644
--- a/app/src/main/res/layout/treatments_wizardinfo_dialog.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -1,34 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
     android:minWidth="300dp"
     android:orientation="vertical"
-    android:padding="10dp">
+    tools:context=".dialogs.WizardInfoDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginBottom="5dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="-15dp"
-            android:background="@color/listdelimiter" />
-
-        <TextView
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:paddingBottom="10dp"
-            android:text="@string/wear_wizard_settings"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:layout_gravity="center"
+            android:background="@color/dialog_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/carbs"
+                android:src="@drawable/icon_calculator" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/wear_wizard_settings"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/spacer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="5dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -466,7 +483,7 @@
             android:layout_height="56dp"
             android:orientation="horizontal"
             android:background="@android:color/transparent"
-            android:gravity="end|right"
+            android:gravity="end"
             android:layout_gravity="center_vertical"
             android:paddingBottom="8dp">
 
@@ -474,11 +491,11 @@
                 android:id="@+id/close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="16dp"
                 android:layout_marginEnd="16dp"
                 style="@style/mdtp_ActionButton.Text"
                 android:text="@string/mdtp_ok" />
         </LinearLayout>
 
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/import_summary_details.xml b/app/src/main/res/layout/import_summary_details.xml
new file mode 100644
index 0000000000..8c9c0bd7f2
--- /dev/null
+++ b/app/src/main/res/layout/import_summary_details.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp">
+
+    <WebView
+        android:id="@+id/details_webview"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:background="@android:color/transparent" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/import_summary_item.xml b/app/src/main/res/layout/import_summary_item.xml
new file mode 100644
index 0000000000..66c0922d5c
--- /dev/null
+++ b/app/src/main/res/layout/import_summary_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent">
+
+    <ImageView
+        android:id="@+id/status_icon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_margin="4dp"
+        android:src="@drawable/ic_toast_check" />
+
+    <ImageView
+        android:id="@+id/summary_icon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:src="@drawable/ic_meta_format"
+        android:tint="#ffffff" />
+
+    <TextView
+        android:id="@+id/summary_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:layout_weight="1"
+        android:text="Sample text here"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        tools:ignore="HardcodedText" />
+
+</TableRow>
+
diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml
index ef24280345..3b5066e533 100644
--- a/app/src/main/res/layout/loop_fragment.xml
+++ b/app/src/main/res/layout/loop_fragment.xml
@@ -57,51 +57,6 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="5dp"
-                android:background="@color/listdelimiter" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:gravity="end"
-                    android:paddingRight="5dp"
-                    android:text="@string/openapsma_lastenact_label"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:layout_width="5dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:gravity="center_horizontal"
-                    android:paddingEnd="2dp"
-                    android:paddingStart="2dp"
-                    android:text=":"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/loop_lastenact"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="start"
-                    android:paddingLeft="5dp"
-                    android:textColor="@android:color/white"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -282,6 +237,96 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_tbrrequest_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_tbrrequest_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_tbrexecution_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_tbrexecution_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -327,6 +372,96 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_smbrequest_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_smbrequest_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_smbexecution_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_smbexecution_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 01d279b925..35ddd5eed4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -1,551 +1,584 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".plugins.general.overview.OverviewFragment">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <ScrollView
+        android:id="@+id/overview_toppart_scrollbar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/overview_accepttempbutton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <ScrollView
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/overview_buttons"
-            android:fillViewport="true">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/overview_notifications"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_looplayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+            </androidx.recyclerview.widget.RecyclerView>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/overview_looplayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                app:layout_constraintBottom_toTopOf="@+id/overview_pumpstatuslayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_notifications">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/overview_notifications"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/overview_apsmode"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/openloop"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_activeprofile"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                </androidx.recyclerview.widget.RecyclerView>
 
-                <LinearLayout
-                    android:id="@+id/overview_looplayout"
+                <TextView
+                    android:id="@+id/overview_activeprofile"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_temptarget"
+                    app:layout_constraintStart_toEndOf="@+id/overview_apsmode"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_temptarget"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/temptargetshort"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/mdtp_white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_activeprofile"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_pumpstatuslayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/bg_tbr_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_looplayout">
+
+                <TextView
+                    android:id="@+id/overview_pumpstatus"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/initializing"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                    <TextView
-                        android:id="@+id/overview_apsmode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:text="Open Loop"
+            </LinearLayout>
 
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/bg_tbr_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_statuslights"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pumpstatuslayout">
 
-
-                    <TextView
-                        android:id="@+id/overview_activeprofile"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:text="Profile"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <TextView
-                        android:id="@+id/overview_temptarget"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="TempTarget"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/mdtp_white" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_pumpstatuslayout"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/overview_bg"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
+                    android:text="00.0"
+                    android:textSize="42sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:id="@+id/overview_pumpstatus"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="@string/initializing"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:baselineAligned="false"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/overview_arrow"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:layout_weight="0"
-                    android:orientation="horizontal">
+                    android:layout_marginTop="5dp"
+                    android:paddingStart="-2dp"
+                    android:paddingEnd="0dp"
+                    android:text="→"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:id="@+id/overview_bg"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="6dp"
-                                android:text="00.0"
-                                android:textSize="42sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/overview_arrow"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginTop="-5dp"
-                                android:layout_marginEnd="4dp"
-                                android:paddingStart="-2dp"
-                                android:paddingEnd="0dp"
-                                android:text="→"
-                                android:textSize="28sp"
-                                android:textStyle="bold" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:layout_marginTop="2dp"
-                            android:layout_marginBottom="10dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/overview_timeago"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginTop="-2dp"
-                                android:paddingStart="2dp"
-                                android:layout_weight="0.5"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_delta"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginTop="-2dp"
-                                android:paddingStart="2dp"
-                                android:layout_weight="0.5"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_avgdelta"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
-                                android:layout_weight="0.5"
-                                android:textSize="12sp"/>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:layout_marginTop="6dp"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="20dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/iob"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/overview_iob"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="14dp"
-                                android:text=""
-                                android:textSize="16sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="20dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/cob"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/overview_cob"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:text=""
-                                android:textSize="16sp"
-                                android:textStyle="bold"/>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="20dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/basal_short"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/overview_basebasal"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="10dp"
-                                android:text="0.50U/h @17:35 1/30min - 0.40U/h"
-                                android:textSize="16sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="20dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="AS"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/overview_sensitivity"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="20dp"
-                                android:text=""
-                                android:textSize="16sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_statuslights"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/overview_hor_space"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
+                    android:text="                    "
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
 
-                    <TextView
-                        android:id="@+id/overview_canulaage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
 
-                    <TextView
-                        android:id="@+id/overview_insulinage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/overview_timeago"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 min ago"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_delta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_bg" />
 
-                    <TextView
-                        android:id="@+id/overview_reservoirlevel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/overview_delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 15m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_avgdelta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_timeago" />
 
-                    <TextView
-                        android:id="@+id/overview_sensorage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/overview_avgdelta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 40m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_delta" />
 
-                    <TextView
-                        android:id="@+id/overview_batterylevel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
 
-                </LinearLayout>
+                <!-- right side -->
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/overview_bg_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_iob_label"
+                    app:layout_constraintGuide_percent="0.40"
+                    app:layout_constraintStart_toEndOf="@+id/overview_hor_space"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <!-- right side IOB -->
+                <TextView
+                    android:id="@+id/overview_iob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_iob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_label"
+                    app:layout_constraintTop_toTopOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_iob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_iob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_colon" />
+
+                <!-- right side COB -->
+                <TextView
+                    android:id="@+id/overview_cob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
+
+                <!-- right side basal -->
+                <TextView
+                    android:id="@+id/overview_basebasal_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/basal_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_colon" />
+
+                <!-- right side extended  -->
+                <TextView
+                    android:id="@+id/overview_extendedbolus_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/extended_bolus_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_basebasal_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_label" />
 
                 <TextView
                     android:id="@+id/overview_extendedbolus"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/mdtp_white" />
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_colon" />
 
-                <RelativeLayout
+                <!-- right side AS  -->
+                <TextView
+                    android:id="@+id/overview_sensitivity_label"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_height="wrap_content"
+                    android:text="@string/sensitivity_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_extendedbolus_label" />
 
-                    <com.jjoe64.graphview.GraphView
-                        android:id="@+id/overview_bggraph"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent" />
+                <TextView
+                    android:id="@+id/overview_sensitivity_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_label" />
 
-                    <ImageButton
-                        android:id="@+id/overview_chartMenuButton"
-                        android:layout_width="30dp"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentTop="true"
-                        android:paddingTop="5dp"
-                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
-
-                    <TextView
-                        android:id="@+id/overview_iobcalculationprogess"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:textSize="15sp" />
-
-                </RelativeLayout>
-
-
-                <com.jjoe64.graphview.GraphView
-                    android:id="@+id/overview_iobgraph"
+                <TextView
+                    android:id="@+id/overview_sensitivity"
                     android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:visibility="gone" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="100%"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_colon" />
 
-            </LinearLayout>
-
-        </ScrollView>
-
-        <LinearLayout
-            android:id="@+id/overview_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical">
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <LinearLayout
-                android:id="@+id/overview_accepttemplayout"
+                android:id="@+id/overview_statuslights"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:orientation="horizontal"
-                android:visibility="gone">
+                app:layout_constraintBottom_toTopOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bg_tbr_layout">
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_accepttempbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/overview_canulaage"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_weight="0.5"
-                    android:text="Accept new temp\n0.25U/h"
-                    android:textColor="@color/colorAcceptTempButton" />
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_insulinage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_reservoirlevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_sensorage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_batterylevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_bggraph"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_iobgraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_statuslights" />
+
+            <ImageButton
+                android:id="@+id/overview_chartMenuButton"
+                android:layout_width="30dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingRight="5dp">
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:contentDescription="@string/chartmenu"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph"
+                app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_treatmentbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_insulin_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_treatment_label"
-                    android:textColor="@color/colorTreatmentButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+            <TextView
+                android:id="@+id/overview_iobcalculationprogess"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text=""
+                android:textSize="15sp"
+                app:layout_constraintBottom_toBottomOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintStart_toStartOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_insulinbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_insulin_label"
-                    android:textColor="@color/colorInsulinButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_carbsbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_carbs_label"
-                    android:textColor="@color/colorCarbsButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_iobgraph"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_bggraph" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_calibrationbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calibration"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calibration"
-                    android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+    </ScrollView>
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_cgmbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_xdrip"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_cgm"
-                    android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+    <info.nightscout.androidaps.utils.SingleClickButton
+        android:id="@+id/overview_accepttempbutton"
+        style="?android:attr/buttonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="@string/setbasalquestion"
+        android:textColor="@color/colorAcceptTempButton"
+        app:layout_constraintBottom_toTopOf="@id/overview_buttons_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/overview_toppart_scrollbar"
+        android:visibility="gone"/>
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_quickwizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_quickwizard"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="Quick wizard"
-                    android:textColor="@color/colorQuickWizardButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+    <LinearLayout
+        android:id="@+id/overview_buttons_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="5dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/overview_accepttempbutton">
 
-            </LinearLayout>
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_treatmentbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_insulin_carbs"
+            android:text="@string/overview_treatment_label"
+            android:textColor="@color/colorTreatmentButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
 
-        </LinearLayout>
-    </RelativeLayout>
-</FrameLayout>
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_insulinbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_bolus"
+            android:text="@string/overview_insulin_label"
+            android:textColor="@color/colorInsulinButton"
+            android:textSize="10sp" />
+
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_carbsbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_cp_bolus_carbs"
+            android:text="@string/overview_carbs_label"
+            android:textColor="@color/colorCarbsButton"
+            android:textSize="10sp" />
+
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_wizardbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_calculator"
+            android:text="@string/overview_calculator_label"
+            android:textColor="@color/colorCalculatorButton"
+            android:textSize="10sp" />
+
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_calibrationbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_calibration"
+            android:text="@string/overview_calibration"
+            android:textColor="@color/colorCalibrationButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
+
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_cgmbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_xdrip"
+            android:text="@string/overview_cgm"
+            android:textColor="@color/colorCalibrationButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
+
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_quickwizardbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_quickwizard"
+            android:text="@string/quickwizard"
+            android:textColor="@color/colorQuickWizardButton"
+            android:textSize="10sp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/overview_fragment_landscape.xml b/app/src/main/res/layout/overview_fragment_landscape.xml
new file mode 100644
index 0000000000..edaa1df7a5
--- /dev/null
+++ b/app/src/main/res/layout/overview_fragment_landscape.xml
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".plugins.general.overview.OverviewFragment">
+
+    <ScrollView
+        android:id="@+id/overview_toppart_scrollbar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/overview_notifications"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_looplayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+            </androidx.recyclerview.widget.RecyclerView>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/overview_looplayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_pumpstatuslayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_notifications">
+
+                <TextView
+                    android:id="@+id/overview_apsmode"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/openloop"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_activeprofile"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+                <TextView
+                    android:id="@+id/overview_activeprofile"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_temptarget"
+                    app:layout_constraintStart_toEndOf="@+id/overview_apsmode"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_temptarget"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/temptargetshort"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/mdtp_white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_activeprofile"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_pumpstatuslayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/bg_tbr_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_looplayout">
+
+                <TextView
+                    android:id="@+id/overview_pumpstatus"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/initializing"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/bg_tbr_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_statuslights"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pumpstatuslayout">
+
+                <TextView
+                    android:id="@+id/overview_bg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="00.0"
+                    android:textSize="42sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_arrow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:paddingStart="-2dp"
+                    android:paddingEnd="0dp"
+                    android:text="→"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_hor_space"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="                    "
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+
+                <TextView
+                    android:id="@+id/overview_timeago"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 min ago"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_delta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 15m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_avgdelta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_timeago" />
+
+                <TextView
+                    android:id="@+id/overview_avgdelta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 40m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_delta" />
+
+
+                <!-- right side -->
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/overview_bg_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_iob_label"
+                    app:layout_constraintGuide_percent="0.40"
+                    app:layout_constraintStart_toEndOf="@+id/overview_hor_space"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <!-- right side IOB -->
+                <TextView
+                    android:id="@+id/overview_iob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_iob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_label"
+                    app:layout_constraintTop_toTopOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_iob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_iob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_colon" />
+
+                <!-- right side COB -->
+                <TextView
+                    android:id="@+id/overview_cob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
+
+                <!-- right side basal -->
+                <TextView
+                    android:id="@+id/overview_basebasal_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/basal_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_colon" />
+
+                <!-- right side extended  -->
+                <TextView
+                    android:id="@+id/overview_extendedbolus_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/extended_bolus_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_basebasal_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_colon" />
+
+                <!-- right side AS  -->
+                <TextView
+                    android:id="@+id/overview_sensitivity_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sensitivity_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="100%"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_colon" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_statuslights"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bg_tbr_layout">
+
+                <TextView
+                    android:id="@+id/overview_canulaage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_insulinage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_reservoirlevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_sensorage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_batterylevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_bggraph"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_iobgraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_statuslights" />
+
+            <ImageButton
+                android:id="@+id/overview_chartMenuButton"
+                android:layout_width="30dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:contentDescription="@string/chartmenu"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph"
+                app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
+
+            <TextView
+                android:id="@+id/overview_iobcalculationprogess"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text=""
+                android:textSize="15sp"
+                app:layout_constraintBottom_toBottomOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintStart_toStartOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph" />
+
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_iobgraph"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_accepttempbutton"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_bggraph" />
+
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/overview_accepttempbutton"
+                style="?android:attr/buttonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/setbasalquestion"
+                android:textColor="@color/colorAcceptTempButton"
+                app:layout_constraintBottom_toTopOf="@id/overview_buttons_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_iobgraph"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/overview_buttons_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="0dp"
+                android:paddingEnd="5dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_accepttempbutton">
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_treatmentbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
+                    android:text="@string/overview_treatment_label"
+                    android:textColor="@color/colorTreatmentButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_insulinbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_bolus"
+                    android:text="@string/overview_insulin_label"
+                    android:textColor="@color/colorInsulinButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_carbsbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:text="@string/overview_carbs_label"
+                    android:textColor="@color/colorCarbsButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_wizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calculator"
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_calibrationbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calibration"
+                    android:text="@string/overview_calibration"
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_cgmbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_xdrip"
+                    android:text="@string/overview_cgm"
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_quickwizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:text="@string/quickwizard"
+                    android:textColor="@color/colorQuickWizardButton"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index 2bb210d78a..fa086ab00b 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -1,580 +1,651 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".plugins.general.overview.OverviewFragment">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="2dp"
-        android:layout_marginEnd="2dp">
-
     <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/overview_buttons"
-        android:fillViewport="false">
+        android:id="@+id/overview_toppart_scrollbar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/overview_buttons_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/overview_notifications"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_looplayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
             </androidx.recyclerview.widget.RecyclerView>
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/overview_looplayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingTop="2dp">
+                app:layout_constraintBottom_toTopOf="@+id/overview_pumpstatuslayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_notifications">
 
                 <TextView
                     android:id="@+id/overview_apsmode"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="5dp"
-                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
                     android:gravity="center_vertical|center_horizontal"
-                    android:paddingBottom="3dp"
                     android:paddingTop="3dp"
-                    android:text="Open Loop"
-
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:paddingBottom="3dp"
+                    android:text="@string/openloop"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_activeprofile"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
 
                 <TextView
                     android:id="@+id/overview_activeprofile"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginRight="5dp"
-                    android:layout_weight="1"
+                    android:layout_marginEnd="5dp"
                     android:gravity="center_vertical|center_horizontal"
-                    android:paddingBottom="3dp"
                     android:paddingTop="3dp"
-                    android:text="Profile"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:paddingBottom="3dp"
+                    android:text="@string/profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_temptarget"
+                    app:layout_constraintStart_toEndOf="@+id/overview_apsmode"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/overview_temptarget"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_weight="1"
                     android:gravity="center_vertical|center_horizontal"
-                    android:paddingBottom="3dp"
                     android:paddingTop="3dp"
-                    android:text="TempTarget"
+                    android:paddingBottom="3dp"
+                    android:text="@string/temptargetshort"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/mdtp_white" />
+                    android:textColor="@color/mdtp_white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_activeprofile"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <LinearLayout
                 android:id="@+id/overview_pumpstatuslayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingTop="2dp">
+                app:layout_constraintBottom_toTopOf="@+id/bg_tbr_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_looplayout">
 
                 <TextView
                     android:id="@+id/overview_pumpstatus"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
                     android:gravity="center_vertical|center_horizontal"
-                    android:paddingBottom="3dp"
                     android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
                     android:text="@string/initializing"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:baselineAligned="false"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:layout_weight="0"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/overview_bg"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="6dp"
-                            android:text="00.0"
-                            android:textSize="42sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/overview_arrow"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginTop="-5dp"
-                            android:layout_marginEnd="4dp"
-                            android:paddingStart="-2dp"
-                            android:paddingEnd="0dp"
-                            android:text="→"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:layout_marginTop="2dp"
-                        android:layout_marginBottom="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/overview_timeago"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="-2dp"
-                            android:paddingStart="2dp"
-                            android:layout_weight="0.5"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/overview_delta"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="-2dp"
-                            android:paddingStart="2dp"
-                            android:layout_weight="0.5"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/overview_avgdelta"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="10dp"
-                            android:layout_weight="0.5"
-                            android:textSize="12sp"/>
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginTop="6dp"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="1dp"
-                            android:text="@string/iob"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="5dp"
-                            android:layout_height="wrap_content"
-                            android:text=":"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/overview_iob"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="14dp"
-                            android:text=""
-                            android:textSize="16sp"
-                            android:textStyle="bold"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="1dp"
-                            android:text="@string/cob"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="5dp"
-                            android:layout_height="wrap_content"
-                            android:text=":"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/overview_cob"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:text=""
-                            android:textSize="16sp"
-                            android:textStyle="bold"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="1dp"
-                            android:text="@string/basal_short"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="5dp"
-                            android:layout_height="wrap_content"
-                            android:text=":"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/overview_basebasal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:text="0.50U/h @17:35 1/30min - 0.40U/h"
-                            android:textSize="16sp"
-                            android:textStyle="bold"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="1dp"
-                            android:text="AS"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="5dp"
-                            android:layout_height="wrap_content"
-                            android:text=":"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/overview_sensitivity"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:text=""
-                            android:textSize="16sp"
-                            android:textStyle="bold"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="1dp"
-                            android:text="@string/virtualpump_extendedbolus_label_short"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="5dp"
-                            android:layout_height="wrap_content"
-                            android:text=":"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:id="@+id/overview_extendedbolus"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:text=""
-                            android:textSize="16sp"
-                            android:textStyle="bold"/>
-                    </LinearLayout>
-                </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <include
-                    layout="@layout/careportal_stats_fragment_short"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/overview_pump"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="4sp"
-                            android:text=""
-                            android:textColor="@android:color/white"
-                            android:textSize="14sp" />
-
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="fill_parent"
-                        android:layout_height="2dip"
-                        android:layout_marginBottom="2dp"
-                        android:layout_marginLeft="2dp"
-                        android:layout_marginRight="2dp"
-                        android:layout_marginTop="2dp"
-                        android:background="@color/listdelimiter" />
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:layout_weight="1">
-
-                        <TextView
-                            android:id="@+id/overview_openaps"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="4sp"
-                            android:text=""
-                            android:textColor="@android:color/white"
-                            android:textSize="14sp" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="right"
-                            android:layout_marginEnd="4dp"
-                            android:layout_weight="1">
-
-                        <TextView
-                            android:id="@+id/overview_uploader"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="right"
-                            android:paddingEnd="4sp"
-                            android:text=""
-                            android:textColor="@android:color/white"
-                            android:textSize="14sp" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="fill_parent"
-                        android:layout_height="2dip"
-                        android:layout_marginBottom="2dp"
-                        android:layout_marginLeft="2dp"
-                        android:layout_marginRight="2dp"
-                        android:layout_marginTop="2dp"
-                        android:background="@color/listdelimiter" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/bg_tbr_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_statuslights_nscl"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pumpstatuslayout">
 
-                <RelativeLayout
+                <TextView
+                    android:id="@+id/overview_bg"
                     android:layout_width="wrap_content"
-                    android:layout_height="200dp"
-                    android:layout_weight="1">
+                    android:layout_height="wrap_content"
+                    android:text="00.0"
+                    android:textSize="42sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                    <com.jjoe64.graphview.GraphView
-                        android:id="@+id/overview_bggraph"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent" />
-
-                    <ImageButton
-                        android:id="@+id/overview_chartMenuButton"
-                        android:layout_width="30dp"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentTop="true"
-                        android:paddingTop="5dp"
-                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
-
-                    <TextView
-                        android:id="@+id/overview_iobcalculationprogess"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:textSize="15sp" />
-
-                </RelativeLayout>
-
-                <com.jjoe64.graphview.GraphView
-                    android:id="@+id/overview_iobgraph"
+                <TextView
+                    android:id="@+id/overview_arrow"
                     android:layout_width="wrap_content"
-                    android:layout_height="100dp" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:paddingStart="-2dp"
+                    android:paddingEnd="0dp"
+                    android:text="→"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_hor_space"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="                    "
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+
+                <TextView
+                    android:id="@+id/overview_timeago"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 min ago"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_delta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 15m: 0.35"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_avgdelta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_timeago" />
+
+                <TextView
+                    android:id="@+id/overview_avgdelta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 40m: 0.1"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_delta" />
+
+
+                <!-- right side -->
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/overview_bg_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_iob_label"
+                    app:layout_constraintGuide_percent="0.40"
+                    app:layout_constraintStart_toEndOf="@+id/overview_hor_space"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <!-- right side IOB -->
+                <TextView
+                    android:id="@+id/overview_iob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_iob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_label"
+                    app:layout_constraintTop_toTopOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_iob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_iob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_colon" />
+
+                <!-- right side COB -->
+                <TextView
+                    android:id="@+id/overview_cob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
+
+                <!-- right side basal -->
+                <TextView
+                    android:id="@+id/overview_basebasal_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/basal_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_colon" />
+
+                <!-- right side extended  -->
+                <TextView
+                    android:id="@+id/overview_extendedbolus_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/extended_bolus_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_basebasal_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_colon" />
+
+                <!-- right side AS  -->
+                <TextView
+                    android:id="@+id/overview_sensitivity_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sensitivity_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="100%"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_colon" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_statuslights_nscl"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/colorControlHighlight"
+                android:orientation="horizontal"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_pump"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bg_tbr_layout">
+
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:gravity="center_vertical"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="1dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/icon_cp_age_canula" />
+
+                <TextView
+                    android:id="@+id/careportal_canulaage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="2dp"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:gravity="center_vertical"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="1dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/icon_cp_age_insulin" />
+
+                <TextView
+                    android:id="@+id/careportal_insulinage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="2dp"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="1dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/icon_cp_age_sensor" />
+
+                <TextView
+                    android:id="@+id/careportal_sensorage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="2dp"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:gravity="center_vertical"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="1dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/icon_cp_age_battery" />
+
+                <TextView
+                    android:id="@+id/careportal_pbage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="1dp"
+                    android:textSize="14sp" />
 
             </LinearLayout>
-        </LinearLayout>
+
+            <TextView
+                android:id="@+id/overview_pump"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="4sp"
+                android:paddingEnd="4sp"
+                android:text="Pump: running"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_openaps"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_statuslights_nscl" />
+
+            <TextView
+                android:id="@+id/overview_openaps"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingStart="4sp"
+                android:paddingEnd="4sp"
+                android:text="OAPS: 3 min ago"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toStartOf="@+id/overview_uploader"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pump" />
+
+            <TextView
+                android:id="@+id/overview_uploader"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end"
+                android:paddingStart="4sp"
+                android:paddingEnd="4sp"
+                android:text="UPLD: 84%"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/overview_openaps"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pump" />
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_bggraph"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_iobgraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_openaps" />
+
+            <ImageButton
+                android:id="@+id/overview_chartMenuButton"
+                android:layout_width="30dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:contentDescription="@string/chartmenu"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph"
+                app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
+
+            <TextView
+                android:id="@+id/overview_iobcalculationprogess"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text=""
+                android:textSize="15sp"
+                app:layout_constraintBottom_toBottomOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintStart_toStartOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph" />
+
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_iobgraph"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_bggraph" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
     </ScrollView>
 
     <LinearLayout
-        android:id="@+id/overview_buttons"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
+        android:id="@+id/overview_buttons_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="5dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/overview_toppart_scrollbar">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingRight="5dp">
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_treatmentbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_insulin_carbs"
+            android:text="@string/overview_treatment_label"
+            android:textColor="@color/colorTreatmentButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_treatmentbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_insulin_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_treatment_label"
-                    android:textColor="@color/colorTreatmentButton"
-                    android:textSize="10sp" />
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_insulinbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_bolus"
+            android:text="@string/overview_insulin_label"
+            android:textColor="@color/colorInsulinButton"
+            android:textSize="10sp" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_insulinbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_insulin_label"
-                    android:textColor="@color/colorInsulinButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_carbsbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_cp_bolus_carbs"
+            android:text="@string/overview_carbs_label"
+            android:textColor="@color/colorCarbsButton"
+            android:textSize="10sp" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_carbsbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_carbs_label"
-                    android:textColor="@color/colorCarbsButton"
-                    android:textSize="10sp" />
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_wizardbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_calculator"
+            android:text="@string/overview_calculator_label"
+            android:textColor="@color/colorCalculatorButton"
+            android:textSize="10sp" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_calibrationbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_calibration"
+            android:text="@string/overview_calibration"
+            android:textColor="@color/colorCalibrationButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_quickwizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_quickwizard"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="Quick wizard"
-                    android:textColor="@color/colorQuickWizardButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-            </LinearLayout>
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_cgmbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_xdrip"
+            android:text="@string/overview_cgm"
+            android:textColor="@color/colorCalibrationButton"
+            android:textSize="10sp"
+            android:visibility="gone" />
 
-            </LinearLayout>
-    </RelativeLayout>
-</FrameLayout>
+        <info.nightscout.androidaps.utils.SingleClickButton
+            android:id="@+id/overview_quickwizardbutton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="-4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_quickwizard"
+            android:text="@string/quickwizard"
+            android:textColor="@color/colorQuickWizardButton"
+            android:textSize="10sp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 6dd854c0a6..07f3324f4b 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -27,54 +27,62 @@
 
                 </androidx.recyclerview.widget.RecyclerView>
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/overview_looplayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
+                    app:layout_constraintBottom_toTopOf="@+id/overview_pumpstatuslayout"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_notifications">
 
                     <TextView
                         android:id="@+id/overview_apsmode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
                         android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
                         android:paddingTop="3dp"
-                        android:text="Open Loop"
-
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                        android:paddingBottom="3dp"
+                        android:text="@string/openloop"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/overview_activeprofile"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
 
                     <TextView
                         android:id="@+id/overview_activeprofile"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
+                        android:layout_marginEnd="5dp"
                         android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
                         android:paddingTop="3dp"
-                        android:text="Profile"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                        android:paddingBottom="3dp"
+                        android:text="@string/profile"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/overview_temptarget"
+                        app:layout_constraintStart_toEndOf="@+id/overview_apsmode"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
                         android:id="@+id/overview_temptarget"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_weight="1"
                         android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
                         android:paddingTop="3dp"
-                        android:text="TempTarget"
+                        android:paddingBottom="3dp"
+                        android:text="@string/temptargetshort"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/mdtp_white" />
+                        android:textColor="@color/mdtp_white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/overview_activeprofile"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                </LinearLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <LinearLayout
                     android:id="@+id/overview_pumpstatuslayout"
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
deleted file mode 100644
index e892e565cd..0000000000
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".plugins.general.overview.OverviewFragment">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/overview_buttons"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/overview_notifications"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                </androidx.recyclerview.widget.RecyclerView>
-
-                <LinearLayout
-                    android:id="@+id/overview_looplayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
-
-                    <TextView
-                        android:id="@+id/overview_apsmode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:text="Open Loop"
-
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-
-                    <TextView
-                        android:id="@+id/overview_activeprofile"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:text="Profile"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <TextView
-                        android:id="@+id/overview_temptarget"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="TempTarget"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/mdtp_white" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_pumpstatuslayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
-
-                    <TextView
-                        android:id="@+id/overview_pumpstatus"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="@string/initializing"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:baselineAligned="false"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:layout_weight="0"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:id="@+id/overview_bg"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="2dp"
-                                android:text="00.0"
-                                android:textSize="28sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/overview_arrow"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginTop="-5dp"
-                                android:layout_marginEnd="4dp"
-                                android:paddingStart="-2dp"
-                                android:paddingEnd="0dp"
-                                android:text="→"
-                                android:textSize="20sp"
-                                android:textStyle="bold" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:layout_marginTop="2dp"
-                            android:layout_marginBottom="10dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/overview_timeago"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="6dp"
-                                android:layout_marginTop="-2dp"
-                                android:paddingStart="2dp"
-                                android:layout_weight="0.5"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_delta"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginTop="-2dp"
-                                android:paddingStart="2dp"
-                                android:layout_weight="0.5"
-                                android:textSize="12sp" />
-
-                            <TextView
-                                android:id="@+id/overview_avgdelta"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
-                                android:layout_weight="0.5"
-                                android:textSize="12sp"/>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:layout_marginTop="6dp"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="18dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/iob"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_iob"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="12dp"
-                                android:text=""
-                                android:textSize="14sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="18dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/cob"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_cob"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:text=""
-                                android:textSize="14sp"
-                                android:textStyle="bold"/>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="18dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="@string/basal_short"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_basebasal"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="6dp"
-                                android:text="0.50U/h @17:35 1/30min - 0.40U/h"
-                                android:textSize="14sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="18dp"
-                                android:layout_marginEnd="1dp"
-                                android:text="AS"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:layout_width="5dp"
-                                android:layout_height="wrap_content"
-                                android:text=":"
-                                android:textSize="14sp" />
-
-                            <TextView
-                                android:id="@+id/overview_sensitivity"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="18dp"
-                                android:text=""
-                                android:textSize="14sp"
-                                android:textStyle="bold"/>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_statuslights"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/overview_canulaage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/overview_insulinage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/overview_reservoirlevel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/overview_sensorage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/overview_batterylevel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text=""
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/overview_extendedbolus"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/mdtp_white" />
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="200dp">
-
-                    <com.jjoe64.graphview.GraphView
-                        android:id="@+id/overview_bggraph"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent" />
-
-                    <ImageButton
-                        android:id="@+id/overview_chartMenuButton"
-                        android:layout_width="30dp"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentTop="true"
-                        android:paddingTop="5dp"
-                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
-
-                    <TextView
-                        android:id="@+id/overview_iobcalculationprogess"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:textSize="15sp" />
-
-                </RelativeLayout>
-
-
-                <com.jjoe64.graphview.GraphView
-                    android:id="@+id/overview_iobgraph"
-                    android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-        </ScrollView>
-
-        <LinearLayout
-            android:id="@+id/overview_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/overview_accepttemplayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_accepttempbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_weight="0.5"
-                    android:text="Accept new temp\n0.25U/h"
-                    android:textColor="@color/colorAcceptTempButton" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingRight="5dp">
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_treatmentbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_insulin_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_treatment_label"
-                    android:textColor="@color/colorTreatmentButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_insulinbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_insulin_label"
-                    android:textColor="@color/colorInsulinButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_carbsbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_carbs_label"
-                    android:textColor="@color/colorCarbsButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_calibrationbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calibration"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calibration"
-                    android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_cgmbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_xdrip"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_cgm"
-                    android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.androidaps.utils.SingleClickButton
-                    android:id="@+id/overview_quickwizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_quickwizard"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="Quick wizard"
-                    android:textColor="@color/colorQuickWizardButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </RelativeLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/passwordprompt.xml b/app/src/main/res/layout/passwordprompt.xml
index 63ff30e531..ed2298e4d8 100644
--- a/app/src/main/res/layout/passwordprompt.xml
+++ b/app/src/main/res/layout/passwordprompt.xml
@@ -5,17 +5,13 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/passwordprompt_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
     <EditText
         android:id="@+id/passwordprompt_pass"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textPassword">
+        android:hint="@string/password_hint"
+        android:inputType="textPassword"
+        >
 
         <requestFocus />
 
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
new file mode 100644
index 0000000000..a58fdd1a1c
--- /dev/null
+++ b/app/src/main/res/layout/toast.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/toast_border_ok">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"
+        android:src="@drawable/ic_toast_check"
+        tools:ignore="RtlHardcoded" />
+
+    <TextView
+        android:id="@android:id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginRight="18dp"
+        android:layout_marginBottom="4dp"
+        android:text="Toast goes here..."
+        android:textColor="@color/toastBase"
+        android:textSize="18sp"
+        tools:ignore="HardcodedText,RtlHardcoded" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/treatments_careportal_item.xml b/app/src/main/res/layout/treatments_careportal_item.xml
index 251272cb25..8e391c89ca 100644
--- a/app/src/main/res/layout/treatments_careportal_item.xml
+++ b/app/src/main/res/layout/treatments_careportal_item.xml
@@ -23,33 +23,39 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:gravity="center_vertical|right"
-                android:paddingLeft="10dp"
-                android:paddingRight="5dp"
+                android:gravity="center_vertical|end"
+                android:paddingStart="10dp"
+                android:paddingEnd="5dp"
                 android:text="{fa-clock-o}" />
 
             <TextView
                 android:id="@+id/careportal_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingRight="10dp"
+                android:paddingEnd="10dp"
                 android:text="1.1.2000 18:00"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
+            <TextView
+                android:id="@+id/careportal_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingEnd="10dp"/>
+
             <TextView
                 android:id="@+id/careportal_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:paddingRight="10dp"
+                android:paddingEnd="10dp"
                 android:text=""
                 android:textStyle="bold" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_weight="1"
                 android:text="" />
 
@@ -57,7 +63,7 @@
                 android:id="@+id/ns_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="NS"
                 android:textColor="@color/colorSetTempButton" />
 
@@ -70,19 +76,19 @@
 
             <TextView
                 android:id="@+id/careportal_note"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
                 android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingEnd="10dp"
                 android:text="Activity" />
 
             <TextView
                 android:id="@+id/careportal_remove"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/overview_quickwizard_item_remove_button"
                 android:textAlignment="viewEnd"
                 android:textColor="@android:color/holo_orange_light" />
@@ -92,10 +98,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_alignParentBottom="true"
             android:layout_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginTop="5dp"
             android:background="@color/listdelimiter" />
 
diff --git a/app/src/main/res/values-af-rZA/objectives.xml b/app/src/main/res/values-af-rZA/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-af-rZA/objectives.xml
+++ b/app/src/main/res/values-af-rZA/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index a800677ac4..0497576890 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-bg-rBG/objectives.xml b/app/src/main/res/values-bg-rBG/objectives.xml
index d2e47ec386..633ff84c99 100644
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Назад</string>
     <string name="objectives_button_start">Старт</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Отворете съдържанието на Цикъл плъгина.</string>
     <string name="objectives_usescale">Използвайте функцията за удължаване на периода на графиката, като задържите върху нея.</string>
     <string name="objectives_button_enter">Въведи</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ако сте били потребител на OpenAPS и НС има най-малко 3 месеца цикъл на данни, можете да изпращате по електронна поща objectives@androidaps.org с адрес на НС, за да поискате код за заобикаляне на останалите цели. Въведете кода, получен от разработчици</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ако имате поне 3 месеца опит с други системи, които биха може да получите код за пропускане на целите. Прочетете https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives за получаване на подробна информация.</string>
     <string name="codeaccepted">Код приет!</string>
     <string name="codeinvalid">Неправилен код</string>
     <string name="objectives_exam_objective">Докажете знанията си</string>
@@ -47,6 +46,7 @@
     <string name="requestcode">Код (request code): %1$s</string>
     <string name="objectives_hint">(отбележете всички правилни отговори)</string>
     <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="notconnected">Няма връзка с Интернет!</string>
     <string name="failedretrievetime">Не може да се вземе времето</string>
     <string name="requirementnotmet">Задачите не са изпълнени</string>
     <plurals name="objective_days">
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 9efd624a4c..78b71447fb 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -331,13 +330,13 @@
     <string name="smscommunicator_profilereplywithcode">За да превключите профила към %1$s %2$d%% отговорете с код %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">За да започнете удължен болус %1$.2fЕ за %2$d мин отговорете с код %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">За да въведете %1$dг в %2$s отговорете с код %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">За да стартирате базал от %1$d%Е/ч за %2$d мин отговорете с код %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">За да стартирате базал от %1$d%%Е/ч за %2$d мин отговорете с код %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">За да спрете APS за %1$d минути отговорете с код %2$s</string>
     <string name="smscommunicator_tempbasalset">Временен базал от %1$.2fЕ/ч за %2$d мин стартиран успешно</string>
     <string name="smscommunicator_extendedset">Удължен болус %1$.2fU за %2$d мин стартиран успешно</string>
     <string name="smscommunicator_carbsset">Въглехидрати %1$dг въведени</string>
     <string name="smscommunicator_carbsfailed">Въвеждане на%1$dг въглехидрати - НЕУСПЕШНО</string>
-    <string name="smscommunicator_tempbasalset_percent">Временен базал от %1$d%Е/ч за %2$d мин стартиран успешно</string>
+    <string name="smscommunicator_tempbasalset_percent">Временен базал от %1$d%%Е/ч за %2$d мин стартиран успешно</string>
     <string name="smscommunicator_tempbasalfailed">Неуспешно стартиране на временен базал</string>
     <string name="smscommunicator_extendedfailed">Неуспешно стартиране на удължен болус</string>
     <string name="smscommunicator_basalstopreplywithcode">За да спрете времен базал отговорете с код %1$s</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Започнете първа цел</string>
     <string name="permission">Разрешение</string>
     <string name="askforpermission">Питане за разрешение</string>
+    <string name="needsystemwindowpermission">ААПС изисква разрешение за да може да Ви уведомява</string>
     <string name="needlocationpermission">Приложението се нуждае от достъп до вашето местоположение за да активира BT сканиране</string>
     <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове</string>
     <string name="request">Искане</string>
@@ -1315,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Честотата не се поддържа.</string>
     <string name="medtronic_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Откритата помпа не е идентична с кокнфигурираната.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базалните профили/настройки не са позволен в помпата. Включванете го от настройките на помпата.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базалния профил в помпата е грешен (трябва да е STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Грешен тип TBR в помпата ( трябва да е Absolute).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Грешен максимален болус в помпата ( трябвба да е %1$.2f).</string>
@@ -1442,4 +1443,14 @@
     <string name="alreadyset">Вече направено</string>
     <string name="message">Съобщение</string>
     <string name="clearqueueconfirm">Изтрий опашка? Всички данни ще се загубят!</string>
+    <string name="ebstopsloop">Използване на удължен болус ще спре режим затворен цикъл за времето на болуса. Сигурни ли сте?</string>
+    <string name="closed_loop_disabled_with_eb">Затворен цикъл е недостъпен поради стартиран Удължен болус</string>
+    <string name="extended_bolus_short">УБ</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Меню на графиката</string>
+    <string name="sensitivity_short">АS</string>
+    <string name="loop_smbrequest_time_label">Диапазон между изпълнение на SMB</string>
+    <string name="loop_smbexecution_time_label">Макс. време за изпълнение за SMB</string>
+    <string name="loop_tbrrequest_time_label">Диапазон между временни базали</string>
+    <string name="loop_tbrexecution_time_label">Продължителност на временни базали</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
index a65151aee8..5c038e57a4 100644
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
     <string name="dia_label">Téma: Doba trvání účinku inzulínu</string>
diff --git a/app/src/main/res/values-cs-rCZ/objectives.xml b/app/src/main/res/values-cs-rCZ/objectives.xml
index 76597c063d..b47865c3ef 100644
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Zpět</string>
     <string name="objectives_button_start">Začátek</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Zobrazte obsah modulu Smyčka</string>
     <string name="objectives_usescale">Přepněte režim zobrazení dlouhým stisknutím grafu glykémie</string>
     <string name="objectives_button_enter">Zadat</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokud jste byli dříve uživateli OpenAPS a váš NS má alespoň 3 měsíce dat z používání smyčky, můžete poslat e-mail na adresu objectives@androidaps.org s adresou svého NS a požádat o kód, pomocí něhož budete moci obejít zbývající cíle. Zadejte kód získaný od vývojářů.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokud máte alespoň 3 měsíce zkušeností s uzavřenou smyčkou na jiných systémech, můžete získat kód, který vám umožní přeskočit cíle. Více informací najdete na https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Kód přijat</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Prokažte své znalosti</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index ce46231402..d879db8f49 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -281,7 +280,7 @@
     <string name="danarprofile">DanaR profil</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Celková doba aktivity inzulínu</string>
-    <string name="failedupdatebasalprofile">Chyba při nastavení dočasného bazálu</string>
+    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního pprofilu</string>
     <string name="danar_historyreload">Načíst</string>
     <string name="uploading">Nahrávám</string>
     <string name="danar_ebolus">E bolus</string>
@@ -341,7 +340,7 @@
     <string name="smscommunicator_tempbasalfailed">Spuštění dočasného bazálu selhalo</string>
     <string name="smscommunicator_extendedfailed">Spuštění prodlouženého bolusu selhalo</string>
     <string name="smscommunicator_basalstopreplywithcode">Na zastavení dočasného bazálu odpovězte SMS s kódem %1$s</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Na zastavení prodlouženého bolusu odpovězte SMS s kódem %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Pro zastavení prodlouženého bolusu odpovězte SMS s kódem %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Dočasný bazál zastaven</string>
     <string name="smscommunicator_extendedcanceled">Prodloužený bolus zastaven</string>
     <string name="smscommunicator_tempbasalcancelfailed">Rušení dočasného bazálu selhalo</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Spusťte první cíl</string>
     <string name="permission">Povolení</string>
     <string name="askforpermission">Získat povolení</string>
+    <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
     <string name="needlocationpermission">Aplikace vyžaduje povolení \"umístění\", aby mohla vyhledávat BT zařízení</string>
     <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy</string>
     <string name="request">Požadavek</string>
@@ -1443,4 +1443,15 @@
     <string name="alreadyset">Již nastaveno</string>
     <string name="message">Zpráva</string>
     <string name="clearqueueconfirm">Vymazat frontu? Všechna data ve frontě budou ztracena!</string>
+    <string name="ebstopsloop">Použití funkce prodlouženého bolusu zastaví uzavřenou smyčku po dobu trvání prodlouženého bolusu. Opravdu to chcete?</string>
+    <string name="closed_loop_disabled_with_eb">Uzavřená smyčka je zastavena kvůli běžícímu prodlouženému bolusu</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">PhoneChecker</string>
+    <string name="chartmenu">Možnosti grafu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Čas požadavku SMB</string>
+    <string name="loop_smbexecution_time_label">Čas provedení SMB</string>
+    <string name="loop_tbrrequest_time_label">Čas požadavku dočasného bazálu</string>
+    <string name="loop_tbrexecution_time_label">Čas provedení dočasného bazálu</string>
+    <string name="insight_alert_notification_channel">Upozornění pumpy Insight</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/objectives.xml b/app/src/main/res/values-de-rDE/objectives.xml
index c2a3fe603e..e094670b18 100644
--- a/app/src/main/res/values-de-rDE/objectives.xml
+++ b/app/src/main/res/values-de-rDE/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Zurück</string>
     <string name="objectives_button_start">Start</string>
@@ -37,7 +36,7 @@ die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</str
     <string name="objectives_useloop">Zeige den Inhalt des Loop-Plugins an</string>
     <string name="objectives_usescale">Nutze die Skalierfunktion. Drücke dazu lange auf das BZ-Diagramm</string>
     <string name="objectives_button_enter">OK</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wenn Du früher bereits OpenAPS genutzt hast und auf Deiner Nightscout-Seite mindestens drei Monate Closed-Loop-Daten ersichtlich sind, kannst Du eine E-Mail an objectives@androidaps.org mit Deiner NS-URL und Deinem Anforderungscode senden, um die restlichen Ziele zu überspringen. Code eingeben, der von den Entwicklern übermittelt wurde:</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wenn Du mindestens 3 Monate Closed-Loop-Erfahrung mit einem anderen System hast, kannst Du evtl. einen Code zum Überspringen der Objektives erhalten. Weitere Details unter https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Objectives.html#objectives-ziele-uberspringen.</string>
     <string name="codeaccepted">Code akzeptiert</string>
     <string name="codeinvalid">Code ungültig</string>
     <string name="objectives_exam_objective">Prüfe Dein Wissen</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 463a6fe5bf..324284d44f 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -363,7 +362,7 @@
     <string name="ns_upload_only_summary">Zu Nightscout nur hochladen. Nicht wirksam bei BZ-Werten, wenn nicht eine lokale Quelle wie z. B. xDrip gewählt wird; nicht wirksam bei Profilen, wenn Nightscout-Profile verwendet werden.</string>
     <string name="pumpNotInitialized">Pumpe nicht initialisiert!</string>
     <string name="pumpNotInitializedProfileNotSet">Pumpe nicht initialisiert, Profil nicht gesetzt!</string>
-    <string name="primefill">Vorfüllen/Füllen</string>
+    <string name="primefill">Katheterwechsel</string>
     <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
     <string name="othersettings_title">Andere</string>
     <string name="fillbolus_title">Füll-/Vorfüll-Standardmengen</string>
@@ -686,7 +685,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">min</string>
     <string name="shorthour">h</string>
-    <string name="shortday">T</string>
+    <string name="shortday">d</string>
     <string name="none"><![CDATA[<nichts>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -846,7 +845,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Das Einlesen der geänderten Basalrate in der Pumpe schlug fehl</string>
     <string name="combo_activity_checking_for_history_changes">Änderungen der Historie werden gesucht</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Der Import mehrerer Boli der gleichen Menge, abgegeben in der gleichen Minute, ist gescheitert: Nur ein Datensatz konnte den Behandlungen hinzugefügt werden. Bitte überprüfe die Pumpe und verwende das Careportal, um fehlende Einträge hinzuzufügen. Stelle sicher, dass keine Einträge für genau dieselbe Minute mit derselben  Menge hinzugefügt werden.</string>
-    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
+    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nSupport:\nhttps://de.loopercommunity.org/\nhttp://facebook.androidaps.org</string>
     <string name="combo_check_date">Der letzte Bolus liegt mehr als 24 Stunden zurück oder liegt in der Zukunft. Prüfe bitte das Datum auf der Pumpe.</string>
     <string name="combo_suspious_bolus_time">Zeit/Datum des abgegebenen Boluses auf der Pumpe erscheint falsch, IOB ist wahrscheinlich nicht korrekt. Bitte prüfe Zeit/Datum der Pumpe.</string>
     <string name="profileswitch_ismissing">Profil-Wechsel fehlt, bitte nimm einen Profil-Wechsel vor oder drücke \"AKTIVIERE PROFIL\" im lokalen Profil.</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Starte deine erste Zielsetzung</string>
     <string name="permission">Berechtigung</string>
     <string name="askforpermission">Nach Berechtigung fragen</string>
+    <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
     <string name="needlocationpermission">AndroidAPS benötigt die Standortfreigabe für den BT-Scan.</string>
     <string name="needstoragepermission">AndroidAPS benötigt Zugriff auf den Speicher, um Log-Dateien speichern zu können.</string>
     <string name="request">Anfordern</string>
@@ -1444,4 +1444,15 @@ Unerwartetes Verhalten.</string>
     <string name="alreadyset">Bereits festgelegt</string>
     <string name="message">Nachricht</string>
     <string name="clearqueueconfirm">Warteschlange löschen? Alle Daten in der Warteschlange gehen verloren!</string>
+    <string name="ebstopsloop">Die Verwendung eines Verzögerungsbolus unterbricht dem Closed Loop Modus für die Dauer des Verzögerungsbolus. Willst Du das wirklich?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop wegen Verzögerungsbolus unterbrochen</string>
+    <string name="extended_bolus_short">VerzB</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Diagrammmenü</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB Anfragezeit</string>
+    <string name="loop_smbexecution_time_label">SMB Ausführungszeit</string>
+    <string name="loop_tbrrequest_time_label">Temp. BR Anfragezeit</string>
+    <string name="loop_tbrexecution_time_label">Temp. BR Ausführungszeit</string>
+    <string name="insight_alert_notification_channel">Insight Pumpenalarme</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/insight_alert_descriptions.xml b/app/src/main/res/values-el-rGR/insight_alert_descriptions.xml
index af456804da..84daeb424d 100644
--- a/app/src/main/res/values-el-rGR/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-el-rGR/insight_alert_descriptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="alert_r7_description"><![CDATA[Ποσότητα:<b>%1$d%</b>\nΔιάρκεια:<b>%2$sh</b>]]></string>
+    <string name="alert_r7_description"><![CDATA[Ποσότητα:<b>%1$d%%</b>\nΔιάρκεια:<b>%2$sh</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Η αμπούλα περιεχει:<b>%1$s U</b>]]></string>
     <string name="alert_w32_description">Αλλαγή μπαταρίας.</string>
     <string name="alert_w33_description">Ορίστε ώρα/ημερομηνία.</string>
diff --git a/app/src/main/res/values-el-rGR/objectives.xml b/app/src/main/res/values-el-rGR/objectives.xml
index 4a2ce25a1e..3bad200cdb 100644
--- a/app/src/main/res/values-el-rGR/objectives.xml
+++ b/app/src/main/res/values-el-rGR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Πίσω</string>
     <string name="objectives_button_start">Έναρξη</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 2cdbc7d2a3..6c5050720e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -310,7 +309,7 @@
     <string name="smscommunicator_remotecommandnotallowed">Δεν επιτρέπεται απομακρυσμένη εντολή</string>
     <string name="smscommunicator_remotebolusnotallowed">Απομακρυσμένο bolus μη διαθέσιμο. Δοκιμάστε ξανά αργότερα.</string>
     <string name="smscommunicator_basalreplywithcode">Για έναρξη βασικού %1$.2fU/h για %2$d λεπτά στείλτε κωδικό %3$s</string>
-    <string name="smscommunicator_profilereplywithcode">Για αλλαγή προφίλ σε %1$s %2$d% στείλτε κωδικό %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Για αλλαγή προφίλ σε %1$s %2$d%% στείλτε κωδικό %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Για έναρξη εκτεταμένου bolus %1$.2fU για %2$d λεπτά στείλτε κωδικό %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Για έναρξη βασικού %1$d%% για %2$d λεπτά στείλτε κωδικό %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Για αναστολή κυκλκώματος για %1$d λεπτών στείλτε με κωδικό %2$s</string>
diff --git a/app/src/main/res/values-es-rES/objectives.xml b/app/src/main/res/values-es-rES/objectives.xml
index 9f6a95c2b1..047ce04909 100644
--- a/app/src/main/res/values-es-rES/objectives.xml
+++ b/app/src/main/res/values-es-rES/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Atrás</string>
     <string name="objectives_button_start">Inicio</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
     <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
     <string name="objectives_button_enter">Intro</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si fuiste usuario de OpenAPS y tu NS tiene al menos 3 meses de datos de lazo cerrado, puedes enviar un correo electrónico a objectives@androidaps.org con tu dirección web de NS y solicitar código para saltarse el resto de objetivos. Ingresa posteriormente el código obtenido de los desarrolladores</string>
     <string name="codeaccepted">Código aceptado</string>
     <string name="codeinvalid">Código no válido</string>
     <string name="objectives_exam_objective">Compruebe su conocimiento</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 952344372b..9c4bd4d36a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -327,7 +326,7 @@
     <string name="valueoutofrange">El valor %1$s está fuera de límites</string>
     <string name="smscommunicator_remotecommandnotallowed">Comando remoto no permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">El bolo remoto no está disponible. Inténtalo de nuevo más tarde.</string>
-    <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2f% durante %2$d min, responder con el código %3$s</string>
+    <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2fU/h durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para cambiar el perfil a %1$s %2$d%% responder con el código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para iniciar un bolo extendido de %1$.2fU durante %2$d minutos, responder con el código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para introducir %1$dg en %2$s responder con código %3$s</string>
@@ -1443,4 +1442,11 @@
     <string name="alreadyset">Set listo</string>
     <string name="message">Mensaje</string>
     <string name="clearqueueconfirm">¿Borrar cola? ¡Se perderán todos los datos de la cola!</string>
+    <string name="ebstopsloop">El uso de la función de bolo extendido detendrá el modo de bucle cerrado durante el tiempo de ejecución del bolo extendido. ¿Realmente quieres esto?</string>
+    <string name="closed_loop_disabled_with_eb">Bucle cerrado inhabilitado debido a la ejecución del bolo extendido</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="chartmenu">Menú gráfico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Tiempo requerido de SMB</string>
+    <string name="loop_smbexecution_time_label">Tiempo de ejecución de SMB</string>
 </resources>
diff --git a/app/src/main/res/values-fi-rFI/exam.xml b/app/src/main/res/values-fi-rFI/exam.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/exam.xml
+++ b/app/src/main/res/values-fi-rFI/exam.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/insight_alert_codes.xml b/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
+++ b/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/objectives.xml b/app/src/main/res/values-fi-rFI/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/objectives.xml
+++ b/app/src/main/res/values-fi-rFI/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-fr-rFR/objectives.xml b/app/src/main/res/values-fr-rFR/objectives.xml
index 89af39e082..58f83d4a9c 100644
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Retour</string>
     <string name="objectives_button_start">Départ</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Affichage du contenu du plugin Boucle</string>
     <string name="objectives_usescale">Modification de l\'échelle du graphique par un appui long sur la courbe de glycémie</string>
     <string name="objectives_button_enter">Entrer</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous étiez avant un utilisateur d\'OpenAPS et que votre NS a au moins 3 mois de données de bouclage, vous pouvez envoyer un e-mail à objectives@androidaps.org avec votre adresse NS et demander un code pour contourner le reste des objectifs. Entrez le code obtenu auprès des développeurs</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous avez au moins 3 mois d\'expérience de boucle fermée avec d\'autres systèmes, vous pourriez avoir droit à un code permettant d\'ignorer les objectifs. Voir https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Objectives.html#ignorer-les-objectifs pour plus de détails.</string>
     <string name="codeaccepted">Code accepté</string>
     <string name="codeinvalid">Code invalide</string>
     <string name="objectives_exam_objective">Prouver ses connaissances</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ce65634dd9..6f48c43122 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -43,10 +42,10 @@
     <string name="description_pump_dana_rs">Intégration pour les pompes Diabecare DANA RS</string>
     <string name="description_pump_mdi">Intégration pompe pour les personnes qui font des injections quotidiennes multiples pour le traitement de leur diabète</string>
     <string name="description_pump_virtual">Intégration pour les pompes qui n’ont pas encore de pilote (Boucle Ouverte)</string>
-    <string name="description_sensitivity_aaps">La Sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la periode concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
-    <string name="description_sensitivity_oref0">Sensibilité est calculée à partir des données sur les dernières 24h et les glucides (non absorbés) ne sont plus pris en compte après l’heure spécifiée dans les préférences.</string>
-    <string name="description_sensitivity_oref1">Sensibilité est calculée à partir des données des dernières 8 heures et des glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Plugin calcule également RNS (UAM).</string>
-    <string name="description_sensitivity_weighted_average">Sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.</string>
+    <string name="description_sensitivity_aaps">La sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la période concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
+    <string name="description_sensitivity_oref0">La sensibilité est calculée à partir des données sur les dernières 24h et les glucides (si non absorbés) ne sont plus pris en compte après l’heure spécifiée dans les préférences.</string>
+    <string name="description_sensitivity_oref1">La sensibilité est calculée à partir des données des dernières 8 heures et les glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Le plugin calcule également les RNS (UAM).</string>
+    <string name="description_sensitivity_weighted_average">La sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.</string>
     <string name="description_source_eversense">Recevoir les valeurs de glycémie de l’app Eversense patchée.</string>
     <string name="description_source_glimp">Recevoir les glycémies depuis Glimp.</string>
     <string name="description_source_mm640g">Recevoir les glycémies depuis le 600SeriesAndroidUploder.</string>
@@ -146,7 +145,7 @@
     <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
     <string name="setbasalquestion">Accepter nouveau basal temporaire :</string>
     <string name="overview_treatment_label">Traitement</string>
-    <string name="overview_calculator_label">Calculatrice</string>
+    <string name="overview_calculator_label">Assistant</string>
     <string name="constraintapllied">Restriction appliquée !</string>
     <string name="confirmation">Confirmation</string>
     <string name="bolus">Bolus</string>
@@ -157,7 +156,7 @@
     <string name="changeyourinput">Changez vos entrées !</string>
     <string name="configbuilder_bgsource">Source des glycémies</string>
     <string name="configbuilder_bgsource_description">Quelle source de données doit être utilisée par AndroidAPS ?</string>
-    <string name="xdrip">xDrip</string>
+    <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">Mode APS</string>
     <string name="closedloop">Boucle Fermée</string>
     <string name="openloop">Boucle Ouverte</string>
@@ -196,7 +195,7 @@
     <string name="careportal_newnstreatment_sensor">Capteur</string>
     <string name="careportal_newnstreatment_carbs_label">Glucides</string>
     <string name="careportal_newnstreatment_insulin_label">Insuline</string>
-    <string name="careportal_newnstreatment_carbtime_label">Heure glucides</string>
+    <string name="careportal_newnstreatment_carbtime_label">Décalage horaire</string>
     <string name="careportal_newnstreatment_split_label">Diviser</string>
     <string name="careportal_newnstreatment_duration_label">Durée</string>
     <string name="careportal_newnstreatment_percent_label">Pourcentage</string>
@@ -220,7 +219,7 @@
     <string name="nav_import">Importer les paramètres</string>
     <string name="openapsma_maxbasal_title">Max. U/hr pour le débit temp Basal</string>
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
-    <string name="openapsma_maxiob_title">Le Basal IA maximum que l\'OpenAPS pourra délivrer [U]</string>
+    <string name="openapsma_maxiob_title">IA basale max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
     <string name="dismiss">FERMER</string>
     <string name="danarpump">DanaR</string>
@@ -385,7 +384,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resend_all_data">Renvoyer toutes les données</string>
     <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
     <string name="pumperror">Erreur Pompe</string>
-    <string name="lowbattery">Niveau Batterie Bas</string>
+    <string name="lowbattery">Piles Faibles</string>
     <string name="pumpshutdown">Arrêt de la Pompe</string>
     <string name="batterydischarged">Batterie Pompe Déchargée</string>
     <string name="danarkoreanpump">DanaR Coréenne</string>
@@ -423,7 +422,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="danar_stats_expweight">DTI avec Pondération Exponentielle</string>
     <string name="danar_stats_basalrate">Basal</string>
     <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">DTI Dosage Total d\'Insuline</string>
+    <string name="danar_stats_tdd">DTI</string>
     <string name="danar_stats_date">Date</string>
     <string name="danar_stats_ratio">Ratio</string>
     <string name="danar_stats_amount_days">Nb Jours</string>
@@ -438,7 +437,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="loop_shortname">BOUCLE</string>
     <string name="simpleprofile_shortname">P.S.</string>
     <string name="oaps_shortname">OAPS</string>
-    <string name="localprofile_shortname">P.L.</string>
+    <string name="localprofile_shortname">PL</string>
     <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ACCUEIL</string>
     <string name="virtualpump_shortname">POMPEV</string>
@@ -457,7 +456,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="openapsama_max_daily_safety_multiplier_summary">Valeur par défaut : 3 Ceci est un paramètre important de sécurité de l’OpenAPS. Ceci va limiter vos débits basal à 3 fois votre débit Basal maximum. Il est probable que vous n’aurez pas besoin de changer cela, mais vous devez être conscient de ce qui est discuté pour les limites de sécurité dans “3x max daily; 4x current”.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
     <string name="openapsama_autosens_max_summary">Valeur par défaut: 1.2\nCeci est la limite du multiplicateur utilisé par Autosens (et bientôt Autotune) pour définir +20%% en limite maximale du ratio Autosens. En consequence, ceci dit va définir la valeur maximale du Basal pour Autosens, la valeur minimale de la Sensibilité à l\'Insuline (SI, ISF), et la valeur minimale de la cible glycémique.</string>
-    <string name="openapsama_autosens_min_summary">Valeur par défaut: 0.7\nL’autre aspect pour les limites de sécurité pour Autosens. Cette valeur va créer une limite qui définit jusqu\'à quelle valeur minimale Autosens va pouvoir ajuster le basal , et jusqu\'à quelles valeurs maximales Autosens pourra ajuster la Sensibilité à l\'Insuline (SI, ISF) et les cibles glycémiques.</string>
+    <string name="openapsama_autosens_min_summary">Valeur par défaut: 0,7\nL\'autre volet des limites de sécurité de l\'autosens, c\'est de définir une limite basse sur l\'ajustement des débits de basal et une limite haute sur l\'ajustement de la SI et des cibles GLY effectués par l\'autosens.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens ajuste aussi les cibles</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true\nCeci est utilisé pour autoriser Autosens à ajuster les cibles de glycémie en plus de SI et les basals.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valeur par défaut : 2\nBolus snooze est activé apres votre bolus de repas, la boucle ne réagira pas avec des valeurs basses temporaire quand vous venez juste de manger. L’exemple ici et la valeur par défaut est 2 ; donc avec une Durée d\'Action (DIA) de 3 heures signifie que snooze bolus sera graduellement éliminé après 1,5 heures (3DIA/2).</string>
@@ -544,7 +543,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="treatments_wizard_cob_label">GA</string>
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Démarrage AAPS entré dans NS</string>
-    <string name="restartingapp">Sortie de l’application pour appliquer de nouveaux paramètres.</string>
+    <string name="restartingapp">Sortir de l’application pour appliquer les nouveaux paramètres.</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="configbuilder_insulin">Insuline</string>
     <string name="configbuilder_insulin_description">Quel type d\'insuline utilisez-vous ?</string>
@@ -566,7 +565,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Dernière connexion</string>
     <string name="danar_bluetooth_status">État Bluetooth</string>
-    <string name="nav_about">À propos de</string>
+    <string name="nav_about">À propos</string>
     <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorisation du téléphone manquante</string>
     <string name="xdripstatus_settings">état Xdrip (montre)</string>
@@ -628,7 +627,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="notloadedplugins">Les profils ne sont pas tous téléchargés !</string>
     <string name="valuesnotstored">Valeurs non enregistrées !</string>
     <string name="ns_localbroadcasts">Active les diffusions vers d\'autres applications (comme xDrip). Ne pas activer si plusieurs instances d\'AAPS ou de NSClient sont installées !</string>
-    <string name="ns_localbroadcasts_title">Activer les transmissions locales.</string>
+    <string name="ns_localbroadcasts_title">Activer les transmissions locales</string>
     <string name="careportal_activity_label">ACTIVITÉ et FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">GLUCIDES et BOLUS</string>
     <string name="careportal_cgm_label">MGC et OPENAPS</string>
@@ -644,7 +643,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insulin_peak_time">Temps du Pic [min]</string>
     <string name="free_peak_oref">Profil d\'insuline ajustable Oref</string>
     <string name="rapid_acting_oref">Insuline à Action Rapide Oref </string>
-    <string name="ultrarapid_oref">Insuline à Action Ultra Rapide Oref</string>
+    <string name="ultrarapid_oref">Insuline Ultra Rapide Oref</string>
     <string name="dia_too_short">Durée d’Action pour %1$f trop courte - utiliser %2$f à la place !</string>
     <string name="activate_profile">Activer le profil</string>
     <string name="date"> Date</string>
@@ -701,7 +700,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
     <string name="pump_unreachable">Pompe hors de portée</string>
     <string name="missed_bg_readings">Valeurs de glycémie manquantes</string>
-    <string name="raise_notifications_as_android_notifications">Utiliser le système des notifications</string>
+    <string name="raise_notifications_as_android_notifications">Utiliser les notifications système pour les alertes et notifications</string>
     <string name="localalertsettings_title">Alertes locales</string>
     <string name="enable_missed_bg_readings_alert">Alerte pas nouvelle donnée glycémique</string>
     <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors de portée</string>
@@ -766,7 +765,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="danar_history">Historique pompe</string>
     <string name="combo_activity_setting_basal_profile">Définir le profil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Niveau réservoir pompe bas</string>
-    <string name="combo_pump_battery_low_warrning">Niveau batterie pompe bas</string>
+    <string name="combo_pump_battery_low_warrning">Pile pompe faible</string>
     <string name="combo_is_in_error_state">La pompe affiche l’erreur E%1$d: %2$s</string>
     <string name="combo_reservoir_low">Bas</string>
     <string name="combo_reservoir_empty">Vide</string>
@@ -809,7 +808,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear_notifysmb_title">Notifier en SMB</string>
     <string name="wear_notifysmb_summary">Afficher SMB sur la montre comme un bolus standard.</string>
     <string name="ns_create_announcements_from_errors_title">Créer des messages d’erreurs</string>
-    <string name="ns_create_announcements_from_errors_summary">Créer des annonces Nightscout pour les dialogues d’erreur et alertes locales (également visible dans Careportal sous Traitements)</string>
+    <string name="ns_create_announcements_from_errors_summary">Créer une annonce Nightscout pour les messages d\'erreur et les alertes locales (également visible dans la section Careportal de l\'onglet traitements)</string>
     <string name="wear_predictions_summary">Affichez les prédictions sur l\'écran de montre.</string>
     <string name="wear_predictions_title">Prédictions</string>
     <string name="data_choices">Choix de données</string>
@@ -824,7 +823,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="category">Catégorie</string>
     <string name="subcategory">Sous-catégorie</string>
     <string name="bolusrecordedonly">Le bolus sera seulement enregistré</string>
-    <string name="ns_autobackfill_summary">Réassortiment automatique des glycémies manquantes en utilisant NS</string>
+    <string name="ns_autobackfill_summary">Remplissage automatique des glycémies manquantes en utilisant NS</string>
     <string name="loop_smbsetbypump_label">SMB défini par la pompe</string>
     <string name="overview_show_activity">Activité</string>
     <string name="overview_show_sensitivity">Sensibilité</string>
@@ -847,7 +846,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_error_failure_reading_changed_basal_rate">Le pourcentage de basal a changé dans la pompe mais sa lecture a échoué</string>
     <string name="combo_activity_checking_for_history_changes">Vérification des modifications de l\'historique</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Merci de vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
-    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
+    <string name="about_link_urls">\n\nhttps://androidaps.readthedocs.io/en/latest/CROWDIN/fr\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">Le dernier bolus enregistré date d\'il y a plus de 24h ou est dans le futur. Vérifiez que la date dans la pompe est correctement définie.</string>
     <string name="combo_suspious_bolus_time">L\'heure/date sur la pompe du dernier bolus administré semble erroné. L\'IA est probablement incorrecte. Vérifiez l\'heure/date de la pompe.</string>
     <string name="profileswitch_ismissing">ProfileSwitch manquant. S’il vous plaît faire un changement de profil ou appuyez sur « Activer le profil » dans le LocalProfile.</string>
@@ -885,7 +884,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="reset">réinitialiser</string>
     <string name="waitingfortimesynchronization">En attente de synchronisation de l\'heure (%1$d sec)</string>
     <string name="loopdisconnectedfor">Déconnecté (%1$d m)</string>
-    <string name="openapssmb_maxiob_title">Maximum Insuline Active IA pour OpenAPS [U]</string>
+    <string name="openapssmb_maxiob_title">IA totale maximale pour OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contaxte OpenAPS\nOpenAPS n’ajoutera pas plus d’insuline si l\'IA (Insuline Active) actuelle est supérieure à cette valeur</string>
     <string name="pump_stopped">Pompe arrêtée</string>
     <string name="pump_started">Pompe démarrée</string>
@@ -909,15 +908,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="cgm">MGC</string>
     <string name="ns_wifionly">Utilisez uniquement connexion Wi-fi</string>
     <string name="ns_wifi_ssids">Wi-fi SSID</string>
-    <string name="ns_chargingonly">Wi-fi uniquement pendant la charge</string>
+    <string name="ns_chargingonly">Uniquement si en charge</string>
     <string name="connectionsettings_title">Paramètres de connexion</string>
     <string name="ns_wifi_allowedssids">SSIDs autorisés (séparés par point-virgule)</string>
     <string name="ns_allowroaming">Autoriser connexion données itinérance</string>
     <string name="openapsama_autosens_max">Maximum Ratio Autosens</string>
     <string name="openapsama_autosens_min">Minimum Ratio Autosens</string>
-    <string name="openapsama_bolussnooze_dia_divisor">Diviseur de Bolus snooze DIA</string>
-    <string name="openapsama_max_daily_safety_multiplier">Maximum multiplicateur quotidien de sécurité</string>
-    <string name="openapsama_current_basal_safety_multiplier">Multiplicateur actuel de sécurité du Basal</string>
+    <string name="openapsama_bolussnooze_dia_divisor">Snooze bolus Diviseur de DAI</string>
+    <string name="openapsama_max_daily_safety_multiplier">Multiplicateur max quotidien de sécurité</string>
+    <string name="openapsama_current_basal_safety_multiplier">Multiplicateur de sécurité basale courante</string>
     <string name="value_unavailable_short">ND</string>
     <string name="virtualpump_type">Type de pompe virtuelle</string>
     <string name="virtualpump_definition">Définition de pompe</string>
@@ -947,6 +946,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="startobjective">Démarrez votre premier objectif</string>
     <string name="permission">Autorisation</string>
     <string name="askforpermission">Demande d\'autorisation</string>
+    <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
     <string name="needlocationpermission">L\'application requiert l\'autorisation de localisation pour le balayage Bluetooth</string>
     <string name="needstoragepermission">L\'application requiert une autorisation de stockage de données afin de pouvoir sauvegarder les fichiers journaux</string>
     <string name="request">Demande</string>
@@ -984,7 +984,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
     <string name="custom">Personnalisé</string>
     <string name="largetimedifftitle">Différence horaire importante</string>
-    <string name="largetimediff">La différence horaire importante:\nTime avec la pompe de plus d\'1,5 heure.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DIA après la dernière entrée erronée de l\'historique et en tout état de cause au minimum une DIA à partir de maintenant.</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
     <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
     <string name="storedsettingsfound">Paramètres sauvegardés trouvés</string>
     <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
@@ -1015,7 +1015,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="commanderror">Erreur de commande</string>
     <string name="speederror">Erreur de vitesse</string>
     <string name="insulinlimitviolation">Violation d\'une limite d\'insuline</string>
-    <string name="loop_openmode_min_change">Changement minimum possible [%]</string>
+    <string name="loop_openmode_min_change">Changement minimum [%]</string>
     <string name="loop_openmode_min_change_summary">Le fonctionnement de la Boucle demandera une confirmation uniquement si le changement est supérieur à cette valeur en %. Par défaut, la valeur est 20%</string>
     <string name="pairfirst">Appairez SVP votre pompe avec votre téléphone !</string>
     <string name="searching_for_devices">Recherche d\'appareils en cours…</string>
@@ -1056,9 +1056,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="stop_pump">Arrêter la pompe</string>
     <string name="operating_mode">Mode de fonctionnement</string>
     <string name="insight_status">État</string>
-    <string name="tdd_bolus">Bolus DTI</string>
-    <string name="tdd_basal">DTI basale</string>
-    <string name="tdd_total">Total DTI</string>
+    <string name="tdd_bolus">DTI Bolus</string>
+    <string name="tdd_basal">DTI Basale</string>
+    <string name="tdd_total">DTI Total</string>
     <string name="recovering">Récupération en cours.</string>
     <string name="not_paired">Non appairé</string>
     <string name="last_connected">Dernière connexion</string>
@@ -1244,7 +1244,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
     <string name="medtronic_pump_encoding_4b6b_local">Encodage logiciel 4b6b</string>
     <string name="medtronic_pump_encoding_4b6b_rileylink">Encodage matériel 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Réveil et mise au point</string>
+    <string name="medtronic_custom_action_wake_and_tune">Réveil et Réglage</string>
     <string name="medtronic_custom_action_clear_bolus_block">Effacer le bloc Bolus</string>
     <string name="medtronic_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
     <string name="medtronic_pump_battery_select">Type de batterie (vue d\'alimentation)</string>
@@ -1270,8 +1270,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Paramètres</string>
     <string name="rileylink_settings_tab2">Historique</string>
-    <string name="rileylink_status">Statut du RileyLink</string>
-    <string name="medtronic_pump_status">Statut de la pompe</string>
+    <string name="rileylink_status">État du RileyLink</string>
+    <string name="medtronic_pump_status">État de la pompe</string>
     <string name="title_activity_rileylink_settings">Paramètres RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
     <string name="rileylink_configured_address">Adresse configurée</string>
@@ -1300,7 +1300,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="rileylink_error_bt_disabled">Bluetooth est désactivé</string>
     <string name="rileylink_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
     <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
-    <string name="rileylink_error_pump_unreachable">Pompe inaccessible</string>
+    <string name="rileylink_error_pump_unreachable">Pompe hors de portée</string>
     <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
     <string name="rileylink_error_address_not_set_short">Non configuré</string>
     <!-- RL Target Device -->
@@ -1396,7 +1396,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
-    <string name="objectives_button_unfinish">Suppression terminée</string>
+    <string name="objectives_button_unfinish">Refaire l\'objectif</string>
     <string name="objectives_button_unstart">Suppression démarrée</string>
     <string name="timedetection">Détection de temps</string>
     <string name="doyouwantresetstart">Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès.</string>
@@ -1425,10 +1425,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="invalidage">Âge invalide</string>
     <string name="invalidweight">Poids invalide</string>
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
-    <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Médian: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Cible: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
     <string name="tdd">DTI</string>
-    <string name="tir">TIR</string>
+    <string name="tir">Cible Gly</string>
     <string name="activitymonitor">Moniteur d\'activité</string>
     <string name="doyouwantresetstats">Voulez-vous réinitialiser les stats d\'activité ?</string>
     <string name="statistics">Statistiques</string>
@@ -1444,4 +1444,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="alreadyset">Déjà configuré</string>
     <string name="message">Message</string>
     <string name="clearqueueconfirm">Effacer la file d\'attente ? Toutes les données en file d\'attente seront perdues !</string>
+    <string name="ebstopsloop">L\'utilisation du bolus étendu arrètera la boucle fermée pour la durée d\'exécution du bolus étendu. Voulez-vous vraiment le faire ?</string>
+    <string name="closed_loop_disabled_with_eb">Boucle fermée désactivée à cause du bolus étendu</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"Vérif. du téléphone\"</string>
+    <string name="chartmenu">Menu Graph</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Heure de demande SMB</string>
+    <string name="loop_smbexecution_time_label">Heure d\'exécution SMB</string>
+    <string name="loop_tbrrequest_time_label">Heure de demande basal temp</string>
+    <string name="loop_tbrexecution_time_label">Heure d\'exécution basal temp</string>
+    <string name="insight_alert_notification_channel">Alertes Pompe Insight</string>
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/objectives.xml b/app/src/main/res/values-ga-rIE/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-ga-rIE/objectives.xml
+++ b/app/src/main/res/values-ga-rIE/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index df88c88e20..b3e84cab92 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <string name="nav_preferences">Sainroghanna</string>
+    <string name="reset_db_confirm">An bhfuil tú cinnte gur mian leat an bhunachair sonraí a athshocrú?</string>
+    <string name="alert_dialog_storage_permission_text">Le do thoil atosaigh do ghuthán nó atosaigh AndroidAPS ó Socruithe an Chórais \nmura dhéanann tú é seo, ní bheidh logáil ag na appana AndroidAPS (tá sé tábhachtach na halgartaim a rianú agus a fhíorú go bhfuil siad ag obair i gceart)!</string>
+    <string name="description_source_mm640g">Luachanna BG a fháil ón 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Sonraí a íoslódáil ó Nightscout</string>
+    <string name="description_source_xdrip">Luachanna BG a fháil ó xDrip.</string>
+    <string name="nsprofileview_target_label">Cuspóir</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/l</string>
+    <string name="MM640g">MM640g</string>
+    <string name="danar_stats_tbb2">TBB * 2</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="smb_shortname">SMB</string>
     <!-- Pump Abstract -->
     <!-- Medtronic (MDT) - Base -->
     <!-- MDT Configuration -->
diff --git a/app/src/main/res/values-hr-rHR/objectives.xml b/app/src/main/res/values-hr-rHR/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-hr-rHR/objectives.xml
+++ b/app/src/main/res/values-hr-rHR/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 4b9047c775..62abcc22bc 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
     <string name="dia_label">Argomento: Durata dell\'Azione dell\'Insulina</string>
@@ -47,8 +46,8 @@
     <string name="exercise_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
     <string name="exercise_switchprofileabove100">Fare un cambio profilo sopra il 100%.</string>
     <string name="exercise_stoploop">Stoppare il loop.</string>
-    <string name="exercise_doitbeforestart">Impostare un temp-target \"attività\" prima dell\'inizio dell\'esercizio fisico.</string>
-    <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
+    <string name="exercise_doitbeforestart">Impostare un temp-target \"attività fisica\" prima dell\'inizio dell\'esercizio fisico.</string>
+    <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività fisica\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">Argomento: Loop Disabilitato/Sospeso</string>
     <string name="suspendloop_doigetinsulin">Ricevo insulina quando il loop è disabilitato/sospeso?</string>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_titles.xml b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
index d510f14df2..123334b48d 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_titles.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="alert_r1_title">Eroga bolo</string>
     <string name="alert_r2_title">Bolo perso</string>
@@ -10,8 +9,8 @@
     <string name="alert_w32_title">Batteria quasi scarica</string>
     <string name="alert_w33_title">Ora/data non valida</string>
     <string name="alert_w34_title">Fine della garanzia</string>
-    <string name="alert_w36_title">TBR annullato</string>
-    <string name="alert_w38_title">Bolo annullato</string>
+    <string name="alert_w36_title">TBR cancellato</string>
+    <string name="alert_w38_title">Bolo cancellato</string>
     <string name="alert_w39_title">Avviso di prestito</string>
     <string name="alert_m20_title">Cartuccia non inserita</string>
     <string name="alert_m21_title">Cartuccia vuota</string>
diff --git a/app/src/main/res/values-it-rIT/insight_exceptions.xml b/app/src/main/res/values-it-rIT/insight_exceptions.xml
index fa33f5f7f2..fc68ba559f 100644
--- a/app/src/main/res/values-it-rIT/insight_exceptions.xml
+++ b/app/src/main/res/values-it-rIT/insight_exceptions.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="connection_failed">Connessione fallita</string>
     <string name="connection_lost">Connessione persa</string>
@@ -7,9 +6,9 @@
     <string name="socket_creation_failed">Creazione socket fallita</string>
     <string name="timeout">Timeout</string>
     <string name="maximum_number_of_bolus_type_already_running">Numero massimo tipo di bolo già in esecuzione</string>
-    <string name="no_active_tbr_to_cancel">Nessun TBR attivo da annullare</string>
+    <string name="no_active_tbr_to_cancel">Nessun TBR attivo da cancellare</string>
     <string name="no_active_tbr_to_change">Nessun TBR attivo da modificare</string>
-    <string name="no_such_bolus_to_cancel">Nessun bolo da annullare</string>
+    <string name="no_such_bolus_to_cancel">Nessun bolo da cancellare</string>
     <string name="pump_already_in_that_state_exception">Micro già in questo stato</string>
     <string name="run_mode_not_allowed">Modalità di esecuzione non consentita</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/objectives.xml b/app/src/main/res/values-it-rIT/objectives.xml
index cd0360f973..84a9152c3d 100644
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Indietro</string>
     <string name="objectives_button_start">Avvia</string>
@@ -18,14 +17,14 @@
     <string name="objectives_maxiob_objective">Regolazione del loop chiuso, aumentando max IOB al di sopra di 0 e abbassando gradualmente i target glicemici</string>
     <string name="objectives_maxiob_gate">Esegui l\'applicazione per alcuni giorni e almeno una notte senza allarmi di glicemia bassa, prima di abbassare il target glicemico</string>
     <string name="objectives_autosens_objective">Adatta basali e rapporti se necessario, quindi attiva auto-sens</string>
-    <string name="objectives_autosens_gate">1 settimana di looping diurno con dichiarazione regolare dei carboidrati, eseguito con successo</string>
+    <string name="objectives_autosens_gate">1 settimana di looping diurno con inserimento regolare dei carboidrati, eseguito con successo</string>
     <string name="objectives_ama_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
     <string name="objectives_smb_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, come SMB</string>
     <string name="objectives_smb_gate">È necessario leggere il wiki e aumentare maxIOB affinché le azioni di SMB funzionino adeguatamente! Un buon inizio è maxIOB = media bolo posto + 3 x max basale giornaliera</string>
     <string name="objectives_bgavailableinns">Glicemia disponibile in NS</string>
     <string name="objectives_pumpstatusavailableinns">Stato micro disponibile in NS</string>
     <string name="objectives_manualenacts">Attivazioni manuali</string>
-    <string name="accomplished">Compiuto: %1$s</string>
+    <string name="accomplished">Completato: %1$s</string>
     <string name="objectives_usage_objective">Impara a controllare AndroidAPS</string>
     <string name="objectives_usage_gate">Esegui varie azioni in AndroidAPS</string>
     <string name="objectives_useprofileswitch">Imposta il profilo \"90%\" per 10 min (premi a lungo sul nome profilo nella sezione Panoramica)</string>
@@ -36,12 +35,12 @@
     <string name="objectives_useloop">Visualizza il contenuto del plugin Loop</string>
     <string name="objectives_usescale">Usa la funzione di ridimensionamento premendo a lungo sul grafico delle glicemie</string>
     <string name="objectives_button_enter">Entra</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se prima eri un utente OpenAPS e il tuo NS ha almeno 3 mesi di dati in loop, puoi inviare un\'e-mail a objectives@androidaps.org con il tuo indirizzo NS e richiedere il codice per ignorare il resto degli obiettivi. Inserisci il codice ottenuto dagli sviluppatori</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se hai almeno 3 mesi di esperienza in loop chiuso con altri sistemi potresti beneficiare di un codice per saltare gli obiettivi. Guarda https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives per i dettagli.</string>
     <string name="codeaccepted">Codice accettato</string>
     <string name="codeinvalid">Codice non valido</string>
     <string name="objectives_exam_objective">Dai prova della tua conoscenza</string>
     <string name="objectives_exam_gate">Studia e rispondi correttamente alle domande</string>
-    <string name="answerdisabledto">Risposta disabilitata per: %1$s</string>
+    <string name="answerdisabledto">Risposta disabilitata fino a: %1$s</string>
     <string name="wronganswer">Risposta sbagliata!</string>
     <string name="unfinshed_button">Prossimo N.C.</string>
     <string name="requestcode">Codice richiesta: %1$s</string>
@@ -51,7 +50,7 @@
     <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
     <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
     <string name="notconnected">Non connesso a internet</string>
-    <string name="failedretrievetime">Impossibile recuperare l\'orario</string>
+    <string name="failedretrievetime">Impossibile recuperare l\'ora</string>
     <string name="requirementnotmet">Requisiti obiettivo non soddisfatti</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d giorno</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index f4b18228fd..c344c3229e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -14,7 +13,7 @@
     <string name="reset_db_confirm">Vuoi davvero resettare i database?</string>
     <string name="nav_exit">Esci</string>
     <string name="danar_useextended_title">Usa boli estesi per &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo DanaR Bluetooth</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
@@ -25,7 +24,7 @@
     <string name="description_food">Visualizza l\'elenco dei cibi definiti in Nightscout</string>
     <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
-    <string name="description_insulin_free_peak">Ti consente di definire il picco dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
+    <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
     <string name="description_loop">Attiva o disattiva l\'implementazione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
     <string name="description_ma">Stato dell\'algoritmo nel 2016</string>
@@ -42,7 +41,7 @@
     <string name="description_pump_dana_r_v2">Integrazione del microinfusore DANA Diabecare R con firmware aggiornato</string>
     <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
     <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
-    <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop Aperto)</string>
+    <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop aperto)</string>
     <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze.</string>
     <string name="description_sensitivity_oref0">La sensibilità è calcolata dai dati delle ultime 24h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze.</string>
     <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il Plugin calcola anche UAM.</string>
@@ -51,7 +50,7 @@
     <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
     <string name="description_source_mm640g">Ricevi valori glicemia da 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Scarica dati glicemia da Nightscout</string>
-    <string name="description_source_xdrip">Ricevi dati glicemia da xDrip.</string>
+    <string name="description_source_xdrip">Ricevi valori glicemia da xDrip.</string>
     <string name="description_treatments">Salva tutti i trattamenti che sono stati fatti</string>
     <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
     <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
@@ -120,7 +119,7 @@
     <string name="configbuilder_treatments">Trattamenti</string>
     <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere utilizzato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
-    <string name="configbuilder_profile_description">Quale profilo dovrebbe usare AndroidAPS?</string>
+    <string name="configbuilder_profile_description">Quale profilo AndroidAPS dovrebbe usare?</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">Quale algoritmo APS dovrebbe apportare aggiustamenti terapeutici?</string>
     <string name="configbuilder_general">Generale</string>
@@ -132,7 +131,7 @@
     <string name="configbuilder_loop">Loop</string>
     <string name="configbuilder_loop_description">Usalo per attivare l\'integrazione del loop di AndroidAPS.</string>
     <string name="loop_aps_label">APS</string>
-    <string name="loop_constraintsprocessed_label">Dopo aver elaborato i vincoli</string>
+    <string name="loop_constraintsprocessed_label">Dopo elaborazione vincoli</string>
     <string name="loop_tbrsetbypump_label">Basale temporanea impostata dal micro</string>
     <string name="openapsma_lastenact_label">Ultima attivazione</string>
     <string name="ok">OK</string>
@@ -176,7 +175,7 @@
     <string name="careportal_announcement">Annuncio</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Domanda</string>
-    <string name="careportal_exercise">Esercizio</string>
+    <string name="careportal_exercise">Esercizio fisico</string>
     <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
     <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
     <string name="careportal_cgmsensorstart">Avvio Sensore</string>
@@ -196,7 +195,7 @@
     <string name="careportal_newnstreatment_sensor">Sensore</string>
     <string name="careportal_newnstreatment_carbs_label">CHO</string>
     <string name="careportal_newnstreatment_insulin_label">Insulina</string>
-    <string name="careportal_newnstreatment_carbtime_label">Tempo CHO</string>
+    <string name="careportal_newnstreatment_carbtime_label">Offset CHO</string>
     <string name="careportal_newnstreatment_split_label">Frazione</string>
     <string name="careportal_newnstreatment_duration_label">Durata</string>
     <string name="careportal_newnstreatment_percent_label">Percentuale</string>
@@ -246,9 +245,9 @@
     <string name="enacted">Attivato</string>
     <string name="comment">Commento</string>
     <string name="success">OK</string>
-    <string name="percent">Per cento</string>
+    <string name="percent">Percentuale</string>
     <string name="absolute">Assoluto</string>
-    <string name="canceltemp">Cancellare basale temporanea</string>
+    <string name="canceltemp">Cancella basale temporanea</string>
     <string name="smscommunicator">Comunicazioni SMS</string>
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
@@ -265,7 +264,7 @@
     <string name="smscommunicator_remotebolusmindistance">Quanti minuti devono trascorrere, almeno, tra un bolo e il successivo</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Per la tua sicurezza, per modificare questa preferenza hai bisogno di aggiungere almeno 2 numeri di telefono.</string>
     <string name="bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
-    <string name="bolusrequested">Sto per erogare %1$.2fU</string>
+    <string name="bolusrequested">A erogare %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered">Bolo pasto di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s per %2$d minuti</string>
@@ -344,8 +343,8 @@
     <string name="smscommunicator_extendedstopreplywithcode">Per stoppare il bolo esteso rispondi col codice %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Basale temporanea cancellata</string>
     <string name="smscommunicator_extendedcanceled">Bolo esteso cancellato</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Cancellazione basale temporanea fallita</string>
-    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallita</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Basale temporanea: cancellazione fallita</string>
+    <string name="smscommunicator_extendedcancelfailed">Bolo esteso: cancellazione fallita</string>
     <string name="smscommunicator_unknowncommand">Comando sconosciuto o risposta errata</string>
     <string name="quickwizard">Calcolatore Rapido</string>
     <string name="quickwizardsettings">Impostazioni Calcolatore Rapido</string>
@@ -415,7 +414,7 @@
     <string name="deletefuturetreatments">Elimina trattamenti nel futuro</string>
     <string name="eatingsoon">Pasto a breve</string>
     <string name="hypo">Ipoglicemia</string>
-    <string name="activity">Attività</string>
+    <string name="activity">Attività fisica</string>
     <string name="removerecord">Rimuovi record</string>
     <string name="danar_stats">Statistiche DanaR</string>
     <string name="danar_stats_cumulative_tdd">TDD cumulativo</string>
@@ -619,7 +618,7 @@
     <string name="basal_short">BAS</string>
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
     <string name="keep_screen_on_title">Mantieni lo schermo acceso</string>
-    <string name="keep_screen_on_summary">Evita che Android disattivi lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
+    <string name="keep_screen_on_summary">Evita che Android spenga lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
     <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di inserire tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
     <string name="sensitivityweightedaverage">Sensibilità WeightedAverage</string>
     <string name="mdtp_ok">OK</string>
@@ -639,8 +638,8 @@
     <string name="enablesmb">Abilita SMB</string>
     <string name="enablesmb_summary">Utilizza Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
     <string name="enableuam_summary">Rilevazione dei pasti Non Annunciati</string>
-    <string name="insulin_oref_peak">IOB Curve Peak Time</string>
-    <string name="insulin_peak_time">Peak Time [min]</string>
+    <string name="insulin_oref_peak">Tempo picco Curva IOB</string>
+    <string name="insulin_peak_time">Tempo del picco [min]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
@@ -650,7 +649,7 @@
     <string name="invalid">NON VALIDO</string>
     <string name="waitingforpairing">In attesa di associare il micro</string>
     <string name="pairingok">Associazione OK</string>
-    <string name="pairingtimedout">Time out associazione micro</string>
+    <string name="pairingtimedout">Time out associazione</string>
     <string name="pairing">Accoppiamento</string>
     <string name="danars_nodeviceavailable">Nessun dispositivo trovato finora</string>
     <string name="emptyreservoir">Serbatoio vuoto</string>
@@ -668,8 +667,8 @@
     <string name="default_temptargets">Temp-Target predefiniti</string>
     <string name="eatingsoon_duration">target \"pasto a breve\" - durata</string>
     <string name="eatingsoon_target">target \"pasto a breve\"</string>
-    <string name="activity_duration">target \"attività\" - durata</string>
-    <string name="activity_target">target \"attività\"</string>
+    <string name="activity_duration">target \"attività fisica\" - durata</string>
+    <string name="activity_target">target \"attività fisica\"</string>
     <string name="hypo_duration">target \"ipoglicemia\" - durata</string>
     <string name="hypo_target">target \"ipoglicemia\"</string>
     <string name="danar_history_prime">Riempimento</string>
@@ -696,7 +695,7 @@
     <string name="waitingforestimatedbolusend">Attesa per la fine del bolo. Rimangono %1$d sec.</string>
     <string name="processinghistory">Evento di elaborazione</string>
     <string name="startingbolus">Avvio erogazione bolo</string>
-    <string name="executingrightnow">Il comando verrà eseguito ora</string>
+    <string name="executingrightnow">Il comando sarà eseguito ora</string>
     <string name="pumpdrivercorrected">Driver del micro corretto</string>
     <string name="pump_unreachable">Micro irraggiungibile</string>
     <string name="missed_bg_readings">Letture BG mancanti</string>
@@ -772,7 +771,7 @@
     <string name="combo_reservoir_normal">Normale</string>
     <string name="combo_notification_check_time_date">Necessario aggiornare orologio micro</string>
     <string name="combo_warning">Attenzione</string>
-    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO confermato</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO: confermato</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Il micro potrebbe non essere raggiungibile. Nessun bolo erogato</string>
     <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controlla il micro per evitare un doppio bolo e se è tutto ok, erogalo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
     <string name="combo_error_partial_bolus_delivered">Solo la quantità di %1$.2f U del bolo richiesto di %2$.2f U è stata erogata a causa di un errore. Controlla il micro per verificare quanto accaduto e intraprendi le azioni necessarie.</string>
@@ -790,7 +789,7 @@
     <string name="enablesmbwithcob">Abilita SMB con COB</string>
     <string name="enablesmbwithcob_summary">Abilita SMB quando COB è attivo (ci sono carboidrati non assorbiti).</string>
     <string name="enablesmbwithtemptarget">Abilita SMB con target temporanei</string>
-    <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività)</string>
+    <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività fisica)</string>
     <string name="enablesmbwithhightemptarget">Abilita SMB con target temporanei \"alti\"</string>
     <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando è attivo un target temporaneo \"alto\"</string>
     <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
@@ -816,7 +815,7 @@
     <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
     <string name="g5appnotdetected">Aggiorna la tua app Dexcom ad una versione supportata</string>
     <string name="dexcom_app_not_installed">App Dexcom non installata.</string>
-    <string name="start_activity_tt">Avvia TT Attività</string>
+    <string name="start_activity_tt">Avvia TT Attività fisica</string>
     <string name="start_eating_soon_tt">Avvia TT Pasto a breve</string>
     <string name="temptargetshort">TT</string>
     <string name="do_not_bolus_record_only">No bolo, solo record</string>
@@ -839,13 +838,13 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lettura profilo basale</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcolare se un bolo è ancora necessario.</string>
-    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma impossibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci con lo stesso orario e con la stessa quantità.</string>
+    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma non è possibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci che si riferiscano al medesimo minuto e alla stessa quantità.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto basale temporanea \"alta\" in quanto il calcolo non ha considerato i cambiamenti recenti allo storico del micro</string>
     <string name="combo_activity_checking_pump_state">Aggiornamento stato micro</string>
     <string name="combo_warning_pump_basal_rate_changed">La velocità basale nel micro è cambiata e verrà aggiornata a breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Velocità basale cambiata sul micro, ma la sua lettura è fallita</string>
     <string name="combo_activity_checking_for_history_changes">Controllo modifiche allo storico</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un orario non utilizzato da nessun altro bolo.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un\'ora non utilizzata da nessun altro bolo.</string>
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controlla che la data sul micro sia impostata correttamente.</string>
     <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controlla l\'ora e/o la data del micro.</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Avvia il tuo primo obiettivo</string>
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
+    <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
     <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per eseguire lo scan bluetooth</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
@@ -982,8 +982,8 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Riduci la sensibilità per temp-target < 100]]></string>
     <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
     <string name="custom">Personalizzato</string>
-    <string name="largetimedifftitle">Grande differenza d\'orario</string>
-    <string name="largetimediff">Grande differenza d\'orario:\nL\'orario nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'orario oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
+    <string name="largetimedifftitle">Grande differenza oraria</string>
+    <string name="largetimediff">Grande differenza oraria:\nL\'ora nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'ora oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
     <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
     <string name="storedsettingsfound">Trovate impostazioni salvate</string>
     <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
@@ -1030,11 +1030,11 @@
     <string name="confirm">Conferma</string>
     <string name="mute_alert">Muto</string>
     <string name="pump_alert">Avviso microinfusore</string>
-    <string name="log_site_changes">Registra cambi posizione cannula</string>
+    <string name="log_site_changes">Registra cambi posizione</string>
     <string name="log_reservoir_changes">Registra cambi serbatoio</string>
     <string name="log_tube_changes">Registra cambi catetere</string>
     <string name="log_battery_changes">Registra cambi batteria</string>
-    <string name="log_operating_mode_changes">Registra cambi modalità di funzionamento</string>
+    <string name="log_operating_mode_changes">Registra cambi modalità operativa</string>
     <string name="log_alerts">Registra avvisi</string>
     <string name="enable_tbr_emulation">Abilita emulazione TBR</string>
     <string name="enable_tbr_emulation_summary">Usa i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
@@ -1111,11 +1111,11 @@
     <string name="glucoseisnotavailable">Glicemia non disponibile</string>
     <string name="glucosecomparedmgdl">Glicemia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicemia %1$s %2$.1f %3$s</string>
-    <string name="percentagecompared">Pct profilo %1$s %2$d</string>
+    <string name="percentagecompared">PCT profilo %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
-    <string name="and">And</string>
-    <string name="or">Or</string>
-    <string name="xor">Xor</string>
+    <string name="and">E (AND)</string>
+    <string name="or">O (OR)</string>
+    <string name="xor">O (esclusivo - XOR)</string>
     <string name="atspecifiedtime">A %1$s</string>
     <string name="use_network_location">Usa posizione di rete</string>
     <string name="use_gps_location">Usa posizione GPS</string>
@@ -1161,10 +1161,10 @@
     <string name="storage">vincolo di archiviazione interna</string>
     <string name="diskfull">Libera almeno %1$d MB dalla memoria interna! Loop disabilitato!</string>
     <string name="wrongformat">Formato errato</string>
-    <string name="sms_wrongcode">Codice errato. Comando annullato.</string>
+    <string name="sms_wrongcode">Codice errato. Comando cancellato.</string>
     <string name="notconfigured">Non configurato</string>
     <string name="profileswitchcreated">Cambio profilo creato</string>
-    <string name="recurringTime">Ora ripetizione</string>
+    <string name="recurringTime">Tempo ricorrente</string>
     <string name="every">Ogni</string>
     <string name="never">Mai</string>
     <string name="mins">%1$dmin</string>
@@ -1175,7 +1175,7 @@
     <string name="delete_short">CANC</string>
     <string name="add_short">AGG</string>
     <string name="copy_short">COPIA</string>
-    <string name="addnew">Aggiungere nuovo</string>
+    <string name="addnew">Aggiungi nuovo</string>
     <string name="versionChecker">Controllo Versione</string>
     <string name="signature_verifier">Verificatore firma</string>
     <string name="running_invalid_version">Abbiamo rilevato che stai eseguendo una versione non valida. Loop disabilitato!</string>
@@ -1321,7 +1321,7 @@
     <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato nel micro (deve essere %1$.2f).</string>
     <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata nel micro (deve essere %1$.2f).</string>
     <string name="medtronic_error_operation_not_possible_no_configuration">Operazione non possibile.\n\n Devi prima configurare il micro Medtronic.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica d\'orario di oltre 24h.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica oraria di oltre 24h.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Basali</string>
     <string name="medtronic_history_group_configuration">Configurazioni</string>
@@ -1352,7 +1352,7 @@
     <string name="medtronic_cmd_basal_profile_not_set_is_same">Il profilo basale è lo stesso, non sarà impostato di nuovo.</string>
     <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Ottieni orario micro</string>
+    <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
     <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
     <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
@@ -1377,7 +1377,7 @@
     <string name="loading">Caricamento ...</string>
     <string name="snooze">Posticipa</string>
     <string name="time_range">Intervallo di tempo</string>
-    <string name="timerange_value">Il tempo è compreso tra %1$s e %2$s</string>
+    <string name="timerange_value">L\'intervallo di tempo è compreso tra %1$s e %2$s</string>
     <string name="between">Tra </string>
     <string name="close">Chiudi</string>
     <string name="increasingmaxbasal">Aumento del valore max basale perché l\'impostazione è inferiore alla tua basale massima nel profilo</string>
@@ -1395,8 +1395,8 @@
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
-    <string name="objectives_button_unfinish">Cancella completato</string>
-    <string name="objectives_button_unstart">Cancella avviato</string>
+    <string name="objectives_button_unfinish">Cancella completamento</string>
+    <string name="objectives_button_unstart">Cancella avvio</string>
     <string name="timedetection">Rilevazione tempo</string>
     <string name="doyouwantresetstart">Vuoi resettare l\'avvio dell\'obiettivo? Potresti perdere i tuoi progressi.</string>
     <string name="nopumpselected">Nessun micro selezionato</string>
@@ -1419,7 +1419,7 @@
     <string name="id">ID:</string>
     <string name="submit">Invia</string>
     <string name="mostcommonprofile">Profilo più comune:</string>
-    <string name="survey_comment">Nota: solo i dati visibili su questa schermata verranno caricati (in modo anonimo). Un ID è assegnato a questa installazione di AndroidAPS. Puoi inviare nuovamente i dati se il tuo profilo principale viene modificato, ma lascialo in esecuzione almeno per una settimana per rendere visibili i risultati nel time in range. Il tuo aiuto è apprezzato.</string>
+    <string name="survey_comment">Nota: solo i dati visibili su questa schermata verranno caricati (in modo anonimo). Un ID è assegnato a questa installazione di AndroidAPS. Puoi inviare nuovamente i dati se il tuo profilo principale viene modificato, ma lascialo in esecuzione almeno per una settimana per rendere il risultato visibile nel time in range (TIR). Il tuo aiuto è apprezzato.</string>
     <string name="nav_survey">Sondaggio</string>
     <string name="invalidage">Inserimento età non valido</string>
     <string name="invalidweight">Inserimento peso non valido</string>
@@ -1443,4 +1443,15 @@
     <string name="alreadyset">Già impostato</string>
     <string name="message">Messaggio</string>
     <string name="clearqueueconfirm">Cancellare la coda? Tutti i dati in coda andranno persi!</string>
+    <string name="ebstopsloop">L\'uso della funzione bolo esteso interromperà la modalità loop chiuso per il tempo di esecuzione del bolo esteso. Lo vuoi davvero?</string>
+    <string name="closed_loop_disabled_with_eb">Loop chiuso disabilitato a causa dell\'esecuzione di un bolo esteso</string>
+    <string name="extended_bolus_short">BE</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Menu grafico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Richiesta SMB (momento)</string>
+    <string name="loop_smbexecution_time_label">Esecuzione SMB (momento)</string>
+    <string name="loop_tbrrequest_time_label">Richiesta basale temporanea (momento)</string>
+    <string name="loop_tbrexecution_time_label">Esecuzione basale temporanea (momento)</string>
+    <string name="insight_alert_notification_channel">Avvisi micro Insight</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/objectives.xml b/app/src/main/res/values-iw-rIL/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-iw-rIL/objectives.xml
+++ b/app/src/main/res/values-iw-rIL/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index d4508abe7a..ac0f8d512e 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-ja-rJP/objectives.xml b/app/src/main/res/values-ja-rJP/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-ja-rJP/objectives.xml
+++ b/app/src/main/res/values-ja-rJP/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index 70489fbc5e..dfdfb154d8 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -1,3 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="dia_whatmeansdia">DIA에 대하여 올바른 것은?</string>
+    <string name="dia_label">주제: Duration of Insulin Action(DIA)</string>
+    <string name="dia_minimumis3h">최소값은 3시간입니다.</string>
+    <string name="dia_minimumis5h">최소값은 5시간입니다.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">당신이 사용중인 펌프의 DIA값과 동일합니다.</string>
+    <string name="dia_valuemustbedetermined">당신이 값을 결정해야합니다(최소 5시간 이상)</string>
+    <string name="hypott_label">주제: 저혈당 임시 목표</string>
+    <string name="hypott_whenhypott">저혈당 임시 목표를 설정하는 주된 이유가 무엇입니까?</string>
+    <string name="hypott_goinglow">임시 Basal이 0일 경우 저혈당을 방지하기 위해서.</string>
+    <string name="hypott_preventoversmb">저혈당때문에 섭취한 탄수화물로 인해 급격하게 혈당이 올라간 후 AAPS가 인슐린을 너무 많이 주입하는 것을 방지하기 위해서.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">어떤 프로파일이 오프라인에서 설정할 수 있습니까?</string>
+    <string name="offlineprofile_label">주제: 오프라인 프로파일</string>
+    <string name="offlineprofile_nsprofile">NS 프로파일이 사용될 수 있지만, 오프라인 상에서 설정할 수는 없습니다.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">주제: 펌프 일시중지하기</string>
+    <string name="pumpdisconnect_whattodo">펌프 일시중지할땐 무엇을 해야합니까?</string>
+    <string name="pumpdisconnect_letknow">인슐린이 주입되지 않을것이라는 것을 AAPS가 인지하도록 \'펌프 일시중지\'를 누릅니다.</string>
+    <string name="pumpdisconnect_suspend">펌프가 일시중지되는 동안 \'Loop 일시중지\'를 눌러서 Loop를 중지합니다.</string>
+    <string name="pumpdisconnect_dontchnage">AAPS에선 아무 작업도 하지 않고, 그냥 펌프와 연결을 해제합니다.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">주제: AndroidAPS 설정</string>
+    <string name="objectives_howtosave">다음중 당신의 AAPS 설정을 백업하기 위한 좋은 사례는 무엇입니까?</string>
+    <string name="objectives_exportsettings">정비 메뉴에서 설정 저장하기 합니다.</string>
+    <string name="objectives_storeelsewhere">저장된 설정파일을 이메일, 드롭박스, 구글드라이브 등에 저장한다…</string>
+    <string name="objectives_doexportonstart">AAPS 설치 후 바로 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterchange">설정을 변경한 이후 바로 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterobjective">목표수행을 완료한 후 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterfirtssettings">초기 설정이 완료되면 설정을 저장합니다.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">주제: CGM의 혈당 노이즈가 심할 때</string>
+    <string name="noisycgm_whattodo">CGM 혈당의 노이즈가 심하다면 어떻게 해야합니까?</string>
+    <string name="nothing">아무것도 하지 않고, AAPS가 알아서 하게 내버려둔다.</string>
+    <string name="noisycgm_pause">과도한 주입을 방지하기 위해 Loop를 중지한다.</string>
+    <string name="noisycgm_replacesensor">CGM 센서를 교체한다.</string>
+    <string name="noisycgm_turnoffphone">폰을 끈다.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">CGM앱의 혈당 평활화 기능 작동 여부를 확인한다.</string>
+    <string name="exercise_label">주제: 운동</string>
+    <string name="exercise_whattodo">운동시 어떻게 하는 것이 도움이 됩니까?</string>
+    <string name="exercise_setactivitytt">임시 목표 기능 사용.</string>
+    <string name="exercise_switchprofilebelow100">100%이하로 프로파일을 변경합니다.</string>
+    <string name="exercise_switchprofileabove100">100%이상으로 프로파일을 변경합니다.</string>
+    <string name="exercise_stoploop">Loop를 중지합니다.</string>
+    <string name="exercise_doitbeforestart">운동 시작전 운동 임시목표를 설정합니다.</string>
+    <string name="exercise_afterstart">운동 시작 후 운동 임시목표를 설정하는 것은 운동 시작 전에 설정하는 것보다 나쁜 결과를 초래합니다.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">주제: Loop 중지/일시중지</string>
+    <string name="suspendloop_doigetinsulin">Loop가 중지/일시중지 되었을때 인슐린이 주입됩니까?</string>
+    <string name="suspendloop_yes">네, Basal 인슐린은 계속 주입됩니다.</string>
+    <string name="suspendloop_no">아니오, 인슐린 주입이 모두 중지됩니다.</string>
+    <string name="basaltest_label">주제: Basal, ISF, and IC 테스트</string>
+    <string name="basaltest_when">Basal, ISF 그리고 IC 값은 언제 확인해야 합니까?</string>
+    <string name="basaltest_beforeloop">Loop를 시작하기 전.</string>
+    <string name="basaltest_havingregularhypo">저혈당 빈도가 많을 때</string>
+    <string name="basaltest_havingregularhyper">고혈당 빈도가 많을 때</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">주제: 사전 요구사항</string>
+    <string name="prerequisites_what">필요한 것이 무엇입니까?</string>
+    <string name="prerequisites_determinedcorrectprofile">유효한 프로파일 정보 (Basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">APK파일을 빌드하기 위한 컴퓨터.</string>
+    <string name="prerequisites_phone">지원되는 폰.</string>
+    <string name="prerequisites_car">자동차.</string>
+    <string name="prerequisites_nightscout">목표수행하기 위해 필요한 Nightscout.</string>
+    <string name="prerequisites_tidepoolaccount">Tidepool 계정.</string>
+    <string name="prerequisites_googleaccount">구글(Google) 계정.</string>
+    <string name="prerequisites_githubaccount">깃허브(Github) 계정.</string>
+    <string name="prerequisites_beanandroiddeveloper">안드로이드 개발 경험.</string>
+    <string name="prerequisites_own670g">미니메드(MiniMed) 670G 펌프.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html</string>
+    <string name="prerequisites_smartwatch">스마트워치.</string>
+    <string name="prerequisites_supportedcgm">지원되는 연속혈당측정기(CGM).</string>
+    <string name="update_label">주제: AndroidAPS 업데이트</string>
+    <string name="whatistrue">올바른 것을 선택하세요.</string>
+    <string name="update_git">Git이 설치되어 있어야 합니다.</string>
+    <string name="update_asap">신버전이 나온 후 시간이 되면 바로 업데이트 하세요.</string>
+    <string name="update_keys">동일한 signing keys를 사용하여야 합니다.</string>
+    <string name="update_neverupdate">시스템이 잘 작동한다면 절대 업데이트하지마세요.</string>
+    <string name="update_askfriend">지인에게 신버전의 APK를 달라고 요청합니다.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">주제: 문제해결</string>
+    <string name="troubleshooting_wheretoask">어디에 도움을 요청해야 합니까?</string>
+    <string name="troubleshooting_fb">AndroidAPS 페이스북 그룹에 가입합니다.</string>
+    <string name="troubleshooting_wiki">AndroidAPS documentation을 읽어봅니다.</string>
+    <string name="troubleshooting_gitter">AndroidAPS Gitter Room을 방문합니다.</string>
+    <string name="troubleshooting_googlesupport">AndroidAPS Google support에 방문합니다.</string>
+    <string name="troubleshooting_yourendo">내분비과 의사와 상담해봅니다.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">주제: 인슐린 플러그인</string>
+    <string name="insulin_ultrarapid">\'초-초속효성 Oref\' 플러그인과 사용해야할 인슐린은 무엇입니까?</string>
+    <string name="insulin_fiasp">피아스프(Fiasp®)</string>
+    <string name="insulin_novorapid">노보래피드(NovoRapid®)</string>
+    <string name="insulin_humalog">휴마로그(Humalog®)</string>
+    <string name="insulin_actrapid">액트라피드(Actrapid®)</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">주제: 민감도 플러그인</string>
+    <string name="sensitivity_which">어떤 민감도 알고리즘에 구성 가능한 시간 범위가 있습니까?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">UAM기능(알려지지않은 탄수화물 인식 기능)을 사용하기 위해서 어떤 민감도 알고리즘을 사용해야합니까?</string>
+    <string name="wrongcarbs_label">주제: 탄수화물 입력 에러</string>
+    <string name="wrongcarbs_whattodo">부적절한 탄수화물을 입력하였다면 어떻게 하여야 합니까?</string>
+    <string name="wrongcarbs_treatmentstab">관리에서, 부적절한 탄수화물 입력을 삭제하고, 새 탄수화물을 입력합니다.</string>
+    <string name="wrongcarbs_addfakeinsulin">채움 기능을 이용하여 거짓으로 인슐린을 추가합니다.</string>
+    <string name="extendedcarbs_label">주제: 지방과 단백질 음식</string>
+    <string name="extendedcarbs_handling">많은 양의 지방 그리고\/또는 단백질이 있는 음식을 섭취할땐 어떻게 합니까?</string>
+    <string name="extendedcarbs_useextendedcarbs">지방과 단백질을 탄수화물로 계산하고 \"확장 탄수화물\"기능을 사용합니다.</string>
+    <string name="extendedcarbs_add">지방과 단백질을 탄수화물로 계산하고 Bolus 계산에 추가합니다.</string>
+    <string name="extendedcarbs_useextendedbolus">지방과 단백질을 보완하기 위해서 확장 Bouls를 사용합니다.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">주제: 원격 모니터링</string>
+    <string name="nsclient_howcanyou">당신의 아이의 AAPS를 어떻게 원격으로 모니터합니까?</string>
+    <string name="nsclient_nightscout">Nightscout 사이트를 이용합니다.</string>
+    <string name="nsclient_dexcomfollow">덱스콤 정식앱을 사용한다면 덱스콤 팔로우앱을 사용합니다(혈당만).</string>
+    <string name="nsclient_dexcomfollowxdrip">xDrip앱을 사용한다면 덱스콤 팔로우앱을 사용합니다.</string>
+    <string name="nsclient_xdripfollower">xDrip에서 팔로어 모드를 이용합니다.</string>
+    <string name="nsclient_looponiphone">아이폰에서 Loop앱을 이용합니다.</string>
+    <string name="nsclient_spikeiphone">아이폰에서 Spike앱을 이용합니다.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Children/Children.html</string>
+    <string name="isf_label">주제: ISF(인슐린 민감도)</string>
+    <string name="isf_increasingvalue">높은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
+    <string name="isf_decreasingvalue">낮은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
+    <string name="isf_noeffect">ISF 값 변경은 AAPS가 고혈당을 잡으려고 할때의 인슐린양에 아무런 영향을 주지 않습니다.</string>
+    <string name="isf_preferences">설정에서 ISF 값을 입력해야합니다.</string>
+    <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
+    <string name="ic_label">주제: IC(인슐린-탄수화물 비)</string>
+    <string name="ic_increasingvalue">높은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
+    <string name="ic_decreasingvalue">낮은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
+    <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
+    <string name="ic_different">빵유닛(Bread Unit)을 10g 혹은 12g으로 계산한다면 IC 값도 달라집니다.</string>
+    <string name="ic_meaning">IC의 의미는 다음과 같습니다: 1U의 인슐린으로 얼마나 많은 빵유닛(Bread Units)이 처리되는지.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">주제: 프로파일 변경</string>
+    <string name="profileswitch_pctwillchange">프로파일을 90%로 설정하면 어떻게 됩니까?</string>
+    <string name="profileswitch_basalhigher">Basal이 10% 높아집니다.</string>
+    <string name="profileswitch_basallower">Basal이 10% 낮아집니다.</string>
+    <string name="profileswitch_ichigher">IC 값이 10% 높아집니다.</string>
+    <string name="profileswitch_iclower">IC 값이 10% 낮아집니다.</string>
+    <string name="profileswitch_isfhigher">ISF 값이 10% 높아집니다.</string>
+    <string name="profileswitch_isflower">ISF 값이 10% 낮아집니다.</string>
+    <string name="profileswitch_overall">전체적으로 약 10 % 더 적은 인슐린이 주입되게 됩니다.</string>
+    <string name="profileswitch_targethigher">목표가 10% 높아집니다.</string>
+    <string name="profileswitch_targetlower">목표가 10% 낮아집니다.</string>
+    <string name="profileswitch_targetbottom">하한 목표만 10% 낮아집니다.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">평소보다 1 시간 일찍 일어난 경우, AAPS에게 당신의 변경된 일정을 알리려면 어떻게 해야합니까?</string>
+    <string name="profileswitchtime_1">시간이동 1로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime__1">시간이동 -1로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">시간이동 60으로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime__60">시간이동 -60으로 프로파일을 변경합니다.</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Topic: Basal 값에 대한 도움</string>
+    <string name="basalhelp_where">Basal값 등과 관련된 도움을 어디서 받아야 하나요?</string>
+    <string name="basalhelp_diabetesteam">의료진</string>
+    <string name="basalhelp_google">구글(Google)</string>
+    <string name="basalhelp_facebook">페이스북(Facebook)</string>
+    <string name="other_medication_label">기타 의약품</string>
+    <string name="other_medication_text">AAPS는 혈당을 올리기 위하여 Basal값을 내립니다. SGLT2 억제제(gliflozins) 계열의 의약품들은 예상되는 혈당 상승을 억제하여 인슐린 결핍 (케톤산증)을 유발할 수 있습니다.
+\n일반적인 브랜드명은 다음과 같습니다: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n본인은 AAPS를 사용할 때 이러한 의약품을 복용하지 않거나 혹은 이러한 의약품을 복용하기 전에 Loop를 비활성화 할것임을 약속합니다.</string>
+</resources>
diff --git a/app/src/main/res/values-ko-rKR/objectives.xml b/app/src/main/res/values-ko-rKR/objectives.xml
index 70489fbc5e..86f97a4f64 100644
--- a/app/src/main/res/values-ko-rKR/objectives.xml
+++ b/app/src/main/res/values-ko-rKR/objectives.xml
@@ -1,3 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="objectives_button_back">뒤로</string>
+    <string name="objectives_button_start">시작</string>
+    <string name="objectives_button_verify">확인</string>
+    <string name="nth_objective">%1$d. 목표</string>
+    <string name="objectivenotstarted">목표 %1$d이 시작되지 않았습니다</string>
+    <string name="objectivenotfinished">목표 %1$d이 완료되지 않았습니다</string>
+    <string name="objectives_0_objective">시각화 및 모니터링 설정하고, Basal과 비율을 분석합니다.</string>
+    <string name="objectives_0_gate">Nightscout에서 혈당 데이터가 잘 들어오는지, 펌프, 인슐린 데이터가 업로드 되는지 확인합니다</string>
+    <string name="objectives_openloop_objective">Open Loop를 시작합니다</string>
+    <string name="objectives_openloop_gate">며칠 동안 Open Loop 모드를 사용하고 수동으로 임시Basal을 실행하여 봅니다. 사용자 정의 임시 목표와 (\'활동\', \'저혈당\' 같은) 기본 임시목표를 사용해봅니다</string>
+    <string name="objectives_maxbasal_objective">임시Basal 추천기능과 Open Loop에 대해 이해합니다</string>
+    <string name="objectives_maxbasal_gate">이 경험을 토대로, 최대 Basal을 결정하고 이를 펌프와 설정에 입력합니다</string>
+    <string name="objectives_maxiobzero_objective">Closed Loop를 시작하고 저혈당인슐린 중지 기능(LGS)을 사용해 봅니다</string>
+    <string name="objectives_maxiobzero_gate">최대 IOB = 0 인 상태로 Closed Loop를 몇일동안 실행하되 저혈당 인슐린일시중지(LGS)가 많이 발생하지 않도록 합니다</string>
+    <string name="objectives_maxiob_objective">Closed Loop를 조정하여 최대 IOB를 0 이상으로 올려서 서서히 혈당 목표치를 낮추어 봅니다</string>
+    <string name="objectives_maxiob_gate">혈당을 낮추기 전에 몇일간 사용해보되 최소한 하루는 저혈당 알람이 발생하지 않도록 해봅니다</string>
+    <string name="objectives_autosens_objective">필요하면 Basal과 비율을 조절하고, auto-sens를 활성화합니다</string>
+    <string name="objectives_autosens_gate">섭취한 탄수화물양을 입력하고 1주일동안 낮시간대에 loop를 성공적으로 사용하여 봅니다</string>
+    <string name="objectives_ama_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 봅니다</string>
+    <string name="objectives_smb_objective">낮시간대에 SMB(Super Micro Bolus)같은 추가기능을 활성화해 사용해봅니다</string>
+    <string name="objectives_smb_gate">SMB가 잘 작동하게 하기위해서 wiki를 반드시 읽은 다음 maxIOB 값을 올려보세요! maxIOB=평균 식사 Bolus + 3 x 최대하루 Basal이면 적당한 시작값입니다</string>
+    <string name="objectives_bgavailableinns">NS에서 혈당이 확인 가능합니다</string>
+    <string name="objectives_pumpstatusavailableinns">NS에서 펌프상태가 확인 가능합니다</string>
+    <string name="objectives_manualenacts">수동 주입</string>
+    <string name="accomplished">완료: %1$s</string>
+    <string name="objectives_usage_objective">AndroidAPS를 사용하는 방법을 배워봅니다</string>
+    <string name="objectives_usage_gate">AndroidAPS에서 다양한 작업을 수행해보세요</string>
+    <string name="objectives_useprofileswitch">10분동안 프로파일 90%를 설정해보세요(홈에서 프로파일명을 길게 눌러보세요)</string>
+    <string name="objectives_usedisconnectpump">샤워한다고 가정하고 펌프를 1시간 동안 펌프를 일시중지하세요 (홈에서 Open Loop를 길게 눌러보세요)</string>
+    <string name="objectives_usereconnectpump">... 그리고 같은 방법으로 펌프를 재연결하세요</string>
+    <string name="objectives_usetemptarget">사용자정의 임시 목표를 10분동안 실행해보세요 (홈에서 본인의 현재 목표혈당을 길게 눌러보세요)</string>
+    <string name="objectives_useactions">구성관리자에서 실행 플러그인을 활성화하고 메뉴에서 표시되게 합니다</string>
+    <string name="objectives_useloop">Loop 플러그인 내용을 표시합니다</string>
+    <string name="objectives_usescale">홈의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
+    <string name="objectives_button_enter">입력</string>
+    <string name="codeaccepted">코드 인증</string>
+    <string name="codeinvalid">잘못된 코드</string>
+    <string name="objectives_exam_objective">당신의 지식을 확인해봅니다</string>
+    <string name="objectives_exam_gate">다음 질문에 대해 공부하고 올바른 답을 선택하세요</string>
+    <string name="answerdisabledto">다음 시간까지 답변 불가능: %1$s</string>
+    <string name="wronganswer">잘못된 답변!</string>
+    <string name="unfinshed_button">다음 미답변</string>
+    <string name="requestcode">요청 코드: %1$s</string>
+    <string name="objectives_hint">(올바른 답변을 모두 체크하세요)</string>
+    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#config-builder</string>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="notconnected">인터넷에 연결되지 않음</string>
+    <string name="failedretrievetime">시간을 가져오지 못했습니다</string>
+    <string name="requirementnotmet">목표 요구 사항이 충족되지 않음</string>
+    <plurals name="objective_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="other">%1$d 분</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 167b2d0412..66e4215fe6 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -96,6 +95,7 @@
     <string name="openapsma_profile_label">프로파일</string>
     <string name="openapsma_mealdata_label">식사 데이터</string>
     <string name="result">결과</string>
+    <string name="result_insulin_carbs">결과: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">혈당 데이터 없음</string>
     <string name="nochangerequested">변경사항 없음</string>
     <string name="openapsma_request_label">요청</string>
@@ -104,11 +104,11 @@
     <string name="reason">근거</string>
     <string name="glucose">혈당</string>
     <string name="delta">증분</string>
-    <string name="sms_delta">증분:</string>
+    <string name="sms_delta">Delta:</string>
     <string name="configbuilder">구성 관리자</string>
     <string name="objectives">목표</string>
     <string name="openapsma">OpenAPS MA</string>
-    <string name="overview">개요</string>
+    <string name="overview">홈</string>
     <string name="nsprofile">NS 프로파일</string>
     <string name="simpleprofile">Simple 프로파일</string>
     <string name="treatments">관리</string>
@@ -123,7 +123,7 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">어떤 APS 알고리즘을 사용합니까?</string>
     <string name="configbuilder_general">일반</string>
-    <string name="configbuilder_general_description">유용한 여러가지 플로그인</string>
+    <string name="configbuilder_general_description">유용한 여러가지 플러그인</string>
     <string name="configbuilder_constraints_description">어떤 제약을 적용합니까?</string>
     <string name="days">일</string>
     <string name="constraints">제한</string>
@@ -142,6 +142,7 @@
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
+    <string name="overview_newtempbasal_basalpercent">Basal 값 [%]</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
@@ -153,7 +154,7 @@
     <string name="sms_basal">Basal:</string>
     <string name="carbs">탄수화물</string>
     <string name="changeyourinput">입력값을 변경하세요!</string>
-    <string name="configbuilder_bgsource">혈당 소스</string>
+    <string name="configbuilder_bgsource">혈당 출처</string>
     <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
     <string name="xdrip">xDrip</string>
     <string name="apsmode_title">APS 모드</string>
@@ -179,8 +180,9 @@
     <string name="careportal_cgmsensorinsert">CGM 센서 삽입</string>
     <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
     <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
+    <string name="careportal_profileswitch">프로파일 변경</string>
     <string name="careportal_snackbolus">간식Bolus</string>
-    <string name="careportal_mealbolus">식사Bolus</string>
+    <string name="careportal_mealbolus">Meal Bolus</string>
     <string name="careportal_correctionbolus">교정Bolus</string>
     <string name="careportal_combobolus">콤보Bolus</string>
     <string name="careportal_tempbasalstart">임시Basal 시작</string>
@@ -199,6 +201,7 @@
     <string name="careportal_newnstreatment_percent_label">퍼센트</string>
     <string name="careportal_newnstreatment_absolute_label">절대값</string>
     <string name="careportal_newnstreatment_notes_label">노트</string>
+    <string name="event_time_label">이벤트 시간</string>
     <string name="careportal_newnstreatment_profile_label">프로파일</string>
     <string name="careportal_newnstreatment_enteredby_title">입력자</string>
     <string name="careportal_newnstreatment_glucosetype">혈당 종류</string>
@@ -206,6 +209,7 @@
     <string name="overview_tempbasal_button">임시Basal</string>
     <string name="overview_extendedbolus_button">확장 Bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
+    <string name="missing_carbs">누락 %1$dg</string>
     <string name="exported">설정이 저장되었습니다</string>
     <string name="export_to">다음 위치에 설정을 저장하시겠습니까</string>
     <string name="import_from">다음 위치에서 설정을 불러오시겠습니까</string>
@@ -222,6 +226,7 @@
     <string name="connecting">연결중</string>
     <string name="connected">연결됨</string>
     <string name="disconnected">연결 끊김</string>
+    <string name="danar_pump_settings">다나 펌프 설정</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
@@ -248,16 +253,30 @@
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_mealbolusreplywithcode">MEAL Bolus %1$.2f을 주입하려면 %2$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_temptargetwithcode">임시목표 %1$s를 설정하려면 %2$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_temptargetcancel">임시목표를 취소하려면 %1$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_stopsmswithcode">SMS 원격 기능을 비활성화려면 %1$s를 입력하고 답장하세요.\n\nAAPS 마스터폰을 통해서만 다시 활성화할 수 있습니다.</string>
+    <string name="smscommunicator_stoppedsms">SMS 원격 기능이 중지되었습니다. 다시 활성화하려면 AAPS 마스터폰을 이용하세요.</string>
     <string name="smscommunicator_calibrationreplywithcode">보정값 %1$.2f을 전송하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_bolusfailed">Bolus failed</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">원격 Bolus를 주입한 후 얼마간의 시간이 흐른 후에야 다음 원격 Bolus주입이 가능합니다</string>
+    <string name="smscommunicator_remotebolusmindistance">원격 Bolus를 주입한 후 몇분이 지나야 다음 원격 Bolus 주입이 가능하게 합니까</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">안전을 위하여 이 설정을 수정하기 위해 최소 2개의 폰 번호를 추가해야합니다.</string>
     <string name="bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다.</string>
     <string name="bolusrequested">%1$.2fU을 주입합니다</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다</string>
+    <string name="smscommunicator_mealbolusdelivered">Meal Bolus %1$.2f이 주입 완료되었습니다</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">%2$d 분 동안 목표 %1$s</string>
+    <string name="smscommunicator_tt_set">%2$d 분 동안 목표 %1$s 설정이 완료되었습니다</string>
+    <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
     <string name="bolusdelivering">%1$.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
-    <string name="glucosetype_finger">체혈</string>
+    <string name="glucosetype_finger">채혈</string>
     <string name="glucosetype_sensor">센서</string>
     <string name="manual">수동</string>
+    <string name="careportal_temporarytarget">임시 목표</string>
+    <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">인슐린 활동 기간</string>
@@ -308,21 +327,24 @@
     <string name="smscommunicator_remotecommandnotallowed">원격 명령이 허가되지 않았습니다</string>
     <string name="smscommunicator_remotebolusnotallowed">원격 주입이 불가능합니다. 나중에 다시 시도해주세요.</string>
     <string name="smscommunicator_basalreplywithcode">%2$d분 동안 Basal %1$.2fU/h 주입하려면 %3$s 를 입력하고 답장하세요</string>
-    <string name="smscommunicator_profilereplywithcode">프로파일을 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_profilereplywithcode">프로파일 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_extendedreplywithcode">%2$d분 동안 확장 Bolus %1$.2fU 주입하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_carbsreplywithcode">%2$s에 %1$dg을 입력하려면 %3$s를 입력하고 답장하세요</string>
     <string name="smscommunicator_basalpctreplywithcode">%2$d 분 동안 Basal %1$d%% 주입하려면 %3$s을 입력하고 답장하세요</string>
     <string name="smscommunicator_suspendreplywithcode">%1$d분동안 Loop 일시중지하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalset">Temp Basal %1$.2fU/h for %2$d min started successfully</string>
-    <string name="smscommunicator_extendedset">%2$d분 동안 확장Bolus %1$.2fU주입이 성공적으로 시작되었습니다</string>
-    <string name="smscommunicator_tempbasalset_percent">%2$d분 동안 임시Basal %1$d%%주입이 성공적으로 시작되었습니다</string>
+    <string name="smscommunicator_extendedset">Extended bolus %1$.2fU for %2$d min started successfully</string>
+    <string name="smscommunicator_carbsset">탄수화물 %1$dg 입력이 완료되었습니다</string>
+    <string name="smscommunicator_carbsfailed">탄수화물 %1$dg 입력이 실패하였습니다</string>
+    <string name="smscommunicator_tempbasalset_percent">Temp basal %1$d%% for %2$d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp Basal start failed</string>
-    <string name="smscommunicator_extendedfailed">확장 Bolus 실행 실패</string>
+    <string name="smscommunicator_extendedfailed">Extended bolus start failed</string>
     <string name="smscommunicator_basalstopreplywithcode">임시Basal을 중지하려면 %1$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_extendedstopreplywithcode">확장 Bolus를 중지하려면 %1$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalcanceled">Temp Basal canceled</string>
-    <string name="smscommunicator_extendedcanceled">확장 Bolus 취소</string>
+    <string name="smscommunicator_extendedcanceled">Extended bolus canceled</string>
     <string name="smscommunicator_tempbasalcancelfailed">Canceling Temp Basal failed</string>
-    <string name="smscommunicator_extendedcancelfailed">확장 Bolus 취소가 실패하였습니다.</string>
+    <string name="smscommunicator_extendedcancelfailed">Canceling extended bolus failed</string>
     <string name="smscommunicator_unknowncommand">알려지지 않은 명령이거나 잘못된 답장입니다</string>
     <string name="quickwizard">빠른마법사</string>
     <string name="quickwizardsettings">빠른마법사 설정</string>
@@ -332,12 +354,12 @@
     <string name="overview_editquickwizardlistactivity_add">추가</string>
     <string name="overview_quickwizard_item_edit_button">수정</string>
     <string name="overview_quickwizard_item_remove_button">삭제</string>
-    <string name="mealbolus">식사</string>
+    <string name="mealbolus">Meal</string>
     <string name="correctionbous">교정주입</string>
     <string name="actions">실행</string>
     <string name="androidaps_start">AndroidAPS 시작</string>
     <string name="ns_upload_only">NS에 업로드만 하기(동기화 안됨)</string>
-    <string name="ns_upload_only_summary">NS에 업로드만 하기. 로컬소스(xDrip)가 선택되지 않으면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
+    <string name="ns_upload_only_summary">NS에 업로드만 하기. xDrip같은 로컬 혈당 출처가 선택되지 않다면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="pumpNotInitializedProfileNotSet">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <string name="primefill">교체/채움</string>
@@ -347,11 +369,14 @@
     <string name="button1">버튼1</string>
     <string name="button2">버튼2</string>
     <string name="button3">버튼3</string>
+    <string name="units_colon">단위:</string>
+    <string name="units">단위</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="dia">DIA</string>
     <string name="target_range">목표 범위:</string>
     <string name="prefs_range_title">차트 표시 범위</string>
-    <string name="prefs_range_summary">스마트워치 차트 고/저혈당 선</string>
+    <string name="prefs_range_summary">홈화면/스마트워치의 차트에서 표시되는 고/저혈당 선</string>
     <string name="low_mark">저혈당 선</string>
     <string name="high_mark">고혈당 선</string>
     <string name="wear">워치</string>
@@ -390,6 +415,7 @@
     <string name="eatingsoon">식사직전</string>
     <string name="hypo">저혈당</string>
     <string name="activity">활동</string>
+    <string name="removerecord">기록 삭제</string>
     <string name="danar_stats">DanaR 통계</string>
     <string name="danar_stats_cumulative_tdd">누적 일총량</string>
     <string name="danar_stats_expweight">지수가중 일총량</string>
@@ -527,8 +553,12 @@
     <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
+    <string name="show_statuslights_extended">홈화면에 확장 상태등 표시하기</string>
+    <string name="show_statuslights_extended_summary">홈화면에 캐뉼라 사용기간(cage), 인슐린 사용기간(iage), 센서 사용기간(sage), 펌프용 주사기(reservoir)와 배터리(battery) 남은 양에 대한 확장 표시등을 활성화합니다.</string>
     <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
     <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
+    <string name="statuslights_bat_warning">배터리 잔량 경고값 [%]</string>
+    <string name="statuslights_bat_critical">배터리 잔량 위험값 [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">펌웨어</string>
@@ -552,6 +582,7 @@
     <string name="careportal_insulinage_label">인슐린 사용기간</string>
     <string name="hours">시간</string>
     <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
+    <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
@@ -561,8 +592,8 @@
     <string name="nsalarm_urgentlow">위험 저혈당</string>
     <string name="nsalarm_staledata">누락 데이터</string>
     <string name="nsalarm_urgentstaledata">위험 누락 데이터</string>
-    <string name="nsalarm_staledatavalue_label">누락 데이터 기준값[분]</string>
-    <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값[분]</string>
+    <string name="nsalarm_staledatavalue_label">누락 데이터 기준값 [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값 [min]</string>
     <string name="openapsama_autosens_period">autosens 시간 [h]</string>
     <string name="openapsama_autosens_period_summary">민감도를 감지하기 위해 계산될 총 시간 (탄수화물 흡수 시간은 제외됩니다.)</string>
     <string name="pump">펌프</string>
@@ -594,6 +625,7 @@
     <string name="mdtp_cancel">취소</string>
     <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
     <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
+    <string name="ns_localbroadcasts">다른 앱 (예 : xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient 인스턴스를 두 개 이상 설치 한 경우 활성화하지 마세요!</string>
     <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
     <string name="careportal_activity_label">활동 &amp; 피드백</string>
     <string name="careportal_carbsandbolus_label">탄수화물 &amp; Bolus</string>
@@ -608,7 +640,7 @@
     <string name="enableuam_summary">알리지 않은 식사 감지</string>
     <string name="insulin_oref_peak">IOB 커브 피크 시간</string>
     <string name="insulin_peak_time">피크 시간 [min]</string>
-    <string name="free_peak_oref">자유-피크 Oref</string>
+    <string name="free_peak_oref">사용자지정-피크 Oref</string>
     <string name="rapid_acting_oref">초속효성 Oref</string>
     <string name="ultrarapid_oref">초-초속효성 Oref</string>
     <string name="dia_too_short">DIA %1$f는 너무 짧습니다. 대신 %2$f을 사용하세요!</string>
@@ -618,6 +650,7 @@
     <string name="waitingforpairing">펌프연동 대기중</string>
     <string name="pairingok">연동완료</string>
     <string name="pairingtimedout">연동시간초과</string>
+    <string name="pairing">동기화</string>
     <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
     <string name="emptyreservoir">빈 주사기</string>
     <string name="bloodsugarmeasurementalert">혈당측정알람</string>
@@ -634,7 +667,7 @@
     <string name="default_temptargets">임시목표 기본값</string>
     <string name="eatingsoon_duration">식사직전 기간</string>
     <string name="eatingsoon_target">식사직전 목표</string>
-    <string name="activity_duration">activity 기간</string>
+    <string name="activity_duration">활동 기간</string>
     <string name="activity_target">활동 목표</string>
     <string name="hypo_duration">저혈당 기간</string>
     <string name="hypo_target">저혈당 목표</string>
@@ -652,6 +685,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">분</string>
     <string name="shorthour">시간</string>
+    <string name="shortday">일</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -680,6 +714,7 @@
     <string name="bgsource_upload">혈당 업로드 설정</string>
     <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
+    <string name="smbmaxminutes">SMB 최대 분</string>
     <string name="smbmaxminutes_summary">SMB가 Basal을 제한할 수 있는 최대 시간(분)</string>
     <string name="unsupportedfirmware">지원되지 않는 펌프 펌웨어</string>
     <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
@@ -726,6 +761,7 @@
     <string name="bolus_frequency_exceeded">2개의 동일한 양의 Bolus 주입이 요청되었습니다. 이중으로 Bolus가 주입 되는 사고를 막고 버그로부터 보호하기 위하여 이는 금지됩니다.</string>
     <string name="combo_pump_connected_now">현재</string>
     <string name="combo_activity_reading_pump_history">펌프 이력 읽기</string>
+    <string name="danar_history">펌프 이력</string>
     <string name="combo_activity_setting_basal_profile">Basal 프로파일 설정</string>
     <string name="combo_pump_cartridge_low_warrning">펌프 카트리지 레벨이 낮습니다.</string>
     <string name="combo_pump_battery_low_warrning">펌프배터리가 부족합니다.</string>
@@ -745,15 +781,16 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">전</string>
     <string name="format_hours">%1$.2f 시간</string>
-    <string name="enablesmbalways">항상 SMB를 사용합니다.</string>
-    <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
+    <string name="format_mins">%1$d 분</string>
+    <string name="enablesmbalways">항상 SMB 사용하기</string>
+    <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당출처와만 사용이 가능합니다.</string>
     <string name="enablesmbaftercarbs">탄수화물 이후 SMB를 사용합니다.</string>
-    <string name="enablesmbaftercarbs_summary">탄수화물 이후 6시간동안 SMB를 사용합니다, 0 COB이라도 적용됩니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
+    <string name="enablesmbaftercarbs_summary">탄수화물 이후 6시간동안 SMB를 사용합니다, 0 COB이라도 적용됩니다. G5처럼 잘 필터된 혈당출처와만 사용이 가능합니다.</string>
     <string name="enablesmbwithcob">COB와 SMB를 사용합니다.</string>
     <string name="enablesmbwithcob_summary">활성화된 COB가 있으면 SMB를 사용합니다.</string>
-    <string name="enablesmbwithtemptarget">임시 목표와 SMB를 사용합니다.</string>
+    <string name="enablesmbwithtemptarget">임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithtemptarget_summary">활성화된 임시 목표(식사직전, 운동)가 있으면 SMB를 사용합니다.</string>
-    <string name="enablesmbwithhightemptarget">높은임시 목표와 SMB를 사용합니다.</string>
+    <string name="enablesmbwithhightemptarget">높은 임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithhightemptarget_summary">활성화된 높은 임시 목표(운동)가 있으면 SMB를 사용합니다.</string>
     <string name="let_temp_basal_run">임시Basal 허용</string>
     <string name="mute">음소거</string>
@@ -840,7 +877,7 @@
     <string name="readstatusfailed">상태를 읽지 못했습니다.</string>
     <string name="record_pump_site_change">펌프 위치 변경 기록</string>
     <string name="record_insulin_cartridge_change">인슐린 카트리지 변경 기록</string>
-    <string name="smbalwaysdisabled">선택한 BG 소스가 고급 필터링을 지원하지 않기 때문에 SMB가 항상 비활성화됩니다.</string>
+    <string name="smbalwaysdisabled">선택한 혈당 출처가 고급 필터링을 지원하지 않기 때문에 SMB가 항상 비활성화됩니다.</string>
     <string name="smbnotallowedinopenloopmode">Open Loop모드에선 SMB가 허용되지 않습니다.</string>
     <string name="food_short">Food</string>
     <string name="reset">재설정</string>
@@ -851,7 +888,7 @@
     <string name="pump_stopped">펌프 중지</string>
     <string name="pump_started">펌프 시작</string>
     <string name="pump_paused">펌프 일시중지</string>
-    <string name="absorption_cutoff_title">식사 최대 흡수 시간[h]</string>
+    <string name="absorption_cutoff_title">식사 최대 흡수 시간 [h]</string>
     <string name="absorption_cutoff_summary">식사가 모두 흡수되었다고 간주되는 시간. 나머지 탄수화물은 모두 없어집니다.</string>
     <string name="time">시간</string>
     <string name="overview_show_notes_field_in_dialogs_title">관리창에 노트 영역 보여주기</string>
@@ -902,12 +939,13 @@
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient는 Nightscout와의 연결을 처리합니다. 이 부분을 건너뛸 수 있지만 설정하기 전엔 목적을 수행할 수 없습니다.</string>
     <string name="diawarning">새로운 인슐린 프로파일은 최소 5시간의 DIA가 요구됩니다. 새로운 프로파일의 DIA 5-6시간은 구식 인슐린 프로파일의 DIA 3시간과 동일합니다.</string>
-    <string name="bgsourcesetup">혈당소스 설정하기</string>
+    <string name="bgsourcesetup">혈당 출처 설정하기</string>
     <string name="setupwizard_profile_description">프로파일 소스를 선택해주세요. 당뇨인이 어린이라면 NS 프로파일을 선택하여야 합니다. Nightscout으로 관리해줄 사람이 없다면 당신은 로컬 프로파일을 선호할 수도 있습니다. 여기선 프로파일의 소스를 선택할 뿐이라는 것을 명심하세요. 그 프로파일을 실제 사용하려면 \"프로파일 변경\"을 실행하여 프로파일을 활성화 시켜야합니다.</string>
     <string name="setupwizard_aps_description">사용 가능한 알고리즘 중 하나를 선택하세요. 과거부터 최신의 순으로 정렬이 되어 있습니다. 일반적으로 새로운 알고리즘은 보다 강력하고 공격적입니다. 따라서 당신이 신규 사용자라면 최신의 알고리즘보단 AMA로 시작하는것이 나을 수 있습니다. 사용 전에 OpenAPS 문서를 읽어보고 설정하는 것을 잊지마세요.</string>
     <string name="startobjective">첫번째 목표를 시작하세요.</string>
     <string name="permission">권한</string>
     <string name="askforpermission">권한 요청하기</string>
+    <string name="needsystemwindowpermission">알림에 대한 시스템 창 권한이 필요합니다</string>
     <string name="needlocationpermission">블루투스 스캔을 위해 위치 권한이 필요로 합니다.</string>
     <string name="needstoragepermission">로그 파일을 저장하기 위해 저장공간 권한이 필요로 합니다.</string>
     <string name="request">요청</string>
@@ -921,7 +959,11 @@
     <string name="danar_pumpalarm_sound">소리</string>
     <string name="danar_pumpalarm_vibrate">진동</string>
     <string name="danar_pumpalarm_both">모두</string>
+    <string name="danar_screentimeout">LCD 시간 [seconds]</string>
+    <string name="danar_backlight">화면조명 시간 [seconds]</string>
     <string name="danar_glucoseunits">혈당 단위</string>
+    <string name="danar_shutdown">종료 [hours]</string>
+    <string name="danar_lowreservoir">낮은 주사기량 [Units]</string>
     <string name="danar_saveuseroptions">펌프로 옵션 저장</string>
     <string name="option_on">켜짐</string>
     <string name="option_off">꺼짐</string>
@@ -1114,6 +1156,8 @@
     <string name="tidepool_upload_tbr">임시 Basal 업로드</string>
     <string name="tidepool_upload_profile">프로파일변경, 임시목표 업로드</string>
     <string name="tidepool_upload_bg">혈당 테스트 업로드</string>
+    <string name="dst_in_24h_warning">24시간 미만의 썸머타임 변경</string>
+    <string name="dst_loop_disabled_warning">썸머타임 변경이 3시간 미만입니다 - Closed Loop 비활성됨</string>
     <string name="storage">내부 저장 용량 제한</string>
     <string name="diskfull">내부 저장 공간을 최소 %1$d MB 이상 비우세요! Loop가 비활성화되었습니다!</string>
     <string name="wrongformat">잘못된 형식</string>
@@ -1137,6 +1181,7 @@
     <string name="running_invalid_version">유효하지 않은 버전을 이용 중입니다. Loop가 비활성화 되었습니다!</string>
     <string name="old_version">오래된 버전</string>
     <string name="very_old_version">아주 오래된 버전</string>
+    <string name="new_version_warning">최소 %1$d일 새버전이 가능합니다! %2$d일 후엔 LGS(저혈당주입중지)으로 복귀되며, %3$d일이후엔 Loop가 비활성화 될 것입니다</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Dexcom 앱(패치버전)</string>
@@ -1164,12 +1209,20 @@
     <string name="longitude_short">경도</string>
     <string name="distance_short">거리 [m]:</string>
     <string name="name_short">이름:</string>
-    <string name="lastboluslabel">마지막 Bolus 전</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">때 </string>
+    <string name="location_inside">당신이 그 지역내에 있을 때</string>
+    <string name="location_outside">당신이 그 지역밖에 있을 때</string>
+    <string name="location_going_in">당신이 다음 이름의 지역에 들어갔을 때</string>
+    <string name="location_going_out">당신이 다음 이름의 지역에서 떠날 때</string>
+    <string name="lastboluslabel">마지막 Bolus</string>
     <string name="lastboluscompared">마지막 Bolus 시간 %1$s %2$s 분 전</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">작업명</string>
     <string name="edit_short">편집</string>
+    <string name="please_choose_an_action_type">실행 유형을 선택하세요</string>
+    <string name="please_choose_a_trigger_type">트리거 유형을 선택하세요</string>
     <string name="triggers">트리거:</string>
     <string name="remove_label">삭제</string>
     <string name="preconditions">전제 조건:</string>
@@ -1197,6 +1250,8 @@
     <string name="medtronic_pump_battery_no">선택되지 않음(심플뷰)</string>
     <string name="medtronic_pump_battery_alkaline">알카라인(확장뷰)</string>
     <string name="medtronic_pump_battery_lithium">리튬(확장뷰)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (확장 뷰)</string>
+    <string name="medtronic_bolus_debugging">Bolus/관리 디버깅</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">스캔</string>
     <string name="rileylink_scanner_scan_stop">중지</string>
@@ -1235,6 +1290,7 @@
     <string name="rileylink_state_not_started">시작되지 않았습니다.</string>
     <string name="rileylink_state_rl_init">RileyLink 초기화…</string>
     <string name="rileylink_state_rl_error">RileyLink 에러</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
     <string name="rileylink_state_pc_error">펌프 연결 문제</string>
     <string name="rileylink_state_connected">연결됨</string>
     <!-- RL Errors -->
@@ -1259,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">지원되지 않는 펌프 주파수입니다.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink 주소가 유효하지 않습니다.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">감지된 펌프타입이 설정된 타입과 다릅니다.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal 프로파일/패턴 설정이 펌프에서 활성화되지 않았습니다. 펌프에서 활성화해주세요.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">펌프에 설정된 Basal 프로파일이 올바르지 않습니다 (STD 이어야 합니다).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">펌프에 잘못된 TBR 유형이 설정되었습니다 (절대값이어야합니다).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">펌프에 잘못된 최대 Bolus가 설정되었습니다 (%1$.2f 이어야 합니다.).</string>
@@ -1303,6 +1360,15 @@
     <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
     <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
     <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
+    <string name="profilename">프로파일을 변경</string>
+    <string name="changengetoprofilename">프로파일을 %1$s으로 변경</string>
+    <string name="automation_trigger_pump_last_connection_label">펌프와의 마지막 연결</string>
+    <string name="automation_trigger_pump_last_connection_description">펌프와의 마지막 연결 [분 전]</string>
+    <string name="automation_trigger_pump_last_connection_compared">펌프와의 마지막 연결 %1$s %2$s 분 전</string>
+    <string name="sendsmsactionlabel">SMS 전송: %1$s</string>
+    <string name="sendsmsactiondescription">모든 번호에 SMS 전송</string>
+    <string name="sendsmsactiontext">문자 포함된 SMS 보내기</string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus 제약 적용: %2$.2fU 에서 %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1310,4 +1376,81 @@
     <string name="deliverpartofboluswizard">Bolus 마법사는 계산을 수행하지만 계산된 인슐린의 이 부분만 주입됩니다. SMB 알고리즘에 유용합니다.</string>
     <string name="loading">불러오는 중…</string>
     <string name="snooze">스누즈</string>
+    <string name="time_range">시간 범위</string>
+    <string name="timerange_value">시간은 %1$s 와 %2$s사이입니다</string>
+    <string name="between">사이 </string>
+    <string name="close">닫기</string>
+    <string name="increasingmaxbasal">설정이 프로파일에서의 최대 Basal보다 낮은 이유로 최대 Basal을 올립니다</string>
+    <string name="smscommunicator_messagebody">잘못된 메시지 내용</string>
+    <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
+    <string name="format_percent">%1$d%%</string>
+    <string name="boluswizard">Bolus 마법사</string>
+    <string name="unit_minute_short">분</string>
+    <string name="profile_name">프로파일명:</string>
+    <string name="selected_profile">선택:</string>
+    <string name="unitsnosemicolon">단위</string>
+    <string name="doyouwantswitchprofile">프로파일을 변경하고 현재 프로파일에 대한 변경 사항을 버리시겠습니까?</string>
+    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">켜기</string>
+    <string name="common_off">끄기</string>
+    <string name="objectives_button_unfinish">완료 초기화</string>
+    <string name="objectives_button_unstart">시작 초기화</string>
+    <string name="timedetection">시간 감지</string>
+    <string name="doyouwantresetstart">목표를 초기화하시겠습니까? 진행상황이 삭제됩니다.</string>
+    <string name="nopumpselected">펌프가 선택되지 않음</string>
+    <string name="setupwizard_units_prompt">사용하시는 혈당 단위를 선택하세요</string>
+    <string name="ns_ploadlocalprofile">로컬 프로파일 변경을 NS에 업로드하기</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">TARG</string>
+    <string name="clone_label">복사</string>
+    <string name="saveorresetchangesfirst">우선 현재 변경사항을을 저장하거나 재설정하세요</string>
+    <string name="deletecurrentprofile">현재 프로파일을 삭제 하시겠습니까?</string>
+    <string name="copytolocalprofile">이 프로파일 변경을 기반으로 새 로컬 프로파일을 만드시겠습니까?</string>
+    <string name="profilenamecontainsdot">프로파일명에 점을 포함하고 있습니다.\n이는 NS에서 지원하지 않습니다.\n프로파일이 NS에 업로드되지 않습니다.</string>
+    <string name="low_mark_comment">혈당 정상범위의 하한값(표시 전용)</string>
+    <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
+    <string name="reorder_label">정렬</string>
+    <string name="age">나이:</string>
+    <string name="weight">몸무게:</string>
+    <string name="id">ID:</string>
+    <string name="submit">확인</string>
+    <string name="mostcommonprofile">가장 많이 사용된 프로파일:</string>
+    <string name="survey_comment">참고: 이 화면에 보이는 데이터만 익명으로 업로드됩니다. ID는 AndroidAPS 설치에 할당됩니다. 기본 프로파일이 변경되면 데이터를 다시 제출할 수 있지만 어느정도 시간 범위의 결과가 보이도록 최소 1주일 이상 실행하여 주세요. 당신의 도움 감사하겠습니다.</string>
+    <string name="nav_survey">조사</string>
+    <string name="invalidage">유효하지 않은 나이입니다</string>
+    <string name="invalidweight">유효하지 않은 몸무게입니다</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
+    <string name="average">평균</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">활동 모니터</string>
+    <string name="doyouwantresetstats">활동 통계를 초기화하시겠습니까?</string>
+    <string name="statistics">통계</string>
+    <string name="randombg">무작위 혈당</string>
+    <string name="description_source_randombg">무작위로 혈당을 생성합니다(데모 버전 전용)</string>
+    <string name="randombg_short">BG</string>
+    <string name="tools">도구</string>
+    <string name="show_calculation">계산 표시</string>
+    <string name="error">에러</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">자동화 이벤트</string>
+    <string name="alreadyset">이미 설정됨</string>
+    <string name="message">메시지</string>
+    <string name="clearqueueconfirm">대기열을 삭제하시겠습니까? 대기열에 있는 모든 데이터가 삭제됩니다!</string>
+    <string name="ebstopsloop">확장 Bolus 기능을 사용하는 동안에는 Closed Loop 모드가 중지됩니다. 정말 원하십니까?</string>
+    <string name="closed_loop_disabled_with_eb">확장 Bolus 사용으로 인해 Closed Loop가 비활성화됨</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"전화확인\"</string>
+    <string name="chartmenu">차트 메뉴</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB 요청시간</string>
+    <string name="loop_smbexecution_time_label">SMB 실행시간</string>
+    <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
+    <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
 </resources>
diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index 634982d1fc..5cd75c66cf 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Koks atsakymas apie IVT yra teisingas?</string>
     <string name="dia_label">Tema: Insulino veikimo trukmė</string>
@@ -124,9 +123,9 @@
     <string name="nsclient_spikeiphone">Spike iPhone telefone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_label">Tema: Jautrumo Insulinui Faktorius</string>
-    <string name="isf_increasingvalue">Didesnis IVT lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_decreasingvalue">Mažesnis IVT lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_noeffect">IVT reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
+    <string name="isf_increasingvalue">Didesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
+    <string name="isf_decreasingvalue">Mažesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
+    <string name="isf_noeffect">JIF reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
     <string name="isf_preferences">Nustatymuose turite įvesti JIF.</string>
     <string name="isf_profile">Jei profilyje pakeisite JIF vertę, Ciklas į pokytį iškart atsižvelgs.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -136,7 +135,7 @@
     <string name="ic_decreasingvalue">Mažesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_noeffect">Jei turite 0 AAO (aktyvių angliavandenių organizme), pakeitus IA, glikemija bus koreguojama kitokiu insulino kiekiu.</string>
     <string name="ic_different">IA vertė skirsis priklausomai nuo to, ar duonos vienetui skaičiuojate 10g, ar 12g angliavandenių.</string>
-    <string name="ic_meaning">IA reiškia: kiek vienas vienetas insulino dengia angliavandenių (gramais).</string>
+    <string name="ic_meaning">IA reiškia: kiek vienas vienetas insulino dengia duonos vienetų.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Tema: Profilio keitimas</string>
     <string name="profileswitch_pctwillchange"> Kai profilio keitime nustatote 90%…</string>
diff --git a/app/src/main/res/values-lt-rLT/objectives.xml b/app/src/main/res/values-lt-rLT/objectives.xml
index bf4a460fae..06357e3814 100644
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Atgal</string>
     <string name="objectives_button_start">Pradėti</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Parodyti Ciklo įskiepio turinį</string>
     <string name="objectives_usescale">Panaudokite vaizdo dydžio keitimo funkciją ilgai spaudžiant ant glikemijos kreivės</string>
     <string name="objectives_button_enter">Įeiti</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jei anksčiau naudojote OpenAPS ir jūsų Nightscout svetainėje yra bent trijų mėnesių uždaro ciklo duomenų, galite atsiųsti el. laišką objectives@androidaps.org su savo NS svetainės adresu, ir paprašykite kodo, kad praleistumėte likusius tikslus. Įveskite kodą, kurį pateikė kūrėjai</string>
     <string name="codeaccepted">Kodas priimtas</string>
     <string name="codeinvalid">Neteisingas kodas</string>
     <string name="objectives_exam_objective">Patvirtinkite savo žinias</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 415afbf037..98a261b098 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -143,6 +142,7 @@
     <string name="constraints_violation">Apribojimų pažeidimas</string>
     <string name="treatmentdeliveryerror">Boluso suleidimo klaida</string>
     <string name="tempbasaldeliveryerror">Laikinos bazės suleidimo klaida</string>
+    <string name="overview_newtempbasal_basalpercent">Valandinė bazė [%]</string>
     <string name="setbasalquestion">Patvirtinti naują laikiną bazę:</string>
     <string name="overview_treatment_label">Terapija</string>
     <string name="overview_calculator_label">Skaičiuotuvas</string>
@@ -180,6 +180,7 @@
     <string name="careportal_cgmsensorinsert">NGJ sensoriaus įvedimas</string>
     <string name="careportal_cgmsensorstart">NGJ sensoriaus paleidimas</string>
     <string name="careportal_insulincartridgechange">Insulino rezervuaro keitimas</string>
+    <string name="careportal_profileswitch">Profilio keitimas</string>
     <string name="careportal_snackbolus">Bolusas užkandžiui</string>
     <string name="careportal_mealbolus">Bolusas valgiui</string>
     <string name="careportal_correctionbolus">Bolusas korekcijai</string>
@@ -200,6 +201,7 @@
     <string name="careportal_newnstreatment_percent_label">Procentai</string>
     <string name="careportal_newnstreatment_absolute_label">Absoliutus</string>
     <string name="careportal_newnstreatment_notes_label">Pastabos</string>
+    <string name="event_time_label">Įvykio laikas</string>
     <string name="careportal_newnstreatment_profile_label">Profilis</string>
     <string name="careportal_newnstreatment_enteredby_title">Įvedė</string>
     <string name="careportal_newnstreatment_glucosetype">Gliukozės tipas</string>
@@ -224,6 +226,7 @@
     <string name="connecting">Jungiamasi</string>
     <string name="connected">Prisijungta</string>
     <string name="disconnected">Atsijungta</string>
+    <string name="danar_pump_settings">Dana pompos nustatymai</string>
     <string name="end_user_license_agreement">Licencinė sutartis su vartotoju</string>
     <string name="end_user_license_agreement_text">PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI.</string>
     <string name="end_user_license_agreement_i_understand">SUPRATAU IR SUTINKU</string>
@@ -252,16 +255,28 @@
     <string name="smscommunicator_bolusreplywithcode">Norėdami suleisti %1$.2fvv bolusą, atsakykite kodu %2$s</string>
     <string name="smscommunicator_mealbolusreplywithcode">Norėdami suleisti %1$.2fvv bolusą, atsakykite su kodu %2$s</string>
     <string name="smscommunicator_temptargetwithcode">Norėdami nustatyti laikiną tikslą %1$s, atsakykite su kodu %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Norėdami atšaukti laikiną tikslą, atsakykite su kodu %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Norėdami išjungti SMS nuotolinį valdymą, atsakykite kodu %1$s.\n\n Turėkite omenyje, kad jūs funkciją galėsite atnaujinti tiesiai tik iš AAPS pagrindinio telefono.</string>
+    <string name="smscommunicator_stoppedsms">SMS nuotolinio valdymo funkcija sustojo. Norėdami ją atnaujinti, naudokite AAPS pagrindinį išmanųjį telefoną.</string>
     <string name="smscommunicator_calibrationreplywithcode">Norėdami nusiųsti kalibraciją %1$.2f, atsakykite kodu %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolusas nesuleistas</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimalus minučių skaičius, kuris turi praeiti nuo vieno boluso, suleisto nuotoliniu būdu iki kito</string>
+    <string name="smscommunicator_remotebolusmindistance">Kiek mažiausiai minučių turi praeiti tarp vieno ir kito boluso</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Jūsų saugumui, norėdami redaguoti šį pasirinkimą, jums reikia pridėti ne mažiau kaip 2 telefono numerius.</string>
     <string name="bolusdelivered">%1$.2fvv bolusas sėkmingai suleistas</string>
     <string name="bolusrequested">Bus suleista %1$.2fvv</string>
     <string name="smscommunicator_bolusdelivered">%1$.2fvv bolusas sėkmingai suleistas</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolusas %1$.2fvv sėkmingai suleistas</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Tikslas %1$s %2$d minutėms</string>
+    <string name="smscommunicator_tt_set">Tikslas %1$s %2$d minutėms nustatytas sėkmingai</string>
+    <string name="smscommunicator_tt_canceled">Laikinas tikslas atšauktas sėkmingai</string>
     <string name="bolusdelivering">Leidžiama %1$.2fvv</string>
     <string name="smscommunicator_remotecommandsallowed">Leisti nuotolines komandas SMS žinutėmis</string>
     <string name="glucosetype_finger">Iš piršto</string>
     <string name="glucosetype_sensor">Iš sensoriaus</string>
     <string name="manual">Rankiniu būdu</string>
+    <string name="careportal_temporarytarget">Laikinas tikslas</string>
+    <string name="careportal_temporarytargetcancel">Laikino tikslo atšaukimas</string>
     <string name="danarprofile">DanaR profilio nustatymai</string>
     <string name="danarprofile_dia">IVT [h]</string>
     <string name="danarprofile_dia_summary">Insulino veikimo trukmė</string>
@@ -314,10 +329,13 @@
     <string name="smscommunicator_basalreplywithcode">Norėdami aktyvuoti %1$.2fvv/val bazę, kurios trukmė %2$d min, atsakykite kodu %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Norėdami perjungti profilį %1$s %2$d%%, atsakykite kodu %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Norint pradėti ištęstinį bolusą %1$.2fvv %2$d min., atsakykite kodu %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Įvedimui %1$dg %2$s atsakykite kodu %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Norėdami aktyvuoti %1$d%% bazę %2$d min., atsakykite kodu %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Norėdami sustabdyti Ciklą %1$d min., atsakykite kodu %2$s</string>
     <string name="smscommunicator_tempbasalset">%1$.2f vv/val laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai</string>
     <string name="smscommunicator_extendedset">%1$.2f vv ištęstas bolusas, kurio trukmė %2$d min., aktyvuotas sėkmingai</string>
+    <string name="smscommunicator_carbsset">%1$dg angliavandeniai įrašyti sėkmingai</string>
+    <string name="smscommunicator_carbsfailed">Įvesti %1$dg angliavandenių nepavyko</string>
     <string name="smscommunicator_tempbasalset_percent">%1$d%% laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai</string>
     <string name="smscommunicator_tempbasalfailed">Laikina bazė neaktyvuota</string>
     <string name="smscommunicator_extendedfailed">Ištęstinis bolusas nepradėtas</string>
@@ -351,8 +369,11 @@
     <string name="button1">Mygtukas 1</string>
     <string name="button2">Mygtukas 2</string>
     <string name="button3">Mygtukas 3</string>
+    <string name="units_colon">Vienetai:</string>
+    <string name="units">Vienetai</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="dia">IVT (Insulino Veikimo Trukmė)</string>
     <string name="target_range">Tikslinis diapazonas:</string>
     <string name="prefs_range_title">Vizualizacijos diapazonas</string>
     <string name="prefs_range_summary">Aukštoji ir žemoji riba Apžvalgos grafikuose bei išmaniuosiuose laikrodžiuose</string>
@@ -394,6 +415,7 @@
     <string name="eatingsoon">Netrukus valgysiu</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Aktyvumas</string>
+    <string name="removerecord">Ištrinti įrašą</string>
     <string name="danar_stats">DanaR statistika</string>
     <string name="danar_stats_cumulative_tdd">BPD viso</string>
     <string name="danar_stats_expweight">Eksponentiškai svertinė BPD</string>
@@ -560,6 +582,7 @@
     <string name="careportal_insulinage_label">Insulinas</string>
     <string name="hours">valandos</string>
     <string name="invalidprofile">Netinkamas profilis!!!</string>
+    <string name="doprofileswitch">Profilio keitimas</string>
     <string name="careportal_pbage_label">Pompos baterija</string>
     <string name="careportal_pumpbatterychange">Pompos baterijos keitimas</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
@@ -627,6 +650,7 @@
     <string name="waitingforpairing">Laukiama ryšio su pompa</string>
     <string name="pairingok">Sujungta</string>
     <string name="pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
+    <string name="pairing">Sujungiama</string>
     <string name="danars_nodeviceavailable">Nerasta jokio prietaiso</string>
     <string name="emptyreservoir">Rezervuaras tuščias</string>
     <string name="bloodsugarmeasurementalert">Gliukozės kiekio kraujyje matavimo perspėjimas</string>
@@ -661,6 +685,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">min</string>
     <string name="shorthour">val</string>
+    <string name="shortday">d</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">Energ. vertė</string>
@@ -689,6 +714,7 @@
     <string name="bgsource_upload">KG duomenų perdavimo nustatymai</string>
     <string name="wear_detailed_delta_title">Rodyti gliukozės pokyčio detales</string>
     <string name="wear_detailed_delta_summary">Rodyti pokytį su reikšme po kablelio</string>
+    <string name="smbmaxminutes">SMB max minutės</string>
     <string name="smbmaxminutes_summary">SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
     <string name="unsupportedfirmware">Pompos programinės įrangos versija nepalaikoma</string>
     <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
@@ -735,6 +761,7 @@
     <string name="bolus_frequency_exceeded">Tokio paties dydžio bolusas buvo nustatytas per paskutines dvi minutes. Siekiant išvengti atsitiktinio perdozavimo ir programos klaidų, veiksmas neleidžiamas.</string>
     <string name="combo_pump_connected_now">Dabar</string>
     <string name="combo_activity_reading_pump_history">Skaitoma pompos istorija</string>
+    <string name="danar_history">Pompos istorija</string>
     <string name="combo_activity_setting_basal_profile">Nustatyti bazės profilį</string>
     <string name="combo_pump_cartridge_low_warrning">Pompos rezervuaras beveik tuščias</string>
     <string name="combo_pump_battery_low_warrning">Pompos baterija baigia išsikrauti</string>
@@ -754,6 +781,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">prieš</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d minutės</string>
     <string name="enablesmbalways">Leisti SMB visada</string>
     <string name="enablesmbalways_summary">Leisti SMB visada, nepriklausomai nuo bolusų. Įmanoma tik naudojant patikimų, filtruotų KG duomenų šaltinį, pvz.: Dexcom G5</string>
     <string name="enablesmbaftercarbs">Leisti SMB po angliavandenių įvedimo</string>
@@ -930,7 +958,11 @@
     <string name="danar_pumpalarm_sound">Garsas</string>
     <string name="danar_pumpalarm_vibrate">Vibravimas</string>
     <string name="danar_pumpalarm_both">Abu</string>
+    <string name="danar_screentimeout">Ekrano aktyvumo laikas [seconds]</string>
+    <string name="danar_backlight">Ekrano apšvietimo laikas [seconds]</string>
     <string name="danar_glucoseunits">KG vienetai</string>
+    <string name="danar_shutdown">Išjungimas [hours]</string>
+    <string name="danar_lowreservoir">Žemas rezervuaro lygis [Units]</string>
     <string name="danar_saveuseroptions">Išsaugoti nustatymus pompoje</string>
     <string name="option_on">Įjungti</string>
     <string name="option_off">Išjungti</string>
@@ -1123,6 +1155,8 @@
     <string name="tidepool_upload_tbr">Perkelti laikiną bazę</string>
     <string name="tidepool_upload_profile">Perduoti profilio pokyčius, laikinas bazes</string>
     <string name="tidepool_upload_bg">Perduoti KG testus</string>
+    <string name="dst_in_24h_warning">Laiko persukimas įvyks po 24 val ar mažiau</string>
+    <string name="dst_loop_disabled_warning">Laiko persukimas įvyks po mažiau nei 3 val - Uždaras ciklas deaktyvuotas</string>
     <string name="storage">vidinės saugyklos apribojimas</string>
     <string name="diskfull">Atlaisvinkite ne mažiau kaip %1$d MB iš vidinės atminties! Ciklas išjungtas!</string>
     <string name="wrongformat">Neteisingas formatas</string>
@@ -1146,6 +1180,7 @@
     <string name="running_invalid_version">Nustatyta, kad naudojate neteisingą versiją. Ciklas išjungtas!</string>
     <string name="old_version">sena versija</string>
     <string name="very_old_version">labai sena versija</string>
+    <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d dienų! Po %2$d grįšite prie stabdymo prie žemo, po %3$d ciklas bus išjungtas</string>
     <string name="twohours">2 val</string>
     <string name="formatinsulinunits">%1$.2fV</string>
     <string name="dexcom_app_patched">Dexcom programėlė (modifikuota)</string>
@@ -1173,12 +1208,20 @@
     <string name="longitude_short">Ilguma:</string>
     <string name="distance_short">Atstumas [m]:</string>
     <string name="name_short">Vardas:</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Kada </string>
+    <string name="location_inside">Kai esate nustatytoje zonoje</string>
+    <string name="location_outside">Kai nesate nustatytoje zonoje</string>
+    <string name="location_going_in">Kai įeinate į zoną, kurios pavadinimas</string>
+    <string name="location_going_out">Kai paliekate zoną, kurios pavadinimas</string>
     <string name="lastboluslabel">Paskutinis bolusas</string>
     <string name="lastboluscompared">Paskutinis Bolusas prieš %1$s %2$s min</string>
     <string name="triggercoblabel">AAO</string>
     <string name="cobcompared">AAO %1$s %2$.0f</string>
     <string name="taskname">Užduoties pavadinimas</string>
     <string name="edit_short">Keisti</string>
+    <string name="please_choose_an_action_type">Pasirinkite veiksmo tipą</string>
+    <string name="please_choose_a_trigger_type">Pasirinkite sąlygos tipą</string>
     <string name="triggers">Sąlygos:</string>
     <string name="remove_label">PAŠALINTI</string>
     <string name="preconditions">Išankstinės sąlygos:</string>
@@ -1206,6 +1249,8 @@
     <string name="medtronic_pump_battery_no">Nepasirinkta (paprastas vaizdas)</string>
     <string name="medtronic_pump_battery_alkaline">Šarminė (išplėstinis vaizdas)</string>
     <string name="medtronic_pump_battery_lithium">Ličio (išplėstinis vaizdas)</string>
+    <string name="medtronic_pump_battery_nizn">Šarminė (išplėstinis vaizdas)</string>
+    <string name="medtronic_bolus_debugging">Boluso/Terapijos Derinimas</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SKENAVIMAS</string>
     <string name="rileylink_scanner_scan_stop">STOP</string>
@@ -1269,6 +1314,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Nepalaikomas pompos dažnis.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink adresas neteisingas.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Aptiktas pompos tipas neatitinka nustatymų.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazės profilis / nustatymas pompoje nėra įgalintas. Įgalinkite jį pompoje.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Pompoje nustatytas neteisingas bazės profilis (turi būti STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Pompoje nustatytas neteisingas laikinos bazės tipas (turi būti absoliutus).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Pompoje nustatytas neteisingas Max Bolusas (turi būti %1$.2f).</string>
@@ -1319,6 +1365,7 @@
     <string name="automation_trigger_pump_last_connection_description">Paskutinis prijungimas prie pompos [min]</string>
     <string name="automation_trigger_pump_last_connection_compared">Paskutinis prijungimas prie pompos prieš %1$s%2$s min.</string>
     <string name="sendsmsactionlabel">Siųsti SMS: %1$s</string>
+    <string name="sendsmsactiondescription">Siųsti SMS į visus numerius</string>
     <string name="sendsmsactiontext">Išsiųsti SMS žinutę su tekstu</string>
     <string name="insulinFromCob"><![CDATA[AAO palyginus su AIO: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Pritaikyti boluso apribojimai: %2$.2fU to %3$.2fU</font>]]></string>
@@ -1340,5 +1387,62 @@
     <string name="format_percent">%1$d%%</string>
     <string name="boluswizard">Boluso patarėjas</string>
     <string name="unit_minute_short">min.</string>
+    <string name="profile_name">Profilio pavadinimas:</string>
+    <string name="selected_profile">Parinkta:</string>
+    <string name="unitsnosemicolon">Vienetai</string>
+    <string name="doyouwantswitchprofile">Ar norite pakeisti profilį ir atsisakyti pakeitimų, atliktų dabartiniame profilyje?</string>
     <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Įjungta</string>
+    <string name="common_off">Išjungta</string>
+    <string name="objectives_button_unfinish">Išvalyti užbaigtus</string>
+    <string name="objectives_button_unstart">Išvalyti pradėtus</string>
+    <string name="timedetection">Laiko apibrėžimas</string>
+    <string name="doyouwantresetstart">Ar norite iš naujo nustatyti tikslų pradžią? Jūs galite prarasti jau pasiektus.</string>
+    <string name="nopumpselected">Pompa nepasirinkta</string>
+    <string name="setupwizard_units_prompt">Pasirinkite vienetus, kurių vertes norite parodyti</string>
+    <string name="ns_ploadlocalprofile">Įkelti vietinio profilio pakeitimus į NS</string>
+    <string name="dia_short">IVT (Insulino Veikimo Trukmė)</string>
+    <string name="ic_short">IA (insulino/angliavandenių santykis)</string>
+    <string name="isf_short">JIF (jautrumo insulinui faktorius)</string>
+    <string name="target_short">TIKSLAS</string>
+    <string name="clone_label">Klonuoti</string>
+    <string name="saveorresetchangesfirst">Pirmiausia išsaugoti arba anuliuoti dabartinius pokyčius</string>
+    <string name="deletecurrentprofile">Ištrinti esamą profilį?</string>
+    <string name="copytolocalprofile">Kurti naują vietinį profilį iš šito?</string>
+    <string name="profilenamecontainsdot">Profilio pavadinime yra taškų.\nŠios funkcijos NS nepalaiko.\nProfilis neįkeltas į NS.</string>
+    <string name="low_mark_comment">Mažiausia tikslinės srities vertė (tik rodymui)</string>
+    <string name="high_mark_comment">Didžiausia tikslinės srities vertė (tik rodymui)</string>
+    <string name="reorder_label">Pertvarkyti</string>
+    <string name="age">Amžius:</string>
+    <string name="weight">Svoris:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Pateikti</string>
+    <string name="mostcommonprofile">Dažniausiai naudojamas profilis:</string>
+    <string name="survey_comment">Pastaba: anonimiškai bus įkelti tik tie duomenys, kurie matomi šiame ekrane. Šiam diegimui AndroidAPS priskiria ID. Galite pateikti duomenis dar kartą, jei pasikeitė jūsų pagrindinis profilis. Vis dėlto leiskite jam veikti bent savaitę, kad jo rezultatas būtų matomas laiko diapazone. Ačiū už palaikymą.</string>
+    <string name="nav_survey">Apklausa</string>
+    <string name="invalidage">Neteisingas amžiaus įrašas</string>
+    <string name="invalidweight">Neteisingas svorio įrašas</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bolusas: <b>%3$.2f</b> Bazinis: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Žemas: <b>%2$02d%%</b> Norma: <b>%3$02d%%</b> Aukštas: <b>%4$02d%%</b>]]></string>
+    <string name="average">Vidutinis</string>
+    <string name="tdd">BPD</string>
+    <string name="tir">TIR (Laikas normos ribose)</string>
+    <string name="activitymonitor">Aktyvumo stebėjimas</string>
+    <string name="doyouwantresetstats">Ar norite iš naujo nustatyti aktyvumo statistiką?</string>
+    <string name="statistics">Statistika</string>
+    <string name="randombg">Atsitiktinė KG</string>
+    <string name="description_source_randombg">Generuoti atsitiktinių KG duomenis (demonstracinis režimas)</string>
+    <string name="randombg_short">KG</string>
+    <string name="tools">Įrankiai</string>
+    <string name="show_calculation">Rodyti skaičiavimą</string>
+    <string name="error">Klaida</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Automatizuotas įvykis</string>
+    <string name="alreadyset">Jau nustatyta</string>
+    <string name="message">Pranešimas</string>
+    <string name="clearqueueconfirm">Išvalyti eilę? Visi eilės duomenys bus prarasti!</string>
+    <string name="ebstopsloop">Ištęsto boluso funkcija sustabdys uždaro ciklo režimą ištęsto boluso veikimo metu. Ar tikrai norite patvirtinti savo pasirinkimą?</string>
+    <string name="closed_loop_disabled_with_eb">Uždara ciklas išjungtas dėl ištęsto boluso veikimo</string>
+    <string name="extended_bolus_short">IB (Ištęstas bolusas)</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index 9768183305..eefa78bba3 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -122,7 +122,7 @@
     <string name="nsclient_xdripfollower">xDrip app in volg-modus.</string>
     <string name="nsclient_looponiphone">Loop app op de iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app op de iPhone.</string>
-    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/kinderen.html</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/Children.html</string>
     <string name="isf_label">Onderwerp: Insulinegevoeligheidsfactor</string>
     <string name="isf_increasingvalue">Hogere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_decreasingvalue">Lagere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
@@ -130,7 +130,7 @@
     <string name="isf_preferences">U moet ISF invoeren in Instellingen.</string>
     <string name="isf_profile">Het wijzigen van de ISF-waarde in uw profiel is voldoende om de wijziging toe te passen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#insuline-gevoeligheids-factor-insulin-sensitivity-factor-ISF-mmol-l-E-of-mg-dl-E</string>
-    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profielen.html</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html</string>
     <string name="ic_label">Onderwerp: De KH ratio</string>
     <string name="ic_increasingvalue">Hogere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_decreasingvalue">Lagere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
diff --git a/app/src/main/res/values-nl-rNL/objectives.xml b/app/src/main/res/values-nl-rNL/objectives.xml
index bd41e6d26e..c9e23d317a 100644
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Terug</string>
     <string name="objectives_button_start">Start</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Inhoud van loop plugin weergeven</string>
     <string name="objectives_usescale">Gebruik de schaalfunctie: houd de BG grafiek lang ingedrukt</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Als u eerder OpenAPS gebruikte en u NS ten minste 3 maanden aan Loop gegevens heeft kunt u een code aanvragen waarmee u de rest van de doelstellingen kunt omzeilen. U kunt de aanvraag indienen via objectives@androidaps.org, samen met de url van uw NS. Voer de code die u van de ontwikkelaars hebt ontvangen in</string>
     <string name="codeaccepted">Code geaccepteerd</string>
     <string name="codeinvalid">Code ongeldig</string>
     <string name="objectives_exam_objective">Bewijs je kennis</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 75c71ecc45..b7b391a804 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -143,6 +142,7 @@
     <string name="constraints_violation">In strijd met beperkingen</string>
     <string name="treatmentdeliveryerror">Bolus toedien storing</string>
     <string name="tempbasaldeliveryerror">Tijdelijk basaal toedien storing</string>
+    <string name="overview_newtempbasal_basalpercent">Basaal waarde [%]</string>
     <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Bolus wizard</string>
@@ -180,6 +180,7 @@
     <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
     <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
     <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
+    <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_snackbolus">Snack bolus</string>
     <string name="careportal_mealbolus">Maaltijd bolus</string>
     <string name="careportal_correctionbolus">Correctie bolus</string>
@@ -200,6 +201,7 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluut</string>
     <string name="careportal_newnstreatment_notes_label">Notities</string>
+    <string name="event_time_label">Tijdstip gebeurtenis</string>
     <string name="careportal_newnstreatment_profile_label">Profiel</string>
     <string name="careportal_newnstreatment_enteredby_title">Ingegeven door</string>
     <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
@@ -224,6 +226,7 @@
     <string name="connecting">Verbinden</string>
     <string name="connected">Verbonden</string>
     <string name="disconnected">Niet verbonden</string>
+    <string name="danar_pump_settings">Dana pomp instellingen</string>
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
@@ -272,6 +275,8 @@
     <string name="glucosetype_finger">Vingerprik</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manueel</string>
+    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
     <string name="danarprofile">DanaR profiel instellingen</string>
     <string name="danarprofile_dia">DIA [uur]</string>
     <string name="danarprofile_dia_summary">Duur van insuline activiteit</string>
@@ -325,7 +330,7 @@
     <string name="smscommunicator_profilereplywithcode">Om naar profiel %1$s %2$d%% te wisselen antwoord met code %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Om een vertraagde bolus van %1$.2fE voor %2$d min te starten antwoord met code %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Antwoord met code %3$s om %1$dg in te voeren op %2$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d% voor %2$d min te starten antwoord met code %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d%% voor %2$d min te starten antwoord met code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s</string>
     <string name="smscommunicator_tempbasalset">Tijdelijk basaal %1$.2fE/u voor %2$d minuten succesvol gestart</string>
     <string name="smscommunicator_extendedset">Vertraagde bolus %1$.2fE voor %2$d minuten succesvol gestart</string>
@@ -410,6 +415,7 @@
     <string name="eatingsoon">Eet binnenkort</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Activiteit</string>
+    <string name="removerecord">Verwijder record</string>
     <string name="danar_stats">DanaR Statistiek</string>
     <string name="danar_stats_cumulative_tdd">Cumulatieve TDD</string>
     <string name="danar_stats_expweight">Exponentieel verhoogd TDD</string>
@@ -576,6 +582,7 @@
     <string name="careportal_insulinage_label">Ouderdom insuline</string>
     <string name="hours">uren</string>
     <string name="invalidprofile">Ongeldig profiel !!!</string>
+    <string name="doprofileswitch">Profiel wissel uitvoeren</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
     <string name="ns_alarmoptions">Alarm opties</string>
@@ -643,6 +650,7 @@
     <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
     <string name="pairingok">Koppeling geslaagd</string>
     <string name="pairingtimedout">Koppeling verlopen</string>
+    <string name="pairing">Koppelen</string>
     <string name="danars_nodeviceavailable">Geen toestel gevonden</string>
     <string name="emptyreservoir">Ampul leeg</string>
     <string name="bloodsugarmeasurementalert">Bloed glucose meetpunt alarm</string>
@@ -753,6 +761,7 @@
     <string name="bolus_frequency_exceeded">Een bolus met dezelfde hoeveelheid was gevraagd binnen de afgelopen twee minuten. Om incidentele of door bugs veroorzaakte dubbele bolussen te voorkomen is deze bolus geannuleerd.</string>
     <string name="combo_pump_connected_now">Zojuist</string>
     <string name="combo_activity_reading_pump_history">Lezen van pomp historiek</string>
+    <string name="danar_history">Historiek</string>
     <string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
     <string name="combo_pump_cartridge_low_warrning">Insuline ampul is bijna leeg</string>
     <string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
@@ -772,6 +781,7 @@
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">voorbij</string>
     <string name="format_hours">%1$.2f u</string>
+    <string name="format_mins">%1$d minuten</string>
     <string name="enablesmbalways">Activeer SMB altijd</string>
     <string name="enablesmbalways_summary">SMB altijd aan onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
     <string name="enablesmbaftercarbs">Activeer SMB na koolhydraten</string>
@@ -935,6 +945,7 @@
     <string name="startobjective">Start je eerste Doel</string>
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vragen om toestemming</string>
+    <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
     <string name="needlocationpermission">Toepassing heeft toestemming nodig voor bepalen van Locatie (voor BT scan)</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te kunnen slaan</string>
     <string name="request">Verzoek</string>
@@ -948,7 +959,11 @@
     <string name="danar_pumpalarm_sound">Geluid</string>
     <string name="danar_pumpalarm_vibrate">Trillen</string>
     <string name="danar_pumpalarm_both">Beide</string>
+    <string name="danar_screentimeout">LCD-aan tijd [sec.]</string>
+    <string name="danar_backlight">Achtergrondverlichting-aan tijd [sec.]</string>
     <string name="danar_glucoseunits">Glucose units</string>
+    <string name="danar_shutdown">Afsluiten [uren]</string>
+    <string name="danar_lowreservoir">Laag reservoir (eenheden)</string>
     <string name="danar_saveuseroptions">Opslaan van de opties om de pomp</string>
     <string name="option_on">Aan</string>
     <string name="option_off">Uit</string>
@@ -1206,6 +1221,8 @@
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Taaknaam</string>
     <string name="edit_short">EDIT</string>
+    <string name="please_choose_an_action_type">Kies een actie</string>
+    <string name="please_choose_a_trigger_type">Kies een type trigger</string>
     <string name="triggers">Triggers:</string>
     <string name="remove_label">VERWIJDER</string>
     <string name="preconditions">Voorwaarden:</string>
@@ -1298,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Pomp frequentie niet ondersteund.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Gedetecteerde pomp type komt niet overeen met ingestelde pomp type.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">De instelling voor basaalprofielen/patronen is niet ingeschakeld op de pomp. Schakel het in op de pomp.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basaalprofiel ingesteld op pomp is onjuist (moet STD zijn).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde Tijdelijk Basaal-type ingesteld op pomp (moet Insulinesnelh (E/H) zijn).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Max Bolus ingesteld op pomp (moet %1$.2f zijn).</string>
@@ -1348,6 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Laatste verbinding met pomp [minuten geleden]</string>
     <string name="automation_trigger_pump_last_connection_compared">Laatste verbinding met pomp %1$s %2$s min geleden</string>
     <string name="sendsmsactionlabel">Stuur SMS: %1$s</string>
+    <string name="sendsmsactiondescription">SMS verzenden naar alle nummers</string>
     <string name="sendsmsactiontext">Stuur SMS met tekst</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus limiet bereikt: %2$.2fU naar %3$.2fU</font>]]></string>
@@ -1376,7 +1395,7 @@
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">Aan</string>
     <string name="common_off">Uit</string>
-    <string name="objectives_button_unfinish">Wissen voltooid</string>
+    <string name="objectives_button_unfinish">Voltooiing wissen</string>
     <string name="objectives_button_unstart">Wissen gestart</string>
     <string name="timedetection">Tijd detectie</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
@@ -1399,5 +1418,39 @@
     <string name="weight">Gewicht:</string>
     <string name="id">ID:</string>
     <string name="submit">Verzenden</string>
+    <string name="mostcommonprofile">Meest voorkomende profiel:</string>
     <string name="survey_comment">Opmerking: Alleen gegevens die zichtbaar zijn op dit scherm worden anoniem geüpload. ID is toegewezen aan deze installatie van AndroidAPS. U kunt gegevens opnieuw indienen als uw hoofdprofiel wordt gewijzigd, maar laat het ten minste een week draaien om resultaat zichtbaar te maken in de tijd in het bereik. Uw hulp wordt gewaardeerd.</string>
+    <string name="nav_survey">Enquête</string>
+    <string name="invalidage">Ongeldige leeftijd invoer</string>
+    <string name="invalidweight">Ongeldige gewicht invoer</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Laag: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Hoog: <b>%4$02d%%</b>]]></string>
+    <string name="average">Gemiddelde</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Activiteitsmonitor</string>
+    <string name="doyouwantresetstats">Wil je de activiteitenstatistieken resetten?</string>
+    <string name="statistics">Statistieken</string>
+    <string name="randombg">Willekeurige BG</string>
+    <string name="description_source_randombg">Willekeurige BG gegevens genereren (alleen Demo modus)</string>
+    <string name="randombg_short">BG</string>
+    <string name="tools">Hulpmiddelen</string>
+    <string name="show_calculation">Toon berekening</string>
+    <string name="error">Fout</string>
+    <string name="timeformat12h">12u</string>
+    <string name="timeformat24h">24u</string>
+    <string name="automation_event">Automation gebeurtenis</string>
+    <string name="alreadyset">Al ingesteld</string>
+    <string name="message">Bericht</string>
+    <string name="clearqueueconfirm">Wachtrij leegmaken? Alle gegevens in de wachtrij zullen verloren gaan!</string>
+    <string name="ebstopsloop">Gebruik van Vertraagde bolus functie zal de closed loop modus stoppen voor de duur van de vertraagde bolus. Wil je dit toch?</string>
+    <string name="closed_loop_disabled_with_eb">Closed loop modus uitgeschakeld vanwege afgeven Vertraagde bolus</string>
+    <string name="extended_bolus_short">VertrB</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Grafiek menu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB aanvraagtijd</string>
+    <string name="loop_smbexecution_time_label">SMB uitvoeringstijd</string>
+    <string name="loop_tbrrequest_time_label">Tijdelijk basaal aanvraag tijd</string>
+    <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/objectives.xml b/app/src/main/res/values-pl-rPL/objectives.xml
index 3e529a5c92..a2be1d375e 100644
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Wstecz</string>
     <string name="objectives_button_start">Start</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
     <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe przytrzymanie wykresu glikemii</string>
     <string name="objectives_button_enter">Wprowadź</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jeśli używano OpenAPS przez co najmniej 3 miesiące z NS, gromadząc dane z pętli, można wysłać e-mail na adres objectives@androidaps.org podając adres serwera NightScout i kod zapytania aby pominąć resztę zadań. Wprowadź kod odpowiedzi uzyskany od programistów</string>
     <string name="codeaccepted">Kod został zaakceptowany</string>
     <string name="codeinvalid">Niepoprawny kod</string>
     <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 6260b24658..0152dc7966 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 112ee86451..3ff8541944 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Voltar</string>
     <string name="objectives_button_start">Iniciar</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceite</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 99b5068705..97dff6ccd7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -331,13 +330,13 @@
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d% U/h durante %2$d min responda com o código %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
     <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
-    <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d% U/h durante%2$d min iniciada com êxito</string>
+    <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Falha ao iniciar basal temp</string>
     <string name="smscommunicator_extendedfailed">Falha ao iniciar o bolus estendido</string>
     <string name="smscommunicator_basalstopreplywithcode">Para parar a basal temporária responda com o código %1$s</string>
@@ -565,7 +564,7 @@
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Última ligação</string>
     <string name="danar_bluetooth_status">Estado Bluetooth</string>
-    <string name="nav_about">Acerca</string>
+    <string name="nav_about">Sobre</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
     <string name="xdripstatus_settings">Estado xDrip (relógio)</string>
@@ -743,7 +742,7 @@
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
     <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <string name="combo_programming_bolus">A programar a bomba para injectar o bolus</string>
-    <string name="combo_refresh">Actualizar</string>
+    <string name="combo_refresh">Atualizar</string>
     <string name="combo_pump_state_label">Estado</string>
     <string name="combo_pump_activity_label">Atividades</string>
     <string name="combo_no_pump_connection">Sem conexão há %1$d min</string>
@@ -842,7 +841,7 @@
     <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">A rejeitar a temporal alta uma vez que o cálculo não considerou as mudanças do histórico da bomba</string>
     <string name="combo_activity_checking_pump_state">Atualizando estado da bomba</string>
-    <string name="combo_warning_pump_basal_rate_changed">O rácio da basal foi alterado na bomba e vai ser actualizado em breve</string>
+    <string name="combo_warning_pump_basal_rate_changed">A taxa basal na bomba mudou e será atualizada em breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Rácio da basal foi alterado na bomba, mas a leitura falhou</string>
     <string name="combo_activity_checking_for_history_changes">Verificando alterações de histórico</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pôde ser adicionado aos tratamentos. Por favor confirma na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que nã oexistem outros registos de bólus.</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Iniciar primeiro objectivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
+    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
@@ -1315,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá atcivada na bomba. Active-a na bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
@@ -1442,4 +1443,15 @@
     <string name="alreadyset">Já definido</string>
     <string name="message">Mensagem</string>
     <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
+    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
+    <string name="extended_bolus_short">BE</string>
+    <string name="phonechecker">\"VerificadorTelefone\"</string>
+    <string name="chartmenu">Menu do Gráfico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
+    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/objectives.xml b/app/src/main/res/values-pt-rPT/objectives.xml
index 875a605631..4722ee8fa8 100644
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Voltar</string>
     <string name="objectives_button_start">Iniciar</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceite</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ebd43c8432..1990230176 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -327,17 +326,17 @@
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
-    <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
+    <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d% U/h durante %2$d min responda com o código %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
     <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
-    <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d% U/h durante%2$d min iniciada com êxito</string>
+    <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Início basal temp falhou </string>
     <string name="smscommunicator_extendedfailed">Falha ao iniciar o bólus estendido</string>
     <string name="smscommunicator_basalstopreplywithcode">Para parar a basal temporária responda com o código %1$s</string>
@@ -828,7 +827,7 @@
     <string name="overview_show_activity">Actividade</string>
     <string name="overview_show_sensitivity">Sensibilidade</string>
     <string name="overview_show_deviations">Desvios</string>
-    <string name="overview_show_cob">Carboidratos a bordo</string>
+    <string name="overview_show_cob">Hidratos a Bordo (COB)</string>
     <string name="overview_show_iob">Insulina a bordo</string>
     <string name="overview_show_basals">Basais</string>
     <string name="no_action_selected">Nenhuma acção seleccionada, nada irá acontecer</string>
@@ -884,7 +883,7 @@
     <string name="reset">repor</string>
     <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
     <string name="loopdisconnectedfor">Desligado (%1$d m)</string>
-    <string name="openapssmb_maxiob_title">Máximo total IOS OpenAPS não pode superar [U]</string>
+    <string name="openapssmb_maxiob_title">Máximo total IOB OpenAPS não pode superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor é chamado de Max IOB em contexto de OpenAPS\nOpenAPS não adicionará mais insulina se o IOB atual for maior que este valor</string>
     <string name="pump_stopped">Bomba parada</string>
     <string name="pump_started">Bomba iniciada</string>
@@ -946,6 +945,7 @@
     <string name="startobjective">Iniciar primeiro objectivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
+    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
@@ -1443,4 +1443,15 @@
     <string name="alreadyset">Já definido</string>
     <string name="message">Mensagem</string>
     <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
+    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
+    <string name="extended_bolus_short">BE</string>
+    <string name="phonechecker">\"VerificadorTelefone\"</string>
+    <string name="chartmenu">Menu do Gráfico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
+    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/objectives.xml b/app/src/main/res/values-ro-rRO/objectives.xml
index c37a61470e..cdf5312139 100644
--- a/app/src/main/res/values-ro-rRO/objectives.xml
+++ b/app/src/main/res/values-ro-rRO/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Înapoi</string>
     <string name="objectives_button_start">Start</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index b5869259b2..d7fac933c4 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -315,7 +314,7 @@
     <string name="smscommunicator_suspendreplywithcode">Pentru suspendarea buclei pentru %1$d minute trimiteți codul %2$s</string>
     <string name="smscommunicator_tempbasalset">Bazala temporară %1$.2fU/h pentru %2$d minute a fost trimisă cu succes</string>
     <string name="smscommunicator_extendedset">Bolusul extins de %1$.2fU pentru %2$d min a fost inițiat</string>
-    <string name="smscommunicator_tempbasalset_percent">Bazala temporară %1$d% pentru %2$d minute a fost stabilită cu succes</string>
+    <string name="smscommunicator_tempbasalset_percent">Bazala temporară %1$d%% pentru %2$d minute a fost stabilită cu succes</string>
     <string name="smscommunicator_tempbasalfailed">Trimiterea bazalei temporare a eșuat</string>
     <string name="smscommunicator_extendedfailed">Pornirea bolusului extins a eșuat</string>
     <string name="smscommunicator_basalstopreplywithcode">Pentru oprirea bazalei temporare, răspundeți cu codul %1$s</string>
diff --git a/app/src/main/res/values-ru-rRU/objectives.xml b/app/src/main/res/values-ru-rRU/objectives.xml
index 71faff0d36..38c25925e7 100644
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Назад</string>
     <string name="objectives_button_start">Старт</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Просмотр содержимого модуля Цикл Loop</string>
     <string name="objectives_usescale">Применить функцию масштабирования по долгому нажатию на диаграмму ГК</string>
     <string name="objectives_button_enter">Ввод</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если прежде вы были пользователем OpenAPS и имеете в NS не менее 3 месяцев данных, отправьте электронное письмо на objectives@androidaps.org с вашим адресом NS и запросом кода для обхода остальных целей. Введите код, полученный от разработчиков</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если у вас есть хотя бы три месяца работы с замкнутым циклом с другими системами, то можно получить код пропуска. Подробности смотрите по адресу https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Код принят</string>
     <string name="codeinvalid">Неверный код</string>
     <string name="objectives_exam_objective">Подтвердите ваши знания</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index eb41131556..f8548845d1 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -948,6 +947,7 @@ Context | Edit Context</string>
     <string name="startobjective">Начните первую Цель</string>
     <string name="permission">Права доступа</string>
     <string name="askforpermission">Запросить права доступа</string>
+    <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложение нуждается в разрешении на доступ к определению местоположения для сканирования bluetooth</string>
     <string name="needstoragepermission">Приложение нуждается в разрешении доступа к хранению данных для хранения лог-файлов</string>
     <string name="request">Запрос</string>
@@ -1445,4 +1445,15 @@ Context | Edit Context</string>
     <string name="alreadyset">Уже установлено</string>
     <string name="message">Сообщение</string>
     <string name="clearqueueconfirm">Очистить очередь? Все данные в очереди будут потеряны!</string>
+    <string name="ebstopsloop">Функция Пролонгированный Болюс остановит режим замкнутого цикла на время действия пролонгированного болюса. Подтверждаете выбор?</string>
+    <string name="closed_loop_disabled_with_eb">Замкнутый цикл отключен из-за работы Пролонгированного Болюса</string>
+    <string name="extended_bolus_short">ПБ</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Меню графика</string>
+    <string name="sensitivity_short">Авточувств</string>
+    <string name="loop_smbrequest_time_label">Время запроса микроболюса SMB</string>
+    <string name="loop_smbexecution_time_label">Время выполнения микроболюса SMB</string>
+    <string name="loop_tbrrequest_time_label">Время запроса временной базальной скорости</string>
+    <string name="loop_tbrexecution_time_label">Время выполнения временной базальной скорости</string>
+    <string name="insight_alert_notification_channel">Оповещения помпы Insight</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/objectives.xml b/app/src/main/res/values-sk-rSK/objectives.xml
index 467ae4f0de..5da99833ad 100644
--- a/app/src/main/res/values-sk-rSK/objectives.xml
+++ b/app/src/main/res/values-sk-rSK/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Naspäť</string>
     <string name="objectives_button_start">Začiatok</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Zobrazte obsah modulu uzavretý okruh</string>
     <string name="objectives_usescale">Prepnite režim zobrazenia dlhým stlačením grafu glykémie</string>
     <string name="objectives_button_enter">Zadať</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ak ste boli používateľom OpenAPS už predtým a Váš NS má dáta uzavretého okruhu za minimálne 3 mesiace, môžete nám zaslať E-mail na adresu objectives@androidaps.org z Vašou adresou NS a požiadať o kód na obídenie zvyšných cieľov. Zadajte kód získaný od vývojárov</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokiaľ máte aspoň 3 mesiace skúseností s uzavretým okruhom na iných systémoch, môžete získať kód, ktorý vám umožní preskočiť ciele. Viac informácií nájdete na https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Kód akceptovaný</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Preukážte svoje znalosti</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 952561a55c..424955cb09 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -143,6 +142,7 @@
     <string name="constraints_violation">Mimo povolený rozsah</string>
     <string name="treatmentdeliveryerror">Chyba podania bolusu</string>
     <string name="tempbasaldeliveryerror">Chyba podávania dočasného bazálu</string>
+    <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%]</string>
     <string name="setbasalquestion">Povoliť nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
@@ -180,6 +180,7 @@
     <string name="careportal_cgmsensorinsert">Výmena senzora</string>
     <string name="careportal_cgmsensorstart">Spustenie senzora</string>
     <string name="careportal_insulincartridgechange">Výmena inzulínu</string>
+    <string name="careportal_profileswitch">Prepnutie profilu</string>
     <string name="careportal_snackbolus">Bolus na desiatu/olovrant</string>
     <string name="careportal_mealbolus">Bolus na jedlo</string>
     <string name="careportal_correctionbolus">Korekčný bolus</string>
@@ -200,6 +201,7 @@
     <string name="careportal_newnstreatment_percent_label">Percentá</string>
     <string name="careportal_newnstreatment_absolute_label">Absolútne</string>
     <string name="careportal_newnstreatment_notes_label">Poznámky</string>
+    <string name="event_time_label">Čas udalosti</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Zadal</string>
     <string name="careportal_newnstreatment_glucosetype">Zadanie glykémie</string>
@@ -224,6 +226,7 @@
     <string name="connecting">Pripájanie</string>
     <string name="connected">Pripojené</string>
     <string name="disconnected">Odpojené</string>
+    <string name="danar_pump_settings">Nastavenie pumpy Dana</string>
     <string name="end_user_license_agreement">Licenčná zmluva s koncovým používateľom</string>
     <string name="end_user_license_agreement_text">Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM A POTVRDZUJEM</string>
@@ -272,6 +275,8 @@
     <string name="glucosetype_finger">Prst</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="manual">Iný</string>
+    <string name="careportal_temporarytarget">Dočasný cieľ</string>
+    <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
     <string name="danarprofile">DanaR nastavenie profilu</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Celková doba pôsobenia inzulínu</string>
@@ -410,6 +415,7 @@
     <string name="eatingsoon">Pred jedlom</string>
     <string name="hypo">Hypoglykémia</string>
     <string name="activity">Aktivita</string>
+    <string name="removerecord">Odstrániť záznam</string>
     <string name="danar_stats">DanaR štatistiky</string>
     <string name="danar_stats_cumulative_tdd">Kumulatívny TDD</string>
     <string name="danar_stats_expweight">Exponenciálne vážený TDD</string>
@@ -644,6 +650,7 @@
     <string name="waitingforpairing">Čakanie na párovanie na pumpe</string>
     <string name="pairingok">Spárované</string>
     <string name="pairingtimedout">Vypršal časový limit pre párovanie</string>
+    <string name="pairing">Párovanie</string>
     <string name="danars_nodeviceavailable">Zatiaľ nenájdené žiadne zariadenie</string>
     <string name="emptyreservoir">Prázdny zásobník</string>
     <string name="bloodsugarmeasurementalert">Výstraha merania glykémie</string>
@@ -754,6 +761,7 @@
     <string name="bolus_frequency_exceeded">Rovnako veľký bolus už bol v priebehu poslednej minúty požadovaný. Ako preventívna ochrana pred zdvojeným bolusom a ako ochrana pred chybami bola operácia zakázaná.</string>
     <string name="combo_pump_connected_now">Teraz</string>
     <string name="combo_activity_reading_pump_history">Načítavam históriu z pumpy</string>
+    <string name="danar_history">História pumpy</string>
     <string name="combo_activity_setting_basal_profile">Nastavenie bazálneho profilu</string>
     <string name="combo_pump_cartridge_low_warrning">Zásobník inzulínu v pumpe je takmer prázdny</string>
     <string name="combo_pump_battery_low_warrning">Batéria v pumpe je takmer vybitá</string>
@@ -773,6 +781,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">pred</string>
     <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Vždy povoliť SMB</string>
     <string name="enablesmbalways_summary">Povoliť SMB nezávisle na bolusoch. Možno iba zo zdrojom glykémií s dobrým filtrovaním dát, ako napr. G5</string>
     <string name="enablesmbaftercarbs">Povoliť SMB po jedle</string>
@@ -936,6 +945,7 @@
     <string name="startobjective">Spusťte prvý cieľ</string>
     <string name="permission">Povolenie</string>
     <string name="askforpermission">Vyžiadať si povolenie</string>
+    <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
     <string name="needlocationpermission">Aplikácia vyžaduje povolenie \"polohy\", aby mohla vyhľadávať BT zariadenia</string>
     <string name="needstoragepermission">Aplikácia vyžaduje prístup k úložisku, aby mohla ukladať logy</string>
     <string name="request">Požiadavka</string>
@@ -949,7 +959,11 @@
     <string name="danar_pumpalarm_sound">Zvuk</string>
     <string name="danar_pumpalarm_vibrate">Vibrácie</string>
     <string name="danar_pumpalarm_both">Oboje</string>
+    <string name="danar_screentimeout">Čas pred vypnutím displeja [sekundy]</string>
+    <string name="danar_backlight">Podsvietenie [sekundy]</string>
     <string name="danar_glucoseunits">Jednotky</string>
+    <string name="danar_shutdown">Vypnutie [hodiny]</string>
+    <string name="danar_lowreservoir">Nízky stav zásobníka [Jednotky]</string>
     <string name="danar_saveuseroptions">Uložiť do pumpy</string>
     <string name="option_on">ZAP</string>
     <string name="option_off">VYP</string>
@@ -1195,12 +1209,20 @@
     <string name="longitude_short">Lon:</string>
     <string name="distance_short">Vzdial. [m]:</string>
     <string name="name_short">Meno:</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Kedy</string>
+    <string name="location_inside">Keď sa nachádzate vo vnútri oblasti</string>
+    <string name="location_outside">Keď sa nachádzate mimo oblasť</string>
+    <string name="location_going_in">Keď vstúpite do oblasti s názvom</string>
+    <string name="location_going_out">Keď opustíte oblasť s názvom</string>
     <string name="lastboluslabel">Od posledného bolusu</string>
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Názov úlohy</string>
     <string name="edit_short">EDIT</string>
+    <string name="please_choose_an_action_type">Vyberte akciu</string>
+    <string name="please_choose_a_trigger_type">Vyberte typ podmienky</string>
     <string name="triggers">Podmienky:</string>
     <string name="remove_label">VYMAZAŤ</string>
     <string name="preconditions">Predpoklady:</string>
@@ -1293,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvencia pumpy.</string>
     <string name="medtronic_error_rileylink_address_invalid">Neplatná adresa RileyLinku.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Rozpoznaná pumpa je iného typu než nakonfigurovaná.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavenie bazálnych profilov/vzorov nie je na pumpe povolené. Povoľte ich na pumpe.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazálny profil na pumpe je chybný (musí byť STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpe (musí byť absolútny).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpe (musí byť %1$.2f).</string>
@@ -1343,6 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Posledné spojenie s pumpou [pred X minútami]</string>
     <string name="automation_trigger_pump_last_connection_compared">Posledné spojenie s pumpou pred %1$s %2$s minútami</string>
     <string name="sendsmsactionlabel">Poslať SMS: %1$s</string>
+    <string name="sendsmsactiondescription">Poslať SMS na všetky čísla</string>
     <string name="sendsmsactiontext">Odoslať SMS s textom</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikované obmedzenie bolusu: %2$.2fJI na %3$.2fJI</font>]]></string>
@@ -1410,4 +1434,24 @@
     <string name="randombg">Náhodná glykémia</string>
     <string name="description_source_randombg">Vygeneruj náhodné dáta glykémií (iba Demo režim)</string>
     <string name="randombg_short">Glykémia</string>
+    <string name="tools">Nástroje</string>
+    <string name="show_calculation">Zobraziť kalkuláciu</string>
+    <string name="error">Chyba</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">Udalosť automatiky</string>
+    <string name="alreadyset">Už nastavené</string>
+    <string name="message">Správa</string>
+    <string name="clearqueueconfirm">Vymazať frontu? Všetky dáta vo fronte budú stratené!</string>
+    <string name="ebstopsloop">Použitie funkcie rozloženého bolusu zastaví uzavretý okruh na dobu trvania rozloženého bolusu. Naozaj to chcete?</string>
+    <string name="closed_loop_disabled_with_eb">Uzavretý okruh je zastavený kvôli prebiehajúcemu rozloženému bolusu</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">PhoneChecker</string>
+    <string name="chartmenu">Grafové menu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Čas požiadavky SMB</string>
+    <string name="loop_smbexecution_time_label">Čas aplikácie SMB</string>
+    <string name="loop_tbrrequest_time_label">Čas požiadavky dočasného bazálu</string>
+    <string name="loop_tbrexecution_time_label">Čas spustenia dočasného bazálu</string>
+    <string name="insight_alert_notification_channel">Výstrahy pumpy Insight</string>
 </resources>
diff --git a/app/src/main/res/values-sl-rSI/exam.xml b/app/src/main/res/values-sl-rSI/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_codes.xml b/app/src/main/res/values-sl-rSI/insight_alert_codes.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_codes.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml b/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_titles.xml b/app/src/main/res/values-sl-rSI/insight_alert_titles.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_titles.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_exceptions.xml b/app/src/main/res/values-sl-rSI/insight_exceptions.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_exceptions.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/objectives.xml b/app/src/main/res/values-sl-rSI/objectives.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/objectives.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..96062d70ad
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- Pump Abstract -->
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!-- MDT Pump Status -->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+</resources>
diff --git a/app/src/main/res/values-sv-rSE/objectives.xml b/app/src/main/res/values-sv-rSE/objectives.xml
index f049262c18..94b2ba5549 100644
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Tillbaka</string>
     <string name="objectives_button_start">Starta</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Visa innehållet i insticksprogrammet \"Loop\"</string>
     <string name="objectives_usescale">Testa skala om BG-grafen genom att trycka och hålla in fingret på den</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Om du var OpenAPS-användare innan och din NS har minst 3 månaders APS-data, kan du skicka ett e-postmeddelande till objectives@androidaps.org med din NS-adress och begära kod för att kringgå resten av målen. Ange kod som du fått från utvecklarna</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Om du har minst 3 månaders erfarenhet av closed loop med andra system kan du kvalificera dig för en kod för att hoppa över mål. Se https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives för mer info.</string>
     <string name="codeaccepted">Koden godkänd</string>
     <string name="codeinvalid">Koden är felaktig</string>
     <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index cc585016b5..4fada83e89 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -947,6 +946,7 @@ Eversense-appen.</string>
     <string name="startobjective">Påbörja ditt första mål</string>
     <string name="permission">Behörighet</string>
     <string name="askforpermission">Be om behörighet</string>
+    <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver behörighet att använda Platsinfo för att kunna söka efter Bluetooth-enheter</string>
     <string name="needstoragepermission">Appen behöver behörighet att använda Lagring för att kunna spara loggfiler</string>
     <string name="request">Begäran</string>
@@ -1193,7 +1193,7 @@ Eversense-appen.</string>
     <string name="message_short">Medd:</string>
     <string name="profilepercentage">Procent av profil</string>
     <string name="percent_u">Procent [%]:</string>
-    <string name="startprofile">Byt till profil %1$d% i %2$d min</string>
+    <string name="startprofile">Byt till profil %1$d%% i %2$d min</string>
     <string name="startprofileforever">Byt till profil %1$d%%</string>
     <string name="exists">finns</string>
     <string name="notexists">finns inte</string>
@@ -1444,4 +1444,15 @@ Eversense-appen.</string>
     <string name="alreadyset">Redan satt</string>
     <string name="message">Meddelande</string>
     <string name="clearqueueconfirm">Allt data som inte synkats kommer att kastas bort. Är du säker på att du vill tömma kön?</string>
+    <string name="ebstopsloop">OBS! Om du använder förlängd bolus, kommer du inte längre vara i Closed Loop under den tiden som den förlängda bolusen är igång. Vill du fortsätta?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop-läget inaktiverat pga att en förlängd bolus är aktiv</string>
+    <string name="extended_bolus_short">FB</string>
+    <string name="phonechecker">Telefonkontroll</string>
+    <string name="chartmenu">Diagrammeny</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB begärd</string>
+    <string name="loop_smbexecution_time_label">SMB utförd</string>
+    <string name="loop_tbrrequest_time_label">Basalförändring begärd</string>
+    <string name="loop_tbrexecution_time_label">Basalförändring utförd</string>
+    <string name="insight_alert_notification_channel">Pumpvarningar Insight</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/objectives.xml b/app/src/main/res/values-tr-rTR/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-tr-rTR/objectives.xml
+++ b/app/src/main/res/values-tr-rTR/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index b14049e2b4..ca73b4490a 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-zh-rCN/objectives.xml b/app/src/main/res/values-zh-rCN/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-zh-rCN/objectives.xml
+++ b/app/src/main/res/values-zh-rCN/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index be7793e576..1741294a35 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index eca0961ca5..28b0418196 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -191,6 +191,7 @@
         <item>@string/medtronic_pump_battery_alkaline</item>
         <item>@string/medtronic_pump_battery_lithium</item>
         <item>@string/medtronic_pump_battery_nizn</item>
+        <item>@string/medtronic_pump_battery_nimh</item>
     </string-array>
 
     <string-array name="medtronicBatteryTypeValues">
@@ -198,6 +199,7 @@
         <item>@string/key_medtronic_pump_battery_alkaline</item>
         <item>@string/key_medtronic_pump_battery_lithium</item>
         <item>@string/key_medtronic_pump_battery_nizn</item>
+        <item>@string/key_medtronic_pump_battery_nimh</item>
     </string-array>
 
     <string-array name="smbMaxMinutes">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..51ae11cee8
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <attr name="dialogTitleBackground" format="reference" />
+    <attr name="dialogTitleColor" format="reference" />
+    <attr name="dialogTitleIconTint" format="reference" />
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7d9e0c5896..8d1b977fea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -47,6 +47,8 @@
 
     <color name="dialog_title_background">#303030</color>
     <color name="activity_title_background">#121212</color>
+    <color name="dialog_title_color">#FFFFFF</color>
+    <color name="dialog_title_icon_tint">#FFFFFF</color>
 
     <color name="cardColorBackground">#121212</color>
     <color name="cardObjectiveText">#779ECB</color>
@@ -87,4 +89,21 @@
     <color name="ribbonTextCritical">#FFFFFF</color>
 
     <color name="splashBackground">#2E2E2E</color>
+
+    <color name="warningAlertBackground">#FFFB8C00</color>
+    <color name="warningAlertHeaderText">#FF000000</color>
+
+    <color name="errorAlertBackground">#FFFF5555</color>
+    <color name="errorAlertHeaderText">#FF000000</color>
+
+    <color name="toastBorder">#666666</color>
+    <color name="toastBase">#ffffff</color>
+    <color name="toastOk">#77dd77</color>
+    <color name="toastError">#ff0400</color>
+    <color name="toastWarn">#FF8C00</color>
+    <color name="toastInfo">#03A9F4</color>
+
+    <color name="metadataTextWarning">#FF8C00</color>
+    <color name="metadataTextError">#FF5555</color>
+
 </resources>
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index e9063fd2b1..356f97a00f 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -149,7 +149,7 @@
     <string name="profileswitch_targethigher">Target wiil be 10% higher.</string>
     <string name="profileswitch_targetlower">Target will be 10% lower.</string>
     <string name="profileswitch_targetbottom">Only bottom target will be 10% lower.</string>
-    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
     <string name="profileswitchtime_iwant">If you wake up 1h earlier than usual, how should you notify AAPS of the change in your schedule?</string>
     <string name="profileswitchtime_1">Initiate a profile switch with a timeshift of 1</string>
     <string name="profileswitchtime__1">Initiate a profile switch with a timeshift of -1</string>
diff --git a/app/src/main/res/values/fet_attrs.xml b/app/src/main/res/values/fet_attrs.xml
new file mode 100644
index 0000000000..87519166be
--- /dev/null
+++ b/app/src/main/res/values/fet_attrs.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="FormEditText">
+        <attr name="testType">
+            <enum name="regexp" value="0" />
+            <enum name="numeric" value="1" />
+            <enum name="alpha" value="2" />
+            <enum name="alphaNumeric" value="3" />
+            <enum name="email" value="4" />
+            <enum name="creditCard" value="5" />
+            <enum name="phone" value="6" />
+            <enum name="domainName" value="7" />
+            <enum name="ipAddress" value="8" />
+            <enum name="webUrl" value="9" />
+            <enum name="nocheck" value="10" />
+            <enum name="custom" value="11" />
+            <enum name="personName" value="12" />
+            <enum name="personFullName" value="13" />
+            <enum name="date" value="14" />
+            <enum name="numericRange" value="15" />
+            <enum name="floatNumericRange" value="16" />
+            <enum name="httpsUrl" value="17" />
+            <enum name="minLength" value="18" />
+            <enum name="multiPhone" value="19" />
+            <enum name="pinStrength" value="20" />
+        </attr>
+        <attr name="testErrorString" format="string" />
+        <attr name="emptyErrorString" format="string" />
+        <attr name="customRegexp" format="string" />
+        <attr name="customFormat" format="string" />
+        <attr name="emptyAllowed" format="boolean" />
+        <attr name="classType" format="string" />
+        <attr name="minLength" format="integer" />
+        <attr name="minNumber" format="integer" />
+        <attr name="maxNumber" format="integer" />
+        <attr name="floatminNumber" format="float" />
+        <attr name="floatmaxNumber" format="float" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index dac9b0234a..7fada71a72 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -47,7 +47,7 @@
     <string name="objectives_useloop">Display content of Loop plugin</string>
     <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you were OpenAPS user before and your NS has at least 3 months of looping data, you can send an email to objectives@androidaps.org with your NS address and request code to bypass the rest of objectives. Enter code obtained from developers</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you have at least 3 month of closed loop experience with other systems you might qualify for a code to skip objectives. See https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details.</string>
     <string name="codeaccepted">Code accepted</string>
     <string name="codeinvalid">Code invalid</string>
     <string name="objectives_exam_objective">Prove your knowledge</string>
diff --git a/app/src/main/res/values/protection.xml b/app/src/main/res/values/protection.xml
new file mode 100644
index 0000000000..e5c61e1b51
--- /dev/null
+++ b/app/src/main/res/values/protection.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="biometric_title">Authentication required</string>
+    <string name="biometric_description">Place your finger on the fingerprint reader to verify your identity</string>
+    <string name="settings_protection">Settings protection</string>
+    <string name="application_protection">Application protection</string>
+    <string name="bolus_protection">Bolus protection</string>
+    <string name="master_password">Master password</string>
+    <string name="settings_password">Settings password</string>
+    <string name="application_password">Application password</string>
+    <string name="bolus_password">Bolus password</string>
+    <string name="unlock_settings">Unlock settings</string>
+    <string name="biometric">Biometric</string>
+    <string name="custom_password">Custom password</string>
+    <string name="noprotection">No protection</string>
+    <string name="protection">Protection</string>
+    <string name="master_password_missing">Master password is not set!\n\nPlease set your Master password in Preferences (%1$s &#8594; %2$s)</string>
+
+    <string name="password_set">Password set!</string>
+    <string name="password_not_set">Password not set</string>
+    <string name="password_not_changed">Password not changed</string>
+    <string name="password_cleared">Password cleared!</string>
+    <string name="password_hint">Enter password here</string>
+
+    <string name="key_master_password">master_password</string>
+    <string name="key_settings_password" translatable="false">settings_password</string>
+    <string name="key_application_password" translatable="false">application_password</string>
+    <string name="key_bolus_password">translatable="false"bolus_password</string>
+    <string name="key_settings_protection" translatable="false">settings_protection</string>
+    <string name="key_application_protection" translatable="false">application_protection</string>
+    <string name="key_bolus_protection" translatable="false">bolus_protection</string>
+
+    <string-array name="protectiontype">
+        <item>@string/noprotection</item>
+        <item>@string/biometric</item>
+        <item>@string/master_password</item>
+        <item>@string/custom_password</item>
+    </string-array>
+
+    <string-array name="protectiontypeValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f34ec9c784..7cf42b2542 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,9 +194,7 @@
     <string name="enableloop">Enable loop</string>
 
     <string name="openloop_newsuggestion">New suggestion available</string>
-    <string name="unsupportedclientver">Unsupported version of NSClient</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
-    <string name="nsclientnotinstalled">NSClient not installed. Record lost!</string>
     <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus constraint applied</string>
@@ -255,6 +253,51 @@
     <string name="dismiss">DISMISS</string>
     <string name="language" translatable="false">Language</string>
 
+    <string name="password_preferences_encrypt_prompt">You will be asked for master password, which will be used to encrypt exported preferences.</string>
+    <string name="password_preferences_decrypt_prompt">You will be asked for master password, which is needed to decrypt imported preferences.</string>
+    <string name="preferences_export_canceled">Export canceled! Preferences were NOT exported!</string>
+    <string name="preferences_import_canceled">Import canceled! Preferences were NOT imported!</string>
+
+    <string name="check_preferences_before_import">Please check preferences before importing:</string>
+    <string name="check_preferences_cannot_import">Preferences cannot be imported!</string>
+    <string name="check_preferences_dangerous_import">Preferences should not be imported!</string>
+    <string name="check_preferences_details_btn">Explain import issues…</string>
+    <string name="check_preferences_details_title">Import issues details</string>
+    <string name="check_preferences_import_btn">Import</string>
+    <string name="check_preferences_import_anyway_btn">Import anyway (DANGEROUS!)</string>
+
+    <string name="metadata_warning_different_flavour">Preferences were created with different variant of AAPS (%1$s) while you have: %2$s.\n\nSome settings may be missing or invalid - after importing please check and update your preferences.</string>
+    <string name="metadata_warning_different_device">Preferences were created on a different device. It is OK if you are importing from older/different phone, but make sure imported preferences are correct!</string>
+    <string name="metadata_warning_outdated_format">You are using the outdated legacy format from old versions of AAPS, which is not secure! Only use it as a last resort, if you do not have an export in current, JSON format.</string>
+    <string name="metadata_warning_old_export">Imported preferences are already %1$s days old! Maybe you have more up-to-date preferences or you choose the wrong file? Remember to export preferences regularly!</string>
+    <string name="metadata_warning_date_format">Invalid date-time format!</string>
+
+    <string name="metadata_label_format">File format</string>
+    <string name="metadata_label_created_at">Created at</string>
+    <string name="metadata_label_aaps_version">AAPS Version</string>
+    <string name="metadata_label_aaps_flavour">Build Variant</string>
+    <string name="metadata_label_device_name">Exporting device name</string>
+    <string name="metadata_label_device_model">Exporting device model</string>
+    <string name="metadata_label_encryption">File encryption</string>
+
+    <string name="metadata_format_old">Old export format</string>
+    <string name="metadata_format_new">New encrypted format</string>
+    <string name="metadata_format_debug">New debug format (unencrypted)</string>
+    <string name="metadata_format_other">Unknown export format</string>
+
+    <string name="prefdecrypt_settings_tampered">Settings file tampered</string>
+    <string name="prefdecrypt_settings_secure">Settings file is secure</string>
+    <string name="prefdecrypt_settings_unencrypted">Using not secure, unencrypted settings format</string>
+    <string name="prefdecrypt_wrong_json">JSON format error, missing required field (format, content, metadata or security)</string>
+    <string name="prefdecrypt_wrong_password">Decryption error, the given password cannot decrypt the file</string>
+
+    <string name="prefdecrypt_issue_missing_file_hash">File checksum (hash) missing, cannot verify the authenticity of settings!</string>
+    <string name="prefdecrypt_issue_modified">File was modified after export!</string>
+    <string name="prefdecrypt_issue_parsing">Decryption error, parsing preferences failed!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Decryption error, the provided password is invalid or settings file was modified! It may happen that the imported file was exported with a different Master password.</string>
+    <string name="prefdecrypt_issue_wrong_format">Missing encryption configuration, settings format is invalid!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Unsupported or not specified encryption algorithm!</string>
+
     <string name="danarpump">DanaR</string>
     <string name="connecting">Connecting</string>
     <string name="connected">Connected</string>
@@ -503,10 +546,6 @@
     <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0 (AMA) or 8.0 (SMB). This is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values.</string>
     <string name="openapsama_link_to_preferncejson_doc" translatable="false">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
-    <string name="error_only_numeric_digits_allowed">Only numeric digits are allowed.</string>
-    <string name="error_only_numeric_digits_range_allowed">Only numeric digits within the range %1$s - %2$s are allowed.</string>
-    <string name="error_field_must_not_be_empty">The field must not be empty</string>
-    <string name="error_phone_not_valid">Phone number not valid</string>
     <string name="smscommunicator_invalidphonennumber">Invalid SMS phone number</string>
     <string name="overview_calibration">Calibration</string>
     <string name="send_calibration">Send calibration %1$.1f to xDrip?</string>
@@ -526,8 +565,6 @@
     <string name="virtualpump_settings">Virtual pump settings</string>
     <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
     <string name="wrongpassword">Wrong password</string>
-    <string name="settings_password">Password for settings</string>
-    <string name="unlock_settings">Unlock settings</string>
     <string name="approachingdailylimit">Approaching insulin daily limit</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
@@ -552,7 +589,6 @@
     <string name="key_danar_password" translatable="false">danar_password</string>
     <string name="key_danar_useextended" translatable="false">danar_useextended</string>
     <string name="key_danar_visualizeextendedaspercentage" translatable="false">danar_visualizeextendedaspercentage"</string>
-    <string name="key_danarprofile_dia" translatable="false">danarprofile_dia</string>
     <string name="clearlog">Clear log</string>
     <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
     <string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string>
@@ -822,8 +858,15 @@
     <string name="bgsource_upload">BG upload settings</string>
     <string name="wear_detailed_delta_title">Show detailed delta</string>
     <string name="wear_detailed_delta_summary">Show delta with one more decimal place</string>
+    <string name="key_smbinterval" translatable="false">key_smbinterval</string>
+    <string name="smbinterval_summary">How frequently SMBs will be given in min</string>
     <string name="smbmaxminutes">SMB max minutes</string>
     <string name="smbmaxminutes_summary">Max minutes of basal to limit SMB to</string>
+    <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
+    <string name="uamsmbmaxminutes_summary">Max minutes of basal to limit SMB to for UAM</string>
+    <string name="key_carbsReqThreshold" translatable="false">carbsReqThreshold</string>
+    <string name="carbsReqThreshold">Carb suggestion threshold</string>
+    <string name="carbsReqThreshold_summary">When Carbs are suggested, how many carbs will prompt a notification</string>
     <string name="unsupportedfirmware">Unsupported pump firmware</string>
     <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>
@@ -892,6 +935,7 @@
     <string name="ago">ago</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d mins</string>
+    <string name="format_mins_short">%1$dm</string>
     <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
     <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
@@ -1102,6 +1146,7 @@
     <string name="startobjective">Start your first objective</string>
     <string name="permission">Permission</string>
     <string name="askforpermission">Ask for permission</string>
+    <string name="needsystemwindowpermission">Application needs system window permission for notifications</string>
     <string name="needlocationpermission">Application needs location permission for BT scan</string>
     <string name="needstoragepermission">Application needs storage permission to be able store log files</string>
     <string name="request">Request</string>
@@ -1138,6 +1183,12 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Raise sensitivity for temptargets >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Low temptarget lowers sensitivity</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lower sensitivity for temptargets < 100]]></string>
+    <string name="key_resistance_lowers_target" translatable="false">resistance_lowers_target</string>
+    <string name="resistance_lowers_target_title">Resistance lowers target</string>
+    <string name="resistance_lowers_target_summary">When resistance is detected, lower the target glucose</string>
+    <string name="key_sensitivity_raises_target" translatable="false">sensitivity_raises_target</string>
+    <string name="sensitivity_raises_target_title">Sensitivity raises target</string>
+    <string name="sensitivity_raises_target_summary">When sensitivity is detected, raise the target glucose</string>
     <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="custom">Custom</string>
     <string name="largetimedifftitle">Large Time Difference</string>
@@ -1148,7 +1199,9 @@
     <string name="allow_hardware_pump_text">Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time.</string>
     <string name="error_adding_treatment_title">Treatment data incomplete</string>
     <string name="maintenance_settings">Maintenance Settings</string>
-    <string name="maintenance_email">Email</string>
+    <string name="maintenance_email">Email recipient</string>
+    <string name="key_maintenance_encrypt_exported_prefs">maintenance_encrypt_exported_prefs</string>
+    <string name="maintenance_encrypt_exported_prefs">Encrypt exported settings</string>
     <string name="key_maintenance_logs_email" translatable="false">maintenance_logs_email</string>
     <string name="key_maintenance_logs_amount" translatable="false">maintenance_logs_amount</string>
     <string name="key_logshipper_amount" translatable="false">logshipper_amount</string>
@@ -1180,7 +1233,7 @@
     <string name="insulinlimitviolation">Insulin limit violation</string>
     <string name="key_loop_openmode_min_change" translatable="false">loop_openmode_min_change</string>
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
-    <string name="loop_openmode_min_change_summary">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
+    <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
     <string name="pairfirst">Please pair your pump with your phone!</string>
     <string name="searching_for_devices">Searching for devices…</string>
@@ -1340,6 +1393,7 @@
     <string name="tidepool_upload_bg">Upload BG tests</string>
 
     <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
+    <string name="key_uamsmbmaxminutes" translatable="false">uamsmbmaxminutes</string>
     <string name="dst_plugin_name" translatable="false">Daylight Saving time</string>
     <string name="dst_in_24h_warning">Daylight Saving time change in 24h or less</string>
     <string name="dst_loop_disabled_warning">Daylight Saving time change less than 3 hours ago - Closed loop disabled</string>
@@ -1389,6 +1443,8 @@
     <string name="exists">exists</string>
     <string name="notexists">not exists</string>
     <string name="temptargetcompared">Temp target %1$s</string>
+    <string name="btdevicecompared">Bluetooth connection to device %1$s %2$s</string>
+    <string name="btdevice">Connection to Bluetooth device </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -1448,6 +1504,7 @@
     <string name="key_medtronic_pump_battery_alkaline" translatable="false">medtronic_pump_battery_alkaline</string>
     <string name="key_medtronic_pump_battery_lithium" translatable="false">medtronic_pump_battery_lithium</string>
     <string name="key_medtronic_pump_battery_nizn" translatable="false">medtronic_pump_battery_nizn</string>
+    <string name="key_medtronic_pump_battery_nimh" translatable="false">medtronic_pump_battery_nimh</string>
 
     <string name="medtronic_serial_number">Pump Serial Number</string>
     <string name="medtronic_pump_type">Pump Type</string>
@@ -1468,6 +1525,7 @@
     <string name="medtronic_pump_battery_alkaline">Alkaline (Extended view)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (Extended view)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
     <string name="medtronic_bolus_debugging">Bolus/Treatments Debugging</string>
 
     <!-- RL BLE Scanning -->
@@ -1687,5 +1745,60 @@
     <string name="alreadyset">Already set</string>
     <string name="message">Message</string>
     <string name="clearqueueconfirm">Clear queue? All data in queue will be lost!</string>
+    <string name="key_xdripstatus_detailediob" translatable="false">xdripstatus_detailediob</string>
+    <string name="key_xdripstatus_showbgi" translatable="false">xdripstatus_showbgi</string>
+    <string name="key_wear_detailed_delta" translatable="false">wear_detailed_delta</string>
+    <string name="key_snoozedTo" translatable="false">snoozedTo</string>
+    <string name="key_snooze_dst_in24h" translatable="false">snooze_dst_in24h</string>
+    <string name="key_snooze_loopdisabled" translatable="false">snooze_loopdisabled</string>
+    <string name="key_enable_fabric">enable_fabric</string>
+    <string name="sixdigitnumber">^\\d{6}</string>
+    <string name="ebstopsloop">Use of Extended bolus feature will stop closed loop mode for the time of running extended bolus. Do you really want it?</string>
+    <string name="closed_loop_disabled_with_eb">Closed loop disabled because of running Extended bolus</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Chart menu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="databroadcaster" translatable="false">Data Broadcaster</string>
+    <string name="loop_smbrequest_time_label">SMB request time</string>
+    <string name="loop_smbexecution_time_label">SMB execution time</string>
+    <string name="loop_tbrrequest_time_label">Temp basal request time</string>
+    <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
+    <string name="insight_alert_notification_channel">Insight Pump Alerts</string>
 
+    <!-- SMS Communicator & OTP Authenticator -->
+
+    <string name="key_smscommunicator_otp_enabled" translatable="false">smscommunicator_otp_enabled</string>
+    <string name="key_smscommunicator_otp_name" translatable="false">smscommunicator_otp_name</string>
+    <string name="key_smscommunicator_otp_password" translatable="false">smscommunicator_otp_password</string>
+    <string name="key_smscommunicator_otp_secret" translatable="false">smscommunicator_otp_secret</string>
+
+    <string name="smscommunicator_default_user_display_name" comment="This is default user display name, shown by Authenticators">User</string>
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">from Authenticator app for: %1$s</string>
+
+    <string name="smscommunicator_otp_enabled">Enable Authenticator</string>
+    <string name="smscommunicator_otp_enabled_summary">Authenticate commands using One Time Passwords generated by Google Authenticator or similar 2FA apps.</string>
+    <string name="smscommunicator_otp_pin">Additional PIN at token end</string>
+    <string name="smscommunicator_otp_pin_summary">Additional digits that should be memorised and glued at end of each generated One Time Password</string>
+    <string name="smscommunicator_otp_name">User name for Authenticator</string>
+    <string name="smscommunicator_otp_name_summary">User name displayed along with generated OTP on Authenticator App</string>
+
+    <string name="smscomunicator_tab_otp_label">Authenticator setup</string>
+
+    <string name="smscommunicator_otp_verify_label">OTP to check:</string>
+    <string name="smscommunicator_otp_reset_btn">Reset Authenticators</string>
+    <string name="smscommunicator_otp_reset_title">Reset Authenticator Key</string>
+    <string name="smscommunicator_otp_reset_prompt">Are you sure to reset Authenticator key? It will render all currently configured Authenticators invalid, and you will need to set them up again.</string>
+    <string name="smscommunicator_otp_reset_successful">New Authenticator Key was generated! Please use updated QRCode to provision authenticators.</string>
+
+    <string name="smscommunicator_otp_step1_install_header">1. Install Authenticator</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scan code to setup AndroidAPS OTP codes</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Test One-Time-Password</string>
+    <string name="smscommunicator_otp_reset_header">Reset Authenticators</string>
+
+    <string name="smscommunicator_otp_install_info">On each follower phone install Authenticator app that support RFC 6238 TOTP tokens. Popular free apps are:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">DO NOT SHARE this code online!\nUse it only to setup Authenticator App on follower phones.</string>
+    <string name="smscommunicator_otp_reset_warning">By reseting authenticator you make all already provisioned authenticators invalid. You will need to set up them again!</string>
+    <string name="onconnect">On connect</string>
+    <string name="ondisconnect">On disconnect</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d2cacff3b7..ac0fafecc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,6 +11,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="dialogTitleBackground">@color/dialog_title_background</item>
+        <item name="dialogTitleColor">@color/dialog_title_color</item>
+        <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
@@ -27,12 +30,10 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
-    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog">
+    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowMinWidthMajor">96%</item>
-        <item name="android:windowMinWidthMinor">96%</item>
     </style>
 
     <style name="Theme.AppCompat.NoTitle" parent="Theme.AppCompat.NoActionBar">
@@ -49,4 +50,48 @@
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
+    <style name="section_header_label">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">15dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="warning_label">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textColor">#ff0000</item>
+    </style>
+
+    <style name="AppThemeWarningDialog" parent="AppTheme">
+        <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
+        <item name="dialogTitleBackground">@color/warningAlertBackground</item>
+        <item name="dialogTitleColor">@color/warningAlertHeaderText</item>
+        <item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
+    </style>
+
+    <style name="AppThemeWarningDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
+        <item name="android:windowBackground">@drawable/alert_border_warning</item>
+        <item name="colorAccent">@color/warningAlertBackground</item>
+    </style>
+
+    <style name="AppThemeErrorDialog" parent="AppTheme">
+        <item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
+        <item name="dialogTitleBackground">@color/errorAlertBackground</item>
+        <item name="dialogTitleColor">@color/errorAlertHeaderText</item>
+        <item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
+    </style>
+
+    <style name="AppThemeErrorDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
+        <item name="android:windowBackground">@drawable/alert_border_error</item>
+        <item name="colorAccent">@color/errorAlertBackground</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/validator.xml b/app/src/main/res/values/validator.xml
new file mode 100644
index 0000000000..15c40b743c
--- /dev/null
+++ b/app/src/main/res/values/validator.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Only numeric digits are allowed.</string>
+    <string name="error_only_numeric_digits_range_allowed">Only numeric digits within the range %1$s - %2$s are allowed.</string>
+    <string name="error_this_field_cannot_contain_special_character">This field cannot contain any special character</string>
+    <string name="error_only_standard_letters_are_allowed">Only standard letters are allowed</string>
+    <string name="error_field_must_not_be_empty">The field must not be empty</string>
+    <string name="error_email_address_not_valid">Email address not valid</string>
+    <string name="error_creditcard_number_not_valid">Credit card number is not valid</string>
+    <string name="error_phone_not_valid">Phone number not valid</string>
+    <string name="error_domain_not_valid">Domain name not valid</string>
+    <string name="error_ip_not_valid">IP Address not valid</string>
+    <string name="error_url_not_valid">Web Url is not valid</string>
+    <string name="error_notvalid_personname">Not a valid first or last name.</string>
+    <string name="error_notvalid_personfullname">Not a valid full name.</string>
+    <string name="error_date_not_valid">Format not valid</string>
+    <string name="error_mustbe4digitnumber">Must be 4 digit number</string>
+    <string name="error_mustbe6digitnumber">Must be 6 digit number</string>
+    <string name="error_not_a_minimum_length">Not a minimum length</string>
+    <string name="error_pin_not_valid">Pin should be 3 to 6 digits, not same or in series</string>
+
+    <string name="fourdigitnumber" translatable="false">^\\d{4}</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_absorption_aaps.xml b/app/src/main/res/xml/pref_absorption_aaps.xml
index 6996f27aaf..7cc14ebb21 100644
--- a/app/src/main/res/xml/pref_absorption_aaps.xml
+++ b/app/src/main/res/xml/pref_absorption_aaps.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:validate="http://schemas.android.com/apk/res-auto">
+<androidx.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="absorption"
-        android:title="@string/absorptionsettings_title">
+        android:title="@string/absorptionsettings_title"
+        app:initialExpandedChildrenCount="0">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="6"
             android:dialogMessage="@string/absorption_maxtime_summary"
             android:digits="0123456789.,"
@@ -19,7 +21,7 @@
             validate:minNumber="4"
             validate:testType="numericRange" />
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="24"
             android:dialogMessage="@string/openapsama_autosens_period_summary"
             android:digits="0123456789"
@@ -33,9 +35,11 @@
             validate:minNumber="4"
             validate:testType="numericRange" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_aaps_advanced"
+            android:title="@string/advancedsettings_title">
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="1.2"
                 android:dialogMessage="@string/openapsama_autosens_max_summary"
                 android:digits="0123456789.,"
@@ -49,7 +53,7 @@
                 validate:floatminNumber="0.5"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0.7"
                 android:dialogMessage="@string/openapsama_autosens_min_summary"
                 android:inputType="numberDecimal"
@@ -62,8 +66,8 @@
                 validate:floatminNumber="0.1"
                 validate:testType="floatNumericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_absorption_oref0.xml b/app/src/main/res/xml/pref_absorption_oref0.xml
index d951366d27..dd6d452ba4 100644
--- a/app/src/main/res/xml/pref_absorption_oref0.xml
+++ b/app/src/main/res/xml/pref_absorption_oref0.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:validate="http://schemas.android.com/apk/res-auto">
+<androidx.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="absorption"
-        android:title="@string/absorptionsettings_title">
+        android:title="@string/absorptionsettings_title"
+        app:initialExpandedChildrenCount="0">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+    <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="8.0"
             android:dialogMessage="@string/openapsama_min_5m_carbimpact_summary"
             android:inputType="numberDecimal"
@@ -19,7 +21,7 @@
             validate:floatminNumber="0.1"
             validate:testType="floatNumericRange" />
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="6"
             android:dialogMessage="@string/absorption_cutoff_summary"
             android:digits="0123456789.,"
@@ -32,9 +34,11 @@
             validate:minNumber="4"
             validate:testType="numericRange" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_oref0_advanced"
+            android:title="@string/advancedsettings_title">
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="1.2"
                 android:dialogMessage="@string/openapsama_autosens_max_summary"
                 android:digits="0123456789.,"
@@ -48,7 +52,7 @@
                 validate:floatminNumber="0.5"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0.7"
                 android:dialogMessage="@string/openapsama_autosens_min_summary"
                 android:inputType="numberDecimal"
@@ -61,8 +65,8 @@
                 validate:floatminNumber="0.1"
                 validate:testType="floatNumericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_absorption_oref1.xml b/app/src/main/res/xml/pref_absorption_oref1.xml
index d951366d27..b1c3a42160 100644
--- a/app/src/main/res/xml/pref_absorption_oref1.xml
+++ b/app/src/main/res/xml/pref_absorption_oref1.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:validate="http://schemas.android.com/apk/res-auto">
+<androidx.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="absorption"
-        android:title="@string/absorptionsettings_title">
+        android:title="@string/absorptionsettings_title"
+        app:initialExpandedChildrenCount="0">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+    <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="8.0"
             android:dialogMessage="@string/openapsama_min_5m_carbimpact_summary"
             android:inputType="numberDecimal"
@@ -19,7 +21,7 @@
             validate:floatminNumber="0.1"
             validate:testType="floatNumericRange" />
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="6"
             android:dialogMessage="@string/absorption_cutoff_summary"
             android:digits="0123456789.,"
@@ -32,9 +34,11 @@
             validate:minNumber="4"
             validate:testType="numericRange" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_oref1_advanced"
+            android:title="@string/advancedsettings_title">
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="1.2"
                 android:dialogMessage="@string/openapsama_autosens_max_summary"
                 android:digits="0123456789.,"
@@ -48,7 +52,7 @@
                 validate:floatminNumber="0.5"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0.7"
                 android:dialogMessage="@string/openapsama_autosens_min_summary"
                 android:inputType="numberDecimal"
@@ -61,8 +65,8 @@
                 validate:floatminNumber="0.1"
                 validate:testType="floatNumericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_age.xml b/app/src/main/res/xml/pref_age.xml
deleted file mode 100644
index 75496fcb41..0000000000
--- a/app/src/main/res/xml/pref_age.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/patientage">
-
-        <ListPreference
-            android:defaultValue="adult"
-            android:entries="@array/ageArray"
-            android:entryValues="@array/ageValues"
-            android:key="@string/key_age"
-            android:summary="@string/patientage_summary"
-            android:title="@string/patientage" />
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_alerts.xml b/app/src/main/res/xml/pref_alerts.xml
new file mode 100644
index 0000000000..1a81cefc66
--- /dev/null
+++ b/app/src/main/res/xml/pref_alerts.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/localalertsettings_title"
+        app:initialExpandedChildrenCount="0">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enable_missed_bg_readings_alert"
+            android:title="@string/enable_missed_bg_readings_alert" />
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="30"
+            android:dependency="@string/key_enable_missed_bg_readings_alert"
+            android:inputType="number"
+            android:key="@string/key_missed_bg_readings_threshold"
+            android:title="@string/nsalarm_staledatavalue_label"
+            validate:maxNumber="10000"
+            validate:minNumber="15"
+            validate:testType="numericRange" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_enable_pump_unreachable_alert"
+            android:title="@string/enable_pump_unreachable_alert" />
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="30"
+            android:dependency="@string/key_enable_pump_unreachable_alert"
+            android:inputType="number"
+            android:key="@string/key_pump_unreachable_threshold"
+            android:title="@string/pump_unreachable_threshold"
+            validate:maxNumber="300"
+            validate:minNumber="30"
+            validate:testType="numericRange" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_raise_notifications_as_android_notifications"
+            android:title="@string/raise_notifications_as_android_notifications" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_automation.xml b/app/src/main/res/xml/pref_automation.xml
index 933a11fd54..e1c43f32b4 100644
--- a/app/src/main/res/xml/pref_automation.xml
+++ b/app/src/main/res/xml/pref_automation.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/automation">
+    <PreferenceCategory
+        android:title="@string/automation"
+        app:initialExpandedChildrenCount="0">
 
         <ListPreference
             android:defaultValue="PASSIVE"
@@ -12,4 +15,4 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_bgsource.xml b/app/src/main/res/xml/pref_bgsource.xml
index fa6f666109..098d57bc4f 100644
--- a/app/src/main/res/xml/pref_bgsource.xml
+++ b/app/src/main/res/xml/pref_bgsource.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
-        android:title="@string/bgsource_upload">
+        android:title="@string/bgsource_upload"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"
@@ -14,12 +17,6 @@
             android:summary="@string/dexcomg5_xdripupload_summary"
             android:title="@string/dexcomg5_xdripupload_title" />
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_dexcom_lognssensorchange"
-            android:summary="@string/dexcom_lognssensorchange_summary"
-            android:title="@string/dexcom_lognssensorchange_title" />
-
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_bgsourcedexcom.xml b/app/src/main/res/xml/pref_bgsourcedexcom.xml
new file mode 100644
index 0000000000..1ca8fa1140
--- /dev/null
+++ b/app/src/main/res/xml/pref_bgsourcedexcom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/bgsource_upload"
+        app:initialExpandedChildrenCount="0">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_dexcomg5_nsupload"
+            android:title="@string/dexcomg5_nsupload_title" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_dexcomg5_xdripupload"
+            android:summary="@string/dexcomg5_xdripupload_summary"
+            android:title="@string/dexcomg5_xdripupload_title" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_dexcom_lognssensorchange"
+            android:summary="@string/dexcom_lognssensorchange_summary"
+            android:title="@string/dexcom_lognssensorchange_title" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danar.xml b/app/src/main/res/xml/pref_danar.xml
index fcb099e7e3..16ef4aa57d 100644
--- a/app/src/main/res/xml/pref_danar.xml
+++ b/app/src/main/res/xml/pref_danar.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:title="@string/danar_pump_settings">
+        android:title="@string/danar_pump_settings"
+        app:initialExpandedChildrenCount="0">
 
         <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:inputType="numberPassword"
             android:key="@string/key_danar_password"
-            android:title="@string/danar_password_title"/>
+            android:title="@string/danar_password_title"
+            validate:customRegexp="@string/fourdigitnumber"
+            validate:testErrorString="@string/error_mustbe4digitnumber"
+            validate:testType="regexp" />
 
         <ListPreference
             android:defaultValue="0"
@@ -32,9 +38,12 @@
             android:key="@string/key_danar_visualizeextendedaspercentage"
             android:title="@string/danar_visualizeextendedaspercentage_title" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_danar_advanced"
+            android:title="@string/advancedsettings_title">
 
-            <PreferenceCategory android:title="@string/bluetooth">
+            <PreferenceCategory
+                android:title="@string/bluetooth">
 
                 <SwitchPreference
                     android:defaultValue="false"
@@ -44,8 +53,8 @@
 
             </PreferenceCategory>
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danarkorean.xml b/app/src/main/res/xml/pref_danarkorean.xml
index 8f64fe1cbc..90b8ead439 100644
--- a/app/src/main/res/xml/pref_danarkorean.xml
+++ b/app/src/main/res/xml/pref_danarkorean.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:title="@string/danar_pump_settings">
+        android:title="@string/danar_pump_settings"
+        app:initialExpandedChildrenCount="0">
 
         <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:inputType="numberPassword"
             android:key="@string/key_danar_password"
-            android:title="@string/danar_password_title" />
+            android:title="@string/danar_password_title"
+            validate:customRegexp="@string/fourdigitnumber"
+            validate:testErrorString="@string/error_mustbe4digitnumber"
+            validate:testType="regexp" />
 
         <SwitchPreference
             android:defaultValue="false"
@@ -25,7 +31,9 @@
             android:key="@string/key_danar_visualizeextendedaspercentage"
             android:title="@string/danar_visualizeextendedaspercentage_title" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_danarkorean_advanced"
+            android:title="@string/advancedsettings_title">
 
             <PreferenceCategory android:title="@string/bluetooth">
 
@@ -37,8 +45,8 @@
 
             </PreferenceCategory>
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danarprofile.xml b/app/src/main/res/xml/pref_danarprofile.xml
deleted file mode 100644
index 9129735748..0000000000
--- a/app/src/main/res/xml/pref_danarprofile.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="DanaRProfile"
-        android:title="@string/danarprofile">
-        <EditTextPreference
-            android:defaultValue="3"
-            android:key="@string/key_danarprofile_dia"
-            android:numeric="decimal"
-            android:dialogMessage="@string/danarprofile_dia_summary"
-            android:title="@string/danarprofile_dia" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danars.xml b/app/src/main/res/xml/pref_danars.xml
index ec85bfd523..2bd7446a61 100644
--- a/app/src/main/res/xml/pref_danars.xml
+++ b/app/src/main/res/xml/pref_danars.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/danarspump">
+    <PreferenceCategory
+        android:title="@string/danarspump"
+        app:initialExpandedChildrenCount="0">
 
         <Preference
             android:key="blescannner"
@@ -16,10 +20,13 @@
             android:summary=""
             android:title="@string/selectedpump" />
 
-        <EditTextPreference
-            android:inputType="textCapCharacters"
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:inputType="numberPassword"
             android:key="@string/key_danar_password"
-            android:title="@string/danar_password_title"/>
+            android:title="@string/danar_password_title"
+            validate:customRegexp="@string/fourdigitnumber"
+            validate:testErrorString="@string/error_mustbe4digitnumber"
+            validate:testType="regexp" />
 
         <ListPreference
             android:defaultValue="0"
@@ -28,7 +35,9 @@
             android:key="@string/key_danars_bolusspeed"
             android:title="@string/bolusspeed" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_danars_advanced"
+            android:title="@string/advancedsettings_title">
 
             <PreferenceCategory android:title="@string/bluetooth">
 
@@ -40,8 +49,8 @@
 
             </PreferenceCategory>
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danarv2.xml b/app/src/main/res/xml/pref_danarv2.xml
index 70a799b260..011490beec 100644
--- a/app/src/main/res/xml/pref_danarv2.xml
+++ b/app/src/main/res/xml/pref_danarv2.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:title="@string/danar_pump_settings">
+        android:title="@string/danar_pump_settings"
+        app:initialExpandedChildrenCount="0">
 
         <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:inputType="numberPassword"
             android:key="@string/key_danar_password"
-            android:title="@string/danar_password_title" />
+            android:title="@string/danar_password_title"
+            validate:customRegexp="@string/fourdigitnumber"
+            validate:testErrorString="@string/error_mustbe4digitnumber"
+            validate:testType="regexp" />
 
         <ListPreference
             android:defaultValue="0"
@@ -21,7 +27,9 @@
             android:key="@string/key_danars_bolusspeed"
             android:title="@string/bolusspeed" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_danarv2_advanced"
+            android:title="@string/advancedsettings_title">
 
             <PreferenceCategory android:title="@string/bluetooth">
 
@@ -33,8 +41,8 @@
 
             </PreferenceCategory>
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_datachoices.xml b/app/src/main/res/xml/pref_datachoices.xml
index 692a67b070..e60840d09d 100644
--- a/app/src/main/res/xml/pref_datachoices.xml
+++ b/app/src/main/res/xml/pref_datachoices.xml
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
-        android:title="@string/data_choices">
+        android:title="@string/data_choices"
+        app:initialExpandedChildrenCount="0">
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
-
-            <PreferenceCategory android:title="@string/data_choices">
-
-                <SwitchPreference
-                    android:defaultValue="true"
-                    android:key="enable_fabric"
-                    android:summary="@string/allow_automated_crash_reporting"
-                    android:title="@string/fabric_upload" />
-
-            </PreferenceCategory>
-
-        </PreferenceScreen>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_enable_fabric"
+            android:summary="@string/allow_automated_crash_reporting"
+            android:title="@string/fabric_upload" />
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index f1bcbdb858..b5f7074c7e 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -1,23 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
+        app:initialExpandedChildrenCount="0"
         android:title="@string/configbuilder_general">
 
         <ListPreference
-            android:title="@string/unitsnosemicolon"
             android:defaultValue="mg/dl"
             android:entries="@array/unitsArray"
             android:entryValues="@array/unitsValues"
-            android:key="@string/key_units" />
+            android:key="@string/key_units"
+            android:title="@string/unitsnosemicolon" />
 
         <ListPreference
-            android:title="@string/language"
             android:defaultValue="en"
             android:entries="@array/languagesArray"
             android:entryValues="@array/languagesValues"
-            android:key="@string/key_language" />
+            android:key="@string/key_language"
+            android:title="@string/language" />
+
+        <PreferenceCategory android:title="@string/protection">
+
+            <Preference
+                android:inputType="textPassword"
+                android:key="@string/key_master_password"
+                android:title="@string/master_password"
+                />
+
+            <ListPreference
+                android:defaultValue="1"
+                android:entries="@array/protectiontype"
+                android:entryValues="@array/protectiontypeValues"
+                android:key="@string/key_settings_protection"
+                android:title="@string/settings_protection" />
+
+            <Preference
+                android:inputType="textPassword"
+                android:key="@string/key_settings_password"
+                android:title="@string/settings_password" />
+
+            <ListPreference
+                android:defaultValue="1"
+                android:entries="@array/protectiontype"
+                android:entryValues="@array/protectiontypeValues"
+                android:key="@string/key_application_protection"
+                android:title="@string/application_protection" />
+
+            <Preference
+                android:inputType="textPassword"
+                android:key="@string/key_application_password"
+                android:title="@string/application_password" />
+
+            <ListPreference
+                android:defaultValue="1"
+                android:entries="@array/protectiontype"
+                android:entryValues="@array/protectiontypeValues"
+                android:key="@string/key_bolus_protection"
+                android:title="@string/bolus_protection" />
+
+            <Preference
+                android:inputType="textPassword"
+                android:key="@string/key_bolus_password"
+                android:title="@string/bolus_password" />
+
+        </PreferenceCategory>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_insight_local_full.xml b/app/src/main/res/xml/pref_insight_local_full.xml
index 02c4ce752b..ceaba15e38 100644
--- a/app/src/main/res/xml/pref_insight_local_full.xml
+++ b/app/src/main/res/xml/pref_insight_local_full.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/insight_local">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/insight_local"
+        app:initialExpandedChildrenCount="0">
 
         <Preference android:title="@string/insight_pairing">
             <intent
@@ -61,5 +65,7 @@
             android:inputType="number"
             android:key="insight_disconnect_delay"
             android:title="@string/disconnect_delay" />
+
     </PreferenceCategory>
-</PreferenceScreen>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
index 74e5586bf6..780ba686a2 100644
--- a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
+++ b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/insight_local">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/insight_local"
+        app:initialExpandedChildrenCount="0">
 
         <Preference android:title="@string/insight_pairing">
             <intent
@@ -61,5 +65,7 @@
             android:inputType="number"
             android:key="insight_disconnect_delay"
             android:title="@string/disconnect_delay" />
+
     </PreferenceCategory>
-</PreferenceScreen>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_insulinoreffreepeak.xml b/app/src/main/res/xml/pref_insulinoreffreepeak.xml
index 726d0595e2..5b7b290ae0 100644
--- a/app/src/main/res/xml/pref_insulinoreffreepeak.xml
+++ b/app/src/main/res/xml/pref_insulinoreffreepeak.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        android:key="InsulinOrefFreePeak"
-        android:title="@string/insulin_oref_peak">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
-            validate:testType="numericRange"
-            validate:minNumber="35"
-            validate:maxNumber="120"
-            android:digits="0123456789"
+    <PreferenceCategory
+        android:title="@string/insulin_oref_peak"
+        app:initialExpandedChildrenCount="0">
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="75"
-            android:selectAllOnFocus="true"
+            android:digits="0123456789"
             android:inputType="number"
+            android:key="@string/key_insulin_oref_peak"
             android:maxLines="20"
+            android:selectAllOnFocus="true"
             android:title="@string/insulin_peak_time"
-            android:key="@string/key_insulin_oref_peak" />
+            validate:maxNumber="120"
+            validate:minNumber="35"
+            validate:testType="numericRange" />
+
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_loop.xml b/app/src/main/res/xml/pref_loop.xml
index 16c5c94375..0d92a6bc5f 100644
--- a/app/src/main/res/xml/pref_loop.xml
+++ b/app/src/main/res/xml/pref_loop.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="aps_general"
+        app:initialExpandedChildrenCount="0"
         android:title="@string/loop">
 
         <ListPreference
-            android:title="@string/apsmode_title"
-            android:key="@string/key_aps_mode"
             android:defaultValue="open"
             android:entries="@array/aps_modeArray"
-            android:entryValues="@array/aps_modeValues"/>
+            android:entryValues="@array/aps_modeValues"
+            android:key="@string/key_aps_mode"
+            android:title="@string/apsmode_title" />
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="20"
             android:dialogMessage="@string/loop_openmode_min_change_summary"
             android:digits="0123456789"
@@ -28,4 +29,5 @@
             validate:testType="numericRange" />
 
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_maintenance.xml b/app/src/main/res/xml/pref_maintenance.xml
index 8ce4572685..cb7d3108cc 100644
--- a/app/src/main/res/xml/pref_maintenance.xml
+++ b/app/src/main/res/xml/pref_maintenance.xml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
         android:key="maintenance"
-        android:title="@string/maintenance_settings">
+        android:title="@string/maintenance_settings"
+        app:initialExpandedChildrenCount="0">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="logs@androidaps.org"
             android:dialogMessage="@string/maintenance_email"
             android:inputType="textEmailAddress"
             android:key="@string/key_maintenance_logs_email"
             android:selectAllOnFocus="true"
-            android:title="@string/maintenance_email" />
+            android:title="@string/maintenance_email"
+            validate:testType="email"/>
 
-        <!-- TODO: make this working with changed package name(nsclient)
-        validatingEditText:emptyAllowed="false"
-        validatingEditText:testErrorString="@string/invalid_email_message"
-        validatingEditText:testType="email"
-        -->
-
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="2"
             android:inputType="number"
             android:key="@string/key_maintenance_logs_amount"
-            android:title="@string/maintenance_amount">
-
-        </EditTextPreference>
+            android:title="@string/maintenance_amount"
+            validate:maxNumber="10"
+            validate:minNumber="1"
+            validate:testType="numericRange"/>
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_maintenance_encrypt_exported_prefs"
+            android:title="@string/maintenance_encrypt_exported_prefs" />
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_medtronic.xml b/app/src/main/res/xml/pref_medtronic.xml
index 10730f4fcb..0d6349489b 100644
--- a/app/src/main/res/xml/pref_medtronic.xml
+++ b/app/src/main/res/xml/pref_medtronic.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/medtronic_name">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        android:title="@string/medtronic_name"
+        app:initialExpandedChildrenCount="0">
 
         <EditTextPreference
             android:defaultValue="000000"
             android:key="@string/key_medtronic_serial"
             android:selectAllOnFocus="true"
             android:singleLine="false"
-            android:title="@string/medtronic_serial_number" />
+            android:title="@string/medtronic_serial_number"
+            validate:customRegexp="@string/sixdigitnumber"
+            validate:testErrorString="@string/error_mustbe6digitnumber"
+            validate:testType="regexp" />
+
 
         <ListPreference
             android:defaultValue="1"
@@ -28,21 +36,27 @@
 
         <EditTextPreference
             android:defaultValue="35"
+            android:digits="0123456789."
+            android:inputType="number"
             android:key="@string/key_medtronic_max_basal"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:inputType="number"
-            android:digits="0123456789."
-            android:title="@string/medtronic_pump_max_basal" />
+            android:title="@string/medtronic_pump_max_basal"
+            validate:maxNumber="35"
+            validate:minNumber="1"
+            validate:testType="numericRange" />
 
         <EditTextPreference
             android:defaultValue="25"
+            android:digits="0123456789."
+            android:inputType="number"
             android:key="@string/key_medtronic_max_bolus"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:inputType="number"
-            android:digits="0123456789."
-            android:title="@string/medtronic_pump_max_bolus" />
+            android:title="@string/medtronic_pump_max_bolus"
+            validate:maxNumber="25"
+            validate:minNumber="1"
+            validate:testType="numericRange" />
 
         <ListPreference
             android:defaultValue="10"
@@ -78,11 +92,12 @@
 
         <info.nightscout.androidaps.plugins.pump.common.ui.RileyLinkSelectPreference
             android:enabled="true"
+            android:key="@string/key_rileylink_mac_address"
             android:summary=""
-            android:title="RileyLink Configuration"
-            android:key="@string/key_rileylink_mac_address">
+            android:title="RileyLink Configuration">
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
         </info.nightscout.androidaps.plugins.pump.common.ui.RileyLinkSelectPreference>
 
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index b27759f627..6f68d77a7b 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/nsclientinternal_title">
+    <PreferenceCategory
+        android:title="@string/nsclientinternal_title"
+        app:initialExpandedChildrenCount="0">
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="https://{YOUR-SITE}.azurewebsites.net/"
             android:dialogMessage="@string/nsclientinternal_url_dialogmessage"
             android:inputType="textUri"
             android:key="@string/key_nsclientinternal_url"
             android:selectAllOnFocus="true"
             android:title="@string/nsclientinternal_url_title"
-            validate:testType="webUrl" />
+            validate:testType="httpsUrl" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:dialogMessage="@string/nsclientinternal_secret_dialogmessage"
             android:dialogTitle="@string/nsclientinternal_secret_dialogtitle"
             android:inputType="textPassword"
             android:key="@string/key_nsclientinternal_api_secret"
-            android:title="@string/nsclientinternal_secret_title" />
+            android:title="@string/nsclientinternal_secret_title"
+            validate:minLength="12"
+            validate:testType="minLength"/>
 
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_ns_logappstartedevent"
-            android:title="@string/ns_logappstartedevent" />
+            android:title="@string/ns_logappstartedevent"
+            android:summary="@string/ns_logappstartedevent"
+            />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_ns_uploadlocalprofile"
             android:title="@string/ns_ploadlocalprofile" />
 
-        <PreferenceScreen android:title="@string/ns_alarmoptions">
+        <androidx.preference.PreferenceScreen
+            android:key="@string/ns_alarmoptions"
+            android:title="@string/ns_alarmoptions">
 
             <SwitchPreference
                 android:defaultValue="false"
@@ -57,7 +66,7 @@
                 android:key="@string/key_nsalarm_staledata"
                 android:title="@string/nsalarm_staledata" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="16"
                 android:digits="0123456789"
                 android:inputType="number"
@@ -75,7 +84,7 @@
                 android:key="@string/key_nsalarm_urgent_staledata"
                 android:title="@string/nsalarm_urgentstaledata" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="31"
                 android:digits="0123456789"
                 android:inputType="number"
@@ -88,14 +97,16 @@
                 validate:minNumber="30"
                 validate:testType="numericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
-        <PreferenceScreen android:title="@string/connectionsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="@string/connectionsettings_title"
+            android:title="@string/connectionsettings_title">
 
             <SwitchPreference
                 android:defaultValue="false"
-                android:key="@string/key_ns_wifionly"
                 android:disableDependentsState="true"
+                android:key="@string/key_ns_wifionly"
                 android:title="@string/ns_wifionly" />
 
             <EditTextPreference
@@ -115,15 +126,17 @@
                 android:key="@string/key_ns_chargingonly"
                 android:title="@string/ns_chargingonly" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
-       <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_nsclient_advanced"
+            android:title="@string/advancedsettings_title">
 
             <SwitchPreference
                 android:defaultValue="true"
                 android:key="@string/key_ns_autobackfill"
-                android:title="@string/ns_autobackfill_title"
-                android:summary="@string/ns_autobackfill_summary" />
+                android:summary="@string/ns_autobackfill_summary"
+                android:title="@string/ns_autobackfill_title" />
 
             <SwitchPreference
                 android:defaultValue="true"
@@ -138,7 +151,7 @@
                 android:title="@string/ns_localbroadcasts_title" />
 
             <SwitchPreference
-                android:defaultValue="false"
+                android:defaultValue="true"
                 android:key="@string/key_ns_upload_only"
                 android:summary="@string/ns_upload_only_summary"
                 android:title="@string/ns_upload_only" />
@@ -154,8 +167,8 @@
                 android:key="ns_sync_use_absolute"
                 android:title="@string/ns_sync_use_absolute_title" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_openapsama.xml b/app/src/main/res/xml/pref_openapsama.xml
index 1dc22c7348..3e285d7477 100644
--- a/app/src/main/res/xml/pref_openapsama.xml
+++ b/app/src/main/res/xml/pref_openapsama.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        android:key="openapsama"
-        android:title="@string/openapsama">
 
-        <EditTextPreference
+    <PreferenceCategory
+        android:title="@string/openapsama"
+        app:initialExpandedChildrenCount="0">
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="1"
             android:dialogMessage="@string/openapsma_maxbasal_summary"
+            android:inputType="numberDecimal"
             android:key="@string/key_openapsma_max_basal"
-            android:numeric="decimal"
-            android:title="@string/openapsma_maxbasal_title" />
+            android:title="@string/openapsma_maxbasal_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0.1"
+            validate:testType="floatNumericRange" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="1.5"
             android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:inputType="numberDecimal"
             android:key="@string/key_openapsma_max_iob"
-            android:numeric="decimal"
-            android:title="@string/openapsma_maxiob_title" />
+            android:title="@string/openapsma_maxiob_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0"
+            validate:testType="floatNumericRange" />
 
         <SwitchPreference
             android:defaultValue="false"
@@ -30,20 +38,20 @@
             android:summary="@string/openapsama_autosens_adjusttargets_summary"
             android:title="@string/openapsama_autosens_adjusttargets" />
 
-        <com.andreabaccega.widget.ValidatingEditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="3.0"
             android:dialogMessage="@string/openapsama_min_5m_carbimpact_summary"
             android:inputType="numberDecimal"
             android:key="@string/key_openapsama_min_5m_carbimpact"
-            android:maxLines="20"
             android:selectAllOnFocus="true"
-            android:singleLine="true"
             android:title="@string/openapsama_min_5m_carbimpact"
             validate:floatmaxNumber="12.0"
-            validate:floatminNumber="0.1"
+            validate:floatminNumber="1"
             validate:testType="floatNumericRange" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_ama_advanced"
+            android:title="@string/advancedsettings_title">
 
             <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">
                 <intent
@@ -57,7 +65,7 @@
                 android:summary="@string/always_use_shortavg_summary"
                 android:title="@string/always_use_shortavg" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="3"
                 android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
                 android:digits="0123456789.,"
@@ -70,7 +78,7 @@
                 validate:minNumber="1"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="4"
                 android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
                 android:digits="0123456789.,"
@@ -84,7 +92,7 @@
                 validate:floatminNumber="1"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="2"
                 android:dialogMessage="@string/openapsama_bolussnooze_dia_divisor_summary"
                 android:digits="0123456789.,"
@@ -98,8 +106,8 @@
                 validate:minNumber="1"
                 validate:testType="floatNumericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_openapsma.xml b/app/src/main/res/xml/pref_openapsma.xml
index f5492ad590..418eabe4fb 100644
--- a/app/src/main/res/xml/pref_openapsma.xml
+++ b/app/src/main/res/xml/pref_openapsma.xml
@@ -1,25 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:key="openaps"
-        android:title="@string/openapsma">
+        android:title="@string/openapsma"
+        app:initialExpandedChildrenCount="0">
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="1"
             android:dialogMessage="@string/openapsma_maxbasal_summary"
+            android:inputType="numberDecimal"
             android:key="@string/key_openapsma_max_basal"
-            android:numeric="decimal"
-            android:title="@string/openapsma_maxbasal_title" />
+            android:title="@string/openapsma_maxbasal_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0.1"
+            validate:testType="floatNumericRange" />
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="1.5"
             android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:inputType="numberDecimal"
             android:key="@string/key_openapsma_max_iob"
-            android:numeric="decimal"
-            android:title="@string/openapsma_maxiob_title" />
+            android:title="@string/openapsma_maxiob_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0"
+            validate:testType="floatNumericRange" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_ma_advanced"
+            android:title="@string/advancedsettings_title">
 
             <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">
                 <intent
@@ -33,7 +42,7 @@
                 android:summary="@string/always_use_shortavg_summary"
                 android:title="@string/always_use_shortavg" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="2"
                 android:dialogMessage="@string/openapsama_bolussnooze_dia_divisor_summary"
                 android:digits="0123456789.,"
@@ -46,8 +55,9 @@
                 validate:maxNumber="10"
                 validate:minNumber="1"
                 validate:testType="floatNumericRange" />
-        </PreferenceScreen>
+
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 1fd18d9fb5..a4ca7c02d4 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
+    
     <PreferenceCategory
-        android:key="openapssmb"
+        app:initialExpandedChildrenCount="0"
         android:title="@string/openapssmb">
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="1"
             android:dialogMessage="@string/openapsma_maxbasal_summary"
+            android:inputType="numberDecimal"
             android:key="@string/key_openapsma_max_basal"
-            android:numeric="decimal"
-            android:title="@string/openapsma_maxbasal_title" />
+            android:title="@string/openapsma_maxbasal_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0.1"
+            validate:testType="floatNumericRange" />
 
-        <EditTextPreference
-            android:defaultValue="3"
-            android:dialogMessage="@string/openapssmb_maxiob_summary"
-            android:key="@string/key_openapssmb_max_iob"
-            android:numeric="decimal"
-            android:title="@string/openapssmb_maxiob_title" />
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="1.5"
+            android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:inputType="numberDecimal"
+            android:key="@string/key_openapsma_max_iob"
+            android:title="@string/openapsma_maxiob_title"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0"
+            validate:testType="floatNumericRange" />
 
         <SwitchPreference
             android:defaultValue="false"
@@ -65,13 +73,41 @@
             android:summary="@string/enablesmbaftercarbs_summary"
             android:title="@string/enablesmbaftercarbs" />
 
-        <ListPreference
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:defaultValue="3"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="key_smbinterval"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/smbinterval_summary"
+            validate:maxNumber="10"
+            validate:minNumber="1"
+            validate:testType="numericRange" />
+
+        <com.andreabaccega.widget.ValidatingEditTextPreference
             android:defaultValue="30"
             android:entries="@array/smbMaxMinutes"
             android:entryValues="@array/smbMaxMinutes"
             android:key="@string/key_smbmaxminutes"
             android:title="@string/smbmaxminutes_summary" />
 
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:defaultValue="30"
+            android:dialogMessage="@string/uamsmbmaxminutes"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="@string/key_uamsmbmaxminutes"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/uamsmbmaxminutes_summary"
+            validate:maxNumber="120"
+            validate:minNumber="15"
+            validate:testType="numericRange" />
+
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_uam"
@@ -79,25 +115,51 @@
             android:title="@string/enableuam" />
 
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_sensitivity_raises_target"
+            android:summary="@string/sensitivity_raises_target_summary"
+            android:title="@string/sensitivity_raises_target_title"
+            />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_resistance_lowers_target"
+            android:summary="@string/resistance_lowers_target_summary"
+            android:title="@string/resistance_lowers_target_title"
+            />
         <!-- TODO AS-FIX -->
         <SwitchPreference
             android:defaultValue="false"
+            android:enabled="false"
             android:key="@string/key_high_temptarget_raises_sensitivity"
             android:summary="@string/high_temptarget_raises_sensitivity_summary"
-            android:title="@string/high_temptarget_raises_sensitivity_title"
-            android:enabled="false"
-            />
+            android:title="@string/high_temptarget_raises_sensitivity_title" />
 
         <!-- TODO AS-FIX -->
         <SwitchPreference
             android:defaultValue="false"
+            android:enabled="false"
             android:key="@string/key_low_temptarget_lowers_sensitivity"
             android:summary="@string/low_temptarget_lowers_sensitivity_summary"
-            android:title="@string/low_temptarget_lowers_sensitivity_title"
-            android:enabled="false"
-            />
+            android:title="@string/low_temptarget_lowers_sensitivity_title" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title">
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:key="@string/key_carbsReqThreshold"
+            android:title="@string/carbsReqThreshold"
+            android:defaultValue="1"
+            android:dialogMessage="@string/carbsReqThreshold_summary"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            validate:maxNumber="10"
+            validate:minNumber="1"
+            validate:testType="numericRange"/>
+
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_smb_advanced"
+            android:title="@string/advancedsettings_title">
 
             <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">
                 <intent
@@ -111,7 +173,7 @@
                 android:summary="@string/always_use_shortavg_summary"
                 android:title="@string/always_use_shortavg" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="3"
                 android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
                 android:digits="0123456789.,"
@@ -124,7 +186,7 @@
                 validate:minNumber="1"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="4"
                 android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
                 android:digits="0123456789.,"
@@ -138,8 +200,8 @@
                 validate:floatminNumber="1"
                 validate:testType="floatNumericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_others.xml b/app/src/main/res/xml/pref_others.xml
deleted file mode 100644
index cea39d60e8..0000000000
--- a/app/src/main/res/xml/pref_others.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        android:key="others"
-        android:title="@string/othersettings_title">
-        <PreferenceScreen android:title="@string/default_temptargets">
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="number"
-                android:key="@string/key_eatingsoon_duration"
-                android:title="@string/eatingsoon_duration" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="@string/key_eatingsoon_target"
-                android:title="@string/eatingsoon_target" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="number"
-                android:key="@string/key_activity_duration"
-                android:title="@string/activity_duration" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="@string/key_activity_target"
-                android:title="@string/activity_target" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="number"
-                android:key="@string/key_hypo_duration"
-                android:title="@string/hypo_duration" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="@string/key_hypo_target"
-                android:title="@string/hypo_target" />
-        </PreferenceScreen>
-        <PreferenceScreen android:title="@string/fillbolus_title">
-            <EditTextPreference
-                android:defaultValue="0.3"
-                android:inputType="numberDecimal"
-                android:key="fill_button1"
-                android:title="@string/button1" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="fill_button2"
-                android:title="@string/button2" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="fill_button3"
-                android:title="@string/button3" />
-        </PreferenceScreen>
-        <PreferenceScreen
-            android:summary="@string/prefs_range_summary"
-            android:title="@string/prefs_range_title">
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="@string/key_low_mark"
-                android:title="@string/low_mark" />
-            <EditTextPreference
-                android:defaultValue="0"
-                android:inputType="numberDecimal"
-                android:key="@string/key_high_mark"
-                android:title="@string/high_mark" />
-        </PreferenceScreen>
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_short_tabtitles"
-            android:title="@string/short_tabtitles" />
-    </PreferenceCategory>
-    <PreferenceScreen android:title="@string/localalertsettings_title">
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_enable_missed_bg_readings_alert"
-            android:title="@string/enable_missed_bg_readings_alert" />
-        <EditTextPreference
-            android:defaultValue="30"
-            android:dependency="@string/key_enable_missed_bg_readings_alert"
-            android:inputType="number"
-            android:key="@string/key_missed_bg_readings_threshold"
-            android:title="@string/nsalarm_staledatavalue_label" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/key_enable_pump_unreachable_alert"
-            android:title="@string/enable_pump_unreachable_alert" />
-        <com.andreabaccega.widget.ValidatingEditTextPreference
-            validate:testType="numericRange"
-            validate:minNumber="30"
-            validate:maxNumber="300"
-            android:defaultValue="30"
-            android:dependency="@string/key_enable_pump_unreachable_alert"
-            android:inputType="number"
-            android:key="@string/key_pump_unreachable_threshold"
-            android:title="@string/pump_unreachable_threshold">
-        </com.andreabaccega.widget.ValidatingEditTextPreference>
-    </PreferenceScreen>
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/key_raise_notifications_as_android_notifications"
-        android:title="@string/raise_notifications_as_android_notifications" />
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 86feae3068..1e4825f113 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/overview">
+    <PreferenceCategory
+        android:title="@string/overview"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_keep_screen_on"
-            android:title="@string/keep_screen_on_title"
-            android:summary="@string/keep_screen_on_summary"/>
+            android:summary="@string/keep_screen_on_summary"
+            android:title="@string/keep_screen_on_title" />
 
-        <PreferenceScreen android:title="@string/overview_buttons_selection">
+        <androidx.preference.PreferenceScreen
+            android:key="@string/overview_buttons_selection"
+            android:title="@string/overview_buttons_selection">
 
             <SwitchPreference
                 android:defaultValue="false"
@@ -27,7 +32,7 @@
                 android:key="@string/key_show_insulin_button"
                 android:title="@string/configbuilder_insulin" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0.5"
                 android:dependency="@string/key_show_insulin_button"
                 android:dialogMessage="@string/insulin_increment_button_message"
@@ -41,7 +46,7 @@
                 validate:floatminNumber="-5.0"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="1.0"
                 android:dependency="@string/key_show_insulin_button"
                 android:dialogMessage="@string/insulin_increment_button_message"
@@ -55,7 +60,7 @@
                 validate:floatminNumber="-5.0"
                 validate:testType="floatNumericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="2.0"
                 android:dependency="@string/key_show_insulin_button"
                 android:dialogMessage="@string/insulin_increment_button_message"
@@ -74,7 +79,7 @@
                 android:key="@string/key_show_carbs_button"
                 android:title="@string/carbs" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="5"
                 android:dependency="@string/key_show_carbs_button"
                 android:dialogMessage="@string/carb_increment_button_message"
@@ -88,7 +93,7 @@
                 validate:minNumber="-50"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="10"
                 android:dependency="@string/key_show_carbs_button"
                 android:dialogMessage="@string/carb_increment_button_message"
@@ -102,7 +107,7 @@
                 validate:minNumber="-50"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="20"
                 android:dependency="@string/key_show_carbs_button"
                 android:dialogMessage="@string/carb_increment_button_message"
@@ -128,7 +133,7 @@
                 android:summary="@string/show_calibration_button_summary"
                 android:title="@string/overview_calibration" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
         <Preference
             android:key="quickwizard"
@@ -136,14 +141,143 @@
             <intent android:action="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
         </Preference>
 
+        <androidx.preference.PreferenceScreen
+            android:key="@string/default_temptargets"
+            android:title="@string/default_temptargets">
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="number"
+                android:key="@string/key_eatingsoon_duration"
+                android:title="@string/eatingsoon_duration"
+                validate:maxNumber="120"
+                validate:minNumber="15"
+                validate:testType="numericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="@string/key_eatingsoon_target"
+                android:title="@string/eatingsoon_target"
+                validate:floatmaxNumber="160.0"
+                validate:floatminNumber="4.0"
+                validate:testType="floatNumericRange" />
+
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="number"
+                android:key="@string/key_activity_duration"
+                android:title="@string/activity_duration"
+                validate:maxNumber="600"
+                validate:minNumber="15"
+                validate:testType="numericRange" />
+
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="@string/key_activity_target"
+                android:title="@string/activity_target"
+                validate:floatmaxNumber="220.0"
+                validate:floatminNumber="6.0"
+                validate:testType="floatNumericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="number"
+                android:key="@string/key_hypo_duration"
+                android:title="@string/hypo_duration"
+                validate:maxNumber="180"
+                validate:minNumber="15"
+                validate:testType="numericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="@string/key_hypo_target"
+                android:title="@string/hypo_target"
+                validate:floatmaxNumber="220.0"
+                validate:floatminNumber="6.0"
+                validate:testType="floatNumericRange" />
+
+
+        </androidx.preference.PreferenceScreen>
+
+        <androidx.preference.PreferenceScreen
+            android:key="@string/fillbolus_title"
+            android:title="@string/fillbolus_title">
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0.3"
+                android:inputType="numberDecimal"
+                android:key="fill_button1"
+                android:title="@string/button1"
+                validate:floatmaxNumber="20.0"
+                validate:floatminNumber="0.05"
+                validate:testType="floatNumericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="fill_button2"
+                android:title="@string/button2"
+                validate:floatmaxNumber="20.0"
+                validate:floatminNumber="0.05"
+                validate:testType="floatNumericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="fill_button3"
+                android:title="@string/button3"
+                validate:floatmaxNumber="20.0"
+                validate:floatminNumber="0.05"
+                validate:testType="floatNumericRange" />
+
+
+        </androidx.preference.PreferenceScreen>
+
+        <androidx.preference.PreferenceScreen
+            android:key="@string/prefs_range_title"
+            android:summary="@string/prefs_range_summary"
+            android:title="@string/prefs_range_title">
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="@string/key_low_mark"
+                android:title="@string/low_mark"
+                validate:floatmaxNumber="160"
+                validate:floatminNumber="3"
+                validate:testType="floatNumericRange" />
+
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+                android:defaultValue="0"
+                android:inputType="numberDecimal"
+                android:key="@string/key_high_mark"
+                android:title="@string/high_mark"
+                validate:floatmaxNumber="250"
+                validate:floatminNumber="5"
+                validate:testType="floatNumericRange" />
+
+        </androidx.preference.PreferenceScreen>
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_short_tabtitles"
+            android:title="@string/short_tabtitles" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_show_notes_entry_dialogs"
             android:title="@string/overview_show_notes_field_in_dialogs_title" />
 
-        <PreferenceScreen android:title="@string/advancedsettings_title" android:key="@string/key_advancedsettings">
+        <androidx.preference.PreferenceScreen
+            android:key="absorption_overview_advanced"
+            android:title="@string/advancedsettings_title">
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="100"
                 android:dialogMessage="@string/deliverpartofboluswizard"
                 android:inputType="number"
@@ -174,7 +308,7 @@
                 android:summary="@string/show_statuslights_extended_summary"
                 android:title="@string/show_statuslights_extended" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="80"
                 android:dependency="@string/key_show_statuslights"
                 android:inputType="numberSigned"
@@ -187,7 +321,7 @@
                 validate:minNumber="0"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="10"
                 android:dependency="@string/key_show_statuslights"
                 android:inputType="numberSigned"
@@ -200,7 +334,7 @@
                 validate:minNumber="0"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="25"
                 android:dependency="@string/key_show_statuslights"
                 android:inputType="numberSigned"
@@ -213,7 +347,7 @@
                 validate:minNumber="0"
                 validate:testType="numericRange" />
 
-            <com.andreabaccega.widget.ValidatingEditTextPreference
+            <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="5"
                 android:dependency="@string/key_show_statuslights"
                 android:inputType="numberSigned"
@@ -226,8 +360,8 @@
                 validate:minNumber="0"
                 validate:testType="numericRange" />
 
-        </PreferenceScreen>
+        </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_password.xml b/app/src/main/res/xml/pref_password.xml
deleted file mode 100644
index f050d0486c..0000000000
--- a/app/src/main/res/xml/pref_password.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="password"
-        android:title="@string/settings_password">
-
-        <EditTextPreference
-            android:title="@string/settings_password"
-            android:key="settings_password"
-            android:inputType="textPassword">
-        </EditTextPreference>
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_poctech.xml b/app/src/main/res/xml/pref_poctech.xml
deleted file mode 100644
index 8a48a7fd05..0000000000
--- a/app/src/main/res/xml/pref_poctech.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:title="@string/bgsource_upload">
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_dexcomg5_nsupload"
-            android:title="@string/dexcomg5_nsupload_title" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_dexcomg5_xdripupload"
-            android:summary="@string/dexcomg5_xdripupload_summary"
-            android:title="@string/dexcomg5_xdripupload_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_safety.xml b/app/src/main/res/xml/pref_safety.xml
index e906c92608..e3f5f2e23d 100644
--- a/app/src/main/res/xml/pref_safety.xml
+++ b/app/src/main/res/xml/pref_safety.xml
@@ -1,20 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
-        android:key="treatmentssafety"
-        android:title="@string/treatmentssafety_title">
+        android:title="@string/treatmentssafety_title"
+        app:initialExpandedChildrenCount="0">
+
+        <ListPreference
+            android:defaultValue="adult"
+            android:entries="@array/ageArray"
+            android:entryValues="@array/ageValues"
+            android:key="@string/key_age"
+            android:summary="@string/patientage_summary"
+            android:title="@string/patientage" />
 
         <EditTextPreference
-            android:title="@string/treatmentssafety_maxbolus_title"
-            android:key="@string/key_treatmentssafety_maxbolus"
             android:defaultValue="3"
-            android:inputType="numberDecimal">
-        </EditTextPreference>
+            android:inputType="numberDecimal"
+            android:key="@string/key_treatmentssafety_maxbolus"
+            android:title="@string/treatmentssafety_maxbolus_title"
+            validate:floatmaxNumber="25.0"
+            validate:floatminNumber="0.1"
+            validate:testType="floatNumericRange" />
+
+
         <EditTextPreference
-            android:title="@string/treatmentssafety_maxcarbs_title"
-            android:key="@string/key_treatmentssafety_maxcarbs"
             android:defaultValue="48"
-            android:inputType="numberDecimal">
-        </EditTextPreference>
+            android:inputType="numberDecimal"
+            android:key="@string/key_treatmentssafety_maxcarbs"
+            android:title="@string/treatmentssafety_maxcarbs_title"
+            validate:floatmaxNumber="200"
+            validate:floatminNumber="1"
+            validate:testType="numericRange" />
+
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_smscommunicator.xml b/app/src/main/res/xml/pref_smscommunicator.xml
index e76b1b15b2..404757fe31 100644
--- a/app/src/main/res/xml/pref_smscommunicator.xml
+++ b/app/src/main/res/xml/pref_smscommunicator.xml
@@ -1,29 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        android:key="smscommunicator"
-        android:title="@string/smscommunicator">
 
-        <EditTextPreference
+    <PreferenceCategory
+        android:title="@string/smscommunicator"
+        app:initialExpandedChildrenCount="0">
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:key="@string/key_smscommunicator_allowednumbers"
             android:summary="@string/smscommunicator_allowednumbers_summary"
-            android:title="@string/smscommunicator_allowednumbers" />
-        <com.andreabaccega.widget.ValidatingEditTextPreference
-            android:key="@string/key_smscommunicator_remotebolusmindistance"
-            android:defaultValue="15"
-            android:summary="@string/smscommunicator_remotebolusmindistance_summary"
-            android:title="@string/smscommunicator_remotebolusmindistance"
-            validate:minNumber="3"
-            validate:maxNumber="60"
-            validate:testType="numericRange"
-            android:singleLineTitle="false"
-            />
+            android:title="@string/smscommunicator_allowednumbers"
+            validate:testType="multiPhone" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_smscommunicator_remotecommandsallowed"
             android:title="@string/smscommunicator_remotecommandsallowed" />
 
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="15"
+            android:key="@string/key_smscommunicator_remotebolusmindistance"
+            android:summary="@string/smscommunicator_remotebolusmindistance_summary"
+            android:title="@string/smscommunicator_remotebolusmindistance"
+            validate:maxNumber="60"
+            validate:minNumber="3"
+            validate:testType="numericRange" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:enabled="false"
+            android:key="@string/key_smscommunicator_otp_enabled"
+            android:summary="@string/smscommunicator_otp_enabled_summary"
+            android:title="@string/smscommunicator_otp_enabled"
+            app:isPreferenceVisible="false" />
+
+        <Preference
+            android:dependency="@string/key_smscommunicator_remotecommandsallowed"
+            android:key="otpsetup"
+            android:title="@string/smscomunicator_tab_otp_label">
+            <intent android:action="info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />
+        </Preference>
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:dependency="@string/key_smscommunicator_remotecommandsallowed"
+            android:key="@string/key_smscommunicator_otp_password"
+            android:summary="@string/smscommunicator_otp_pin_summary"
+            android:title="@string/smscommunicator_otp_pin"
+            validate:testType="pinStrength" />
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:dependency="@string/key_smscommunicator_remotecommandsallowed"
+            android:key="@string/key_smscommunicator_otp_name"
+            android:summary="@string/smscommunicator_otp_name_summary"
+            android:title="@string/smscommunicator_otp_name"
+            validate:testType="personName" />
+
+
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_tidepool.xml b/app/src/main/res/xml/pref_tidepool.xml
index a3b8d6301d..96e3c8f218 100644
--- a/app/src/main/res/xml/pref_tidepool.xml
+++ b/app/src/main/res/xml/pref_tidepool.xml
@@ -1,53 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:key="tidepool_upload_screen"
-        android:title="@string/tidepool">
+        android:title="@string/tidepool"
+        app:initialExpandedChildrenCount="0">
 
-        <EditTextPreference
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:key="@string/key_tidepool_username"
             android:summary="@string/summary_tidepool_username"
-            android:title="@string/title_tidepool_username" />
+            android:title="@string/title_tidepool_username"
+            validate:testType="email"/>
+
         <EditTextPreference
             android:inputType="textPassword"
             android:key="@string/key_tidepool_password"
             android:summary="@string/summary_tidepool_password"
             android:title="@string/title_tidepool_password" />
+
         <Preference
             android:key="@string/key_tidepool_test_login"
             android:title="@string/title_tidepool_test_login" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/key_tidepool_upload_cgm"
             android:title="@string/tidepool_upload_cgm" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/key_tidepool_upload_bolus"
             android:title="@string/tidepool_upload_bolus" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/key_tidepool_upload_bg"
             android:title="@string/tidepool_upload_bg" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/key_tidepool_upload_tbr"
             android:title="@string/tidepool_upload_tbr" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/key_tidepool_upload_profile"
             android:title="@string/tidepool_upload_profile" />
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:enabled="false"
             android:key="@string/key_tidepool_dev_servers"
             android:summary="@string/summary_tidepool_dev_servers"
             android:title="@string/title_tidepool_dev_servers" />
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="@string/key_tidepool_only_while_charging"
             android:summary="Upload data only when charging"
             android:title="Only when charging" />
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="@string/key_tidepool_only_while_unmetered"
@@ -56,5 +69,5 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
 
diff --git a/app/src/main/res/xml/pref_virtualpump.xml b/app/src/main/res/xml/pref_virtualpump.xml
index 367fa59531..deb92bccfd 100644
--- a/app/src/main/res/xml/pref_virtualpump.xml
+++ b/app/src/main/res/xml/pref_virtualpump.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="virtualpump"
-        android:title="@string/virtualpump_settings">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="virtualpump_uploadstatus"
-            android:title="@string/virtualpump_uploadstatus_title" />
+    <PreferenceCategory
+        android:title="@string/virtualpump_settings"
+        app:initialExpandedChildrenCount="0">
 
         <ListPreference
             android:defaultValue="1"
@@ -15,7 +12,12 @@
             android:entryValues="@array/virtualPumpTypes"
             android:key="@string/key_virtualpump_type"
             android:title="@string/virtualpump_type" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="virtualpump_uploadstatus"
+            android:title="@string/virtualpump_uploadstatus_title" />
+
     </PreferenceCategory>
 
-
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_wear.xml b/app/src/main/res/xml/pref_wear.xml
index be74ee986a..855ae4a9af 100644
--- a/app/src/main/res/xml/pref_wear.xml
+++ b/app/src/main/res/xml/pref_wear.xml
@@ -1,96 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="wearplugin"
-        android:title="@string/wear_settings">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-        <PreferenceScreen
-            android:title="@string/wear_settings">
+    <PreferenceCategory
+        android:title="@string/wear_settings"
+        app:initialExpandedChildrenCount="0">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="wearcontrol"
+            android:summary="@string/wearcontrol_summary"
+            android:title="@string/wearcontrol_title" />
+
+        <PreferenceCategory
+            android:dependency="wearcontrol"
+            android:summary="@string/wear_wizard_settings_summary"
+            android:title="@string/wear_wizard_settings">
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="wearcontrol"
+                android:key="@string/key_wearwizard_bg"
+                android:title="@string/treatments_wizard_bg_label" />
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:dependency="@string/key_wearwizard_bg"
+                android:key="@string/key_wearwizard_tt"
+                android:title="@string/treatments_wizard_tt_label" />
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:dependency="wearcontrol"
+                android:key="@string/key_wearwizard_trend"
+                android:title="@string/treatments_wizard_bgtrend_label" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="wearcontrol"
+                android:key="@string/key_wearwizard_cob"
+                android:title="@string/treatments_wizard_cob_label" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="wearcontrol"
+                android:key="@string/key_wearwizard_bolusiob"
+                android:title="@string/treatments_wizard_bolusiob_label" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="wearcontrol"
+                android:key="@string/key_wearwizard_basaliob"
+                android:title="@string/treatments_wizard_basaliob_label" />
+
+        </PreferenceCategory>
+
+        <PreferenceCategory
+            android:title="@string/wear_display_settings">
 
             <SwitchPreference
                 android:defaultValue="false"
-                android:key="wearcontrol"
-                android:summary="@string/wearcontrol_summary"
-                android:title="@string/wearcontrol_title" />
+                android:key="@string/key_wear_detailediob"
+                android:summary="@string/wear_detailedIOB_summary"
+                android:title="@string/wear_detailedIOB_title" />
 
-            <PreferenceCategory
-                android:key="wearplugin"
-                android:title="@string/wear_wizard_settings"
-                android:summary="@string/wear_wizard_settings_summary"
-                android:dependency="wearcontrol">
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_wear_detailed_delta"
+                android:summary="@string/wear_detailed_delta_summary"
+                android:title="@string/wear_detailed_delta_title" />
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_bg"
-                    android:title="@string/treatments_wizard_bg_label"
-                    android:defaultValue="true"
-                    android:dependency="wearcontrol"/>
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_wear_showbgi"
+                android:summary="@string/wear_showbgi_summary"
+                android:title="@string/wear_showbgi_title" />
+            <SwitchPreference
+                android:defaultValue="true"
+                android:key="wear_predictions"
+                android:summary="@string/wear_predictions_summary"
+                android:title="@string/wear_predictions_title" />
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_tt"
-                    android:title="@string/treatments_wizard_tt_label"
-                    android:defaultValue="false"
-                    android:dependency="@string/key_wearwizard_bg"/>
+        </PreferenceCategory>
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_trend"
-                    android:title="@string/treatments_wizard_bgtrend_label"
-                    android:defaultValue="false"
-                    android:dependency="wearcontrol"/>
+        <PreferenceCategory
+            android:title="@string/wear_general_settings">
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_cob"
-                    android:title="@string/treatments_wizard_cob_label"
-                    android:defaultValue="true"
-                    android:dependency="wearcontrol"/>
+            <SwitchPreference
+                android:defaultValue="true"
+                android:key="wear_notifySMB"
+                android:summary="@string/wear_notifysmb_summary"
+                android:title="@string/wear_notifysmb_title" />
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_bolusiob"
-                    android:title="@string/treatments_wizard_bolusiob_label"
-                    android:defaultValue="true"
-                    android:dependency="wearcontrol"/>
+        </PreferenceCategory>
 
-                <CheckBoxPreference
-                    android:key="@string/key_wearwizard_basaliob"
-                    android:title="@string/treatments_wizard_basaliob_label"
-                    android:defaultValue="true"
-                    android:dependency="wearcontrol"/>
-            </PreferenceCategory>
-
-            <PreferenceCategory
-                android:key="wearplugin"
-                android:title="@string/wear_display_settings">
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="@string/key_wear_detailediob"
-                    android:summary="@string/wear_detailedIOB_summary"
-                    android:title="@string/wear_detailedIOB_title" />
-
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="wear_detailed_delta"
-                    android:summary="@string/wear_detailed_delta_summary"
-                    android:title="@string/wear_detailed_delta_title" />
-
-                <SwitchPreference
-                    android:defaultValue="false"
-                    android:key="@string/key_wear_showbgi"
-                    android:summary="@string/wear_showbgi_summary"
-                    android:title="@string/wear_showbgi_title" />
-                <SwitchPreference
-                    android:defaultValue="true"
-                    android:key="wear_predictions"
-                    android:summary="@string/wear_predictions_summary"
-                    android:title="@string/wear_predictions_title" />
-            </PreferenceCategory>
-            <PreferenceCategory
-                android:key="wearplugin"
-                android:title="@string/wear_general_settings">
-                <SwitchPreference
-                    android:defaultValue="true"
-                    android:key="wear_notifySMB"
-                    android:summary="@string/wear_notifysmb_summary"
-                    android:title="@string/wear_notifysmb_title" />
-            </PreferenceCategory>
-        </PreferenceScreen>
     </PreferenceCategory>
-</PreferenceScreen>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_xdripstatus.xml b/app/src/main/res/xml/pref_xdripstatus.xml
index 959377ea7b..00aa8262ef 100644
--- a/app/src/main/res/xml/pref_xdripstatus.xml
+++ b/app/src/main/res/xml/pref_xdripstatus.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
-        android:key="xdripstatus"
-        android:title="@string/xdripstatus_settings">
+        android:title="@string/xdripstatus_settings"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="true"
-            android:key="xdripstatus_detailediob"
-            android:title="@string/wear_detailedIOB_title"
-            android:summary="@string/wear_detailedIOB_summary"/>
+            android:key="@string/key_xdripstatus_detailediob"
+            android:summary="@string/wear_detailedIOB_summary"
+            android:title="@string/wear_detailedIOB_title" />
+
         <SwitchPreference
             android:defaultValue="false"
-            android:key="xdripstatus_showbgi"
-            android:title="@string/wear_showbgi_title"
-            android:summary="@string/wear_showbgi_summary"/>
+            android:key="@string/key_xdripstatus_showbgi"
+            android:summary="@string/wear_showbgi_summary"
+            android:title="@string/wear_showbgi_title" />
+
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/test/java/android/util/Log.java b/app/src/test/java/android/util/Log.java
deleted file mode 100644
index bc2777f297..0000000000
--- a/app/src/test/java/android/util/Log.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package android.util;
-
-import java.time.LocalDateTime;
-
-/**
- * Created by andy on 3/10/19.
- */
-
-public class Log {
-
-    // 03-10 13:44:42.847 12790-12888/info.nightscout.androidaps D/MedtronicHistoryData:
-
-    static boolean isLoggingEnabled = false;
-
-
-    public static void setLoggingEnabled(boolean enabled) {
-        isLoggingEnabled = enabled;
-    }
-
-
-    private void writeLog(String type, String tag, String message) {
-        if (isLoggingEnabled) {
-            LocalDateTime ldt = LocalDateTime.now();
-            System.out.println("DEBUG: " + tag + ": " + message);
-        }
-    }
-
-
-    public static int d(String tag, String msg) {
-        System.out.println("DEBUG: " + tag + ": " + msg);
-        return 0;
-    }
-
-
-    public static int v(String tag, String msg) {
-        System.out.println("VERBOSE: " + tag + ": " + msg);
-        return 0;
-    }
-
-
-    public static int i(String tag, String msg) {
-        System.out.println("INFO: " + tag + ": " + msg);
-        return 0;
-    }
-
-
-    public static int w(String tag, String msg) {
-        System.out.println("WARN: " + tag + ": " + msg);
-        return 0;
-    }
-
-
-    public static int e(String tag, String msg) {
-        System.out.println("ERROR: " + tag + ": " + msg);
-        return 0;
-    }
-
-    // add other methods if required...
-}
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
deleted file mode 100644
index b48942fbc4..0000000000
--- a/app/src/test/java/info/AAPSMocker.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package info;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.powermock.api.mockito.PowerMockito;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ConstraintChecker;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-public class AAPSMocker {
-    private static String validProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    private static Profile profile;
-    private static ProfileStore profileStore;
-    public static final String TESTPROFILENAME = "someProfile";
-
-    public static CommandQueue queue;
-    public static ConfigBuilderPlugin configBuilderPlugin;
-    public static ProfileFunctions profileFunctions;
-    public static ConstraintChecker constraintChecker;
-
-    public static void mockStrings() {
-        Locale.setDefault(new Locale("en", "US"));
-
-        when(MainApp.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.");
-        when(MainApp.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences");
-        when(MainApp.gs(R.string.objectivenotstarted)).thenReturn("Objective %d not started");
-        when(MainApp.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump");
-        when(MainApp.gs(R.string.autosensdisabledinpreferences)).thenReturn("Autosens disabled in preferences");
-        when(MainApp.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences");
-        when(MainApp.gs(R.string.limitingbasalratio)).thenReturn("Limiting basal rate to %.2f U/h because of %s");
-        when(MainApp.gs(R.string.pumplimit)).thenReturn("pump limit");
-        when(MainApp.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value");
-        when(MainApp.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences");
-        when(MainApp.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier");
-        when(MainApp.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier");
-        when(MainApp.gs(R.string.limitingpercentrate)).thenReturn("Limiting percent rate to %d%% because of %s");
-        when(MainApp.gs(R.string.pumplimit)).thenReturn("pump limit");
-        when(MainApp.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s");
-        when(MainApp.gs(R.string.hardlimit)).thenReturn("hard limit");
-        when(MainApp.gs(R.string.key_child)).thenReturn("child");
-        when(MainApp.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s");
-        when(MainApp.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %.1f U because of %s");
-        when(MainApp.gs(R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable");
-        when(MainApp.gs(R.string.loop)).thenReturn("Loop");
-        when(MainApp.gs(R.string.loop_shortname)).thenReturn("LOOP");
-        when(MainApp.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering");
-        when(MainApp.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode");
-        when(MainApp.gs(R.string.Glimp)).thenReturn("Glimp");
-        when(MainApp.gs(R.string.glucose)).thenReturn("Glucose");
-        when(MainApp.gs(R.string.delta)).thenReturn("Delta");
-        when(MainApp.gs(R.string.short_avgdelta)).thenReturn("Short avg. delta");
-        when(MainApp.gs(R.string.long_avgdelta)).thenReturn("Long avg. delta");
-        when(MainApp.gs(R.string.zerovalueinprofile)).thenReturn("Invalid profile: %s");
-        when(MainApp.gs(R.string.success)).thenReturn("Success");
-        when(MainApp.gs(R.string.enacted)).thenReturn("Enacted");
-        when(MainApp.gs(R.string.comment)).thenReturn("Comment");
-        when(MainApp.gs(R.string.smb_shortname)).thenReturn("SMB");
-        when(MainApp.gs(R.string.canceltemp)).thenReturn("Cancel temp basal");
-        when(MainApp.gs(R.string.duration)).thenReturn("Duration");
-        when(MainApp.gs(R.string.percent)).thenReturn("Percent");
-        when(MainApp.gs(R.string.absolute)).thenReturn("Absolute");
-        when(MainApp.gs(R.string.waitingforpumpresult)).thenReturn("Waiting for result");
-        when(MainApp.gs(R.string.insulin_unit_shortname)).thenReturn("U");
-        when(MainApp.gs(R.string.minimalbasalvaluereplaced)).thenReturn("Basal value replaced by minimal supported value: %1$s");
-        when(MainApp.gs(R.string.basalprofilenotaligned)).thenReturn("Basal values not aligned to hours: %s");
-        when(MainApp.gs(R.string.minago)).thenReturn("%d min ago");
-        when(MainApp.gs(R.string.hoursago)).thenReturn("%.1fh ago");
-        when(MainApp.gs(R.string.careportal_profileswitch)).thenReturn("Profile Switch");
-        when(MainApp.gs(R.string.configbuilder_insulin)).thenReturn("Insulin");
-        when(MainApp.gs(R.string.bolusdelivering)).thenReturn("Delivering 0.0U");
-        when(MainApp.gs(R.string.profile_per_unit)).thenReturn("/U");
-        when(MainApp.gs(R.string.shortday)).thenReturn("d");
-        when(MainApp.gs(R.string.shorthour)).thenReturn("h");
-        when(MainApp.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U");
-        when(MainApp.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h");
-        when(MainApp.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.");
-        when(MainApp.gs(R.string.sms_iob)).thenReturn("IOB:");
-        when(MainApp.gs(R.string.sms_lastbg)).thenReturn("Last BG:");
-        when(MainApp.gs(R.string.sms_minago)).thenReturn("%1$dmin ago");
-        when(MainApp.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed");
-        when(MainApp.gs(R.string.smscommunicator_stopsmswithcode)).thenReturn("To disable the SMS Remote Service reply with code %1$s.\\n\\nKeep in mind that you\\'ll able to reactivate it directly from the AAPS master smartphone only.");
-        when(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2$s.");
-        when(MainApp.gs(R.string.smscommunicator_temptargetwithcode)).thenReturn("To set the Temp Target %1$s reply with code %2$s");
-        when(MainApp.gs(R.string.smscommunicator_temptargetcancel)).thenReturn("To cancel Temp Target reply with code %1$s");
-        when(MainApp.gs(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.");
-        when(MainApp.gs(R.string.smscommunicator_tt_set)).thenReturn("Target %1$s for %2$d minutes set successfully");
-        when(MainApp.gs(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully");
-        when(MainApp.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1$d m)");
-        when(MainApp.gs(R.string.smscommunicator_loopisdisabled)).thenReturn("Loop is disabled");
-        when(MainApp.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled");
-        when(MainApp.gs(R.string.wrongformat)).thenReturn("Wrong format");
-        when(MainApp.gs(R.string.smscommunicator_loophasbeendisabled)).thenReturn("Loop has been disabled");
-        when(MainApp.gs(R.string.smscommunicator_loophasbeenenabled)).thenReturn("Loop has been enabled");
-        when(MainApp.gs(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled");
-        when(MainApp.gs(R.string.smscommunicator_loopresumed)).thenReturn("Loop resumed");
-        when(MainApp.gs(R.string.smscommunicator_wrongduration)).thenReturn("Wrong duration");
-        when(MainApp.gs(R.string.smscommunicator_suspendreplywithcode)).thenReturn("To suspend loop for %1$d minutes reply with code %2$s");
-        when(MainApp.gs(R.string.smscommunicator_loopsuspended)).thenReturn("Loop suspended");
-        when(MainApp.gs(R.string.smscommunicator_unknowncommand)).thenReturn("Unknown command or wrong reply");
-        when(MainApp.gs(R.string.notconfigured)).thenReturn("Not configured");
-        when(MainApp.gs(R.string.smscommunicator_profilereplywithcode)).thenReturn("To switch profile to %1$s %2$d%% reply with code %3$s");
-        when(MainApp.gs(R.string.profileswitchcreated)).thenReturn("Profile switch created");
-        when(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode)).thenReturn("To stop temp basal reply with code %1$s");
-        when(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode)).thenReturn("To start basal %1$d%% for %2$d min reply with code %3$s");
-        when(MainApp.gs(R.string.smscommunicator_tempbasalset_percent)).thenReturn("Temp basal %1$d%% for %2$d min started successfully");
-        when(MainApp.gs(R.string.smscommunicator_basalreplywithcode)).thenReturn("To start basal %1$.2fU/h for %2$d min reply with code %3$s");
-        when(MainApp.gs(R.string.smscommunicator_tempbasalset)).thenReturn("Temp basal %1$.2fU/h for %2$d min started successfully");
-        when(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode)).thenReturn("To stop extended bolus reply with code %1$s");
-        when(MainApp.gs(R.string.smscommunicator_extendedcanceled)).thenReturn("Extended bolus canceled");
-        when(MainApp.gs(R.string.smscommunicator_extendedreplywithcode)).thenReturn("To start extended bolus %1$.2fU for %2$d min reply with code %3$s");
-        when(MainApp.gs(R.string.smscommunicator_extendedset)).thenReturn("Extended bolus %1$.2fU for %2$d min started successfully");
-        when(MainApp.gs(R.string.smscommunicator_bolusreplywithcode)).thenReturn("To deliver bolus %1$.2fU reply with code %2$s");
-        when(MainApp.gs(R.string.smscommunicator_bolusdelivered)).thenReturn("Bolus %1$.2fU delivered successfully");
-        when(MainApp.gs(R.string.smscommunicator_remotebolusnotallowed)).thenReturn("Remote bolus not available. Try again later.");
-        when(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode)).thenReturn("To send calibration %1$.2f reply with code %2$s");
-        when(MainApp.gs(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.");
-        when(MainApp.gs(R.string.pumpsuspended)).thenReturn("Pump suspended");
-        when(MainApp.gs(R.string.cob)).thenReturn("COB");
-        when(MainApp.gs(R.string.value_unavailable_short)).thenReturn("n/a");
-        when(MainApp.gs(R.string.starttemptarget)).thenReturn("Start temp target");
-        when(MainApp.gs(R.string.stoptemptarget)).thenReturn("Stop temp target");
-        when(MainApp.gs(R.string.disableloop)).thenReturn("Disable loop");
-        when(MainApp.gs(R.string.enableloop)).thenReturn("Enable loop");
-        when(MainApp.gs(R.string.resumeloop)).thenReturn("Resume loop");
-        when(MainApp.gs(R.string.suspendloop)).thenReturn("Suspend loop");
-        when(MainApp.gs(R.string.pumpNotInitialized)).thenReturn("Pump not initialized!");
-        when(MainApp.gs(R.string.increasingmaxbasal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile");
-        when(MainApp.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered");
-        when(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2$s");
-        when(MainApp.gs(R.string.smscommunicator_mealbolusdelivered)).thenReturn("Meal Bolus %1$.2fU delivered successfully");
-        when(MainApp.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1$s for %2$d minutes");
-        when(MainApp.gs(R.string.smscommunicator_carbsreplywithcode)).thenReturn("To enter %1$dg at %2$s reply with code %3$s");
-        when(MainApp.gs(R.string.smscommunicator_carbsset)).thenReturn("Carbs %1$dg entered successfully");
-    }
-
-    public static MainApp mockMainApp() {
-        System.setProperty("disableFirebase", "true");
-        PowerMockito.mockStatic(MainApp.class);
-        MainApp mainApp = mock(MainApp.class);
-        when(MainApp.instance()).thenReturn(mainApp);
-
-        return mainApp;
-    }
-
-    public static void mockConfigBuilder() {
-        PowerMockito.mockStatic(ConfigBuilderPlugin.class);
-        configBuilderPlugin = mock(ConfigBuilderPlugin.class);
-        when(ConfigBuilderPlugin.getPlugin()).thenReturn(configBuilderPlugin);
-    }
-
-    public static ConstraintChecker mockConstraintsChecker() {
-        constraintChecker = mock(ConstraintChecker.class);
-        when(MainApp.getConstraintChecker()).thenReturn(constraintChecker);
-        return constraintChecker;
-    }
-
-    public static void mockSP() {
-        PowerMockito.mockStatic(SP.class);
-        when(SP.getLong(anyInt(), anyLong())).thenReturn(0L);
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(false);
-        when(SP.getInt(anyInt(), anyInt())).thenReturn(0);
-        when(SP.getString(anyInt(), anyString())).thenReturn("");
-    }
-
-    public static void mockL() {
-        PowerMockito.mockStatic(L.class);
-        when(L.isEnabled(any())).thenReturn(true);
-    }
-
-    public static void mockNSUpload() {
-        PowerMockito.mockStatic(NSUpload.class);
-    }
-
-    public static void mockApplicationContext() {
-        Context mockedContext = mock(Context.class);
-        Resources mResources = mock(Resources.class);
-        when(MainApp.instance().getApplicationContext()).thenReturn(mockedContext);
-        when(mockedContext.getResources()).thenReturn(mResources);
-        PackageManager packageManager = mock(PackageManager.class);
-        when(mockedContext.getPackageManager()).thenReturn(packageManager);
-    }
-
-    public static DatabaseHelper mockDatabaseHelper() {
-        DatabaseHelper databaseHelper = mock(DatabaseHelper.class);
-        when(MainApp.getDbHelper()).thenReturn(databaseHelper);
-        return databaseHelper;
-    }
-
-    public static void mockCommandQueue() {
-        queue = mock(CommandQueue.class);
-        when(ConfigBuilderPlugin.getPlugin().getCommandQueue()).thenReturn(queue);
-    }
-
-    public static TreatmentsPlugin mockTreatmentPlugin() {
-        PowerMockito.mockStatic(TreatmentsPlugin.class);
-        TreatmentsPlugin treatmentsPlugin = PowerMockito.mock(TreatmentsPlugin.class);
-        when(TreatmentsPlugin.getPlugin()).thenReturn(treatmentsPlugin);
-        when(treatmentsPlugin.getLastCalculationTreatments()).thenReturn(new IobTotal(0));
-        when(treatmentsPlugin.getLastCalculationTempBasals()).thenReturn(new IobTotal(0));
-
-        TreatmentService treatmentService = PowerMockito.mock(TreatmentService.class);
-        when(treatmentsPlugin.getService()).thenReturn(treatmentService);
-        return treatmentsPlugin;
-    }
-
-    public static void mockTreatmentService() {
-        TreatmentService treatmentService = PowerMockito.mock(TreatmentService.class);
-        try {
-            PowerMockito.whenNew(TreatmentService.class).withNoArguments().thenReturn(treatmentService);
-        } catch (Exception e) {
-        }
-
-    }
-
-    public static Profile getValidProfile() {
-        try {
-            if (profile == null)
-                profile = new Profile(new JSONObject(validProfile), Constants.MGDL);
-        } catch (JSONException ignored) {
-        }
-        return profile;
-    }
-
-    public static ProfileStore getValidProfileStore() {
-        try {
-            if (profileStore == null) {
-                JSONObject json = new JSONObject();
-                JSONObject store = new JSONObject();
-                JSONObject profile = new JSONObject(validProfile);
-
-                json.put("defaultProfile", TESTPROFILENAME);
-                json.put("store", store);
-                store.put(TESTPROFILENAME, profile);
-                profileStore = new ProfileStore(json);
-            }
-        } catch (JSONException ignored) {
-            Assert.fail("getValidProfileStore() failed");
-        }
-        return profileStore;
-    }
-
-    public static void mockProfileFunctions() {
-        PowerMockito.mockStatic(ProfileFunctions.class);
-        profileFunctions = PowerMockito.mock(ProfileFunctions.class);
-        PowerMockito.when(ProfileFunctions.getSystemUnits()).thenReturn(Constants.MGDL);
-        PowerMockito.when(ProfileFunctions.getInstance()).thenReturn(profileFunctions);
-        profile = getValidProfile();
-        PowerMockito.when(ProfileFunctions.getInstance().getProfile()).thenReturn(profile);
-        PowerMockito.when(ProfileFunctions.getInstance().getProfileName()).thenReturn(TESTPROFILENAME);
-    }
-
-    public static IobCobCalculatorPlugin mockIobCobCalculatorPlugin() {
-        PowerMockito.mockStatic(IobCobCalculatorPlugin.class);
-        IobCobCalculatorPlugin iobCobCalculatorPlugin = PowerMockito.mock(IobCobCalculatorPlugin.class);
-        PowerMockito.when(IobCobCalculatorPlugin.getPlugin()).thenReturn(iobCobCalculatorPlugin);
-        Object dataLock = new Object();
-        PowerMockito.when(iobCobCalculatorPlugin.getDataLock()).thenReturn(dataLock);
-        return iobCobCalculatorPlugin;
-    }
-
-}
diff --git a/app/src/test/java/info/BundleMock.java b/app/src/test/java/info/BundleMock.java
deleted file mode 100644
index 62b4f28db6..0000000000
--- a/app/src/test/java/info/BundleMock.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package info;
-
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.util.SparseArray;
-
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyByte;
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyDouble;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyShort;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.when;
-
-public final class BundleMock {
-
-    public static Bundle mock() {
-        return mock(new HashMap<String, Object>());
-    }
-
-    public static Bundle mock(final HashMap<String, Object> map) {
-
-        Answer unsupported = new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                throw new UnsupportedOperationException();
-            }
-        };
-        Answer put = new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                map.put((String)invocation.getArguments()[0], invocation.getArguments()[1]);
-                return null;
-            }
-        };
-        Answer<Object> get = new Answer<Object>() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.get(invocation.getArguments()[0]);
-            }
-        };
-        Answer<Object> getOrDefault = new Answer<Object>() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                Object key = invocation.getArguments()[0];
-                return map.containsKey(key) ? map.get(key) : invocation.getArguments()[1];
-            }
-        };
-
-        Bundle bundle = Mockito.mock(Bundle.class);
-
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.size();
-            }
-        }).when(bundle).size();
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.isEmpty();
-            }
-        }).when(bundle).isEmpty();
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                map.clear();
-                return null;
-            }
-        }).when(bundle).clear();
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.containsKey(invocation.getArguments()[0]);
-            }
-        }).when(bundle).containsKey(anyString());
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.get(invocation.getArguments()[0]);
-            }
-        }).when(bundle).get(anyString());
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                map.remove(invocation.getArguments()[0]);
-                return null;
-            }
-        }).when(bundle).remove(anyString());
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return map.keySet();
-            }
-        }).when(bundle).keySet();
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                return BundleMock.class.getSimpleName() + "{map=" + map.toString() + "}";
-            }
-        }).when(bundle).toString();
-
-        doAnswer(put).when(bundle).putBoolean(anyString(), anyBoolean());
-        when(bundle.getBoolean(anyString())).thenAnswer(get);
-        when(bundle.getBoolean(anyString(), anyBoolean())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putByte(anyString(), anyByte());
-        when(bundle.getByte(anyString())).thenAnswer(get);
-        when(bundle.getByte(anyString(), anyByte())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putChar(anyString(), anyChar());
-        when(bundle.getChar(anyString())).thenAnswer(get);
-        when(bundle.getChar(anyString(), anyChar())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putInt(anyString(), anyShort());
-        when(bundle.getShort(anyString())).thenAnswer(get);
-        when(bundle.getShort(anyString(), anyShort())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putLong(anyString(), anyLong());
-        when(bundle.getLong(anyString())).thenAnswer(get);
-        when(bundle.getLong(anyString(), anyLong())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putFloat(anyString(), anyFloat());
-        when(bundle.getFloat(anyString())).thenAnswer(get);
-        when(bundle.getFloat(anyString(), anyFloat())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putDouble(anyString(), anyDouble());
-        when(bundle.getDouble(anyString())).thenAnswer(get);
-        when(bundle.getDouble(anyString(), anyDouble())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putString(anyString(), anyString());
-        when(bundle.getString(anyString())).thenAnswer(get);
-        when(bundle.getString(anyString(), anyString())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putBooleanArray(anyString(), any(boolean[].class));
-        when(bundle.getBooleanArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putLongArray(anyString(), any(long[].class));
-        when(bundle.getLongArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putDoubleArray(anyString(), any(double[].class));
-        when(bundle.getDoubleArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putIntArray(anyString(), any(int[].class));
-        when(bundle.getIntArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putInt(anyString(), anyInt());
-        when(bundle.getInt(anyString())).thenAnswer(get);
-        when(bundle.getInt(anyString(), anyInt())).thenAnswer(getOrDefault);
-
-        doAnswer(unsupported).when(bundle).putAll(any(Bundle.class));
-        when(bundle.hasFileDescriptors()).thenAnswer(unsupported);
-
-        doAnswer(put).when(bundle).putShort(anyString(), anyShort());
-        when(bundle.getShort(anyString())).thenAnswer(get);
-        when(bundle.getShort(anyString(), anyShort())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putFloat(anyString(), anyFloat());
-        when(bundle.getFloat(anyString())).thenAnswer(get);
-        when(bundle.getFloat(anyString(), anyFloat())).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putCharSequence(anyString(), any(CharSequence.class));
-        when(bundle.getCharSequence(anyString())).thenAnswer(get);
-        when(bundle.getCharSequence(anyString(), any(CharSequence.class))).thenAnswer(getOrDefault);
-
-        doAnswer(put).when(bundle).putBundle(anyString(), any(Bundle.class));
-        when(bundle.getBundle(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putParcelable(anyString(), any(Parcelable.class));
-        when(bundle.getParcelable(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putParcelableArray(anyString(), any(Parcelable[].class));
-        when(bundle.getParcelableArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putParcelableArrayList(anyString(), any(ArrayList.class));
-        when(bundle.getParcelableArrayList(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putSparseParcelableArray(anyString(), any(SparseArray.class));
-        when(bundle.getSparseParcelableArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putSerializable(anyString(), any(Serializable.class));
-        when(bundle.getSerializable(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putIntegerArrayList(anyString(), any(ArrayList.class));
-        when(bundle.getIntegerArrayList(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putStringArrayList(anyString(), any(ArrayList.class));
-        when(bundle.getStringArrayList(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putCharSequenceArrayList(anyString(), any(ArrayList.class));
-        when(bundle.getCharSequenceArrayList(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putCharArray(anyString(), any(char[].class));
-        when(bundle.getCharArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putByteArray(anyString(), any(byte[].class));
-        when(bundle.getByteArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putShortArray(anyString(), any(short[].class));
-        when(bundle.getShortArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putFloatArray(anyString(), any(float[].class));
-        when(bundle.getFloatArray(anyString())).thenAnswer(get);
-
-        doAnswer(put).when(bundle).putCharSequenceArray(anyString(), any(CharSequence[].class));
-        when(bundle.getCharSequenceArray(anyString())).thenAnswer(get);
-
-        return bundle;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/SPMocker.java b/app/src/test/java/info/SPMocker.java
deleted file mode 100644
index cfed7f6b11..0000000000
--- a/app/src/test/java/info/SPMocker.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package info;
-
-import org.junit.Assert;
-import org.mockito.ArgumentMatchers;
-import org.powermock.api.mockito.PowerMockito;
-
-import java.util.HashMap;
-
-import info.nightscout.androidaps.utils.SP;
-
-public class SPMocker {
-
-    static HashMap<String, Object> data = new HashMap<>();
-
-    public static void prepareMock() {
-        PowerMockito.mockStatic(SP.class);
-
-        try {
-            PowerMockito.when(SP.class, "putString", ArgumentMatchers.anyString(), ArgumentMatchers.anyString()).then(invocation -> {
-                String key = invocation.getArgument(0);
-                String value = invocation.getArgument(1);
-                data.put(key, value);
-                System.out.print("putString " + key + " " + value + "\n");
-                return null;
-            });
-
-            PowerMockito.when(SP.class, "getString", ArgumentMatchers.anyString(), ArgumentMatchers.any()).then(invocation -> {
-                String key = invocation.getArgument(0);
-                String def = invocation.getArgument(1);
-                String value = (String) data.get(key);
-                if (value == null) value = def;
-                System.out.print("getString " + key + " " + value + "\n");
-                return value;
-            });
-
-            PowerMockito.when(SP.class, "putBoolean", ArgumentMatchers.anyString(), ArgumentMatchers.anyBoolean()).then(invocation -> {
-                String key = invocation.getArgument(0);
-                Boolean value = invocation.getArgument(1);
-                data.put(key, value);
-                System.out.print("putBoolean " + key + " " + value + "\n");
-                return null;
-            });
-
-            PowerMockito.when(SP.class, "getBoolean", ArgumentMatchers.anyString(), ArgumentMatchers.any()).then(invocation -> {
-                String key = invocation.getArgument(0);
-                Boolean def = invocation.getArgument(1);
-                Boolean value = (Boolean) data.get(key);
-                if (value == null) value = def;
-                System.out.print("getBoolean " + key + " " + value + "\n");
-                return value;
-            });
-
-            PowerMockito.when(SP.class, "getDouble", ArgumentMatchers.anyString(), ArgumentMatchers.any()).then(invocation -> {
-                String key = invocation.getArgument(0);
-                Double def = invocation.getArgument(1);
-                Double value = (Double) data.get(key);
-                if (value == null) value = def;
-                System.out.print("getDouble " + key + " " + value + "\n");
-                return value;
-            });
-
-        } catch (Exception e) {
-            Assert.fail("Unable to mock the construction of the SP object: " + e.getMessage());
-        }
-
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBase.kt b/app/src/test/java/info/nightscout/androidaps/TestBase.kt
new file mode 100644
index 0000000000..278a74d081
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/TestBase.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import org.json.JSONObject
+import org.junit.Before
+import org.junit.Rule
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import java.util.*
+
+open class TestBase {
+
+    val aapsLogger = AAPSLoggerTest()
+
+    // Add a JUnit rule that will setup the @Mock annotated vars and log.
+    // Another possibility would be to add `MockitoAnnotations.initMocks(this) to the setup method.
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setupLocale() {
+        Locale.setDefault(Locale.ENGLISH)
+        System.setProperty("disableFirebase", "true")
+    }
+
+    // Workaround for Kotlin nullability.
+    // https://medium.com/@elye.project/befriending-kotlin-and-mockito-1c2e7b0ef791
+    // https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
+    fun <T> anyObject(): T {
+        Mockito.any<T>()
+        return uninitialized()
+    }
+
+    @Suppress("Unchecked_Cast")
+    fun <T> uninitialized(): T = null as T
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
new file mode 100644
index 0000000000..d36c2f961b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import org.junit.Before
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+
+@PrepareForTest(FabricPrivacy::class)
+open class TestBaseWithProfile : TestBase() {
+    @Mock lateinit var activePluginProvider: ActivePluginProvider
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var fabricPrivacy: FabricPrivacy
+
+    val rxBus = RxBusWrapper()
+
+    val profileInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Profile) {
+                it.aapsLogger = aapsLogger
+                it.activePlugin = activePluginProvider
+                it.resourceHelper = resourceHelper
+                it.rxBus = rxBus
+                it.fabricPrivacy = fabricPrivacy
+            }
+            if (it is ProfileSwitch) {
+                it.treatmentsPlugin = treatmentsPlugin
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+    lateinit var validProfileJSON: String
+    lateinit var validProfile: Profile
+    val TESTPROFILENAME = "someProfile"
+
+    @Before
+    fun prepareMock() {
+        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfile = Profile(profileInjector, JSONObject(validProfileJSON), Constants.MGDL)
+    }
+
+    fun getValidProfileStore(): ProfileStore {
+        val json = JSONObject()
+        val store = JSONObject()
+        store.put(TESTPROFILENAME, JSONObject(validProfileJSON))
+        json.put("defaultProfile", TESTPROFILENAME)
+        json.put("store", store)
+        return ProfileStore(profileInjector, json)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.java b/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.java
deleted file mode 100644
index 7b224b1ccd..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-/**
- * Created by mike on 26.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-public class DetailedBolusInfoTest {
-
-    @Test
-    public void toStringShouldBeOverloaded() {
-        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-        Assert.assertEquals(true, detailedBolusInfo.toString().contains("insulin"));
-    }
-
-    @Test
-    public void copyShouldCopyAllProperties() {
-        DetailedBolusInfo d1 = new DetailedBolusInfo();
-        d1.deliverAt = 123;
-        DetailedBolusInfo d2 = d1.copy();
-        Assert.assertEquals(true, EqualsBuilder.reflectionEquals(d2, d1));
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt
new file mode 100644
index 0000000000..6587bc880d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/DetailedBolusInfoTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.data
+
+import org.apache.commons.lang3.builder.EqualsBuilder
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class DetailedBolusInfoTest {
+
+    @Test fun toStringShouldBeOverloaded() {
+        val detailedBolusInfo = DetailedBolusInfo()
+        Assert.assertEquals(true, detailedBolusInfo.toString().contains("insulin"))
+    }
+
+    @Test fun copyShouldCopyAllProperties() {
+        val d1 = DetailedBolusInfo()
+        d1.deliverAt = 123
+        val d2 = d1.copy()
+        Assert.assertEquals(true, EqualsBuilder.reflectionEquals(d2, d1))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/IobTest.java b/app/src/test/java/info/nightscout/androidaps/data/IobTest.java
deleted file mode 100644
index 778bdbf59c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/IobTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-/**
- * Created by mike on 27.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-public class IobTest {
-
-    @Test
-    public void plusTest() {
-        Iob a = new Iob().iobContrib(1).activityContrib(2);
-        Iob b = new Iob().iobContrib(3).activityContrib(4);
-        a.plus(b);
-        Assert.assertEquals(4d, a.iobContrib, 0.01d);
-        Assert.assertEquals(6d, a.activityContrib, 0.01d);
-    }
-
-    @Test
-    public void equalTest() {
-        Iob a1 = new Iob().iobContrib(1).activityContrib(2);
-        Iob a2 = new Iob().iobContrib(1).activityContrib(2);
-        Iob b = new Iob().iobContrib(3).activityContrib(4);
-
-        Assert.assertEquals(true, a1.equals(a1));
-        Assert.assertEquals(true, a1.equals(a2));
-        Assert.assertEquals(false, a1.equals(b));
-        Assert.assertEquals(false, a1.equals(null));
-        Assert.assertEquals(false, a1.equals(new Object()));
-    }
-    @Test
-    public void hashCodeTest() {
-        Iob a = new Iob().iobContrib(1).activityContrib(2);
-        Assert.assertNotEquals(0, a.hashCode());
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/IobTest.kt b/app/src/test/java/info/nightscout/androidaps/data/IobTest.kt
new file mode 100644
index 0000000000..ed5837ea0a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/IobTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.data
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class IobTest {
+
+    @Test fun plusTest() {
+        val a = Iob().iobContrib(1.0).activityContrib(2.0)
+        val b = Iob().iobContrib(3.0).activityContrib(4.0)
+        a.plus(b)
+        Assert.assertEquals(4.0, a.iobContrib, 0.01)
+        Assert.assertEquals(6.0, a.activityContrib, 0.01)
+    }
+
+    @Test fun equalTest() {
+        val a1 = Iob().iobContrib(1.0).activityContrib(2.0)
+        val a2 = Iob().iobContrib(1.0).activityContrib(2.0)
+        val b = Iob().iobContrib(3.0).activityContrib(4.0)
+        Assert.assertTrue(a1 == a1)
+        Assert.assertTrue(a1 == a2)
+        Assert.assertFalse(a1 == b)
+        Assert.assertFalse(a1 == null)
+        Assert.assertFalse(a1 == Any())
+    }
+
+    @Test fun hashCodeTest() {
+        val a = Iob().iobContrib(1.0).activityContrib(2.0)
+        Assert.assertNotEquals(0, a.hashCode().toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java b/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java
deleted file mode 100644
index b54b112516..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.utils.DateUtil;
-
-/**
- * Created by mike on 27.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-public class IobTotalTest {
-
-    long now = DateUtil.now();
-
-    @Test
-    public void copytest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 10;
-        IobTotal b = a.copy();
-        Assert.assertEquals(a.iob, b.iob, 0.01d);
-    }
-
-    @Test
-    public void plusTest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 10;
-        a.activity = 10;
-        a.bolussnooze = 10;
-        a.basaliob = 10;
-        a.netbasalinsulin = 10;
-        a.hightempinsulin = 10;
-        a.netInsulin = 10;
-        a.extendedBolusInsulin = 10;
-        a.plus(a.copy());
-        Assert.assertEquals(20, a.iob, 0.01d);
-        Assert.assertEquals(20, a.activity, 0.01d);
-        Assert.assertEquals(20, a.bolussnooze, 0.01d);
-        Assert.assertEquals(20, a.basaliob, 0.01d);
-        Assert.assertEquals(20, a.netbasalinsulin, 0.01d);
-        Assert.assertEquals(20, a.hightempinsulin, 0.01d);
-        Assert.assertEquals(20, a.netInsulin, 0.01d);
-        Assert.assertEquals(20, a.extendedBolusInsulin, 0.01d);
-    }
-
-    @Test
-    public void combineTest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 10;
-        a.activity = 11;
-        a.bolussnooze = 12;
-        a.basaliob = 13;
-        a.netbasalinsulin = 14;
-        a.hightempinsulin = 15;
-        a.netInsulin = 16;
-        a.extendedBolusInsulin = 17;
-        IobTotal b = a.copy();
-        IobTotal c = IobTotal.combine(a, b);
-        Assert.assertEquals(a.time, c.time, 0.01d);
-        Assert.assertEquals(23, c.iob, 0.01d);
-        Assert.assertEquals(22, c.activity, 0.01d);
-        Assert.assertEquals(12, c.bolussnooze, 0.01d);
-        Assert.assertEquals(26, c.basaliob, 0.01d);
-        Assert.assertEquals(28, c.netbasalinsulin, 0.01d);
-        Assert.assertEquals(30, c.hightempinsulin, 0.01d);
-        Assert.assertEquals(32, c.netInsulin, 0.01d);
-        Assert.assertEquals(34, c.extendedBolusInsulin, 0.01d);
-    }
-
-    @Test
-    public void roundTest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 1.1111111111111;
-        a.activity = 1.1111111111111;
-        a.bolussnooze = 1.1111111111111;
-        a.basaliob = 1.1111111111111;
-        a.netbasalinsulin = 1.1111111111111;
-        a.hightempinsulin = 1.1111111111111;
-        a.netInsulin = 1.1111111111111;
-        a.extendedBolusInsulin = 1.1111111111111;
-        a.round();
-        Assert.assertEquals(1.111d, a.iob, 0.00001d);
-        Assert.assertEquals(1.1111d, a.activity, 0.00001d);
-        Assert.assertEquals(1.1111d, a.bolussnooze, 0.00001d);
-        Assert.assertEquals(1.111d, a.basaliob, 0.00001d);
-        Assert.assertEquals(1.111d, a.netbasalinsulin, 0.00001d);
-        Assert.assertEquals(1.111d, a.hightempinsulin, 0.00001d);
-        Assert.assertEquals(1.111d, a.netInsulin, 0.00001d);
-        Assert.assertEquals(1.111d, a.extendedBolusInsulin, 0.00001d);
-    }
-
-    @Test
-    public void jsonTest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 10;
-        a.activity = 11;
-        a.bolussnooze = 12;
-        a.basaliob = 13;
-        a.netbasalinsulin = 14;
-        a.hightempinsulin = 15;
-        a.netInsulin = 16;
-        a.extendedBolusInsulin = 17;
-        try {
-            JSONObject j = a.json();
-            Assert.assertEquals(a.iob, j.getDouble("iob"), 0.0000001d);
-            Assert.assertEquals(a.basaliob, j.getDouble("basaliob"), 0.0000001d);
-            Assert.assertEquals(a.activity, j.getDouble("activity"), 0.0000001d);
-            Assert.assertEquals(now, DateUtil.fromISODateString(j.getString("time")).getTime(), 1000);
-        } catch (Exception e) {
-            Assert.fail("Exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void determineBasalJsonTest() {
-        IobTotal a = new IobTotal(now);
-        a.iob = 10;
-        a.activity = 11;
-        a.bolussnooze = 12;
-        a.basaliob = 13;
-        a.netbasalinsulin = 14;
-        a.hightempinsulin = 15;
-        a.netInsulin = 16;
-        a.extendedBolusInsulin = 17;
-        a.iobWithZeroTemp = new IobTotal(now);
-        try {
-            JSONObject j = a.determineBasalJson();
-            Assert.assertEquals(a.iob, j.getDouble("iob"), 0.0000001d);
-            Assert.assertEquals(a.basaliob, j.getDouble("basaliob"), 0.0000001d);
-            Assert.assertEquals(a.bolussnooze, j.getDouble("bolussnooze"), 0.0000001d);
-            Assert.assertEquals(a.activity, j.getDouble("activity"), 0.0000001d);
-            Assert.assertEquals(0, j.getLong("lastBolusTime"));
-            Assert.assertEquals(now, DateUtil.fromISODateString(j.getString("time")).getTime(), 1000);
-            Assert.assertNotNull(j.getJSONObject("iobWithZeroTemp"));
-        } catch (Exception e) {
-            Assert.fail("Exception: " + e.getMessage());
-        }
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt b/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
new file mode 100644
index 0000000000..42b7d96361
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
@@ -0,0 +1,130 @@
+package info.nightscout.androidaps.data
+
+import info.nightscout.androidaps.utils.DateUtil
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class IobTotalTest {
+
+    var now = DateUtil.now()
+    @Test fun copytest() {
+        val a = IobTotal(now)
+        a.iob = 10.0
+        val b = a.copy()
+        Assert.assertEquals(a.iob, b.iob, 0.01)
+    }
+
+    @Test fun plusTest() {
+        val a = IobTotal(now)
+        a.iob = 10.0
+        a.activity = 10.0
+        a.bolussnooze = 10.0
+        a.basaliob = 10.0
+        a.netbasalinsulin = 10.0
+        a.hightempinsulin = 10.0
+        a.netInsulin = 10.0
+        a.extendedBolusInsulin = 10.0
+        a.plus(a.copy())
+        Assert.assertEquals(20.0, a.iob, 0.01)
+        Assert.assertEquals(20.0, a.activity, 0.01)
+        Assert.assertEquals(20.0, a.bolussnooze, 0.01)
+        Assert.assertEquals(20.0, a.basaliob, 0.01)
+        Assert.assertEquals(20.0, a.netbasalinsulin, 0.01)
+        Assert.assertEquals(20.0, a.hightempinsulin, 0.01)
+        Assert.assertEquals(20.0, a.netInsulin, 0.01)
+        Assert.assertEquals(20.0, a.extendedBolusInsulin, 0.01)
+    }
+
+    @Test fun combineTest() {
+        val a = IobTotal(now)
+        a.iob = 10.0
+        a.activity = 11.0
+        a.bolussnooze = 12.0
+        a.basaliob = 13.0
+        a.netbasalinsulin = 14.0
+        a.hightempinsulin = 15.0
+        a.netInsulin = 16.0
+        a.extendedBolusInsulin = 17.0
+        val b = a.copy()
+        val c = IobTotal.combine(a, b)
+        Assert.assertEquals(a.time.toDouble(), c.time.toDouble(), 0.01)
+        Assert.assertEquals(23.0, c.iob, 0.01)
+        Assert.assertEquals(22.0, c.activity, 0.01)
+        Assert.assertEquals(12.0, c.bolussnooze, 0.01)
+        Assert.assertEquals(26.0, c.basaliob, 0.01)
+        Assert.assertEquals(28.0, c.netbasalinsulin, 0.01)
+        Assert.assertEquals(30.0, c.hightempinsulin, 0.01)
+        Assert.assertEquals(32.0, c.netInsulin, 0.01)
+        Assert.assertEquals(34.0, c.extendedBolusInsulin, 0.01)
+    }
+
+    @Test fun roundTest() {
+        val a = IobTotal(now)
+        a.iob = 1.1111111111111
+        a.activity = 1.1111111111111
+        a.bolussnooze = 1.1111111111111
+        a.basaliob = 1.1111111111111
+        a.netbasalinsulin = 1.1111111111111
+        a.hightempinsulin = 1.1111111111111
+        a.netInsulin = 1.1111111111111
+        a.extendedBolusInsulin = 1.1111111111111
+        a.round()
+        Assert.assertEquals(1.111, a.iob, 0.00001)
+        Assert.assertEquals(1.1111, a.activity, 0.00001)
+        Assert.assertEquals(1.1111, a.bolussnooze, 0.00001)
+        Assert.assertEquals(1.111, a.basaliob, 0.00001)
+        Assert.assertEquals(1.111, a.netbasalinsulin, 0.00001)
+        Assert.assertEquals(1.111, a.hightempinsulin, 0.00001)
+        Assert.assertEquals(1.111, a.netInsulin, 0.00001)
+        Assert.assertEquals(1.111, a.extendedBolusInsulin, 0.00001)
+    }
+
+    @Test fun jsonTest() {
+        val a = IobTotal(now)
+        a.iob = 10.0
+        a.activity = 11.0
+        a.bolussnooze = 12.0
+        a.basaliob = 13.0
+        a.netbasalinsulin = 14.0
+        a.hightempinsulin = 15.0
+        a.netInsulin = 16.0
+        a.extendedBolusInsulin = 17.0
+        try {
+            val j = a.json()
+            Assert.assertEquals(a.iob, j.getDouble("iob"), 0.0000001)
+            Assert.assertEquals(a.basaliob, j.getDouble("basaliob"), 0.0000001)
+            Assert.assertEquals(a.activity, j.getDouble("activity"), 0.0000001)
+            Assert.assertEquals(now.toFloat(), DateUtil.fromISODateString(j.getString("time")).time.toFloat(), 1000f)
+        } catch (e: Exception) {
+            Assert.fail("Exception: " + e.message)
+        }
+    }
+
+    @Test fun determineBasalJsonTest() {
+        val a = IobTotal(now)
+        a.iob = 10.0
+        a.activity = 11.0
+        a.bolussnooze = 12.0
+        a.basaliob = 13.0
+        a.netbasalinsulin = 14.0
+        a.hightempinsulin = 15.0
+        a.netInsulin = 16.0
+        a.extendedBolusInsulin = 17.0
+        a.iobWithZeroTemp = IobTotal(now)
+        try {
+            val j = a.determineBasalJson()
+            Assert.assertEquals(a.iob, j.getDouble("iob"), 0.0000001)
+            Assert.assertEquals(a.basaliob, j.getDouble("basaliob"), 0.0000001)
+            Assert.assertEquals(a.bolussnooze, j.getDouble("bolussnooze"), 0.0000001)
+            Assert.assertEquals(a.activity, j.getDouble("activity"), 0.0000001)
+            Assert.assertEquals(0, j.getLong("lastBolusTime"))
+            Assert.assertEquals(now.toFloat(), DateUtil.fromISODateString(j.getString("time")).time.toFloat(), 1000f)
+            Assert.assertNotNull(j.getJSONObject("iobWithZeroTemp"))
+        } catch (e: Exception) {
+            Assert.fail("Exception: " + e.message)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.java b/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.java
deleted file mode 100644
index c4cdca885e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-/**
- * Created by mike on 26.03.2018.
- */
-@RunWith(PowerMockRunner.class)
-public class MealDataTest {
-    @Test
-    public void canCreateObject() {
-        MealData md = new MealData();
-        Assert.assertEquals(0d, md.boluses, 0.01d);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt b/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt
new file mode 100644
index 0000000000..4c82b528b2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.data
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MealDataTest {
+
+    @Test fun canCreateObject() {
+        val md = MealData()
+        Assert.assertEquals(0.0, md.boluses, 0.01)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java
deleted file mode 100644
index a1f2a95943..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-/**
- * Created by mike on 26.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-public class NonOverapingIntervalsTest {
-
-    private final long startDate = DateUtil.now();
-    NonOverlappingIntervals<TemporaryBasal> list = new NonOverlappingIntervals<>();
-
-    @Test
-    public void doTests() {
-        // create one 10h interval and test value in and out
-        list.add(new TemporaryBasal().date(startDate).duration((int) T.hours(10).mins()).absolute(1));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(1d, list.getValueByInterval(startDate).absoluteRate, 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-
-        // stop temp  after 5h
-        list.add(new TemporaryBasal().date(startDate + T.hours(5).msecs()).duration(0));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(1d, list.getValueByInterval(startDate).absoluteRate, 0.01d);
-        Assert.assertEquals(1d, list.getValueByInterval(startDate + T.hours(5).msecs() - 1).absoluteRate, 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1));
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-
-        // insert 1h interval inside
-        list.add(new TemporaryBasal().date(startDate + T.hours(3).msecs()).duration((int) T.hours(1).mins()).absolute(2));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(1d, list.getValueByInterval(startDate).absoluteRate, 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() - 1));
-        Assert.assertEquals(2d, list.getValueByInterval(startDate + T.hours(3).msecs()).absoluteRate, 0.01d);
-        Assert.assertEquals(2d, list.getValueByInterval(startDate + T.hours(4).msecs() - 1).absoluteRate, 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(4).msecs() + 1));
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-    }
-
-    @Test
-    public void testCopyConstructor() {
-        list.reset();
-        list.add(new TemporaryBasal().date(startDate).duration((int) T.hours(10).mins()).absolute(1));
-        NonOverlappingIntervals<TemporaryBasal> list2 = new NonOverlappingIntervals<>(list);
-        Assert.assertEquals(1, list2.getList().size());
-    }
-
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt b/app/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt
new file mode 100644
index 0000000000..7a915e9e13
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.data
+
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class NonOverlappingIntervalsTest {
+
+    private val startDate = DateUtil.now()
+    var list = NonOverlappingIntervals<TemporaryBasal>()
+
+    @Test
+    fun doTests() {
+        // create one 10h interval and test value in and out
+        list.add(TemporaryBasal().date(startDate).duration(T.hours(10).mins().toInt()).absolute(1.0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+
+        // stop temp  after 5h
+        list.add(TemporaryBasal().date(startDate + T.hours(5).msecs()).duration(0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
+        Assert.assertEquals(1.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.absoluteRate, 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+
+        // insert 1h interval inside
+        list.add(TemporaryBasal().date(startDate + T.hours(3).msecs()).duration(T.hours(1).mins().toInt()).absolute(2.0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() - 1))
+        Assert.assertEquals(2.0, list.getValueByInterval(startDate + T.hours(3).msecs())!!.absoluteRate, 0.01)
+        Assert.assertEquals(2.0, list.getValueByInterval(startDate + T.hours(4).msecs() - 1)!!.absoluteRate, 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(4).msecs() + 1))
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+    }
+
+    @Test
+    fun testCopyConstructor() {
+        list.reset()
+        list.add(TemporaryBasal().date(startDate).duration(T.hours(10).mins().toInt()).absolute(1.0))
+        val list2 = NonOverlappingIntervals(list)
+        Assert.assertEquals(1, list2.list.size.toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java
deleted file mode 100644
index 80ad43999e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-/**
- * Created by mike on 26.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-public class OverapingIntervalsTest {
-
-    private final long startDate = DateUtil.now();
-    OverlappingIntervals<TempTarget> list = new OverlappingIntervals<>();
-
-    @Test
-    public void doTests() {
-        // create one 10h interval and test value in and out
-        list.add(new TempTarget().date(startDate).duration((int) T.hours(10).mins()).low(100).high(100));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(100d, list.getValueByInterval(startDate).target(), 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-
-        // stop temp target after 5h
-        list.add(new TempTarget().date(startDate + T.hours(5).msecs()).duration(0));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(100d, list.getValueByInterval(startDate).target(), 0.01d);
-        Assert.assertEquals(100d, list.getValueByInterval(startDate + T.hours(5).msecs() - 1).target(), 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1));
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-
-        // insert 1h interval inside
-        list.add(new TempTarget().date(startDate + T.hours(3).msecs()).duration((int) T.hours(1).mins()).low(200).high(200));
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()));
-        Assert.assertEquals(100d, list.getValueByInterval(startDate).target(), 0.01d);
-        Assert.assertEquals(100d, list.getValueByInterval(startDate + T.hours(5).msecs() - 1).target(), 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1));
-        Assert.assertEquals(200d, list.getValueByInterval(startDate + T.hours(3).msecs()).target(), 0.01d);
-        Assert.assertEquals(100d, list.getValueByInterval(startDate + T.hours(4).msecs() + 1).target(), 0.01d);
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1));
-    }
-
-    @Test
-    public void testCopyConstructor() {
-        list.reset();
-        list.add(new TempTarget().date(startDate).duration((int) T.hours(10).mins()).low(100).high(100));
-        OverlappingIntervals<TempTarget> list2 = new OverlappingIntervals<>(list);
-        Assert.assertEquals(1, list2.getList().size());
-    }
-
-    @Test
-    public void testReversingArrays() {
-        List<TempTarget> someList = new ArrayList<>();
-        someList.add(new TempTarget().date(startDate).duration((int) T.hours(3).mins()).low(200).high(200));
-        someList.add(new TempTarget().date(startDate + T.hours(1).msecs()).duration((int) T.hours(1).mins()).low(100).high(100));
-        list.reset();
-        list.add(someList);
-        Assert.assertEquals(startDate, list.get(0).date);
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).date);
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversedList().get(0).date);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt b/app/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt
new file mode 100644
index 0000000000..70b2bb896a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.data
+
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class OverlappingIntervalsTest {
+
+    private val startDate = DateUtil.now()
+    var list = OverlappingIntervals<TempTarget>()
+    @Test fun doTests() {
+        // create one 10h interval and test value in and out
+        list.add(TempTarget().date(startDate).duration(T.hours(10).mins().toInt()).low(100.0).high(100.0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+
+        // stop temp target after 5h
+        list.add(TempTarget().date(startDate + T.hours(5).msecs()).duration(0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.target(), 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+
+        // insert 1h interval inside
+        list.add(TempTarget().date(startDate + T.hours(3).msecs()).duration(T.hours(1).mins().toInt()).low(200.0).high(200.0))
+        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.target(), 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
+        Assert.assertEquals(200.0, list.getValueByInterval(startDate + T.hours(3).msecs())!!.target(), 0.01)
+        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(4).msecs() + 1)!!.target(), 0.01)
+        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
+    }
+
+    @Test fun testCopyConstructor() {
+        list.reset()
+        list.add(TempTarget().date(startDate).duration(T.hours(10).mins().toInt()).low(100.0).high(100.0))
+        val list2 = OverlappingIntervals(list)
+        Assert.assertEquals(1, list2.list.size.toLong())
+    }
+
+    @Test fun testReversingArrays() {
+        val someList: MutableList<TempTarget> = ArrayList()
+        someList.add(TempTarget().date(startDate).duration(T.hours(3).mins().toInt()).low(200.0).high(200.0))
+        someList.add(TempTarget().date(startDate + T.hours(1).msecs()).duration(T.hours(1).mins().toInt()).low(100.0).high(100.0))
+        list.reset()
+        list.add(someList)
+        Assert.assertEquals(startDate, list[0].date)
+        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).date)
+        Assert.assertEquals(startDate + T.hours(1).msecs(), list.reversedList[0].date)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java
deleted file mode 100644
index 121af322f7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-/**
- * Created by mike on 26.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class, TreatmentService.class})
-public class ProfileIntervalsTest {
-    private final long startDate = DateUtil.now();
-    ProfileIntervals<ProfileSwitch> list = new ProfileIntervals<>();
-
-    @Test
-    public void doTests() {
-        // create one 10h interval and test value in and out
-        list.add(new ProfileSwitch().date(startDate).duration((int) T.hours(10).mins()).profileName("1").profile(AAPSMocker.getValidProfile()));
-        // for older date first record should be returned only if has zero duration
-        Assert.assertEquals(null, list.getValueToTime(startDate - T.secs(1).msecs()));
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate)).profileName);
-        Assert.assertEquals(null, list.getValueToTime(startDate + T.hours(10).msecs() + 1));
-
-        list.reset();
-        list.add(new ProfileSwitch().date(startDate).profileName("1").profile(AAPSMocker.getValidProfile()));
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate - T.secs(1).msecs())).profileName);
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate)).profileName);
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(10).msecs() + 1)).profileName);
-
-        // switch to different profile after 5h
-        list.add(new ProfileSwitch().date(startDate + T.hours(5).msecs()).duration(0).profileName("2").profile(AAPSMocker.getValidProfile()));
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate - T.secs(1).msecs())).profileName);
-        Assert.assertEquals("1", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(5).msecs() - 1)).profileName);
-        Assert.assertEquals("2", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(5).msecs() + 1)).profileName);
-
-        // insert 1h interval inside
-        list.add(new ProfileSwitch().date(startDate + T.hours(6).msecs()).duration((int) T.hours(1).mins()).profileName("3").profile(AAPSMocker.getValidProfile()));
-        Assert.assertEquals("2", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(6).msecs() - 1)).profileName);
-        Assert.assertEquals("3", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(6).msecs() + 1)).profileName);
-        Assert.assertEquals("2", ((ProfileSwitch) list.getValueToTime(startDate + T.hours(7).msecs() + 1)).profileName);
-    }
-
-    @Test
-    public void testCopyConstructor() {
-        list.reset();
-        list.add(new ProfileSwitch().date(startDate).duration((int) T.hours(10).mins()).profileName("4").profile(AAPSMocker.getValidProfile()));
-        ProfileIntervals<ProfileSwitch> list2 = new ProfileIntervals<>(list);
-        Assert.assertEquals(1, list2.getList().size());
-    }
-
-    @Test
-    public void invalidProfilesShouldNotBeReturned() {
-        list.reset();
-        list.add(new ProfileSwitch().date(startDate + T.hours(1).msecs()).profileName("6"));
-        Assert.assertEquals(null, list.get(0));
-    }
-
-    @Test
-    public void testReversingArrays() {
-        List<ProfileSwitch> someList = new ArrayList<>();
-        someList.add(new ProfileSwitch().date(startDate).duration((int) T.hours(3).mins()).profileName("5").profile(AAPSMocker.getValidProfile()));
-        someList.add(new ProfileSwitch().date(startDate + T.hours(1).msecs()).duration((int) T.hours(1).mins()).profileName("6").profile(AAPSMocker.getValidProfile()));
-        list.reset();
-        list.add(someList);
-        Assert.assertEquals(startDate, list.get(0).date);
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).date);
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversedList().get(0).date);
-
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockTreatmentPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt b/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt
new file mode 100644
index 0000000000..06a0239767
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt
@@ -0,0 +1,90 @@
+package info.nightscout.androidaps.data
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.db.ProfileSwitch
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(VirtualPumpPlugin::class)
+class ProfileIntervalsTest : TestBaseWithProfile() {
+
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    private val startDate = DateUtil.now()
+    var list = ProfileIntervals<ProfileSwitch>()
+
+    @Before
+    fun mock() {
+        `when`(activePluginProvider.activePump).thenReturn(virtualPumpPlugin)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(PumpDescription())
+    }
+    @Test
+    fun doTests() {
+        // create one 10h interval and test value in and out
+        list.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(10).mins().toInt()).profileName("1").profile(validProfile))
+        // for older date first record should be returned only if has zero duration
+        Assert.assertEquals(null, list.getValueToTime(startDate - T.secs(1).msecs()))
+        Assert.assertEquals("1", (list.getValueToTime(startDate) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals(null, list.getValueToTime(startDate + T.hours(10).msecs() + 1))
+        list.reset()
+        list.add(ProfileSwitch(profileInjector).date(startDate).profileName("1").profile(validProfile))
+        Assert.assertEquals("1", (list.getValueToTime(startDate - T.secs(1).msecs()) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("1", (list.getValueToTime(startDate) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("1", (list.getValueToTime(startDate + T.hours(10).msecs() + 1) as ProfileSwitch?)!!.profileName)
+
+        // switch to different profile after 5h
+        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(5).msecs()).duration(0).profileName("2").profile(validProfile))
+        Assert.assertEquals("1", (list.getValueToTime(startDate - T.secs(1).msecs()) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("1", (list.getValueToTime(startDate + T.hours(5).msecs() - 1) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(5).msecs() + 1) as ProfileSwitch?)!!.profileName)
+
+        // insert 1h interval inside
+        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(6).msecs()).duration(T.hours(1).mins().toInt()).profileName("3").profile(validProfile))
+        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(6).msecs() - 1) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("3", (list.getValueToTime(startDate + T.hours(6).msecs() + 1) as ProfileSwitch?)!!.profileName)
+        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(7).msecs() + 1) as ProfileSwitch?)!!.profileName)
+    }
+
+    @Test
+    fun testCopyConstructor() {
+        list.reset()
+        list.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(10).mins().toInt()).profileName("4").profile(validProfile))
+        val list2 = ProfileIntervals(list)
+        Assert.assertEquals(1, list2.list.size.toLong())
+    }
+
+    @Test fun invalidProfilesShouldNotBeReturned() {
+        list.reset()
+        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(1).msecs()).profileName("6"))
+        Assert.assertEquals(null, list[0])
+    }
+
+    @Test fun testReversingArrays() {
+        val someList: MutableList<ProfileSwitch> = ArrayList()
+        someList.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(3).mins().toInt()).profileName("5").profile(validProfile))
+        someList.add(ProfileSwitch(profileInjector).date(startDate + T.hours(1).msecs()).duration(T.hours(1).mins().toInt()).profileName("6").profile(validProfile))
+        list.reset()
+        list.add(someList)
+        Assert.assertEquals(startDate, list[0].date)
+        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).date)
+        Assert.assertEquals(startDate + T.hours(1).msecs(), list.reversedList[0].date)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java
deleted file mode 100644
index b24ede4e6e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import junit.framework.Assert;
-
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 18.03.2018.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, VirtualPumpPlugin.class, FabricPrivacy.class})
-public class ProfileTest {
-
-    PumpInterface pump = new VirtualPumpPlugin();
-    String validProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    String belowLimitValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.001\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    String notAllignedBasalValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:30\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    String notStartingAtZeroValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:30\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    String noUnitsValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\"}";
-    String wrongProfile = "{\"dia\":\"3\",\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-
-    //String profileStore = "{\"defaultProfile\":\"Default\",\"store\":{\"Default\":" + validProfile + "}}";
-
-    @Test
-    public void doTests() throws Exception {
-        Profile p = new Profile();
-
-        // Test valid profile
-        p = new Profile(new JSONObject(validProfile), 100, 0);
-        Assert.assertEquals(true, p.isValid("Test"));
-        Assert.assertEquals(true, p.log().contains("NS units: mmol"));
-        JSONAssert.assertEquals(validProfile, p.getData(), false);
-        Assert.assertEquals(3.0d, p.getDia(), 0.01d);
-        Assert.assertEquals(TimeZone.getTimeZone("UTC"), p.getTimeZone());
-        Assert.assertEquals("00:30", p.format_HH_MM(30 * 60));
-        Calendar c = Calendar.getInstance();
-        c.set(Calendar.HOUR_OF_DAY, 1);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-        c.set(Calendar.MILLISECOND, 0);
-        Assert.assertEquals(1800d, p.getIsfMgdl(c.getTimeInMillis()), 0.01d);
-        c.set(Calendar.HOUR_OF_DAY, 2);
-        Assert.assertEquals(1980d, p.getIsfMgdl(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(110d, p.getIsfTimeFromMidnight(2 * 60 * 60), 0.01d);
-        Assert.assertEquals("00:00    100,0 mmol/U\n" + "02:00    110,0 mmol/U", p.getIsfList().replace(".", ","));
-        Assert.assertEquals(30d, p.getIc(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(30d, p.getIcTimeFromMidnight(2 * 60 * 60), 0.01d);
-        Assert.assertEquals("00:00    30,0 g/U", p.getIcList().replace(".", ","));
-        Assert.assertEquals(0.1d, p.getBasal(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(0.1d, p.getBasalTimeFromMidnight(2 * 60 * 60), 0.01d);
-        Assert.assertEquals("00:00    0,10 U/h", p.getBasalList().replace(".", ","));
-        Assert.assertEquals(0.1d, p.getBasalValues()[0].value);
-        Assert.assertEquals(0.1d, p.getMaxDailyBasal());
-        Assert.assertEquals(2.4d, p.percentageBasalSum(), 0.01d);
-        Assert.assertEquals(2.4d, p.baseBasalSum(), 0.01d);
-        Assert.assertEquals(81d, p.getTargetMgdl(2 * 60 * 60), 0.01d);
-        Assert.assertEquals(72d, p.getTargetLowMgdl(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(4d, p.getTargetLowTimeFromMidnight(2 * 60 * 60), 0.01d);
-        Assert.assertEquals(90d, p.getTargetHighMgdl(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(5d, p.getTargetHighTimeFromMidnight(2 * 60 * 60), 0.01d);
-        Assert.assertEquals("00:00    4,0 - 5,0 mmol", p.getTargetList().replace(".", ","));
-        Assert.assertEquals(100, p.getPercentage());
-        Assert.assertEquals(0, p.getTimeshift());
-
-        Assert.assertEquals(0.1d, p.toMgdl(0.1d, Constants.MGDL));
-        Assert.assertEquals(18d, p.toMgdl(1d, Constants.MMOL));
-        Assert.assertEquals(1d, p.toMmol(18d, Constants.MGDL));
-        Assert.assertEquals(18d, p.toMmol(18d, Constants.MMOL));
-        Assert.assertEquals(18d, p.fromMgdlToUnits(18d, Constants.MGDL));
-        Assert.assertEquals(1d, p.fromMgdlToUnits(18d, Constants.MMOL));
-        Assert.assertEquals(18d, p.toUnits(18d, 1d, Constants.MGDL));
-        Assert.assertEquals(1d, p.toUnits(18d, 1d, Constants.MMOL));
-        Assert.assertEquals("18", p.toUnitsString(18d, 1d, Constants.MGDL));
-        Assert.assertEquals("1,0", p.toUnitsString(18d, 1d, Constants.MMOL).replace(".", ","));
-        Assert.assertEquals("5 - 6", p.toTargetRangeString(5d, 6d, Constants.MGDL, Constants.MGDL));
-        Assert.assertEquals("4", p.toTargetRangeString(4d, 4d, Constants.MGDL, Constants.MGDL));
-
-        //Test basal profile below limit
-        p = new Profile(new JSONObject(belowLimitValidProfile), 100, 0);
-        p.isValid("Test");
-        //Assert.assertEquals(true, ((AAPSMocker.MockedBus) MainApp.bus()).notificationSent);
-
-        // Test profile w/o units
-        p = new Profile(new JSONObject(noUnitsValidProfile), 100, 0);
-        Assert.assertEquals(null, p.getUnits());
-        p = new Profile(new JSONObject(noUnitsValidProfile), Constants.MMOL);
-        Assert.assertEquals(Constants.MMOL, p.getUnits());
-        // failover to MGDL
-        p = new Profile(new JSONObject(noUnitsValidProfile), null);
-        Assert.assertEquals(Constants.MGDL, p.getUnits());
-
-        //Test profile not starting at midnight
-        p = new Profile(new JSONObject(notStartingAtZeroValidProfile), 100, 0);
-        Assert.assertEquals(30.0d, p.getIc(0), 0.01d);
-
-        // Test wrong profile
-        p = new Profile(new JSONObject(wrongProfile), 100, 0);
-        Assert.assertEquals(false, p.isValid("Test"));
-
-        // Test percentage functionality
-        p = new Profile(new JSONObject(validProfile), 50, 0);
-        Assert.assertEquals(0.05d, p.getBasal(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(1.2d, p.percentageBasalSum(), 0.01d);
-        Assert.assertEquals(60d, p.getIc(c.getTimeInMillis()), 0.01d);
-        Assert.assertEquals(3960d, p.getIsfMgdl(c.getTimeInMillis()), 0.01d);
-
-        // Test timeshift functionality
-        p = new Profile(new JSONObject(validProfile), 100, 1);
-        Assert.assertEquals(
-                "00:00    110.0 mmol/U\n" +
-                        "01:00    100.0 mmol/U\n" +
-                        "03:00    110.0 mmol/U", p.getIsfList());
-
-        // Test hour alignment
-        ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().is30minBasalRatesCapable = false;
-        //((AAPSMocker.MockedBus) MainApp.bus()).notificationSent = false;
-        p = new Profile(new JSONObject(notAllignedBasalValidProfile), 100, 0);
-        p.isValid("Test");
-        //Assert.assertEquals(true, ((AAPSMocker.MockedBus) MainApp.bus()).notificationSent);
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-
-        PowerMockito.mockStatic(FabricPrivacy.class);
-    }
- }
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
new file mode 100644
index 0000000000..ac4988d8ac
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
@@ -0,0 +1,150 @@
+package info.nightscout.androidaps.data
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.utils.FabricPrivacy
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import org.skyscreamer.jsonassert.JSONAssert
+import java.util.*
+
+/**
+ * Created by mike on 18.03.2018.
+ */
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(VirtualPumpPlugin::class, FabricPrivacy::class)
+class ProfileTest : TestBaseWithProfile() {
+
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    var okProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    var belowLimitValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.001\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    var notAllignedBasalValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:30\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    var notStartingAtZeroValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:30\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    var noUnitsValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\"}"
+    var wrongProfile = "{\"dia\":\"3\",\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+
+    //String profileStore = "{\"defaultProfile\":\"Default\",\"store\":{\"Default\":" + validProfile + "}}";
+
+    val pumpDescription = PumpDescription()
+
+    @Before
+    fun prepare() {
+        `when`(activePluginProvider.getActivePump()).thenReturn(virtualPumpPlugin)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        `when`(resourceHelper.gs(R.string.profile_per_unit)).thenReturn("/U")
+        `when`(resourceHelper.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U")
+        `when`(resourceHelper.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h")
+    }
+
+    @Test
+    fun doTests() {
+
+        // Test valid profile
+        var p: Profile = Profile(profileInjector, JSONObject(okProfile), 100, 0)
+        Assert.assertEquals(true, p.isValid("Test"))
+        Assert.assertEquals(true, p.log().contains("NS units: mmol"))
+        JSONAssert.assertEquals(okProfile, p.data, false)
+        Assert.assertEquals(3.0, p.dia, 0.01)
+        Assert.assertEquals(TimeZone.getTimeZone("UTC"), p.timeZone)
+        Assert.assertEquals("00:30", p.format_HH_MM(30 * 60))
+        val c = Calendar.getInstance()
+        c[Calendar.HOUR_OF_DAY] = 1
+        c[Calendar.MINUTE] = 0
+        c[Calendar.SECOND] = 0
+        c[Calendar.MILLISECOND] = 0
+        Assert.assertEquals(1800.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+        c[Calendar.HOUR_OF_DAY] = 2
+        Assert.assertEquals(1980.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(110.0, p.getIsfTimeFromMidnight(2 * 60 * 60), 0.01)
+        Assert.assertEquals("""
+    00:00    100,0 mmol/U
+    02:00    110,0 mmol/U
+    """.trimIndent(), p.isfList.replace(".", ","))
+        Assert.assertEquals(30.0, p.getIc(c.timeInMillis), 0.01)
+        Assert.assertEquals(30.0, p.getIcTimeFromMidnight(2 * 60 * 60), 0.01)
+        Assert.assertEquals("00:00    30,0 g/U", p.icList.replace(".", ","))
+        Assert.assertEquals(0.1, p.getBasal(c.timeInMillis), 0.01)
+        Assert.assertEquals(0.1, p.getBasalTimeFromMidnight(2 * 60 * 60), 0.01)
+        Assert.assertEquals("00:00    0,10 U/h", p.basalList.replace(".", ","))
+        Assert.assertEquals(0.1, p.basalValues[0].value, 0.01)
+        Assert.assertEquals(0.1, p.maxDailyBasal, 0.01)
+        Assert.assertEquals(2.4, p.percentageBasalSum(), 0.01)
+        Assert.assertEquals(2.4, p.baseBasalSum(), 0.01)
+        Assert.assertEquals(81.0, p.getTargetMgdl(2 * 60 * 60), 0.01)
+        Assert.assertEquals(72.0, p.getTargetLowMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(4.0, p.getTargetLowTimeFromMidnight(2 * 60 * 60), 0.01)
+        Assert.assertEquals(90.0, p.getTargetHighMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(5.0, p.getTargetHighTimeFromMidnight(2 * 60 * 60), 0.01)
+        Assert.assertEquals("00:00    4,0 - 5,0 mmol", p.targetList.replace(".", ","))
+        Assert.assertEquals(100, p.percentage)
+        Assert.assertEquals(0, p.timeshift)
+        Assert.assertEquals(0.1, Profile.toMgdl(0.1, Constants.MGDL), 0.01)
+        Assert.assertEquals(18.0, Profile.toMgdl(1.0, Constants.MMOL), 0.01)
+        Assert.assertEquals(1.0, Profile.toMmol(18.0, Constants.MGDL), 0.01)
+        Assert.assertEquals(18.0, Profile.toMmol(18.0, Constants.MMOL), 0.01)
+        Assert.assertEquals(18.0, Profile.fromMgdlToUnits(18.0, Constants.MGDL), 0.01)
+        Assert.assertEquals(1.0, Profile.fromMgdlToUnits(18.0, Constants.MMOL), 0.01)
+        Assert.assertEquals(18.0, Profile.toUnits(18.0, 1.0, Constants.MGDL), 0.01)
+        Assert.assertEquals(1.0, Profile.toUnits(18.0, 1.0, Constants.MMOL), 0.01)
+        Assert.assertEquals("18", Profile.toUnitsString(18.0, 1.0, Constants.MGDL))
+        Assert.assertEquals("1,0", Profile.toUnitsString(18.0, 1.0, Constants.MMOL).replace(".", ","))
+        Assert.assertEquals("5 - 6", Profile.toTargetRangeString(5.0, 6.0, Constants.MGDL, Constants.MGDL))
+        Assert.assertEquals("4", Profile.toTargetRangeString(4.0, 4.0, Constants.MGDL, Constants.MGDL))
+
+        //Test basal profile below limit
+        p = Profile(profileInjector, JSONObject(belowLimitValidProfile), 100, 0)
+        p.isValid("Test")
+        //Assert.assertEquals(true, ((AAPSMocker.MockedBus) MainApp.bus()).notificationSent);
+
+        // Test profile w/o units
+        p = Profile(profileInjector, JSONObject(noUnitsValidProfile), 100, 0)
+        Assert.assertEquals(null, p.units)
+        p = Profile(profileInjector, JSONObject(noUnitsValidProfile), Constants.MMOL)
+        Assert.assertEquals(Constants.MMOL, p.units)
+        // failover to MGDL
+        p = Profile(profileInjector, JSONObject(noUnitsValidProfile), null)
+        Assert.assertEquals(Constants.MGDL, p.units)
+
+        //Test profile not starting at midnight
+        p = Profile(profileInjector, JSONObject(notStartingAtZeroValidProfile), 100, 0)
+        Assert.assertEquals(30.0, p.getIc(0), 0.01)
+
+        // Test wrong profile
+        p = Profile(profileInjector, JSONObject(wrongProfile), 100, 0)
+        Assert.assertEquals(false, p.isValid("Test"))
+
+        // Test percentage functionality
+        p = Profile(profileInjector, JSONObject(okProfile), 50, 0)
+        Assert.assertEquals(0.05, p.getBasal(c.timeInMillis), 0.01)
+        Assert.assertEquals(1.2, p.percentageBasalSum(), 0.01)
+        Assert.assertEquals(60.0, p.getIc(c.timeInMillis), 0.01)
+        Assert.assertEquals(3960.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+
+        // Test timeshift functionality
+        p = Profile(profileInjector, JSONObject(okProfile), 100, 1)
+        Assert.assertEquals(
+            """
+                00:00    110.0 mmol/U
+                01:00    100.0 mmol/U
+                03:00    110.0 mmol/U
+                """.trimIndent(), p.isfList)
+
+        // Test hour alignment
+        pumpDescription.is30minBasalRatesCapable = false
+        //((AAPSMocker.MockedBus) MainApp.bus()).notificationSent = false;
+        p = Profile(profileInjector, JSONObject(notAllignedBasalValidProfile), 100, 0)
+        p.isValid("Test")
+        //Assert.assertEquals(true, ((AAPSMocker.MockedBus) MainApp.bus()).notificationSent);
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.java b/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.java
deleted file mode 100644
index 7ce14c2281..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import android.text.Html;
-import android.text.Spanned;
-
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by mike on 29.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, Html.class})
-public class PumpEnactResultTest {
-
-    PumpEnactResult per = new PumpEnactResult();
-
-    @Test
-    public void successTest() throws Exception {
-        per.success(true);
-        Assert.assertEquals(true, per.success);
-    }
-
-    @Test
-    public void enactedTest() throws Exception {
-        per.enacted(true);
-        Assert.assertEquals(true, per.enacted);
-    }
-
-    @Test
-    public void commentTest() throws Exception {
-        per.comment("SomeComment");
-        Assert.assertEquals("SomeComment", per.comment);
-    }
-
-    @Test
-    public void durationTest() throws Exception {
-        per.duration(10);
-        Assert.assertEquals(10, per.duration);
-    }
-
-    @Test
-    public void absoluteTest() throws Exception {
-        per.absolute(11d);
-        Assert.assertEquals(11d, per.absolute, 0.01d);
-    }
-
-    @Test
-    public void percentTest() throws Exception {
-        per.percent(10);
-        Assert.assertEquals((int) 10, per.percent);
-    }
-
-    @Test
-    public void isPercentTest() throws Exception {
-        per.isPercent(true);
-        Assert.assertEquals(true, per.isPercent);
-    }
-
-    @Test
-    public void isTempCancelTest() throws Exception {
-        per.isTempCancel(true);
-        Assert.assertEquals(true, per.isTempCancel);
-    }
-
-    @Test
-    public void bolusDeliveredTest() throws Exception {
-        per.bolusDelivered(11d);
-        Assert.assertEquals(11d, per.bolusDelivered, 0.01d);
-    }
-
-    @Test
-    public void carbsDeliveredTest() throws Exception {
-        per.carbsDelivered(11d);
-        Assert.assertEquals(11d, per.carbsDelivered, 0.01d);
-    }
-
-    @Test
-    public void queuedTest() throws Exception {
-        per.queued(true);
-        Assert.assertEquals(true, per.queued);
-    }
-
-    @Test
-    public void logTest() throws Exception {
-        per = new PumpEnactResult();
-        Assert.assertEquals("Success: false Enacted: false Comment:  Duration: -1 Absolute: -1.0 Percent: -1 IsPercent: false IsTempCancel: false bolusDelivered: 0.0 carbsDelivered: 0.0 Queued: false", per.log());
-    }
-
-    @Test
-    public void toStringTest() throws Exception {
-        per = new PumpEnactResult().enacted(true).bolusDelivered(10).comment("AAA");
-        Assert.assertEquals("Success: false\n" +
-                "Enacted: true\n" +
-                "Comment: AAA\n" +
-                "Insulin: 10.0 U", per.toString());
-
-        per = new PumpEnactResult().enacted(true).isTempCancel(true).comment("AAA");
-        Assert.assertEquals("Success: false\n" +
-                "Enacted: true\n" +
-                "Comment: AAA\n" +
-                "Cancel temp basal", per.toString());
-
-        per = new PumpEnactResult().enacted(true).isPercent(true).percent(90).duration(20).comment("AAA");
-        Assert.assertEquals("Success: false\n" +
-                "Enacted: true\n" +
-                "Comment: AAA\n" +
-                "Duration: 20 min\n" +
-                "Percent: 90%", per.toString());
-
-        per = new PumpEnactResult().enacted(true).isPercent(false).absolute(1).duration(30).comment("AAA");
-        Assert.assertEquals("Success: false\n" +
-                "Enacted: true\n" +
-                "Comment: AAA\n" +
-                "Duration: 30 min\n" +
-                "Absolute: 1.0 U/h", per.toString());
-
-        per = new PumpEnactResult().enacted(false).comment("AAA");
-        Assert.assertEquals("Success: false\n" +
-                "Comment: AAA", per.toString());
-    }
-
-    @Test
-    public void toHtmlTest() throws Exception {
-        per = new PumpEnactResult().enacted(true).bolusDelivered(10).comment("AAA");
-        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>SMB</b>: 10.0 U", per.toHtml());
-
-        per = new PumpEnactResult().enacted(true).isTempCancel(true).comment("AAA");
-        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br>Cancel temp basal", per.toHtml());
-
-        per = new PumpEnactResult().enacted(true).isPercent(true).percent(90).duration(20).comment("AAA");
-        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>Duration</b>: 20 min<br><b>Percent</b>: 90%", per.toHtml());
-
-        per = new PumpEnactResult().enacted(true).isPercent(false).absolute(1).duration(30).comment("AAA");
-        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>Duration</b>: 30 min<br><b>Absolute</b>: 1.00 U/h", per.toHtml());
-
-        per = new PumpEnactResult().enacted(false).comment("AAA");
-        Assert.assertEquals("<b>Success</b>: false<br><b>Comment</b>: AAA", per.toHtml());
-    }
-
-    @Test
-    public void jsonTest() throws Exception {
-        JSONObject o;
-        per = new PumpEnactResult().enacted(true).bolusDelivered(10).comment("AAA");
-        o = per.json(AAPSMocker.getValidProfile());
-        JSONAssert.assertEquals("{\"smb\":10}", o, false);
-
-        per = new PumpEnactResult().enacted(true).isTempCancel(true).comment("AAA");
-        o = per.json(AAPSMocker.getValidProfile());
-        JSONAssert.assertEquals("{\"rate\":0,\"duration\":0}", o, false);
-
-        per = new PumpEnactResult().enacted(true).isPercent(true).percent(90).duration(20).comment("AAA");
-        o = per.json(AAPSMocker.getValidProfile());
-        JSONAssert.assertEquals("{\"rate\":0.9,\"duration\":20}", o, false);
-
-        per = new PumpEnactResult().enacted(true).isPercent(false).absolute(1).duration(30).comment("AAA");
-        o = per.json(AAPSMocker.getValidProfile());
-        JSONAssert.assertEquals("{\"rate\":1,\"duration\":30}", o, false);
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt b/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
new file mode 100644
index 0000000000..e15db553c2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
@@ -0,0 +1,197 @@
+package info.nightscout.androidaps.data
+
+import android.text.Html
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import org.skyscreamer.jsonassert.JSONAssert
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, Html::class)
+class PumpEnactResultTest : TestBaseWithProfile() {
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is PumpEnactResult) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+    @Before
+    fun mock() {
+        `when`(resourceHelper.gs(R.string.success)).thenReturn("Success")
+        `when`(resourceHelper.gs(R.string.enacted)).thenReturn("Enacted")
+        `when`(resourceHelper.gs(R.string.comment)).thenReturn("Comment")
+        `when`(resourceHelper.gs(R.string.configbuilder_insulin)).thenReturn("Insulin")
+        `when`(resourceHelper.gs(R.string.smb_shortname)).thenReturn("SMB")
+        `when`(resourceHelper.gs(R.string.insulin_unit_shortname)).thenReturn("U")
+        `when`(resourceHelper.gs(R.string.canceltemp)).thenReturn("Cancel temp basal")
+        `when`(resourceHelper.gs(R.string.duration)).thenReturn("Duration")
+        `when`(resourceHelper.gs(R.string.percent)).thenReturn("Percent")
+        `when`(resourceHelper.gs(R.string.absolute)).thenReturn("Absolute")
+    }
+
+    @Test fun successTest() {
+        val per = PumpEnactResult(injector)
+
+        per.success(true)
+        Assert.assertEquals(true, per.success)
+    }
+
+    @Test fun enactedTest() {
+        val per = PumpEnactResult(injector)
+
+        per.enacted(true)
+        Assert.assertEquals(true, per.enacted)
+    }
+
+    @Test fun commentTest() {
+        val per = PumpEnactResult(injector)
+
+        per.comment("SomeComment")
+        Assert.assertEquals("SomeComment", per.comment)
+    }
+
+    @Test fun durationTest() {
+        val per = PumpEnactResult(injector)
+
+        per.duration(10)
+        Assert.assertEquals(10, per.duration.toLong())
+    }
+
+    @Test fun absoluteTest() {
+        val per = PumpEnactResult(injector)
+
+        per.absolute(11.0)
+        Assert.assertEquals(11.0, per.absolute, 0.01)
+    }
+
+    @Test fun percentTest() {
+        val per = PumpEnactResult(injector)
+
+        per.percent(10)
+        Assert.assertEquals(10, per.percent)
+    }
+
+    @Test fun isPercentTest() {
+        val per = PumpEnactResult(injector)
+
+        per.isPercent(true)
+        Assert.assertEquals(true, per.isPercent)
+    }
+
+    @Test fun isTempCancelTest() {
+        val per = PumpEnactResult(injector)
+
+        per.isTempCancel(true)
+        Assert.assertEquals(true, per.isTempCancel)
+    }
+
+    @Test fun bolusDeliveredTest() {
+        val per = PumpEnactResult(injector)
+
+        per.bolusDelivered(11.0)
+        Assert.assertEquals(11.0, per.bolusDelivered, 0.01)
+    }
+
+    @Test fun carbsDeliveredTest() {
+        val per = PumpEnactResult(injector)
+
+        per.carbsDelivered(11.0)
+        Assert.assertEquals(11.0, per.carbsDelivered, 0.01)
+    }
+
+    @Test fun queuedTest() {
+        val per = PumpEnactResult(injector)
+
+        per.queued(true)
+        Assert.assertEquals(true, per.queued)
+    }
+
+    @Test fun logTest() {
+        val per = PumpEnactResult(injector)
+
+        Assert.assertEquals("Success: false Enacted: false Comment:  Duration: -1 Absolute: -1.0 Percent: -1 IsPercent: false IsTempCancel: false bolusDelivered: 0.0 carbsDelivered: 0.0 Queued: false", per.log())
+    }
+
+    @Test fun toStringTest() {
+        var per = PumpEnactResult(injector).enacted(true).bolusDelivered(10.0).comment("AAA")
+        Assert.assertEquals("""
+    Success: false
+    Enacted: true
+    Comment: AAA
+    Insulin: 10.0 U
+    """.trimIndent(), per.toString())
+        per = PumpEnactResult(injector).enacted(true).isTempCancel(true).comment("AAA")
+        Assert.assertEquals("""
+    Success: false
+    Enacted: true
+    Comment: AAA
+    Cancel temp basal
+    """.trimIndent(), per.toString())
+        per = PumpEnactResult(injector).enacted(true).isPercent(true).percent(90).duration(20).comment("AAA")
+        Assert.assertEquals("""
+    Success: false
+    Enacted: true
+    Comment: AAA
+    Duration: 20 min
+    Percent: 90%
+    """.trimIndent(), per.toString())
+        per = PumpEnactResult(injector).enacted(true).isPercent(false).absolute(1.0).duration(30).comment("AAA")
+        Assert.assertEquals("""
+    Success: false
+    Enacted: true
+    Comment: AAA
+    Duration: 30 min
+    Absolute: 1.0 U/h
+    """.trimIndent(), per.toString())
+        per = PumpEnactResult(injector).enacted(false).comment("AAA")
+        Assert.assertEquals("""
+    Success: false
+    Comment: AAA
+    """.trimIndent(), per.toString())
+    }
+
+    @Test fun toHtmlTest() {
+
+        var per: PumpEnactResult = PumpEnactResult(injector).enacted(true).bolusDelivered(10.0).comment("AAA")
+        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>SMB</b>: 10.0 U", per.toHtml())
+        per = PumpEnactResult(injector).enacted(true).isTempCancel(true).comment("AAA")
+        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br>Cancel temp basal", per.toHtml())
+        per = PumpEnactResult(injector).enacted(true).isPercent(true).percent(90).duration(20).comment("AAA")
+        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>Duration</b>: 20 min<br><b>Percent</b>: 90%", per.toHtml())
+        per = PumpEnactResult(injector).enacted(true).isPercent(false).absolute(1.0).duration(30).comment("AAA")
+        Assert.assertEquals("<b>Success</b>: false<br><b>Enacted</b>: true<br><b>Comment</b>: AAA<br><b>Duration</b>: 30 min<br><b>Absolute</b>: 1.00 U/h", per.toHtml())
+        per = PumpEnactResult(injector).enacted(false).comment("AAA")
+        Assert.assertEquals("<b>Success</b>: false<br><b>Comment</b>: AAA", per.toHtml())
+    }
+
+    @Test fun jsonTest() {
+        var o: JSONObject?
+
+        var per: PumpEnactResult = PumpEnactResult(injector).enacted(true).bolusDelivered(10.0).comment("AAA")
+        o = per.json(validProfile)
+        JSONAssert.assertEquals("{\"smb\":10}", o, false)
+        per = PumpEnactResult(injector).enacted(true).isTempCancel(true).comment("AAA")
+        o = per.json(validProfile)
+        JSONAssert.assertEquals("{\"rate\":0,\"duration\":0}", o, false)
+        per = PumpEnactResult(injector).enacted(true).isPercent(true).percent(90).duration(20).comment("AAA")
+        o = per.json(validProfile)
+        JSONAssert.assertEquals("{\"rate\":0.9,\"duration\":20}", o, false)
+        per = PumpEnactResult(injector).enacted(true).isPercent(false).absolute(1.0).duration(30).comment("AAA")
+        o = per.json(validProfile)
+        JSONAssert.assertEquals("{\"rate\":1,\"duration\":30}", o, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
deleted file mode 100644
index 820e8d34b1..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package info.nightscout.androidaps.data;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.SPMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SP.class, MainApp.class, Profile.class})
-public class QuickWizardTest {
-
-    private String data1 = "{\"buttonText\":\"Meal\",\"carbs\":36,\"validFrom\":0,\"validTo\":18000," +
-            "\"useBG\":0,\"useCOB\":0,\"useBolusIOB\":0,\"useBasalIOB\":0,\"useTrend\":0,\"useSuperBolus\":0,\"useTemptarget\":0}";
-    private String data2 = "{\"buttonText\":\"Lunch\",\"carbs\":18,\"validFrom\":36000,\"validTo\":39600," +
-            "\"useBG\":0,\"useCOB\":0,\"useBolusIOB\":1,\"useBasalIOB\":2,\"useTrend\":0,\"useSuperBolus\":0,\"useTemptarget\":0}";
-
-    private JSONArray array;
-
-    public QuickWizardTest() {
-        try {
-            array = new JSONArray("[" + data1 + "," + data2 + "]");
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Before
-    public void mock() throws Exception {
-        AAPSMocker.mockMainApp();
-        SPMocker.prepareMock();
-        PowerMockito.mockStatic(Profile.class);
-        PowerMockito.when(Profile.class, "secondsFromMidnight").thenReturn(0);
-
-    }
-
-    @Test
-    public void setDataTest() {
-        QuickWizard.INSTANCE.setData(array);
-        Assert.assertEquals(2, QuickWizard.INSTANCE.size());
-    }
-
-    @Test
-    public void saveTest() {
-        QuickWizard.INSTANCE.setData(array);
-        QuickWizard.INSTANCE.save();
-        Assert.assertEquals("[{\"useBolusIOB\":0,\"buttonText\":\"Meal\",\"useTrend\":0,\"carbs\":36,\"useCOB\":0,\"useBasalIOB\":0,\"useTemptarget\":0,\"useBG\":0,\"validFrom\":0,\"useSuperBolus\":0,\"validTo\":18000},{\"useBolusIOB\":1,\"buttonText\":\"Lunch\",\"useTrend\":0,\"carbs\":18,\"useCOB\":0,\"useBasalIOB\":2,\"useTemptarget\":0,\"useBG\":0,\"validFrom\":36000,\"useSuperBolus\":0,\"validTo\":39600}]", SP.getString("QuickWizard", "d"));
-    }
-
-    @Test
-    public void getTest() {
-        QuickWizard.INSTANCE.setData(array);
-        Assert.assertEquals("Lunch", QuickWizard.INSTANCE.get(1).buttonText());
-    }
-
-    @Test
-    public void getActive() {
-        QuickWizard.INSTANCE.setData(array);
-        QuickWizardEntry e = QuickWizard.INSTANCE.getActive();
-        Assert.assertEquals(36d, e.carbs(), 0.01d);
-        QuickWizard.INSTANCE.remove(0);
-        QuickWizard.INSTANCE.remove(0);
-        Assert.assertNull(QuickWizard.INSTANCE.getActive());
-    }
-
-    @Test
-    public void newEmptyItemTest() {
-        Assert.assertNotNull(QuickWizard.INSTANCE.newEmptyItem());
-    }
-
-    @Test
-    public void addOrUpdate() {
-        QuickWizard.INSTANCE.setData(array);
-        Assert.assertEquals(2, QuickWizard.INSTANCE.size());
-        QuickWizard.INSTANCE.addOrUpdate(QuickWizard.INSTANCE.newEmptyItem());
-        Assert.assertEquals(3, QuickWizard.INSTANCE.size());
-        QuickWizardEntry q = QuickWizard.INSTANCE.newEmptyItem();
-        q.position = 0;
-        QuickWizard.INSTANCE.addOrUpdate(q);
-        Assert.assertEquals(3, QuickWizard.INSTANCE.size());
-    }
-
-    @Test
-    public void remove() {
-        QuickWizard.INSTANCE.setData(array);
-        QuickWizard.INSTANCE.remove(0);
-        Assert.assertEquals(1, QuickWizard.INSTANCE.size());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
new file mode 100644
index 0000000000..69a166dc86
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
@@ -0,0 +1,103 @@
+package info.nightscout.androidaps.data
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.wizard.QuickWizard
+import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
+import org.json.JSONArray
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(Profile::class)
+class QuickWizardTest : TestBase() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var loopPlugin: LoopPlugin
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    private val data1 = "{\"buttonText\":\"Meal\",\"carbs\":36,\"validFrom\":0,\"validTo\":18000," +
+        "\"useBG\":0,\"useCOB\":0,\"useBolusIOB\":0,\"useBasalIOB\":0,\"useTrend\":0,\"useSuperBolus\":0,\"useTemptarget\":0}"
+    private val data2 = "{\"buttonText\":\"Lunch\",\"carbs\":18,\"validFrom\":36000,\"validTo\":39600," +
+        "\"useBG\":0,\"useCOB\":0,\"useBolusIOB\":1,\"useBasalIOB\":2,\"useTrend\":0,\"useSuperBolus\":0,\"useTemptarget\":0}"
+    var array: JSONArray = JSONArray("[$data1,$data2]")
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is QuickWizardEntry) {
+                it.aapsLogger = aapsLogger
+                it.sp = sp
+                it.profileFunction = profileFunction
+                it.treatmentsPlugin = treatmentsPlugin
+                it.loopPlugin = loopPlugin
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+        }
+    }
+
+    private lateinit var quickWizard : QuickWizard
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(Profile::class.java)
+        PowerMockito.`when`<Any>(Profile::class.java, "secondsFromMidnight").thenReturn(0)
+        `when`(sp.getString("QuickWizard", "[]")).thenReturn("[]")
+        quickWizard = QuickWizard(sp, injector)
+    }
+
+    @Test fun setDataTest() {
+        quickWizard.setData(array)
+        Assert.assertEquals(2, quickWizard.size())
+    }
+
+    @Test fun test() {
+        quickWizard.setData(array)
+        Assert.assertEquals("Lunch", quickWizard.get(1).buttonText())
+    }
+
+    @Test fun active() {
+        quickWizard.setData(array)
+        val e: QuickWizardEntry = quickWizard.getActive()!!
+        Assert.assertEquals(36.0, e.carbs().toDouble(), 0.01)
+        quickWizard.remove(0)
+        quickWizard.remove(0)
+        Assert.assertNull(quickWizard.getActive())
+    }
+
+    @Test fun newEmptyItemTest() {
+        Assert.assertNotNull(quickWizard.newEmptyItem())
+    }
+
+    @Test fun addOrUpdate() {
+        quickWizard.setData(array)
+        Assert.assertEquals(2, quickWizard.size())
+        quickWizard.addOrUpdate(quickWizard.newEmptyItem())
+        Assert.assertEquals(3, quickWizard.size())
+        val q: QuickWizardEntry = quickWizard.newEmptyItem()
+        q.position = 0
+        quickWizard.addOrUpdate(q)
+        Assert.assertEquals(3, quickWizard.size())
+    }
+
+    @Test fun remove() {
+        quickWizard.setData(array)
+        quickWizard.remove(0)
+        Assert.assertEquals(1, quickWizard.size())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
index bb216ff5ab..d2afc0d5f3 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
@@ -1,24 +1,29 @@
 package info.nightscout.androidaps.data.defaultProfile
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.Constants
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-class DefaultProfileTest {
+class DefaultProfileTest : TestBase() {
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
 
     @Test
     fun profile() {
-        var p = DefaultProfile().profile(5.0, 5.1 / 0.3, 0.0, Constants.MGDL)
+        var p = DefaultProfile(injector).profile(5.0, 5.1 / 0.3, 0.0, Constants.MGDL)
         assertEquals(0.150, p.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(15.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(11.8, p.getIsfTimeFromMidnight(0), 0.001)
 
-        p = DefaultProfile().profile(7.0, 10.0 / 0.4, 0.0, Constants.MGDL)
+        p = DefaultProfile(injector).profile(7.0, 10.0 / 0.4, 0.0, Constants.MGDL)
         assertEquals(0.350, p.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(15.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(6.8, p.getIsfTimeFromMidnight(0), 0.001)
 
-        p = DefaultProfile().profile(12.0, 25.0 / 0.5, 0.0, Constants.MGDL)
+        p = DefaultProfile(injector).profile(12.0, 25.0 / 0.5, 0.0, Constants.MGDL)
         assertEquals(0.80, p.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(10.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(2.2, p.getIsfTimeFromMidnight(0), 0.001)
diff --git a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.java b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.java
deleted file mode 100644
index e3714a7545..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, Logger.class, L.class, SP.class, GlucoseStatus.class})
-public class BgReadingTest {
-    private BgReading bgReading = new BgReading();
-
-    @Test
-    public void valueToUnits() {
-        bgReading.value = 18;
-        assertEquals(18, bgReading.valueToUnits(Constants.MGDL) * 1, 0.01d);
-        assertEquals(1, bgReading.valueToUnits(Constants.MMOL) * 1, 0.01d);
-    }
-
-    @Test
-    public void directionToSymbol() {
-        bgReading = new BgReading();
-        bgReading.direction = "DoubleDown";
-        assertEquals("\u21ca", bgReading.directionToSymbol());
-        bgReading.direction = "SingleDown";
-        assertEquals("\u2193", bgReading.directionToSymbol());
-        bgReading.direction = "FortyFiveDown";
-        assertEquals("\u2198", bgReading.directionToSymbol());
-        bgReading.direction = "Flat";
-        assertEquals("\u2192", bgReading.directionToSymbol());
-        bgReading.direction = "FortyFiveUp";
-        assertEquals("\u2197", bgReading.directionToSymbol());
-        bgReading.direction = "SingleUp";
-        assertEquals("\u2191", bgReading.directionToSymbol());
-        bgReading.direction = "DoubleUp";
-        assertEquals("\u21c8", bgReading.directionToSymbol());
-        bgReading.direction = "OUT OF RANGE";
-        assertEquals("??", bgReading.directionToSymbol());
-
-    }
-
-    @Test
-    public void dateTest() {
-        bgReading = new BgReading();
-        long now = System.currentTimeMillis();
-        bgReading.date = now;
-        Date nowDate = new Date(now);
-        assertEquals(now, bgReading.date(now).date);
-        assertEquals(now, bgReading.date(nowDate).date);
-    }
-
-    @Test
-    public void valueTest() {
-        bgReading = new BgReading();
-        double valueToSet = 81; // 4.5 mmol
-        assertEquals(81d, bgReading.value(valueToSet).value, 0.01d);
-    }
-
-    @Test
-    public void copyFromTest() {
-        bgReading = new BgReading();
-        BgReading copy = new BgReading();
-        bgReading.value = 81;
-        long now = System.currentTimeMillis();
-        bgReading.date = now;
-        copy.date = now;
-
-        copy.copyFrom(bgReading);
-
-        assertEquals(81, copy.value, 0.1d);
-        assertEquals(now, copy.date);
-        assertEquals(bgReading.directionToSymbol(), copy.directionToSymbol());
-    }
-
-    @Test
-    public void isEqualTest() {
-        bgReading = new BgReading();
-        BgReading copy = new BgReading();
-        bgReading.value = 81;
-        long now = System.currentTimeMillis();
-        bgReading.date = now;
-        copy.date = now;
-
-        copy.copyFrom(bgReading);
-
-        assertTrue(copy.isEqual(bgReading));
-        assertFalse(copy.isEqual(new BgReading()));
-    }
-
-    @Test
-    public void calculateDirection() {
-        List<BgReading> bgReadingsList = null;
-        AAPSMocker.mockDatabaseHelper();
-
-        when(MainApp.getDbHelper().getAllBgreadingsDataFromTime(anyLong(),anyBoolean())).thenReturn(bgReadingsList);
-        assertEquals("NONE", bgReading.calculateDirection());
-        setReadings(72,0);
-        assertEquals("DoubleUp", bgReading.calculateDirection());
-        setReadings(76,60);
-        assertEquals("SingleUp", bgReading.calculateDirection());
-        setReadings(74,65);
-        assertEquals("FortyFiveUp", bgReading.calculateDirection());
-        setReadings(72,72);
-        assertEquals("Flat", bgReading.calculateDirection());
-        setReadings(0,72);
-        assertEquals("DoubleDown", bgReading.calculateDirection());
-        setReadings(60,76);
-        assertEquals("SingleDown", bgReading.calculateDirection());
-        setReadings(65,74);
-        assertEquals("FortyFiveDown", bgReading.calculateDirection());
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockDatabaseHelper();
-    }
-
-    public void setReadings(int current_value, int previous_value){
-        BgReading now = new BgReading();
-        now.value = current_value;
-        now.date = System.currentTimeMillis();
-        BgReading previous = new BgReading();
-        previous.value = previous_value;
-        previous.date = System.currentTimeMillis() - ( 6 * 60 * 1000L);
-        List<BgReading> bgReadings = new ArrayList() {{
-            add(now);
-            add(previous);
-        }};
-        when(MainApp.getDbHelper().getAllBgreadingsDataFromTime(anyLong(),anyBoolean())).thenReturn(bgReadings);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
new file mode 100644
index 0000000000..7f55f458d4
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
@@ -0,0 +1,166 @@
+package info.nightscout.androidaps.db
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+import java.util.logging.Logger
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, Logger::class, L::class, SP::class, GlucoseStatus::class)
+class BgReadingTest : TestBase() {
+
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is BgReading) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.defaultValueHelper = defaultValueHelper
+                it.profileFunction = profileFunction
+            }
+        }
+    }
+
+    @Test
+    fun valueToUnits() {
+        val bgReading = BgReading(injector)
+        bgReading.value = 18.0
+        Assert.assertEquals(18.0, bgReading.valueToUnits(Constants.MGDL) * 1, 0.01)
+        Assert.assertEquals(1.0, bgReading.valueToUnits(Constants.MMOL) * 1, 0.01)
+    }
+
+    @Test
+    fun directionToSymbol() {
+        val bgReading = BgReading(injector)
+        bgReading.direction = "DoubleDown"
+        Assert.assertEquals("\u21ca", bgReading.directionToSymbol())
+        bgReading.direction = "SingleDown"
+        Assert.assertEquals("\u2193", bgReading.directionToSymbol())
+        bgReading.direction = "FortyFiveDown"
+        Assert.assertEquals("\u2198", bgReading.directionToSymbol())
+        bgReading.direction = "Flat"
+        Assert.assertEquals("\u2192", bgReading.directionToSymbol())
+        bgReading.direction = "FortyFiveUp"
+        Assert.assertEquals("\u2197", bgReading.directionToSymbol())
+        bgReading.direction = "SingleUp"
+        Assert.assertEquals("\u2191", bgReading.directionToSymbol())
+        bgReading.direction = "DoubleUp"
+        Assert.assertEquals("\u21c8", bgReading.directionToSymbol())
+        bgReading.direction = "OUT OF RANGE"
+        Assert.assertEquals("??", bgReading.directionToSymbol())
+    }
+
+    @Test fun dateTest() {
+        val bgReading = BgReading(injector)
+        val now = System.currentTimeMillis()
+        bgReading.date = now
+        val nowDate = Date(now)
+        Assert.assertEquals(now, bgReading.date(now).date)
+        Assert.assertEquals(now, bgReading.date(nowDate).date)
+    }
+
+    @Test fun valueTest() {
+        val bgReading = BgReading(injector)
+        val valueToSet = 81.0 // 4.5 mmol
+        Assert.assertEquals(81.0, bgReading.value(valueToSet).value, 0.01)
+    }
+
+    @Test fun copyFromTest() {
+        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
+        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
+        setReadings(72, 0)
+        val bgReading = BgReading(injector)
+        val copy = BgReading(injector)
+        bgReading.value = 81.0
+        val now = System.currentTimeMillis()
+        bgReading.date = now
+        copy.date = now
+        copy.copyFrom(bgReading)
+        Assert.assertEquals(81.0, copy.value, 0.1)
+        Assert.assertEquals(now, copy.date)
+        Assert.assertEquals(bgReading.directionToSymbol(), copy.directionToSymbol())
+    }
+
+    @Test
+    fun isEqualTest() {
+        val bgReading = BgReading(injector)
+        val copy = BgReading(injector)
+        bgReading.value = 81.0
+        val now = System.currentTimeMillis()
+        bgReading.date = now
+        copy.date = now
+        copy.copyFrom(bgReading)
+        Assert.assertTrue(copy.isEqual(bgReading))
+        Assert.assertFalse(copy.isEqual(BgReading(injector)))
+    }
+
+    @Test fun calculateDirection() {
+        val bgReading = BgReading(injector)
+        val bgReadingsList: List<BgReading>? = null
+        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
+        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
+        `when`(MainApp.getDbHelper().getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadingsList)
+        Assert.assertEquals("NONE", bgReading.calculateDirection())
+        setReadings(72, 0)
+        Assert.assertEquals("DoubleUp", bgReading.calculateDirection())
+        setReadings(76, 60)
+        Assert.assertEquals("SingleUp", bgReading.calculateDirection())
+        setReadings(74, 65)
+        Assert.assertEquals("FortyFiveUp", bgReading.calculateDirection())
+        setReadings(72, 72)
+        Assert.assertEquals("Flat", bgReading.calculateDirection())
+        setReadings(0, 72)
+        Assert.assertEquals("DoubleDown", bgReading.calculateDirection())
+        setReadings(60, 76)
+        Assert.assertEquals("SingleDown", bgReading.calculateDirection())
+        setReadings(65, 74)
+        Assert.assertEquals("FortyFiveDown", bgReading.calculateDirection())
+    }
+
+    @Before
+    fun prepareMock() {
+        val mainApp = PowerMockito.mockStatic(MainApp::class.java)
+//        AAPSMocker.mockApplicationContext()
+//        AAPSMocker.mockSP()
+//        AAPSMocker.mockL()
+//        AAPSMocker.mockDatabaseHelper()
+//        `when`(mainApp.androidInjector()).thenReturn(injector.androidInjector())
+    }
+
+    fun setReadings(current_value: Int, previous_value: Int) {
+        val now = BgReading(injector)
+        now.value = current_value.toDouble()
+        now.date = System.currentTimeMillis()
+        val previous = BgReading(injector)
+        previous.value = previous_value.toDouble()
+        previous.date = System.currentTimeMillis() - 6 * 60 * 1000L
+        val bgReadings: MutableList<BgReading> = mutableListOf()
+        bgReadings.add(now)
+        bgReadings.add(previous)
+        `when`(MainApp.getDbHelper().getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadings)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
deleted file mode 100644
index 3dbe770bfc..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 19.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class ConstraintTest {
-
-    @Test
-    public void doTests() {
-        Constraint<Boolean> b = new Constraint<>(true);
-        Assert.assertEquals(Boolean.TRUE, b.value());
-        Assert.assertEquals("", b.getReasons());
-        Assert.assertEquals("", b.getMostLimitedReasons());
-        b.set(false);
-        Assert.assertEquals(Boolean.FALSE, b.value());
-        Assert.assertEquals("", b.getReasons());
-        Assert.assertEquals("", b.getMostLimitedReasons());
-        b.set(true, "Set true", this);
-        Assert.assertEquals(Boolean.TRUE, b.value());
-        Assert.assertEquals("ConstraintTest: Set true", b.getReasons());
-        Assert.assertEquals("ConstraintTest: Set true", b.getMostLimitedReasons());
-        b.set(false, "Set false", this);
-        Assert.assertEquals(Boolean.FALSE, b.value());
-        Assert.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getReasons());
-        Assert.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getMostLimitedReasons());
-
-        Constraint<Double> d = new Constraint<>(10d);
-        d.set(5d, "Set 5d", this);
-        Assert.assertEquals(5d, d.value());
-        Assert.assertEquals("ConstraintTest: Set 5d", d.getReasons());
-        Assert.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons());
-        d.setIfSmaller(6d, "Set 6d", this);
-        Assert.assertEquals(5d, d.value());
-        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d", d.getReasons());
-        Assert.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons());
-        d.setIfSmaller(4d, "Set 4d", this);
-        Assert.assertEquals(4d, d.value());
-        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d", d.getReasons());
-        Assert.assertEquals("ConstraintTest: Set 4d", d.getMostLimitedReasons());
-        Assert.assertEquals(10d, d.originalValue());
-        d.setIfDifferent(7d, "Set 7d", this);
-        Assert.assertEquals(7d, d.value());
-        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getReasons());
-        Assert.assertEquals("ConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getMostLimitedReasons());
-        Assert.assertEquals(10d, d.originalValue());
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.kt
new file mode 100644
index 0000000000..a41d7c1630
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+/**
+ * Created by mike on 19.03.2018.
+ */
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, SP::class)
+class ConstraintTest : TestBase() {
+
+    @Test fun doTests() {
+        val b = Constraint(true)
+        Assert.assertEquals(true, b.value())
+        Assert.assertEquals("", b.getReasons(aapsLogger))
+        Assert.assertEquals("", b.getMostLimitedReasons(aapsLogger))
+        b.set(aapsLogger, false)
+        Assert.assertEquals(false, b.value())
+        Assert.assertEquals("", b.getReasons(aapsLogger))
+        Assert.assertEquals("", b.getMostLimitedReasons(aapsLogger))
+        b.set(aapsLogger, true, "Set true", this)
+        Assert.assertEquals(true, b.value())
+        Assert.assertEquals("ConstraintTest: Set true", b.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set true", b.getMostLimitedReasons(aapsLogger))
+        b.set(aapsLogger, false, "Set false", this)
+        Assert.assertEquals(false, b.value())
+        Assert.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getMostLimitedReasons(aapsLogger))
+        val d = Constraint(10.0)
+        d.set(aapsLogger, 5.0, "Set 5d", this)
+        Assert.assertEquals(5.0, d.value(), 0.01)
+        Assert.assertEquals("ConstraintTest: Set 5d", d.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons(aapsLogger))
+        d.setIfSmaller(aapsLogger, 6.0, "Set 6d", this)
+        Assert.assertEquals(5.0, d.value(), 0.01)
+        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d", d.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons(aapsLogger))
+        d.setIfSmaller(aapsLogger, 4.0, "Set 4d", this)
+        Assert.assertEquals(4.0, d.value(), 0.01)
+        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d", d.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set 4d", d.getMostLimitedReasons(aapsLogger))
+        Assert.assertEquals(10.0, d.originalValue(), 0.01)
+        d.setIfDifferent(aapsLogger, 7.0, "Set 7d", this)
+        Assert.assertEquals(7.0, d.value(), 0.01)
+        Assert.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getReasons(aapsLogger))
+        Assert.assertEquals("ConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getMostLimitedReasons(aapsLogger))
+        Assert.assertEquals(10.0, d.originalValue(), 0.01)
+    }
+
+    @Before
+    fun prepareMock() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
deleted file mode 100644
index f3577e35c8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import android.content.Context;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ConstraintChecker;
-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.constraints.objectives.ObjectivesPlugin;
-import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
-import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 18.03.2018.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, FabricPrivacy.class, SP.class, Context.class, OpenAPSMAPlugin.class, OpenAPSAMAPlugin.class, OpenAPSSMBPlugin.class})
-public class ConstraintsCheckerTest {
-
-    VirtualPumpPlugin pump = new VirtualPumpPlugin();
-    ConstraintChecker constraintChecker;
-
-    SafetyPlugin safetyPlugin;
-    ObjectivesPlugin objectivesPlugin;
-    ComboPlugin comboPlugin;
-    DanaRPlugin danaRPlugin;
-    DanaRSPlugin danaRSPlugin;
-    LocalInsightPlugin insightPlugin;
-    OpenAPSSMBPlugin openAPSSMBPlugin;
-
-    boolean notificationSent = false;
-
-    public ConstraintsCheckerTest() {
-    }
-
-    @Test
-    public void isLoopInvokationAllowedTest() {
-        comboPlugin.setPluginEnabled(PluginType.PUMP, true);
-        comboPlugin.setValidBasalRateProfileSelectedOnPump(false);
-
-        Constraint<Boolean> c = constraintChecker.isLoopInvokationAllowed();
-        Assert.assertEquals(true, c.getReasonList().size() == 2); // Combo & Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 2); // Combo & Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void isClosedLoopAllowedTest() {
-        when(SP.getString(R.string.key_aps_mode, "open")).thenReturn("closed");
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getMAXIOB_ZERO_CL_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = constraintChecker.isClosedLoopAllowed();
-        Assert.assertEquals(true, c.getReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-
-        when(SP.getString(R.string.key_aps_mode, "open")).thenReturn("open");
-        c = constraintChecker.isClosedLoopAllowed();
-        Assert.assertEquals(true, c.getReasonList().size() == 3); // 2x Safety & Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 3); // 2x Safety & Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void isAutosensModeEnabledTest() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getAUTOSENS_OBJECTIVE()).setStartedOn(0);
-        when(SP.getBoolean(R.string.key_openapsama_useautosens, false)).thenReturn(false);
-
-        Constraint<Boolean> c = constraintChecker.isAutosensModeEnabled();
-        Assert.assertEquals(true, c.getReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void isAMAModeEnabledTest() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getAMA_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = constraintChecker.isAMAModeEnabled();
-        Assert.assertEquals(true, c.getReasonList().size() == 1); // Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 1); // Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void isAdvancedFilteringEnabledTest() {
-        when(ConfigBuilderPlugin.getPlugin().getActiveBgSource()).thenReturn(SourceGlimpPlugin.getPlugin());
-
-        Constraint<Boolean> c = constraintChecker.isAdvancedFilteringEnabled();
-        Assert.assertEquals(true, c.getReasonList().size() == 1); // Safety
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 1); // Safety
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void isSuperBolusEnabledTest() throws Exception {
-        OpenAPSSMBPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-
-        Constraint<Boolean> c = constraintChecker.isSuperBolusEnabled();
-        Assert.assertEquals(Boolean.FALSE, c.value()); // SMB should limit
-    }
-
-    @Test
-    public void isSMBModeEnabledTest() throws Exception {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getSMB_OBJECTIVE()).setStartedOn(0);
-        when(SP.getBoolean(R.string.key_use_smb, false)).thenReturn(false);
-        when(MainApp.getConstraintChecker().isClosedLoopAllowed()).thenReturn(new Constraint<>(true));
-
-        Constraint<Boolean> c = constraintChecker.isSMBModeEnabled();
-        Assert.assertEquals(true, c.getReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(true, c.getMostLimitedReasonList().size() == 2); // Safety & Objectives
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    // applyBasalConstraints tests
-    @Test
-    public void basalRateShouldBeLimited() throws Exception {
-        // DanaR, RS
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        // Insight
-//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
-//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
-//        result.maximumBasalAmount = 1.1d;
-//        insightPlugin.setStatusResult(result);
-
-        // No limit by default
-        when(SP.getDouble(R.string.key_openapsma_max_basal, 1d)).thenReturn(1d);
-        when(SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d)).thenReturn(4d);
-        when(SP.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        // Apply all limits
-        Constraint<Double> d = constraintChecker.getMaxBasalAllowed(AAPSMocker.getValidProfile());
-        Assert.assertEquals(0.8d, d.value());
-        Assert.assertEquals(6, d.getReasonList().size());
-        Assert.assertEquals("DanaR: Limiting basal rate to 0.80 U/h because of pump limit", d.getMostLimitedReasons());
-
-    }
-
-    @Test
-    public void percentBasalRateShouldBeLimited() throws Exception {
-        // DanaR, RS
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        // Insight
-//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
-//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
-//        result.maximumBasalAmount = 1.1d;
-//        insightPlugin.setStatusResult(result);
-
-        // No limit by default
-        when(SP.getDouble(R.string.key_openapsma_max_basal, 1d)).thenReturn(1d);
-        when(SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d)).thenReturn(4d);
-        when(SP.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        // Apply all limits
-        Constraint<Integer> i = constraintChecker.getMaxBasalPercentAllowed(AAPSMocker.getValidProfile());
-        Assert.assertEquals((Integer) 100, i.value());
-        Assert.assertEquals(8, i.getReasonList().size()); // 6x Safety & RS & R
-        Assert.assertEquals("Safety: Limiting percent rate to 100% because of pump limit", i.getMostLimitedReasons());
-
-    }
-
-    // applyBolusConstraints tests
-    @Test
-    public void bolusAmountShouldBeLimited() throws Exception {
-        // DanaR, RS
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBolus = 6d;
-
-        // Insight
-//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
-//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
-//        result.maximumBolusAmount = 7d;
-//        insightPlugin.setStatusResult(result);
-
-        // No limit by default
-        when(SP.getDouble(R.string.key_treatmentssafety_maxbolus, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        // Apply all limits
-        Constraint<Double> d = constraintChecker.getMaxBolusAllowed();
-        Assert.assertEquals(3d, d.value());
-        Assert.assertEquals(4, d.getReasonList().size()); // 2x Safety & RS & R
-        Assert.assertEquals("Safety: Limiting bolus to 3.0 U because of max value in preferences", d.getMostLimitedReasons());
-
-    }
-
-    // applyCarbsConstraints tests
-    @Test
-    public void carbsAmountShouldBeLimited() throws Exception {
-        // No limit by default
-        when(SP.getInt(R.string.key_treatmentssafety_maxcarbs, 48)).thenReturn(48);
-
-        // Apply all limits
-        Constraint<Integer> i = constraintChecker.getMaxCarbsAllowed();
-        Assert.assertEquals((Integer) 48, i.value());
-        Assert.assertEquals(true, i.getReasonList().size() == 1);
-        Assert.assertEquals("Safety: Limiting carbs to 48 g because of max value in preferences", i.getMostLimitedReasons());
-    }
-
-    // applyMaxIOBConstraints tests
-    @Test
-    public void iobAMAShouldBeLimited() {
-        // No limit by default
-        when(SP.getDouble(R.string.key_openapsma_max_iob, 1.5d)).thenReturn(1.5d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("teenage");
-        OpenAPSAMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-        OpenAPSMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, false);
-        OpenAPSSMBPlugin.getPlugin().setPluginEnabled(PluginType.APS, false);
-
-        // Apply all limits
-        Constraint<Double> d = constraintChecker.getMaxIOBAllowed();
-        Assert.assertEquals(1.5d, d.value());
-        Assert.assertEquals(d.getReasonList().toString(), 2, d.getReasonList().size());
-        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences", d.getMostLimitedReasons());
-
-    }
-
-    @Test
-    public void iobSMBShouldBeLimited() {
-        // No limit by default
-        when(SP.getDouble(R.string.key_openapssmb_max_iob, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("teenage");
-        OpenAPSSMBPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-        OpenAPSAMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, false);
-        OpenAPSMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, false);
-
-        // Apply all limits
-        Constraint<Double> d = constraintChecker.getMaxIOBAllowed();
-        Assert.assertEquals(3d, d.value());
-        Assert.assertEquals(d.getReasonList().toString(), 2, d.getReasonList().size());
-        Assert.assertEquals("Safety: Limiting IOB to 3.0 U because of max value in preferences", d.getMostLimitedReasons());
-
-    }
-
-    @Before
-    public void prepareMock() throws Exception {
-
-        PowerMockito.mockStatic(FabricPrivacy.class);
-
-        MainApp mainApp = AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockConstraintsChecker();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockCommandQueue();
-
-        when(mainApp.getPackageName()).thenReturn("info.nightscout.androidaps");
-
-        // RS constructor
-        when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
-
-        //SafetyPlugin
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-
-        constraintChecker = new ConstraintChecker();
-
-        safetyPlugin = SafetyPlugin.getPlugin();
-        objectivesPlugin = ObjectivesPlugin.INSTANCE;
-        comboPlugin = ComboPlugin.getPlugin();
-        danaRPlugin = DanaRPlugin.getPlugin();
-        danaRSPlugin = DanaRSPlugin.getPlugin();
-        insightPlugin = LocalInsightPlugin.getPlugin();
-        openAPSSMBPlugin = OpenAPSSMBPlugin.getPlugin();
-        ArrayList<PluginBase> constraintsPluginsList = new ArrayList<>();
-        constraintsPluginsList.add(safetyPlugin);
-        constraintsPluginsList.add(objectivesPlugin);
-        constraintsPluginsList.add(comboPlugin);
-        constraintsPluginsList.add(danaRPlugin);
-        constraintsPluginsList.add(danaRSPlugin);
-        constraintsPluginsList.add(insightPlugin);
-        constraintsPluginsList.add(openAPSSMBPlugin);
-        when(mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class)).thenReturn(constraintsPluginsList);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
new file mode 100644
index 0000000000..763cd748cc
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -0,0 +1,344 @@
+package info.nightscout.androidaps.interfaces
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+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.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
+import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentService
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+/**
+ * Created by mike on 18.03.2018.
+ */
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, SP::class, Context::class, OpenAPSMAPlugin::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, GlimpPlugin::class)
+class ConstraintsCheckerTest : TestBaseWithProfile() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var sp: SP
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var context: Context
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Mock lateinit var glimpPlugin: GlimpPlugin
+    @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+
+    private var buildHelper = BuildHelper()
+    lateinit var danaRPump: DanaRPump
+
+    lateinit var constraintChecker: ConstraintChecker
+    private lateinit var safetyPlugin: SafetyPlugin
+    private lateinit var objectivesPlugin: ObjectivesPlugin
+    private lateinit var comboPlugin: ComboPlugin
+    private lateinit var danaRPlugin: DanaRPlugin
+    private lateinit var danaRSPlugin: DanaRSPlugin
+    private lateinit var insightPlugin: LocalInsightPlugin
+    private lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+    private lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
+    private lateinit var openAPSMAPlugin: OpenAPSMAPlugin
+    private lateinit var hardLimits: HardLimits
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Objective) {
+                it.sp = sp
+            }
+        }
+    }
+
+    @Before
+    fun prepare() {
+        `when`(resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(resourceHelper.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted)).thenReturn("Objective %d not started")
+        `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
+        `when`(resourceHelper.gs(R.string.autosensdisabledinpreferences)).thenReturn("Autosens disabled in preferences")
+        `when`(resourceHelper.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
+        `when`(resourceHelper.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(resourceHelper.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
+        `when`(resourceHelper.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s")
+        `when`(resourceHelper.gs(R.string.hardlimit)).thenReturn("hard limit")
+        `when`(resourceHelper.gs(R.string.key_child)).thenReturn("child")
+        `when`(resourceHelper.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
+        `when`(resourceHelper.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %.1f U because of %s")
+        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+
+        // RS constructor
+        `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
+
+        //SafetyPlugin
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        constraintChecker = ConstraintChecker(activePlugin)
+
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp)
+        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context)
+        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits)
+        openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits)
+        openAPSMAPlugin = OpenAPSMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin)
+        val constraintsPluginsList = ArrayList<PluginBase?>()
+        constraintsPluginsList.add(safetyPlugin)
+        constraintsPluginsList.add(objectivesPlugin)
+        constraintsPluginsList.add(comboPlugin)
+        constraintsPluginsList.add(danaRPlugin)
+        constraintsPluginsList.add(danaRSPlugin)
+        constraintsPluginsList.add(insightPlugin)
+        constraintsPluginsList.add(openAPSSMBPlugin)
+        `when`(activePlugin.getSpecificPluginsListByInterface(ConstraintsInterface::class.java)).thenReturn(constraintsPluginsList)
+        objectivesPlugin.onStart()
+    }
+
+    // Combo & Objectives
+    @Test
+    fun isLoopInvocationAllowedTest() {
+        `when`(activePlugin.activePump).thenReturn(comboPlugin)
+        comboPlugin.setPluginEnabled(PluginType.PUMP, true)
+        comboPlugin.setValidBasalRateProfileSelectedOnPump(false)
+        val c = constraintChecker.isLoopInvocationAllowed()
+        Assert.assertEquals(true, c.reasonList.size == 2) // Combo & Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 2) // Combo & Objectives
+        Assert.assertEquals(java.lang.Boolean.FALSE, c.value())
+    }
+
+    // Safety & Objectives
+    // 2x Safety & Objectives
+    @Test
+    fun isClosedLoopAllowedTest() {
+        `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("closed")
+        objectivesPlugin.objectives[ObjectivesPlugin.MAXIOB_ZERO_CL_OBJECTIVE].startedOn = 0
+        var c: Constraint<Boolean> = constraintChecker.isClosedLoopAllowed()
+        Assert.assertEquals(true, c.reasonList.size == 2) // Safety & Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 2) // Safety & Objectives
+        Assert.assertEquals(false, c.value())
+        `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("open")
+        c = constraintChecker.isClosedLoopAllowed()
+        Assert.assertEquals(true, c.reasonList.size == 3) // 2x Safety & Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 3) // 2x Safety & Objectives
+        Assert.assertEquals(false, c.value())
+    }
+
+    // Safety & Objectives
+    @Test
+    fun isAutosensModeEnabledTest() {
+        objectivesPlugin.objectives[ObjectivesPlugin.AUTOSENS_OBJECTIVE].startedOn = 0
+        `when`(sp.getBoolean(R.string.key_openapsama_useautosens, false)).thenReturn(false)
+        val c = constraintChecker.isAutosensModeEnabled()
+        Assert.assertEquals(true, c.reasonList.size == 2) // Safety & Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 2) // Safety & Objectives
+        Assert.assertEquals(java.lang.Boolean.FALSE, c.value())
+    }
+
+    // Objectives
+    @Test
+    fun isAMAModeEnabledTest() {
+        objectivesPlugin.objectives[ObjectivesPlugin.AMA_OBJECTIVE].startedOn = 0
+        val c = constraintChecker.isAMAModeEnabled()
+        Assert.assertEquals(true, c.reasonList.size == 1) // Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 1) // Objectives
+        Assert.assertEquals(java.lang.Boolean.FALSE, c.value())
+    }
+
+    // Safety
+    @Test
+    fun isAdvancedFilteringEnabledTest() {
+        `when`(activePlugin.activeBgSource).thenReturn(glimpPlugin)
+        val c = constraintChecker.isAdvancedFilteringEnabled()
+        Assert.assertEquals(true, c.reasonList.size == 1) // Safety
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 1) // Safety
+        Assert.assertEquals(false, c.value())
+    }
+
+    // SMB should limit
+    @Test
+    fun isSuperBolusEnabledTest() {
+        openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true)
+        val c = constraintChecker.isSuperBolusEnabled()
+        Assert.assertEquals(java.lang.Boolean.FALSE, c.value()) // SMB should limit
+    }
+
+    // Safety & Objectives
+    @Test
+    fun isSMBModeEnabledTest() {
+        objectivesPlugin.objectives[ObjectivesPlugin.SMB_OBJECTIVE].startedOn = 0
+        `when`(sp.getBoolean(R.string.key_use_smb, false)).thenReturn(false)
+        `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("open")
+//        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(Constraint(true))
+        val c = constraintChecker.isSMBModeEnabled()
+        Assert.assertEquals(true, c.reasonList.size == 3) // 2x Safety & Objectives
+        Assert.assertEquals(true, c.mostLimitedReasonList.size == 3) // 2x Safety & Objectives
+        Assert.assertEquals(false, c.value())
+    }
+
+    // applyBasalConstraints tests
+    @Test
+    fun basalRateShouldBeLimited() {
+        `when`(activePlugin.activePump).thenReturn(danaRPlugin)
+        // DanaR, RS
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+
+        // Insight
+//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
+//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
+//        result.maximumBasalAmount = 1.1d;
+//        insightPlugin.setStatusResult(result);
+
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0)
+        `when`(sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
+        `when`(sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+
+        // Apply all limits
+        val d = constraintChecker.getMaxBasalAllowed(validProfile)
+        Assert.assertEquals(0.8, d.value(), 0.01)
+        Assert.assertEquals(6, d.reasonList.size)
+        Assert.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", d.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test
+    fun percentBasalRateShouldBeLimited() {
+        `when`(activePlugin.activePump).thenReturn(danaRPlugin)
+        // DanaR, RS
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+
+        // Insight
+//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
+//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
+//        result.maximumBasalAmount = 1.1d;
+//        insightPlugin.setStatusResult(result);
+
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0)
+        `when`(sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
+        `when`(sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+
+        // Apply all limits
+        val i = constraintChecker.getMaxBasalPercentAllowed(validProfile)
+        Assert.assertEquals(100, i.value())
+        Assert.assertEquals(9, i.reasonList.size) // 7x Safety & RS & R
+        Assert.assertEquals("Safety: Limiting max percent rate to 100% because of pump limit", i.getMostLimitedReasons(aapsLogger))
+    }
+
+    // applyBolusConstraints tests
+    @Test
+    fun bolusAmountShouldBeLimited() {
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(PumpDescription())
+        // DanaR, RS
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBolus = 6.0
+
+        // Insight
+//        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
+//        StatusTaskRunner.Result result = new StatusTaskRunner.Result();
+//        result.maximumBolusAmount = 7d;
+//        insightPlugin.setStatusResult(result);
+
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+
+        // Apply all limits
+        val d = constraintChecker.getMaxBolusAllowed()
+        Assert.assertEquals(3.0, d.value(), 0.01)
+        Assert.assertEquals(4, d.reasonList.size) // 2x Safety & RS & R
+        Assert.assertEquals("Safety: Limiting bolus to 3.0 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+    }
+
+    // applyCarbsConstraints tests
+    @Test
+    fun carbsAmountShouldBeLimited() {
+        // No limit by default
+        `when`(sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48)).thenReturn(48)
+
+        // Apply all limits
+        val i = constraintChecker.getMaxCarbsAllowed()
+        Assert.assertEquals(48, i.value())
+        Assert.assertEquals(true, i.reasonList.size == 1)
+        Assert.assertEquals("Safety: Limiting carbs to 48 g because of max value in preferences", i.getMostLimitedReasons(aapsLogger))
+    }
+
+    // applyMaxIOBConstraints tests
+    @Test
+    fun iobAMAShouldBeLimited() {
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("teenage")
+        openAPSAMAPlugin.setPluginEnabled(PluginType.APS, true)
+        openAPSMAPlugin.setPluginEnabled(PluginType.APS, false)
+        openAPSSMBPlugin.setPluginEnabled(PluginType.APS, false)
+
+        // Apply all limits
+        val d = constraintChecker.getMaxIOBAllowed()
+        Assert.assertEquals(1.5, d.value(), 0.01)
+        Assert.assertEquals(d.reasonList.toString(), 2, d.reasonList.size)
+        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test
+    fun iobSMBShouldBeLimited() {
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("teenage")
+        openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true)
+        openAPSAMAPlugin.setPluginEnabled(PluginType.APS, false)
+        openAPSMAPlugin.setPluginEnabled(PluginType.APS, false)
+
+        // Apply all limits
+        val d = constraintChecker.getMaxIOBAllowed()
+        Assert.assertEquals(3.0, d.value(), 0.01)
+        Assert.assertEquals(d.reasonList.toString(), 2, d.reasonList.size)
+        Assert.assertEquals("Safety: Limiting IOB to 3.0 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.java
deleted file mode 100644
index 166ab5a436..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment;
-
-@RunWith(PowerMockRunner.class)
-public class PluginDescriptionTest {
-
-    @Test
-    public void mainTypeTest() {
-        PluginDescription pluginDescription = new PluginDescription().mainType(PluginType.PUMP);
-        Assert.assertEquals(PluginType.PUMP, pluginDescription.getType());
-    }
-
-    @Test
-    public void fragmentClassTest() {
-        PluginDescription pluginDescription = new PluginDescription().fragmentClass(NSProfileFragment.class.getName());
-        Assert.assertEquals(NSProfileFragment.class.getName(), pluginDescription.getFragmentClass());
-    }
-
-    @Test
-    public void alwaysEnabledTest() {
-        PluginDescription pluginDescription = new PluginDescription().alwaysEnabled(true);
-        Assert.assertEquals(true, pluginDescription.alwaysEnabled);
-    }
-
-    @Test
-    public void alwayVisibleTest() {
-        PluginDescription pluginDescription = new PluginDescription().alwaysVisible(true);
-        Assert.assertEquals(true, pluginDescription.alwaysVisible);
-    }
-
-    @Test
-    public void neverVisibleTest() {
-        PluginDescription pluginDescription = new PluginDescription().neverVisible(true);
-        Assert.assertEquals(true, pluginDescription.neverVisible);
-    }
-
-    @Test
-    public void showInListTest() {
-        PluginDescription pluginDescription = new PluginDescription().showInList(false);
-        Assert.assertEquals(false, pluginDescription.showInList);
-    }
-
-    @Test
-    public void pluginName() {
-        PluginDescription pluginDescription = new PluginDescription().pluginName(10);
-        Assert.assertEquals(10, pluginDescription.pluginName);
-    }
-
-    @Test
-    public void shortNameTest() {
-        PluginDescription pluginDescription = new PluginDescription().shortName(10);
-        Assert.assertEquals(10, pluginDescription.shortName);
-    }
-
-    @Test
-    public void preferencesIdTest() {
-        PluginDescription pluginDescription = new PluginDescription().preferencesId(10);
-        Assert.assertEquals(10, pluginDescription.preferencesId);
-    }
-
-    @Test
-    public void enableByDefault() {
-        PluginDescription pluginDescription = new PluginDescription().enableByDefault(true);
-        Assert.assertEquals(true, pluginDescription.enableByDefault);
-    }
-
-    @Test
-    public void visibleByDefault() {
-        PluginDescription pluginDescription = new PluginDescription().visibleByDefault(true);
-        Assert.assertEquals(true, pluginDescription.visibleByDefault);
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
new file mode 100644
index 0000000000..c611c6205a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class PluginDescriptionTest {
+
+    @Test fun mainTypeTest() {
+        val pluginDescription = PluginDescription().mainType(PluginType.PUMP)
+        Assert.assertEquals(PluginType.PUMP, pluginDescription.type)
+    }
+
+    @Test fun fragmentClassTest() {
+        val pluginDescription = PluginDescription().fragmentClass(NSProfileFragment::class.java.name)
+        Assert.assertEquals(NSProfileFragment::class.java.name, pluginDescription.getFragmentClass())
+    }
+
+    @Test fun alwaysEnabledTest() {
+        val pluginDescription = PluginDescription().alwaysEnabled(true)
+        Assert.assertEquals(true, pluginDescription.alwaysEnabled)
+    }
+
+    @Test fun alwayVisibleTest() {
+        val pluginDescription = PluginDescription().alwaysVisible(true)
+        Assert.assertEquals(true, pluginDescription.alwaysVisible)
+    }
+
+    @Test fun neverVisibleTest() {
+        val pluginDescription = PluginDescription().neverVisible(true)
+        Assert.assertEquals(true, pluginDescription.neverVisible)
+    }
+
+    @Test fun showInListTest() {
+        val pluginDescription = PluginDescription().showInList(false)
+        Assert.assertEquals(false, pluginDescription.showInList)
+    }
+
+    @Test fun pluginName() {
+        val pluginDescription = PluginDescription().pluginName(10)
+        Assert.assertEquals(10, pluginDescription.pluginName.toLong())
+    }
+
+    @Test fun shortNameTest() {
+        val pluginDescription = PluginDescription().shortName(10)
+        Assert.assertEquals(10, pluginDescription.shortName.toLong())
+    }
+
+    @Test fun preferencesIdTest() {
+        val pluginDescription = PluginDescription().preferencesId(10)
+        Assert.assertEquals(10, pluginDescription.preferencesId.toLong())
+    }
+
+    @Test fun enableByDefault() {
+        val pluginDescription = PluginDescription().enableByDefault(true)
+        Assert.assertEquals(true, pluginDescription.enableByDefault)
+    }
+
+    @Test fun visibleByDefault() {
+        val pluginDescription = PluginDescription().visibleByDefault(true)
+        Assert.assertEquals(true, pluginDescription.visibleByDefault)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java
deleted file mode 100644
index 77a4741198..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpCapability;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpTempBasalType;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-
-/**
- * Created by andy on 5/13/18.
- */
-public class PumpDescritpionTest {
-
-    @Test
-    public void setPumpDescription() {
-
-        PumpDescription pumpDescription = new PumpDescription();
-
-        pumpDescription.setPumpDescription(PumpType.AccuChekCombo);
-
-        Assert.assertEquals(pumpDescription.bolusStep, PumpType.AccuChekCombo.getBolusSize(), 0.1d);
-        Assert.assertEquals(pumpDescription.basalMinimumRate, PumpType.AccuChekCombo.getBaseBasalStep(), 0.1d);
-        Assert.assertEquals(pumpDescription.basalStep, PumpType.AccuChekCombo.getBaseBasalStep(), 0.1d);
-        Assert.assertEquals(pumpDescription.extendedBolusDurationStep, PumpType.AccuChekCombo.getExtendedBolusSettings().getDurationStep(), 0.1d);
-        Assert.assertEquals(pumpDescription.extendedBolusMaxDuration, PumpType.AccuChekCombo.getExtendedBolusSettings().getMaxDuration(), 0.1d);
-        Assert.assertEquals(pumpDescription.extendedBolusStep, PumpType.AccuChekCombo.getExtendedBolusSettings().getStep(), 0.1d);
-        Assert.assertEquals(pumpDescription.isExtendedBolusCapable, PumpType.AccuChekCombo.getPumpCapability().hasCapability(PumpCapability.ExtendedBolus));
-        Assert.assertEquals(pumpDescription.isBolusCapable, PumpType.AccuChekCombo.getPumpCapability().hasCapability(PumpCapability.Bolus));
-        Assert.assertEquals(pumpDescription.isRefillingCapable, PumpType.AccuChekCombo.getPumpCapability().hasCapability(PumpCapability.Refill));
-        Assert.assertEquals(pumpDescription.isSetBasalProfileCapable, PumpType.AccuChekCombo.getPumpCapability().hasCapability(PumpCapability.BasalProfileSet));
-        Assert.assertEquals(pumpDescription.isTempBasalCapable, PumpType.AccuChekCombo.getPumpCapability().hasCapability(PumpCapability.TempBasal));
-        Assert.assertEquals(pumpDescription.maxTempPercent, PumpType.AccuChekCombo.getTbrSettings().getMaxDose(), 0.1d);
-        Assert.assertEquals(pumpDescription.tempPercentStep, PumpType.AccuChekCombo.getTbrSettings().getStep(), 0.1d);
-        Assert.assertEquals(pumpDescription.tempBasalStyle, PumpType.AccuChekCombo.getPumpTempBasalType()== PumpTempBasalType.Percent ? PumpDescription.PERCENT : PumpDescription.ABSOLUTE);
-        Assert.assertEquals(pumpDescription.tempDurationStep, PumpType.AccuChekCombo.getTbrSettings().getDurationStep());
-        Assert.assertEquals(pumpDescription.tempDurationStep15mAllowed, PumpType.AccuChekCombo.getSpecialBasalDurations().hasCapability(PumpCapability.BasalRate_Duration15minAllowed));
-        Assert.assertEquals(pumpDescription.tempDurationStep30mAllowed, PumpType.AccuChekCombo.getSpecialBasalDurations().hasCapability(PumpCapability.BasalRate_Duration30minAllowed));
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.kt
new file mode 100644
index 0000000000..fdec787568
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpCapability
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpTempBasalType
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import org.junit.Assert
+import org.junit.Test
+
+/**
+ * Created by andy on 5/13/18.
+ */
+class PumpDescritpionTest {
+
+    @Test fun setPumpDescription() {
+        val pumpDescription = PumpDescription()
+        pumpDescription.setPumpDescription(PumpType.AccuChekCombo)
+        Assert.assertEquals(pumpDescription.bolusStep, PumpType.AccuChekCombo.bolusSize, 0.1)
+        Assert.assertEquals(pumpDescription.basalMinimumRate, PumpType.AccuChekCombo.baseBasalStep, 0.1)
+        Assert.assertEquals(pumpDescription.basalStep, PumpType.AccuChekCombo.baseBasalStep, 0.1)
+        Assert.assertEquals(pumpDescription.extendedBolusDurationStep, PumpType.AccuChekCombo.extendedBolusSettings.durationStep.toDouble(), 0.1)
+        Assert.assertEquals(pumpDescription.extendedBolusMaxDuration, PumpType.AccuChekCombo.extendedBolusSettings.maxDuration.toDouble(), 0.1)
+        Assert.assertEquals(pumpDescription.extendedBolusStep, PumpType.AccuChekCombo.extendedBolusSettings.step, 0.1)
+        Assert.assertEquals(pumpDescription.isExtendedBolusCapable, PumpType.AccuChekCombo.pumpCapability.hasCapability(PumpCapability.ExtendedBolus))
+        Assert.assertEquals(pumpDescription.isBolusCapable, PumpType.AccuChekCombo.pumpCapability.hasCapability(PumpCapability.Bolus))
+        Assert.assertEquals(pumpDescription.isRefillingCapable, PumpType.AccuChekCombo.pumpCapability.hasCapability(PumpCapability.Refill))
+        Assert.assertEquals(pumpDescription.isSetBasalProfileCapable, PumpType.AccuChekCombo.pumpCapability.hasCapability(PumpCapability.BasalProfileSet))
+        Assert.assertEquals(pumpDescription.isTempBasalCapable, PumpType.AccuChekCombo.pumpCapability.hasCapability(PumpCapability.TempBasal))
+        Assert.assertEquals(pumpDescription.maxTempPercent.toDouble(), PumpType.AccuChekCombo.tbrSettings.maxDose, 0.1)
+        Assert.assertEquals(pumpDescription.tempPercentStep.toDouble(), PumpType.AccuChekCombo.tbrSettings.step, 0.1)
+        Assert.assertEquals(pumpDescription.tempBasalStyle, if (PumpType.AccuChekCombo.pumpTempBasalType == PumpTempBasalType.Percent) PumpDescription.PERCENT else PumpDescription.ABSOLUTE)
+        Assert.assertEquals(pumpDescription.tempDurationStep.toLong(), PumpType.AccuChekCombo.tbrSettings.durationStep.toLong())
+        Assert.assertEquals(pumpDescription.tempDurationStep15mAllowed, PumpType.AccuChekCombo.specialBasalDurations.hasCapability(PumpCapability.BasalRate_Duration15minAllowed))
+        Assert.assertEquals(pumpDescription.tempDurationStep30mAllowed, PumpType.AccuChekCombo.specialBasalDurations.hasCapability(PumpCapability.BasalRate_Duration30minAllowed))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java
deleted file mode 100644
index 1db142af2c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package info.nightscout.androidaps.plugins.aps.loop;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.data.ConstraintChecker;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class, ProfileFunctions.class, TreatmentsPlugin.class, L.class})
-public class APSResultTest {
-    VirtualPumpPlugin virtualPumpPlugin;
-    TreatmentsPlugin treatmentsPlugin;
-    Constraint<Boolean> closedLoopEnabled = new Constraint<>(false);
-
-    @Test
-    public void isChangeRequestedTest() {
-        APSResult apsResult = new APSResult();
-
-        // BASAL RATE IN TEST PROFILE IS 1U/h
-
-        // **** PERCENT pump ****
-        virtualPumpPlugin.getPumpDescription().setPumpDescription(PumpType.Cellnovo1); // % based
-        apsResult.usePercent(true);
-
-        // closed loop mode return original request
-        closedLoopEnabled.set(true);
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(null);
-        apsResult.tempBasalRequested(false);
-        Assert.assertEquals(false, apsResult.isChangeRequested());
-        apsResult.tempBasalRequested(true).percent(200).duration(30);
-        Assert.assertEquals(true, apsResult.isChangeRequested());
-
-        // open loop
-        closedLoopEnabled.set(false);
-        // no change requested
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(null);
-        apsResult.tempBasalRequested(false);
-        Assert.assertEquals(false, apsResult.isChangeRequested());
-
-        // request 100% when no temp is running
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(null);
-        apsResult.tempBasalRequested(true).percent(100).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request equal temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(70).duration(30));
-        apsResult.tempBasalRequested(true).percent(70).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request zero temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(10).duration(30));
-        apsResult.tempBasalRequested(true).percent(0).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // request high temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(190).duration(30));
-        apsResult.tempBasalRequested(true).percent(200).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // request slightly different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(70).duration(30));
-        apsResult.tempBasalRequested(true).percent(80).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(70).duration(30));
-        apsResult.tempBasalRequested(true).percent(120).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // it should work with absolute temps too
-        // request different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(1).duration(30));
-        apsResult.tempBasalRequested(true).percent(100).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(2).duration(30));
-        apsResult.tempBasalRequested(true).percent(50).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // **** ABSOLUTE pump ****
-        virtualPumpPlugin.getPumpDescription().setPumpDescription(PumpType.Medtronic_515_715); // U/h based
-        apsResult.usePercent(false);
-
-        // open loop
-        closedLoopEnabled.set(false);
-        // request 100% when no temp is running
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(null);
-        apsResult.tempBasalRequested(true).rate(1).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request equal temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(2).duration(30));
-        apsResult.tempBasalRequested(true).rate(2).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(200).duration(30));
-        apsResult.tempBasalRequested(true).rate(2).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request zero temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(0.1d).duration(30));
-        apsResult.tempBasalRequested(true).rate(0).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // request high temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(34.9).duration(30));
-        apsResult.tempBasalRequested(true).rate(35).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // request slightly different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(1.1d).duration(30));
-        apsResult.tempBasalRequested(true).rate(1.2d).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        // request different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().absolute(1.1d).duration(30));
-        apsResult.tempBasalRequested(true).rate(1.5d).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-        // it should work with percent temps too
-        // request different temp
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(110).duration(30));
-        apsResult.tempBasalRequested(true).rate(1.1d).duration(30);
-        Assert.assertEquals(false , apsResult.isChangeRequested());
-
-        when(treatmentsPlugin.getTempBasalFromHistory(anyLong())).thenReturn(new TemporaryBasal().percent(200).duration(30));
-        apsResult.tempBasalRequested(true).rate(0.5d).duration(30);
-        Assert.assertEquals(true , apsResult.isChangeRequested());
-
-    }
-
-    @Test
-    public void cloneTest() {
-        APSResult apsResult = new APSResult();
-        apsResult.rate(10);
-
-        APSResult apsResult2 = apsResult.clone();
-        Assert.assertEquals(apsResult.rate, apsResult2.rate, 0);
-    }
-
-    @Test
-    public void jsonTest() {
-        closedLoopEnabled.set(true);
-        APSResult apsResult = new APSResult();
-        apsResult.rate(20).tempBasalRequested(true);
-        Assert.assertEquals(20d, JsonHelper.safeGetDouble(apsResult.json(), "rate"), 0d);
-
-        apsResult.rate(20).tempBasalRequested(false);
-        Assert.assertEquals(false, apsResult.json().has("rate"));
-    }
-
-    @Before
-    public void prepareMock() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockTreatmentService();
-        AAPSMocker.mockL();
-        treatmentsPlugin = AAPSMocker.mockTreatmentPlugin();
-        ConstraintChecker constraintChecker = AAPSMocker.mockConstraintsChecker();
-
-        virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
-
-        when(constraintChecker.isClosedLoopAllowed()).thenReturn(closedLoopEnabled);
-
-        Mockito.when(SP.getDouble(anyInt(), anyDouble())).thenReturn(30d);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
new file mode 100644
index 0000000000..5db025db4c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
@@ -0,0 +1,207 @@
+package info.nightscout.androidaps.plugins.aps.loop
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class)
+class APSResultTest : TestBaseWithProfile() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var sp: SP
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    private var closedLoopEnabled = Constraint(false)
+    private val pumpDescription = PumpDescription()
+
+    @Test
+    fun changeRequestedTest() {
+
+        val apsResult = APSResult(HasAndroidInjector { AndroidInjector { Unit } })
+            .also {
+                it.aapsLogger = aapsLogger
+                it.constraintChecker = constraintChecker
+                it.sp = sp
+                it.activePlugin = activePluginProvider
+                it.treatmentsPlugin = treatmentsPlugin
+                it.profileFunction = profileFunction
+                it.resourceHelper = resourceHelper
+            }
+
+        // BASAL RATE IN TEST PROFILE IS 1U/h
+
+        // **** PERCENT pump ****
+        pumpDescription.setPumpDescription(PumpType.Cellnovo1) // % based
+        apsResult.usePercent(true)
+
+        // closed loop mode return original request
+        closedLoopEnabled.set(aapsLogger, true)
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(null)
+        apsResult.tempBasalRequested(false)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+        apsResult.tempBasalRequested(true).percent(200).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // open loop
+        closedLoopEnabled.set(aapsLogger, false)
+        // no change requested
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(null)
+        apsResult.tempBasalRequested(false)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request 100% when no temp is running
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(null)
+        apsResult.tempBasalRequested(true).percent(100).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request equal temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(70).duration(30))
+        apsResult.tempBasalRequested(true).percent(70).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request zero temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(10).duration(30))
+        apsResult.tempBasalRequested(true).percent(0).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // request high temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(190).duration(30))
+        apsResult.tempBasalRequested(true).percent(200).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // request slightly different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(70).duration(30))
+        apsResult.tempBasalRequested(true).percent(80).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(70).duration(30))
+        apsResult.tempBasalRequested(true).percent(120).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // it should work with absolute temps too
+        // request different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(1.0).duration(30))
+        apsResult.tempBasalRequested(true).percent(100).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(2.0).duration(30))
+        apsResult.tempBasalRequested(true).percent(50).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // **** ABSOLUTE pump ****
+        virtualPumpPlugin.pumpDescription.setPumpDescription(PumpType.Medtronic_515_715) // U/h based
+        apsResult.usePercent(false)
+
+        // open loop
+        closedLoopEnabled.set(aapsLogger, false)
+        // request 100% when no temp is running
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(null)
+        apsResult.tempBasalRequested(true).rate(1.0).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request equal temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(2.0).duration(30))
+        apsResult.tempBasalRequested(true).rate(2.0).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(200).duration(30))
+        apsResult.tempBasalRequested(true).rate(2.0).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request zero temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(0.1).duration(30))
+        apsResult.tempBasalRequested(true).rate(0.0).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // request high temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(34.9).duration(30))
+        apsResult.tempBasalRequested(true).rate(35.0).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // request slightly different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(1.1).duration(30))
+        apsResult.tempBasalRequested(true).rate(1.2).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+
+        // request different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().absolute(1.1).duration(30))
+        apsResult.tempBasalRequested(true).rate(1.5).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+
+        // it should work with percent temps too
+        // request different temp
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(110).duration(30))
+        apsResult.tempBasalRequested(true).rate(1.1).duration(30)
+        Assert.assertEquals(false, apsResult.isChangeRequested)
+        `when`(treatmentsPlugin.getTempBasalFromHistory(ArgumentMatchers.anyLong())).thenReturn(TemporaryBasal().percent(200).duration(30))
+        apsResult.tempBasalRequested(true).rate(0.5).duration(30)
+        Assert.assertEquals(true, apsResult.isChangeRequested)
+    }
+
+    @Test fun cloneTest() {
+        val apsResult = APSResult(HasAndroidInjector { AndroidInjector { Unit } })
+            .also {
+                it.aapsLogger = aapsLogger
+                it.constraintChecker = constraintChecker
+                it.sp = sp
+                it.activePlugin = activePluginProvider
+                it.treatmentsPlugin = treatmentsPlugin
+                it.profileFunction = profileFunction
+                it.resourceHelper = resourceHelper
+            }
+        apsResult.rate(10.0)
+        val apsResult2 = apsResult.newAndClone(HasAndroidInjector { AndroidInjector { Unit } })
+        Assert.assertEquals(apsResult.rate, apsResult2.rate, 0.0)
+    }
+
+    @Test fun jsonTest() {
+        closedLoopEnabled.set(aapsLogger, true)
+        val apsResult = APSResult(HasAndroidInjector { AndroidInjector { Unit } })
+            .also {
+                it.aapsLogger = aapsLogger
+                it.constraintChecker = constraintChecker
+                it.sp = sp
+                it.activePlugin = activePluginProvider
+                it.treatmentsPlugin = treatmentsPlugin
+                it.profileFunction = profileFunction
+                it.resourceHelper = resourceHelper
+            }
+        apsResult.rate(20.0).tempBasalRequested(true)
+        Assert.assertEquals(20.0, safeGetDouble(apsResult.json(), "rate"), 0.0)
+        apsResult.rate(20.0).tempBasalRequested(false)
+        Assert.assertEquals(false, apsResult.json().has("rate"))
+    }
+
+    @Before
+    fun prepare() {
+        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(closedLoopEnabled)
+        `when`(activePluginProvider.activePump).thenReturn(virtualPumpPlugin)
+        `when`(sp.getDouble(ArgumentMatchers.anyInt(), ArgumentMatchers.anyDouble())).thenReturn(30.0)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.java
deleted file mode 100644
index ecbc9d55c3..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.plugins.aps.loop;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class})
-public class LoopPluginTest {
-
-    VirtualPumpPlugin virtualPumpPlugin;
-    LoopPlugin loopPlugin;
-
-    @Test
-    public void testPluginInterface() {
-        Assert.assertEquals(LoopFragment.class.getName(), loopPlugin.pluginDescription.getFragmentClass());
-        Assert.assertEquals(PluginType.LOOP, loopPlugin.getType());
-        Assert.assertEquals("Loop", loopPlugin.getName());
-        Assert.assertEquals("LOOP", loopPlugin.getNameShort());
-        Assert.assertEquals(true, loopPlugin.hasFragment());
-        Assert.assertEquals(true, loopPlugin.showInList(PluginType.LOOP));
-        Assert.assertEquals(R.xml.pref_loop, loopPlugin.getPreferencesId());
-
-        // Plugin is disabled by default
-        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP));
-        loopPlugin.setPluginEnabled(PluginType.LOOP, true);
-        Assert.assertEquals(true, loopPlugin.isEnabled(PluginType.LOOP));
-
-        // No temp basal capable pump should disable plugin
-        virtualPumpPlugin.getPumpDescription().isTempBasalCapable = false;
-        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP));
-        virtualPumpPlugin.getPumpDescription().isTempBasalCapable = true;
-
-
-        // Fragment is hidden by default
-        Assert.assertEquals(false, loopPlugin.isFragmentVisible());
-        loopPlugin.setFragmentVisible(PluginType.LOOP, true);
-        Assert.assertEquals(true, loopPlugin.isFragmentVisible());
-
-    }
-    
-/* ***********  not working
-    @Test
-    public void eventTreatmentChangeShouldTriggerInvoke() {
-
-        // Unregister tested plugin to prevent calling real invoke
-        MainApp.bus().unregister(loopPlugin);
-
-        class MockedLoopPlugin extends LoopPlugin {
-            boolean invokeCalled = false;
-
-            @Override
-            public void invoke(String initiator, boolean allowNotification) {
-                invokeCalled = true;
-            }
-
-        }
-
-        MockedLoopPlugin mockedLoopPlugin = new MockedLoopPlugin();
-        Treatment t = new Treatment();
-        bus.post(new EventTreatmentChange(t));
-        Assert.assertEquals(true, mockedLoopPlugin.invokeCalled);
-    }
-*/
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-
-        loopPlugin = LoopPlugin.getPlugin();
-        virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
-
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
new file mode 100644
index 0000000000..804f68a91f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
@@ -0,0 +1,110 @@
+package info.nightscout.androidaps.plugins.aps.loop
+
+import android.content.Context
+import dagger.Lazy
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class)
+class LoopPluginTest : TestBase() {
+
+    @Mock lateinit var sp: SP
+    private val rxBus: RxBusWrapper = RxBusWrapper()
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var context: Context
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var actionStringHandler: Lazy<ActionStringHandler>
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    lateinit var loopPlugin: LoopPlugin
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
+    @Before fun prepareMock() {
+        loopPlugin = LoopPlugin(injector, aapsLogger, rxBus, sp, constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, treatmentsPlugin, virtualPumpPlugin, actionStringHandler, iobCobCalculatorPlugin)
+        `when`(activePlugin.getActivePump()).thenReturn(virtualPumpPlugin)
+    }
+
+    @Test
+    fun testPluginInterface() {
+        `when`(resourceHelper.gs(R.string.loop)).thenReturn("Loop")
+        `when`(resourceHelper.gs(R.string.loop_shortname)).thenReturn("LOOP")
+        val pumpDescription = PumpDescription()
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        Assert.assertEquals(LoopFragment::class.java.name, loopPlugin.pluginDescription.fragmentClass)
+        Assert.assertEquals(PluginType.LOOP, loopPlugin.getType())
+        Assert.assertEquals("Loop", loopPlugin.name)
+        Assert.assertEquals("LOOP", loopPlugin.nameShort)
+        Assert.assertEquals(true, loopPlugin.hasFragment())
+        Assert.assertEquals(true, loopPlugin.showInList(PluginType.LOOP))
+        Assert.assertEquals(R.xml.pref_loop.toLong(), loopPlugin.preferencesId.toLong())
+
+        // Plugin is disabled by default
+        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP))
+        loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+        Assert.assertEquals(true, loopPlugin.isEnabled(PluginType.LOOP))
+
+        // No temp basal capable pump should disable plugin
+        virtualPumpPlugin.pumpDescription.isTempBasalCapable = false
+        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP))
+        virtualPumpPlugin.pumpDescription.isTempBasalCapable = true
+
+        // Fragment is hidden by default
+        Assert.assertEquals(false, loopPlugin.isFragmentVisible())
+        loopPlugin.setFragmentVisible(PluginType.LOOP, true)
+        Assert.assertEquals(true, loopPlugin.isFragmentVisible())
+    }
+
+    /* ***********  not working
+    @Test
+    public void eventTreatmentChangeShouldTriggerInvoke() {
+
+        // Unregister tested plugin to prevent calling real invoke
+        MainApp.bus().unregister(loopPlugin);
+
+        class MockedLoopPlugin extends LoopPlugin {
+            boolean invokeCalled = false;
+
+            @Override
+            public void invoke(String initiator, boolean allowNotification) {
+                invokeCalled = true;
+            }
+
+        }
+
+        MockedLoopPlugin mockedLoopPlugin = new MockedLoopPlugin();
+        Treatment t = new Treatment();
+        bus.post(new EventTreatmentChange(t));
+        Assert.assertEquals(true, mockedLoopPlugin.invokeCalled);
+    }
+*/
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.java
deleted file mode 100644
index 39c5f3279e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.plugins.configBuilder;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class})
-public class ConfigBuilderPluginTest {
-
-    @Test
-    public void getPluginTest() {
-        ConfigBuilderPlugin configBuilderPlugin = ConfigBuilderPlugin.getPlugin();
-        Assert.assertNotNull(configBuilderPlugin);
-    }
-
-    @Test
-    public void onStartTest() {
-        ConfigBuilderPlugin configBuilderPlugin = ConfigBuilderPlugin.getPlugin();
-        configBuilderPlugin.setPluginEnabled(PluginType.GENERAL, true);
-    }
-
-    @Test
-    public void onStopTest() {
-        ConfigBuilderPlugin configBuilderPlugin = ConfigBuilderPlugin.getPlugin();
-        configBuilderPlugin.setPluginEnabled(PluginType.GENERAL, true);
-        configBuilderPlugin.setPluginEnabled(PluginType.GENERAL, false);
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
new file mode 100644
index 0000000000..ac412d2f02
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
@@ -0,0 +1,50 @@
+package info.nightscout.androidaps.plugins.configBuilder
+
+import dagger.Lazy
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ConfigBuilderPluginTest : TestBase() {
+
+    @Mock lateinit var virtualPumpPlugin: Lazy<VirtualPumpPlugin>
+    @Mock lateinit var treatmentsPlugin: Lazy<TreatmentsPlugin>
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var profileFunction: ProfileFunction
+
+    lateinit var configBuilderPlugin: ConfigBuilderPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+
+        }
+    }
+
+    @Test
+    fun dummy() {
+
+    }
+
+    @Before
+    fun prepareMock() {
+        configBuilderPlugin = ConfigBuilderPlugin(activePlugin, injector, sp, RxBusWrapper(), aapsLogger, resourceHelper, profileFunction)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java
deleted file mode 100644
index 303d63d9c9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.dstHelper;
-
-import android.content.Context;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class})
-public class DstHelperPluginTest {
-    DstHelperPlugin plugin = new DstHelperPlugin();
-
-    @Test
-    public void runTest() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-
-        TimeZone tz = TimeZone.getTimeZone("Europe/Rome");
-        TimeZone.setDefault(tz);
-        Calendar cal = Calendar.getInstance(tz, Locale.ITALIAN);
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN);
-        Date dateBeforeDST = df.parse("2018-03-25 01:55");
-        cal.setTime(dateBeforeDST);
-        Assert.assertEquals(false, plugin.wasDST(cal));
-        Assert.assertEquals(true, plugin.willBeDST(cal));
-
-
-        TimeZone.setDefault(tz);
-        cal = Calendar.getInstance(tz, Locale.ITALIAN);
-        dateBeforeDST = df.parse("2018-03-25 03:05");
-        cal.setTime(dateBeforeDST);
-        Assert.assertEquals(true, plugin.wasDST(cal));
-        Assert.assertEquals(false, plugin.willBeDST(cal));
-
-
-        TimeZone.setDefault(tz);
-        cal = Calendar.getInstance(tz, Locale.ITALIAN);
-        dateBeforeDST = df.parse("2018-03-25 02:05"); //Cannot happen!!!
-        cal.setTime(dateBeforeDST);
-        Assert.assertEquals(true, plugin.wasDST(cal));
-        Assert.assertEquals(false, plugin.willBeDST(cal));
-
-        TimeZone.setDefault(tz);
-        cal = Calendar.getInstance(tz, Locale.ITALIAN);
-        dateBeforeDST = df.parse("2018-03-25 05:55"); //Cannot happen!!!
-        cal.setTime(dateBeforeDST);
-        Assert.assertEquals(true, plugin.wasDST(cal));
-        Assert.assertEquals(false, plugin.willBeDST(cal));
-
-        TimeZone.setDefault(tz);
-        cal = Calendar.getInstance(tz, Locale.ITALIAN);
-        dateBeforeDST = df.parse("2018-03-25 06:05"); //Cannot happen!!!
-        cal.setTime(dateBeforeDST);
-        Assert.assertEquals(false, plugin.wasDST(cal));
-        Assert.assertEquals(false, plugin.willBeDST(cal));
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
new file mode 100644
index 0000000000..d1f147d691
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
@@ -0,0 +1,74 @@
+package info.nightscout.androidaps.plugins.constraints.dstHelper
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class DstHelperPluginTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var loopPlugin: LoopPlugin
+
+    lateinit var plugin: DstHelperPlugin
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
+
+    @Before
+    fun mock() {
+        plugin = DstHelperPlugin(injector, aapsLogger, RxBusWrapper(), resourceHelper, sp, activePlugin, loopPlugin)
+    }
+
+    @Test
+    fun runTest() {
+        val tz = TimeZone.getTimeZone("Europe/Rome")
+        TimeZone.setDefault(tz)
+        var cal = Calendar.getInstance(tz, Locale.ITALIAN)
+        val df: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN)
+        var dateBeforeDST = df.parse("2018-03-25 01:55")
+        cal.time = dateBeforeDST
+        Assert.assertEquals(false, plugin.wasDST(cal))
+        Assert.assertEquals(true, plugin.willBeDST(cal))
+        TimeZone.setDefault(tz)
+        cal = Calendar.getInstance(tz, Locale.ITALIAN)
+        dateBeforeDST = df.parse("2018-03-25 03:05")
+        cal.time = dateBeforeDST
+        Assert.assertEquals(true, plugin.wasDST(cal))
+        Assert.assertEquals(false, plugin.willBeDST(cal))
+        TimeZone.setDefault(tz)
+        cal = Calendar.getInstance(tz, Locale.ITALIAN)
+        dateBeforeDST = df.parse("2018-03-25 02:05") //Cannot happen!!!
+        cal.time = dateBeforeDST
+        Assert.assertEquals(true, plugin.wasDST(cal))
+        Assert.assertEquals(false, plugin.willBeDST(cal))
+        TimeZone.setDefault(tz)
+        cal = Calendar.getInstance(tz, Locale.ITALIAN)
+        dateBeforeDST = df.parse("2018-03-25 05:55") //Cannot happen!!!
+        cal.time = dateBeforeDST
+        Assert.assertEquals(true, plugin.wasDST(cal))
+        Assert.assertEquals(false, plugin.willBeDST(cal))
+        TimeZone.setDefault(tz)
+        cal = Calendar.getInstance(tz, Locale.ITALIAN)
+        dateBeforeDST = df.parse("2018-03-25 06:05") //Cannot happen!!!
+        cal.time = dateBeforeDST
+        Assert.assertEquals(false, plugin.wasDST(cal))
+        Assert.assertEquals(false, plugin.willBeDST(cal))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.java
deleted file mode 100644
index 371e970d23..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.objectives;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class})
-public class ObjectivesPluginTest {
-
-    ObjectivesPlugin objectivesPlugin;
-
-    @Test
-    public void notStartedObjectivesShouldLimitLoopInvocation() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getFIRST_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = objectivesPlugin.isLoopInvocationAllowed(c);
-        Assert.assertEquals("Objectives: Objective 1 not started", c.getReasons());
-        Assert.assertEquals(Boolean.FALSE, c.value());
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getFIRST_OBJECTIVE()).setStartedOn(DateUtil.now());
-    }
-
-    @Test
-    public void notStartedObjective6ShouldLimitClosedLoop() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getMAXIOB_ZERO_CL_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = objectivesPlugin.isClosedLoopAllowed(c);
-        Assert.assertEquals(true, c.getReasons().contains("Objective 6 not started"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void notStartedObjective8ShouldLimitAutosensMode() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getAUTOSENS_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = objectivesPlugin.isAutosensModeEnabled(c);
-        Assert.assertEquals(true, c.getReasons().contains("Objective 8 not started"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void notStartedObjective9ShouldLimitAMAMode() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getAMA_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = objectivesPlugin.isAMAModeEnabled(c);
-        Assert.assertEquals(true, c.getReasons().contains("Objective 9 not started"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void notStartedObjective10ShouldLimitSMBMode() {
-        objectivesPlugin.getObjectives().get(ObjectivesPlugin.INSTANCE.getSMB_OBJECTIVE()).setStartedOn(0);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = objectivesPlugin.isSMBModeEnabled(c);
-        Assert.assertEquals(true, c.getReasons().contains("Objective 10 not started"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-
-        objectivesPlugin = ObjectivesPlugin.INSTANCE;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
new file mode 100644
index 0000000000..b4dc882882
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -0,0 +1,86 @@
+package info.nightscout.androidaps.plugins.constraints.objectives
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ObjectivesPluginTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var sp: SP
+
+    private lateinit var objectivesPlugin: ObjectivesPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Objective) {
+                it.sp = sp
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+    @Before fun prepareMock() {
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp)
+        objectivesPlugin.onStart()
+        `when`(resourceHelper.gs(R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
+    }
+
+    @Test fun notStartedObjectivesShouldLimitLoopInvocation() {
+        objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].startedOn = 0
+        var c = Constraint(true)
+        c = objectivesPlugin.isLoopInvocationAllowed(c)
+        Assert.assertEquals("Objectives: Objective 1 not started", c.getReasons(aapsLogger))
+        Assert.assertEquals(false, c.value())
+        objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].startedOn = DateUtil.now()
+    }
+
+    @Test fun notStartedObjective6ShouldLimitClosedLoop() {
+        objectivesPlugin.objectives[ObjectivesPlugin.MAXIOB_ZERO_CL_OBJECTIVE].startedOn = 0
+        var c = Constraint(true)
+        c = objectivesPlugin.isClosedLoopAllowed(c)
+        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 6 not started"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun notStartedObjective8ShouldLimitAutosensMode() {
+        objectivesPlugin.objectives[ObjectivesPlugin.AUTOSENS_OBJECTIVE].startedOn = 0
+        var c = Constraint(true)
+        c = objectivesPlugin.isAutosensModeEnabled(c)
+        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 8 not started"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun notStartedObjective9ShouldLimitAMAMode() {
+        objectivesPlugin.objectives[ObjectivesPlugin.AMA_OBJECTIVE].startedOn = 0
+        var c = Constraint(true)
+        c = objectivesPlugin.isAMAModeEnabled(c)
+        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 9 not started"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun notStartedObjective10ShouldLimitSMBMode() {
+        objectivesPlugin.objectives[ObjectivesPlugin.SMB_OBJECTIVE].startedOn = 0
+        var c = Constraint(true)
+        c = objectivesPlugin.isSMBModeEnabled(c)
+        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 10 not started"))
+        Assert.assertEquals(false, c.value())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java
deleted file mode 100644
index 1dabf0ff30..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.safety;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-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.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class})
-public class SafetyPluginTest {
-
-    private VirtualPumpPlugin pump = new VirtualPumpPlugin();
-    private SafetyPlugin safetyPlugin;
-
-    @Test
-    public void pumpDescriptionShouldLimitLoopInvocation() {
-        pump.getPumpDescription().isTempBasalCapable = false;
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isLoopInvocationAllowed(c);
-        Assert.assertEquals("Safety: Pump is not temp basal capable", c.getReasons());
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void disabledEngineeringModeShouldLimitClosedLoop() {
-        when(SP.getString(R.string.key_aps_mode, "open")).thenReturn("closed");
-        when(MainApp.isEngineeringModeOrRelease()).thenReturn(false);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isClosedLoopAllowed(c);
-        Assert.assertTrue(c.getReasons().contains("Running dev version. Closed loop is disabled."));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void setOpenLoopInPreferencesShouldLimitClosedLoop() {
-        when(SP.getString(R.string.key_aps_mode, "open")).thenReturn("open");
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isClosedLoopAllowed(c);
-        Assert.assertTrue(c.getReasons().contains("Closed loop mode disabled in preferences"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void notEnabledSMBInPreferencesDisablesSMB() {
-        when(SP.getBoolean(R.string.key_use_smb, false)).thenReturn(false);
-        when(MainApp.getConstraintChecker().isClosedLoopAllowed()).thenReturn(new Constraint<>(true));
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isSMBModeEnabled(c);
-        Assert.assertTrue(c.getReasons().contains("SMB disabled in preferences"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void openLoopPreventsSMB() {
-        when(SP.getBoolean(R.string.key_use_smb, false)).thenReturn(true);
-        when(MainApp.getConstraintChecker().isClosedLoopAllowed()).thenReturn(new Constraint<>(false));
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isSMBModeEnabled(c);
-        Assert.assertTrue(c.getReasons().contains("SMB not allowed in open loop mode"));
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void bgSourceShouldPreventSMBAlways() {
-        when(ConfigBuilderPlugin.getPlugin().getActiveBgSource()).thenReturn(SourceGlimpPlugin.getPlugin());
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = safetyPlugin.isAdvancedFilteringEnabled(c);
-        Assert.assertEquals("Safety: SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering", c.getReasons());
-        Assert.assertEquals(Boolean.FALSE, c.value());
-    }
-
-    @Test
-    public void basalRateShouldBeLimited() {
-        when(SP.getDouble(R.string.key_openapsma_max_basal, 1d)).thenReturn(1d);
-        when(SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d)).thenReturn(4d);
-        when(SP.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        Constraint<Double> c = new Constraint<>(Constants.REALLYHIGHBASALRATE);
-        safetyPlugin.applyBasalConstraints(c, AAPSMocker.getValidProfile());
-        Assert.assertEquals(1d, c.value(), 0.01d);
-        Assert.assertEquals("Safety: Limiting basal rate to 1.00 U/h because of max value in preferences\n" +
-                "Safety: Limiting basal rate to 4.00 U/h because of max basal multiplier\n" +
-                "Safety: Limiting basal rate to 3.00 U/h because of max daily basal multiplier\n" +
-                "Safety: Limiting basal rate to 2.00 U/h because of hard limit", c.getReasons());
-        Assert.assertEquals("Safety: Limiting basal rate to 1.00 U/h because of max value in preferences", c.getMostLimitedReasons());
-
-    }
-
-    @Test
-    public void doNotAllowNegativeBasalRate() {
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        Constraint<Double> d = new Constraint<>(-0.5d);
-        safetyPlugin.applyBasalConstraints(d, AAPSMocker.getValidProfile());
-        Assert.assertEquals(0d, d.value(), 0.01d);
-        Assert.assertEquals("Safety: Limiting basal rate to 0.00 U/h because of it must be positive value\n" +
-                "Safety: Increasing max basal value because setting is lower than your max basal in profile", d.getReasons());
-    }
-
-    @Test
-    public void percentBasalRateShouldBeLimited() {
-        // No limit by default
-        when(SP.getDouble(R.string.key_openapsma_max_basal, 1d)).thenReturn(1d);
-        when(SP.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d)).thenReturn(4d);
-        when(SP.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-
-        Constraint<Integer> i = new Constraint<>(Constants.REALLYHIGHPERCENTBASALRATE);
-        safetyPlugin.applyBasalPercentConstraints(i, AAPSMocker.getValidProfile());
-        Assert.assertEquals((Integer) 100, i.value());
-        Assert.assertEquals("Safety: Percent rate 1111111% recalculated to 11111.11 U/h with current basal 1.00 U/h\n" +
-                "Safety: Limiting basal rate to 1.00 U/h because of max value in preferences\n" +
-                "Safety: Limiting basal rate to 4.00 U/h because of max basal multiplier\n" +
-                "Safety: Limiting basal rate to 3.00 U/h because of max daily basal multiplier\n" +
-                "Safety: Limiting basal rate to 2.00 U/h because of hard limit\n" +
-                "Safety: Limiting percent rate to 100% because of pump limit", i.getReasons());
-        Assert.assertEquals("Safety: Limiting percent rate to 100% because of pump limit", i.getMostLimitedReasons());
-    }
-
-    @Test
-    public void doNotAllowNegativePercentBasalRate() {
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        Constraint<Integer> i = new Constraint<>(-22);
-        safetyPlugin.applyBasalPercentConstraints(i, AAPSMocker.getValidProfile());
-        Assert.assertEquals((Integer) 0, i.value());
-        Assert.assertEquals("Safety: Percent rate -22% recalculated to -0.22 U/h with current basal 1.00 U/h\n" +
-                "Safety: Limiting basal rate to 0.00 U/h because of it must be positive value\n" +
-                "Safety: Increasing max basal value because setting is lower than your max basal in profile\n" +
-                "Safety: Limiting percent rate to 0% because of pump limit", i.getReasons());
-        Assert.assertEquals("Safety: Limiting percent rate to 0% because of pump limit", i.getMostLimitedReasons());
-    }
-
-    @Test
-    public void bolusAmountShouldBeLimited() {
-        when(SP.getDouble(R.string.key_treatmentssafety_maxbolus, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        Constraint<Double> d = new Constraint<>(Constants.REALLYHIGHBOLUS);
-        d = safetyPlugin.applyBolusConstraints(d);
-        Assert.assertEquals(3d, d.value(), 0.01d);
-        Assert.assertEquals("Safety: Limiting bolus to 3.0 U because of max value in preferences\n" +
-                "Safety: Limiting bolus to 5.0 U because of hard limit", d.getReasons());
-        Assert.assertEquals("Safety: Limiting bolus to 3.0 U because of max value in preferences", d.getMostLimitedReasons());
-    }
-
-    @Test
-    public void doNotAllowNegativeBolusAmount() {
-        when(SP.getDouble(R.string.key_treatmentssafety_maxbolus, 3d)).thenReturn(3d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("child");
-
-        Constraint<Double> d = new Constraint<>(-22d);
-        d = safetyPlugin.applyBolusConstraints(d);
-        Assert.assertEquals(0d, d.value(), 0.01d);
-        Assert.assertEquals("Safety: Limiting bolus to 0.0 U because of it must be positive value", d.getReasons());
-        Assert.assertEquals("Safety: Limiting bolus to 0.0 U because of it must be positive value", d.getMostLimitedReasons());
-    }
-
-    @Test
-    public void carbsAmountShouldBeLimited() {
-        // No limit by default
-        when(SP.getInt(R.string.key_treatmentssafety_maxcarbs, 48)).thenReturn(48);
-
-        // Negative carbs not allowed
-        Constraint<Integer> i = new Constraint<>(-22);
-        safetyPlugin.applyCarbsConstraints(i);
-        Assert.assertEquals((Integer) 0, i.value());
-        Assert.assertEquals("Safety: Limiting carbs to 0 g because of it must be positive value", i.getReasons());
-
-        // Apply all limits
-        i = safetyPlugin.applyCarbsConstraints(new Constraint<>(Constants.REALLYHIGHCARBS));
-        Assert.assertEquals((Integer) 48, i.value());
-        Assert.assertEquals("Safety: Limiting carbs to 48 g because of max value in preferences", i.getReasons());
-    }
-
-    @Test
-    public void iobShouldBeLimited() {
-        when(SP.getDouble(R.string.key_openapsma_max_iob, 1.5d)).thenReturn(1.5d);
-        when(SP.getString(R.string.key_age, "")).thenReturn("teenage");
-        OpenAPSMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-        OpenAPSAMAPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-        //OpenAPSSMBPlugin.getPlugin().setPluginEnabled(PluginType.APS, true);
-
-        // Apply all limits
-        Constraint<Double> d = new Constraint<>(Constants.REALLYHIGHIOB);
-        d = safetyPlugin.applyMaxIOBConstraints(d);
-        Assert.assertEquals(1.5d, d.value(), 0.01d);
-        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences\n" +
-                "Safety: Limiting IOB to 7.0 U because of hard limit\n" +
-                "Safety: Limiting IOB to 7.0 U because of hard limit", d.getReasons());
-        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences", d.getMostLimitedReasons());
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockConstraintsChecker();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-
-
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-
-        safetyPlugin = SafetyPlugin.getPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
new file mode 100644
index 0000000000..c3e4b8a01f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
@@ -0,0 +1,247 @@
+package info.nightscout.androidaps.plugins.constraints.safety
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PumpDescription
+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.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, BuildHelper::class, VirtualPumpPlugin::class, GlimpPlugin::class)
+class SafetyPluginTest : TestBaseWithProfile() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
+    @Mock lateinit var openAPSMAPlugin: OpenAPSMAPlugin
+    @Mock lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+    @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var buildHelper: BuildHelper
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var glimpPlugin: GlimpPlugin
+    @Mock lateinit var context: Context
+
+    private lateinit var hardLimits: HardLimits
+    private lateinit var safetyPlugin: SafetyPlugin
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
+    val pumpDescription = PumpDescription()
+
+    @Before
+    fun prepare() {
+        `when`(resourceHelper.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(resourceHelper.gs(R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
+        `when`(resourceHelper.gs(R.string.increasingmaxbasal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile")
+        `when`(resourceHelper.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
+        `when`(resourceHelper.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(resourceHelper.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        `when`(resourceHelper.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
+        `when`(resourceHelper.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(resourceHelper.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
+        `when`(resourceHelper.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
+        `when`(resourceHelper.gs(R.string.hardlimit)).thenReturn("hard limit")
+        `when`(resourceHelper.gs(R.string.key_child)).thenReturn("child")
+
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin)
+    }
+
+    @Test fun pumpDescriptionShouldLimitLoopInvocation() {
+        pumpDescription.isTempBasalCapable = false
+        var c = Constraint(true)
+        c = safetyPlugin.isLoopInvocationAllowed(c)
+        Assert.assertEquals("Safety: Pump is not temp basal capable", c.getReasons(aapsLogger))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun disabledEngineeringModeShouldLimitClosedLoop() {
+        `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("closed")
+        `when`(buildHelper.isEngineeringModeOrRelease()).thenReturn(false)
+        var c = Constraint(true)
+        c = safetyPlugin.isClosedLoopAllowed(c)
+        Assert.assertTrue(c.getReasons(aapsLogger).contains("Running dev version. Closed loop is disabled."))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun setOpenLoopInPreferencesShouldLimitClosedLoop() {
+        `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("open")
+        var c = Constraint(true)
+        c = safetyPlugin.isClosedLoopAllowed(c)
+        Assert.assertTrue(c.getReasons(aapsLogger).contains("Closed loop mode disabled in preferences"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun notEnabledSMBInPreferencesDisablesSMB() {
+        `when`(sp.getBoolean(R.string.key_use_smb, false)).thenReturn(false)
+        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(Constraint(true))
+        var c = Constraint(true)
+        c = safetyPlugin.isSMBModeEnabled(c)
+        Assert.assertTrue(c.getReasons(aapsLogger).contains("SMB disabled in preferences"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun openLoopPreventsSMB() {
+        `when`(sp.getBoolean(R.string.key_use_smb, false)).thenReturn(true)
+        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(Constraint(false))
+        var c = Constraint(true)
+        c = safetyPlugin.isSMBModeEnabled(c)
+        Assert.assertTrue(c.getReasons(aapsLogger).contains("SMB not allowed in open loop mode"))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun bgSourceShouldPreventSMBAlways() {
+        `when`(activePlugin.activeBgSource).thenReturn(glimpPlugin)
+        var c = Constraint(true)
+        c = safetyPlugin.isAdvancedFilteringEnabled(c)
+        Assert.assertEquals("Safety: SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering", c.getReasons(aapsLogger))
+        Assert.assertEquals(false, c.value())
+    }
+
+    @Test fun basalRateShouldBeLimited() {
+        `when`(sp.getDouble(R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0)
+        `when`(sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
+        `when`(sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        safetyPlugin.applyBasalConstraints(c, validProfile)
+        Assert.assertEquals(1.0, c.value(), 0.01)
+        Assert.assertEquals("""
+    Safety: Limiting max basal rate to 1.00 U/h because of max value in preferences
+    Safety: Limiting max basal rate to 4.00 U/h because of max basal multiplier
+    Safety: Limiting max basal rate to 3.00 U/h because of max daily basal multiplier
+    Safety: Limiting max basal rate to 2.00 U/h because of hard limit
+    """.trimIndent(), c.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting max basal rate to 1.00 U/h because of max value in preferences", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test fun doNotAllowNegativeBasalRate() {
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        val d = Constraint(-0.5)
+        safetyPlugin.applyBasalConstraints(d, validProfile)
+        Assert.assertEquals(0.0, d.value(), 0.01)
+        Assert.assertEquals("""
+    Safety: Limiting max basal rate to 0.00 U/h because of it must be positive value
+    Safety: Increasing max basal value because setting is lower than your max basal in profile
+    """.trimIndent(), d.getReasons(aapsLogger))
+    }
+
+    @Test fun percentBasalRateShouldBeLimited() {
+        // No limit by default
+        `when`(sp.getDouble(R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0)
+        `when`(sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
+        `when`(sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        val i = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        safetyPlugin.applyBasalPercentConstraints(i, validProfile)
+        Assert.assertEquals(100, i.value())
+        Assert.assertEquals("""
+    Safety: Percent rate 1111111% recalculated to 11111.11 U/h with current basal 1.00 U/h
+    Safety: Limiting max basal rate to 1.00 U/h because of max value in preferences
+    Safety: Limiting max basal rate to 4.00 U/h because of max basal multiplier
+    Safety: Limiting max basal rate to 3.00 U/h because of max daily basal multiplier
+    Safety: Limiting max basal rate to 2.00 U/h because of hard limit
+    Safety: Limiting max percent rate to 100% because of pump limit
+    Safety: Limiting max basal rate to 500.00 U/h because of pump limit
+    """.trimIndent(), i.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting max percent rate to 100% because of pump limit", i.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test fun doNotAllowNegativePercentBasalRate() {
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        val i = Constraint(-22)
+        safetyPlugin.applyBasalPercentConstraints(i, validProfile)
+        Assert.assertEquals(0, i.value())
+        Assert.assertEquals("""
+    Safety: Percent rate -22% recalculated to -0.22 U/h with current basal 1.00 U/h
+    Safety: Limiting max basal rate to 0.00 U/h because of it must be positive value
+    Safety: Increasing max basal value because setting is lower than your max basal in profile
+    Safety: Limiting max percent rate to 0% because of pump limit
+    """.trimIndent(), i.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting max percent rate to 0% because of pump limit", i.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test fun bolusAmountShouldBeLimited() {
+        `when`(sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        var d = Constraint(Constants.REALLYHIGHBOLUS)
+        d = safetyPlugin.applyBolusConstraints(d)
+        Assert.assertEquals(3.0, d.value()!!, 0.01)
+        Assert.assertEquals("""
+    Safety: Limiting bolus to 3.0 U because of max value in preferences
+    Safety: Limiting bolus to 5.0 U because of hard limit
+    """.trimIndent(), d.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting bolus to 3.0 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test fun doNotAllowNegativeBolusAmount() {
+        `when`(sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)).thenReturn(3.0)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("child")
+        var d = Constraint(-22.0)
+        d = safetyPlugin.applyBolusConstraints(d)
+        Assert.assertEquals(0.0, d.value(), 0.01)
+        Assert.assertEquals("Safety: Limiting bolus to 0.0 U because of it must be positive value", d.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting bolus to 0.0 U because of it must be positive value", d.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test fun carbsAmountShouldBeLimited() {
+        // No limit by default
+        `when`(sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48)).thenReturn(48)
+
+        // Negative carbs not allowed
+        var i = Constraint(-22)
+        safetyPlugin.applyCarbsConstraints(i)
+        Assert.assertEquals(0, i.value())
+        Assert.assertEquals("Safety: Limiting carbs to 0 g because of it must be positive value", i.getReasons(aapsLogger))
+
+        // Apply all limits
+        i = safetyPlugin.applyCarbsConstraints(Constraint(Constants.REALLYHIGHCARBS))
+        Assert.assertEquals(48, i.value())
+        Assert.assertEquals("Safety: Limiting carbs to 48 g because of max value in preferences", i.getReasons(aapsLogger))
+    }
+
+    @Test fun iobShouldBeLimited() {
+        `when`(sp.getDouble(R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5)
+        `when`(sp.getString(R.string.key_age, "")).thenReturn("teenage")
+
+        // Apply all limits
+        var d = Constraint(Constants.REALLYHIGHIOB)
+        d = safetyPlugin.applyMaxIOBConstraints(d)
+        Assert.assertEquals(1.5, d.value()!!, 0.01)
+        Assert.assertEquals("""
+    Safety: Limiting IOB to 1.5 U because of max value in preferences
+    """.trimIndent(), d.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
index 6d4a37882a..706c663802 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
@@ -1,15 +1,30 @@
 package info.nightscout.androidaps.plugins.constraints.signatureVerifier
 
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
 import org.junit.Test
+import org.mockito.Mock
 
-import org.junit.Assert.*
+class SignatureVerifierPluginTest : TestBase() {
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+    @Mock lateinit var context: Context
+    private val rxBus = RxBusWrapper()
 
-class SignatureVerifierPluginTest {
+    val injector = HasAndroidInjector { AndroidInjector { } }
 
     @Test
     fun singleCharUnMapTest() {
+        val plugin = SignatureVerifierPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, context)
         val key = "2ΙšÄΠΒϨÒÇeЄtЄЗž-*Ж*ZcHijЊÄœ<|x\"Ε"
-        val unmapped = SignatureVerifierPlugin.getPlugin().singleCharUnMap(key)
-        assertEquals("32:99:61:C4:A0:92:E8:D2:C7:65:04:74:04:17:7E:2D:2A:16:2A:5A:63:48:69:6A:0A:C4:53:3C:7C:78:22:95", unmapped)
+        val unmapped = plugin.singleCharUnMap(key)
+        Assert.assertEquals("32:99:61:C4:A0:92:E8:D2:C7:65:04:74:04:17:7E:2D:2A:16:2A:5A:63:48:69:6A:0A:C4:53:3C:7C:78:22:95", unmapped)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java
deleted file mode 100644
index bd118d1391..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.storage;
-
-import android.os.Environment;
-import android.os.StatFs;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.io.File;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
-
-/**
- * Created by Rumen on 06.03.2019.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, StorageConstraintPlugin.class, StatFs.class, Environment.class})
-public class StorageConstraintPluginTest extends StorageConstraintPlugin{
-
-    StorageConstraintPlugin storageConstraintPlugin;
-    private File mockedFile;
-    private static final String path = "/data";
-    private StatFs mockedStatFs;
-
-    @Test
-    public void isLoopInvocationAllowedTest(){
-        PowerMockito.mockStatic(StorageConstraintPlugin.class);
-        // Set free space under 200(Mb) to disable loop
-        when(StorageConstraintPlugin.getAvailableInternalMemorySize()).thenReturn(150L);
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = storageConstraintPlugin.isClosedLoopAllowed(c);
-        Assert.assertEquals(Boolean.FALSE, c.value());
-        // Set free space over 200(Mb) to enable loop
-        when(StorageConstraintPlugin.getAvailableInternalMemorySize()).thenReturn(300L);
-        Constraint<Boolean> c2 = new Constraint<>(true);
-        c2 = storageConstraintPlugin.isClosedLoopAllowed(c2);
-        Assert.assertEquals(Boolean.TRUE, c2.value());
-    }
-
-    @Test
-    public void getAvailableInternalMemorySizeTest() throws Exception {
-        PowerMockito.mockStatic(Environment.class);
-        PowerMockito.when(Environment.getDataDirectory()).thenReturn(mockedFile);
-        when(mockedFile.getPath()).thenReturn(path);
-        when(mockedFile.exists()).thenReturn(true);
-
-        whenNew(StatFs.class).withArguments(any()).thenReturn(mockedStatFs);
-        when(mockedStatFs.getBlockSizeLong()).thenReturn(1024L);
-        when(mockedStatFs.getAvailableBlocksLong()).thenReturn(150l*1024);
-
-        long freeSpaceInMb = storageConstraintPlugin.getAvailableInternalMemorySize();
-        Assert.assertEquals(150L, freeSpaceInMb);
-
-    }
-
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        mockedFile = mock(File.class);
-        mockedStatFs = mock(StatFs.class);
-        storageConstraintPlugin = StorageConstraintPlugin.getPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
new file mode 100644
index 0000000000..31a960bcc3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.constraints.storage
+
+import android.os.Environment
+import android.os.StatFs
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class StorageConstraintPluginTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    private val rxBusWrapper = RxBusWrapper()
+
+    lateinit var storageConstraintPlugin: StorageConstraintPlugin
+
+    @Before fun prepareMock() {
+        storageConstraintPlugin = StorageConstraintPlugin(HasAndroidInjector { AndroidInjector { } }, aapsLogger, resourceHelper, rxBusWrapper)
+    }
+
+    class MockedStorageConstraintPlugin constructor(
+        injector: HasAndroidInjector,
+        aapsLogger: AAPSLogger,
+        resourceHelper: ResourceHelper,
+        private val rxBus: RxBusWrapper
+    ) : StorageConstraintPlugin(injector, aapsLogger, resourceHelper, rxBus) {
+
+        var memSize = 150L
+        override fun availableInternalMemorySize(): Long = memSize
+    }
+
+    @Test fun isLoopInvocationAllowedTest() {
+        val mocked = MockedStorageConstraintPlugin(HasAndroidInjector { AndroidInjector { } }, aapsLogger, resourceHelper, rxBusWrapper)
+        // Set free space under 200(Mb) to disable loop
+        mocked.memSize = 150L
+        Assert.assertEquals(false, mocked.isClosedLoopAllowed(Constraint(true)).value())
+        // Set free space over 200(Mb) to enable loop
+        mocked.memSize = 300L
+        Assert.assertEquals(true, mocked.isClosedLoopAllowed(Constraint(true)).value())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt
index 49fd78ff13..17a9c171d0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt
@@ -1,85 +1,92 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.utils.SP
+import android.content.Context
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers
-import org.mockito.Mockito.*
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mock
 
+class VersionCheckerUtilsKtTest : TestBase() {
 
-@RunWith(PowerMockRunner::class)
-class VersionCheckerUtilsKtTest {
+    lateinit var versionCheckerUtils: VersionCheckerUtils
 
+    @Mock lateinit var sp: SP
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var context: Context
 
+    val rxBus = RxBusWrapper()
 
-    @Test
-    fun `should keep 2 digit version`() {
-        assertEquals("1.2", "1.2".numericVersionPart())
+    @Before fun setup() {
+        versionCheckerUtils = VersionCheckerUtils(aapsLogger, sp, resourceHelper, rxBus, context)
     }
 
-    @Test
-    fun `should keep 3 digit version`() {
-        assertEquals("1.2.3", "1.2.3".numericVersionPart())
-    }
+    /*
+        @Test
+        fun `should keep 2 digit version`() {
+            assertEquals("1.2", "1.2".numericVersionPart())
+        }
 
-    @Test
-    fun `should keep 4 digit version`() {
-        assertEquals("1.2.3.4", "1.2.3.4".numericVersionPart())
-    }
+        @Test
+        fun `should keep 3 digit version`() {
+            assertEquals("1.2.3", "1.2.3".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version RC`() {
-        assertEquals("1.2", "1.2-RC1".numericVersionPart())
-    }
+        @Test
+        fun `should keep 4 digit version`() {
+            assertEquals("1.2.3.4", "1.2.3.4".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version RC old format`() {
-        assertEquals("1.2", "1.2RC1".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version RC`() {
+            assertEquals("1.2", "1.2-RC1".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version RC without digit`() {
-        assertEquals("1.2", "1.2-RC".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version RC old format`() {
+            assertEquals("1.2", "1.2RC1".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version dev`() {
-        assertEquals("1.2", "1.2-dev".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version RC without digit`() {
+            assertEquals("1.2", "1.2-RC".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version dev old format 1`() {
-        assertEquals("1.2", "1.2dev".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version dev`() {
+            assertEquals("1.2", "1.2-dev".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 2 digit version dev old format 2`() {
-        assertEquals("1.2", "1.2dev-a3".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version dev old format 1`() {
+            assertEquals("1.2", "1.2dev".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 3 digit version RC`() {
-        assertEquals("1.2.3", "1.2.3-RC1".numericVersionPart())
-    }
+        @Test
+        fun `should strip 2 digit version dev old format 2`() {
+            assertEquals("1.2", "1.2dev-a3".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip 4 digit version RC`() {
-        assertEquals("1.2.3.4", "1.2.3.4-RC5".numericVersionPart())
-    }
+        @Test
+        fun `should strip 3 digit version RC`() {
+            assertEquals("1.2.3", "1.2.3-RC1".numericVersionPart())
+        }
 
-    @Test
-    fun `should strip even with dot`() {
-        assertEquals("1.2", "1.2.RC5".numericVersionPart())
-    }
+        @Test
+        fun `should strip 4 digit version RC`() {
+            assertEquals("1.2.3.4", "1.2.3.4-RC5".numericVersionPart())
+        }
 
+        @Test
+        fun `should strip even with dot`() {
+            assertEquals("1.2", "1.2.RC5".numericVersionPart())
+        }
 
+    */
     @Test
     fun findVersionMatchesRegularVersion() {
         val buildGradle = """blabla
@@ -89,11 +96,11 @@ class VersionCheckerUtilsKtTest {
             |   version = "2.2.2"
             |   appName = "Aaoeu"
         """.trimMargin()
-        val detectedVersion: String? = findVersion(buildGradle)
+        val detectedVersion: String? = versionCheckerUtils.findVersion(buildGradle)
         assertEquals("2.2.2", detectedVersion)
     }
 
-
+    /* TODO finish this tests
     // In case we merge a "x.x.x-dev" into master, don't see it as update.
     @Test
     fun `should return null on non-digit versions on master`() {
@@ -104,31 +111,32 @@ class VersionCheckerUtilsKtTest {
             |   version = "2.2.2-nefarious-underground-mod"
             |   appName = "Aaoeu"
         """.trimMargin()
-        val detectedVersion: String? = findVersion(buildGradle)
+        val detectedVersion: String? = versionCheckerUtils.findVersion(buildGradle)
         assertEquals(null, detectedVersion)
     }
 
     @Test
     fun findVersionMatchesDoesNotMatchErrorResponse() {
         val buildGradle = """<html><body>Balls! No build.gradle here. Move along</body><html>"""
-        val detectedVersion: String? = findVersion(buildGradle)
+        val detectedVersion: String? = versionCheckerUtils.findVersion(buildGradle)
         assertEquals(null, detectedVersion)
     }
 
-    @Test
-    fun testVersionStrip() {
-        assertEquals("2.2.2", "2.2.2".versionStrip())
-        assertEquals("2.2.2", "2.2.2-dev".versionStrip())
-        assertEquals("2.2.2", "2.2.2dev".versionStrip())
-        assertEquals("2.2.2", """"2.2.2"""".versionStrip())
-    }
-
+    /*
+        @Test
+        fun testVersionStrip() {
+            assertEquals("2.2.2", "2.2.2".versionStrip())
+            assertEquals("2.2.2", "2.2.2-dev".versionStrip())
+            assertEquals("2.2.2", "2.2.2dev".versionStrip())
+            assertEquals("2.2.2", """"2.2.2"""".versionStrip())
+        }
+    */
     @Test
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update1`() {
         prepareMainApp()
 
-        compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1")
 
         //verify(bus, times(1)).post(any())
 
@@ -145,7 +153,7 @@ class VersionCheckerUtilsKtTest {
     fun `should find update2`() {
         prepareMainApp()
 
-        compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1-dev")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1-dev")
 
         //verify(bus, times(1)).post(any())
 
@@ -161,7 +169,7 @@ class VersionCheckerUtilsKtTest {
     fun `should find update3`() {
         prepareMainApp()
 
-        compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.1")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.1")
 
         //verify(bus, times(1)).post(any())
 
@@ -177,7 +185,7 @@ class VersionCheckerUtilsKtTest {
     fun `should find update4`() {
         prepareMainApp()
 
-        compareWithCurrentVersion(newVersion = "2.2", currentVersion = "2.1.1")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2", currentVersion = "2.1.1")
 
         //verify(bus, times(1)).post(any())
 
@@ -192,7 +200,7 @@ class VersionCheckerUtilsKtTest {
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update5`() {
         prepareMainApp()
-        compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2-dev")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2-dev")
 
         //verify(bus, times(1)).post(any())
 
@@ -207,7 +215,7 @@ class VersionCheckerUtilsKtTest {
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update6`() {
         prepareMainApp()
-        compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2dev")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2dev")
 
         //verify(bus, times(1)).post(any())
 
@@ -222,7 +230,7 @@ class VersionCheckerUtilsKtTest {
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should not find update on fourth version digit`() {
         prepareMainApp()
-        compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0.1")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0.1")
 
         //verify(bus, times(0)).post(any())
 
@@ -233,9 +241,9 @@ class VersionCheckerUtilsKtTest {
 
     @Test
     @PrepareForTest(MainApp::class, L::class, SP::class)
-    fun `should not find update on personal version with same number` (){
+    fun `should not find update on personal version with same number`() {
         prepareMainApp()
-        compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0-myversion")
+        versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0-myversion")
 
         //verify(bus, times(0)).post(any())
 
@@ -244,7 +252,6 @@ class VersionCheckerUtilsKtTest {
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
-
     @Test
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find same version`() {
@@ -256,7 +263,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.2.2")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
 
         //verify(bus, times(0)).post(any())
 
@@ -276,7 +283,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.2.2")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -285,7 +292,6 @@ class VersionCheckerUtilsKtTest {
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
-
     @Test
     @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version with longer number`() {
@@ -297,7 +303,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.2.2")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -317,7 +323,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "3.0-RC04")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0-RC04")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -337,7 +343,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "3.0RC04")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0RC04")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -357,7 +363,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "3.RC04")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.RC04")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -377,7 +383,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "3.0.RC04")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0.RC04")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -397,7 +403,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "3.7.9")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.7.9")
 
         PowerMockito.verifyStatic(SP::class.java, times(1))
         SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
@@ -417,7 +423,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.3")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.3")
 
         //verify(bus, times(0)).post(any())
 
@@ -437,7 +443,7 @@ class VersionCheckerUtilsKtTest {
             |   appName = "Aaoeu"
         """.trimMargin()
         prepareMainApp()
-        compareWithCurrentVersion(findVersion(buildGradle), currentVersion = "2.3-RC")
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.3-RC")
 
         //verify(bus, times(0)).post(any())
 
@@ -446,9 +452,6 @@ class VersionCheckerUtilsKtTest {
         PowerMockito.verifyNoMoreInteractions(SP::class.java)
     }
 
-
-
-
     @Test
     @PrepareForTest(System::class)
     fun `set time`() {
@@ -474,5 +477,5 @@ class VersionCheckerUtilsKtTest {
         PowerMockito.mockStatic(L::class.java)
         `when`(L.isEnabled(any())).thenReturn(true)
     }
-
+    */
 }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.java
deleted file mode 100644
index e3030b8a91..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable;
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnectorTest;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({})
-public class AutomationEventTest {
-    @Test
-    public void testCloneEvent() throws CloneNotSupportedException {
-        // create test object
-        AutomationEvent event = new AutomationEvent();
-        event.setTitle("Test");
-        event.setTrigger(Trigger.instantiate(TriggerConnectorTest.oneItem));
-        event.addAction(new ActionLoopEnable());
-
-        // export to json
-        final String eventJsonExpected = "{\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\",\"title\":\"Test\",\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable\\\"}\"],\"enabled\":true}";
-        Assert.assertEquals(eventJsonExpected, event.toJSON());
-
-        // clone
-        AutomationEvent clone = new AutomationEvent().fromJSON(eventJsonExpected);
-
-        // check title
-        Assert.assertEquals(event.getTitle(), clone.getTitle());
-
-        // check trigger
-        Assert.assertNotNull(clone.getTrigger());
-        Assert.assertFalse(event.getTrigger() == clone.getTrigger()); // not the same object reference
-        Assert.assertEquals(event.getTrigger().getClass(), clone.getTrigger().getClass());
-        Assert.assertEquals(event.getTrigger().toJSON(), clone.getTrigger().toJSON());
-
-        // check action
-        Assert.assertEquals(1, clone.getActions().size());
-        Assert.assertFalse(event.getActions() == clone.getActions()); // not the same object reference
-        Assert.assertEquals(clone.toJSON(), clone.toJSON());
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
new file mode 100644
index 0000000000..363bf83b21
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.general.automation
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnectorTest
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class AutomationEventTest : TestBase() {
+
+    @Mock lateinit var loopPlugin: LoopPlugin
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is AutomationEvent) {
+                it.aapsLogger = aapsLogger
+            }
+            if (it is ActionLoopEnable) {
+                it.loopPlugin = loopPlugin
+                it.resourceHelper = resourceHelper
+                it.configBuilderPlugin = configBuilderPlugin
+                it.rxBus = RxBusWrapper()
+            }
+        }
+    }
+
+    @Test
+    fun testCloneEvent() {
+        // create test object
+        val event = AutomationEvent(injector)
+        event.title = "Test"
+        event.trigger = TriggerDummy(injector).instantiate(JSONObject(TriggerConnectorTest.oneItem))
+            ?: throw Exception()
+        event.addAction(ActionLoopEnable(injector))
+
+        // export to json
+        val eventJsonExpected = "{\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\",\"title\":\"Test\",\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable\\\"}\"],\"enabled\":true}"
+        Assert.assertEquals(eventJsonExpected, event.toJSON())
+
+        // clone
+        val clone = AutomationEvent(injector).fromJSON(eventJsonExpected)
+
+        // check title
+        Assert.assertEquals(event.title, clone.title)
+
+        // check trigger
+        Assert.assertNotNull(clone.trigger)
+        Assert.assertFalse(event.trigger === clone.trigger) // not the same object reference
+        Assert.assertEquals(event.trigger.javaClass, clone.trigger.javaClass)
+        Assert.assertEquals(event.trigger.toJSON(), clone.trigger.toJSON())
+
+        // check action
+        Assert.assertEquals(1, clone.actions.size.toLong())
+        Assert.assertFalse(event.actions === clone.actions) // not the same object reference
+        Assert.assertEquals(clone.toJSON(), clone.toJSON())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java
deleted file mode 100644
index d299da13ce..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.plugins.general.automation.dialogs.TriggerListAdapter;
-import info.nightscout.androidaps.plugins.general.automation.triggers.DummyTrigger;
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({})
-public class ComposeTriggerTest {
-    @Test
-    public void testTriggerList() {
-        TriggerConnector root = new TriggerConnector();
-
-        // add some triggers
-        Trigger t0 = new DummyTrigger();
-        root.add(t0);
-        Trigger t1 = new DummyTrigger();
-        root.add(t1);
-        Trigger t2 = new DummyTrigger();
-        root.add(t2);
-
-        Assert.assertEquals(3, root.size());
-        Assert.assertEquals(t0, root.get(0));
-        Assert.assertEquals(t1, root.get(1));
-        Assert.assertEquals(t2, root.get(2));
-
-        // remove a trigger
-        root.remove(t1);
-
-        Assert.assertEquals(2, root.size());
-        Assert.assertEquals(t0, root.get(0));
-        Assert.assertEquals(t2, root.get(1));
-    }
-
-    @Test
-    public void testChangeConnector() {
-        // initialize scenario
-        TriggerConnector root = new TriggerConnector(TriggerConnector.Type.AND);
-        Trigger[] t = new Trigger[4];
-        for (int i = 0; i < t.length; ++i) {
-            t[i] = new DummyTrigger();
-            root.add(t[i]);
-        }
-        Assert.assertEquals(4, root.size());
-
-        // change connector of t1,t2 from "and" to "or"
-        Assert.assertEquals(root, t[2].getConnector());
-        TriggerListAdapter.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.OR);
-
-        Assert.assertEquals(3, root.size());
-        Assert.assertEquals(t[0], root.get(0));
-        Assert.assertEquals(t[3], root.get(2));
-        Assert.assertTrue(root.get(1) instanceof TriggerConnector);
-
-        TriggerConnector newConnector = (TriggerConnector) root.get(1);
-        Assert.assertEquals(2, newConnector.size());
-        Assert.assertEquals(t[1], newConnector.get(0));
-        Assert.assertEquals(t[2], newConnector.get(1));
-
-        // undo
-        Assert.assertEquals(newConnector, t[2].getConnector());
-        TriggerListAdapter.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.AND);
-        Assert.assertEquals(4, root.size());
-        for (int i = 0; i < 4; ++i) {
-            Assert.assertEquals(t[i], root.get(i));
-        }
-    }
-
-    @Test
-    public void testConnectorSimplify() {
-        // initialize scenario
-        /*
-         *   parent
-         *   -> child
-         *       -> t0
-         *       -> t1
-         */
-        TriggerConnector parent = new TriggerConnector(TriggerConnector.Type.AND);
-        TriggerConnector child = new TriggerConnector(TriggerConnector.Type.AND);
-        Trigger t0 = new DummyTrigger();
-        Trigger t1 = new DummyTrigger();
-        child.add(t0);
-        child.add(t1);
-        parent.add(child);
-        Assert.assertEquals(1, parent.size());
-        Assert.assertEquals(child, parent.get(0));
-        Assert.assertEquals(2, child.size());
-        Assert.assertEquals(t0, child.get(0));
-        Assert.assertEquals(t1, child.get(1));
-
-        // simplify
-        parent.simplify();
-
-        /*
-         *   parent
-         *   -> t0
-         *   -> t1
-         */
-        Assert.assertEquals(2, parent.size());
-        Assert.assertEquals(t0, parent.get(0));
-        Assert.assertEquals(t1, parent.get(1));
-
-        // add a new child at position 1
-        /*
-         *   parent
-         *   -> t0
-         *   -> newChild
-         *      -> t2
-         *   -> t1
-         */
-        TriggerConnector newChild = new TriggerConnector(TriggerConnector.Type.AND);
-        Trigger t2 = new DummyTrigger();
-        newChild.add(t2);
-        parent.add(1, newChild);
-
-        // simplify
-        parent.simplify();
-
-        /*
-         *   parent
-         *   -> t0
-         *   -> t2
-         *   -> t1
-         */
-        Assert.assertEquals(3, parent.size());
-        Assert.assertEquals(t0, parent.get(0));
-        Assert.assertEquals(t2, parent.get(1));
-        Assert.assertEquals(t1, parent.get(2));
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt
new file mode 100644
index 0000000000..0422edc519
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.plugins.general.automation
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest
+class ComposeTriggerTest : TestBase() {
+
+    var injector: HasAndroidInjector = HasAndroidInjector { AndroidInjector { } }
+
+    @Test fun testTriggerList() {
+        val root = TriggerConnector(injector)
+
+        // add some triggers
+        val t0: Trigger = TriggerDummy(injector)
+        root.list.add(t0)
+        val t1: Trigger = TriggerDummy(injector)
+        root.list.add(t1)
+        val t2: Trigger = TriggerDummy(injector)
+        root.list.add(t2)
+        Assert.assertEquals(3, root.size())
+        Assert.assertEquals(t0, root.list[0])
+        Assert.assertEquals(t1, root.list[1])
+        Assert.assertEquals(t2, root.list[2])
+
+        // remove a trigger
+        root.list.remove(t1)
+        Assert.assertEquals(2, root.size())
+        Assert.assertEquals(t0, root.list[0])
+        Assert.assertEquals(t2, root.list[1])
+    }
+
+    @Test
+    fun testChangeConnector() {
+        // initialize scenario
+        val root = TriggerConnector(injector, TriggerConnector.Type.AND)
+        val t = arrayOfNulls<Trigger>(4)
+        for (i in t.indices) {
+            t[i] = TriggerDummy(injector)
+            root.list.add(t[i]!!)
+        }
+        Assert.assertEquals(4, root.size())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.java
deleted file mode 100644
index c0cb9b70a2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class})
-public class ActionLoopDisableTest {
-    ActionLoopDisable actionLoopDisable = new ActionLoopDisable();
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.disableloop, actionLoopDisable.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        Assert.assertEquals("Disable loop", actionLoopDisable.shortDescription());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_stop_24dp), actionLoopDisable.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        LoopPlugin.getPlugin().setPluginEnabled(PluginType.LOOP, true);
-        actionLoopDisable.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(false, LoopPlugin.getPlugin().isEnabled(PluginType.LOOP));
-        // another call should keep it disabled
-        actionLoopDisable.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(false, LoopPlugin.getPlugin().isEnabled(PluginType.LOOP));
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-        AAPSMocker.mockStrings();
-
-        VirtualPumpPlugin pump = mock(VirtualPumpPlugin.class);
-        when(pump.specialEnableCondition()).thenReturn(true);
-        PumpDescription pumpDescription = new PumpDescription();
-        pumpDescription.isTempBasalCapable = true;
-        when(pump.getPumpDescription()).thenReturn(pumpDescription);
-        when(AAPSMocker.configBuilderPlugin.getActivePump()).thenReturn(pump);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
new file mode 100644
index 0000000000..a606f795db
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionLoopDisableTest : ActionsTestBase() {
+
+    lateinit var sut: ActionLoopDisable
+
+    @Before
+    fun setup() {
+
+        `when`(virtualPumpPlugin.specialEnableCondition()).thenReturn(true)
+        val pumpDescription = PumpDescription().apply { isTempBasalCapable = true }
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(resourceHelper.gs(R.string.disableloop)).thenReturn("Disable loop")
+        `when`(resourceHelper.gs(R.string.alreadydisabled)).thenReturn("Disable loop")
+
+        sut = ActionLoopDisable(injector)
+    }
+
+    @Test
+    fun friendlyNameTest() {
+        Assert.assertEquals(R.string.disableloop, sut.friendlyName())
+    }
+
+    @Test
+    fun shortDescriptionTest() {
+        Assert.assertEquals("Disable loop", sut.shortDescription())
+    }
+
+    @Test
+    fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_stop_24dp, sut.icon())
+    }
+
+    @Test
+    fun doActionTest() {
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).setPluginEnabled(PluginType.LOOP, false)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopDisable")
+        Mockito.verify(commandQueue, Mockito.times(1)).cancelTempBasal(eq(true), anyObject())
+
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+
+        // another call should keep it disabled, no new invocation
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).setPluginEnabled(PluginType.LOOP, false)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopDisable")
+        Mockito.verify(commandQueue, Mockito.times(1)).cancelTempBasal(eq(true), anyObject())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.java
deleted file mode 100644
index d42549d222..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class})
-public class ActionLoopEnableTest {
-    ActionLoopEnable actionLoopEnable = new ActionLoopEnable();
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.enableloop, actionLoopEnable.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        Assert.assertEquals(MainApp.gs(R.string.enableloop), actionLoopEnable.shortDescription());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_play_circle_outline_24dp), actionLoopEnable.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        LoopPlugin.getPlugin().setPluginEnabled(PluginType.LOOP, false);
-        actionLoopEnable.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(true, LoopPlugin.getPlugin().isEnabled(PluginType.LOOP));
-        // another call should keep it enabled
-        actionLoopEnable.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(true, LoopPlugin.getPlugin().isEnabled(PluginType.LOOP));
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-
-        VirtualPumpPlugin pump = mock(VirtualPumpPlugin.class);
-        when(pump.specialEnableCondition()).thenReturn(true);
-        PumpDescription pumpDescription = new PumpDescription();
-        pumpDescription.isTempBasalCapable = true;
-        when(pump.getPumpDescription()).thenReturn(pumpDescription);
-        when(AAPSMocker.configBuilderPlugin.getActivePump()).thenReturn(pump);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
new file mode 100644
index 0000000000..64f545388c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionLoopEnableTest : ActionsTestBase() {
+
+    lateinit var sut: ActionLoopEnable
+
+    @Before
+    fun setup() {
+
+        `when`(virtualPumpPlugin.specialEnableCondition()).thenReturn(true)
+        val pumpDescription = PumpDescription().apply { isTempBasalCapable = true }
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(resourceHelper.gs(R.string.enableloop)).thenReturn("Enable loop")
+        `when`(resourceHelper.gs(R.string.alreadyenabled)).thenReturn("Already enabled")
+
+        sut = ActionLoopEnable(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.enableloop, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Enable loop", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_play_circle_outline_24dp, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).setPluginEnabled(PluginType.LOOP, true)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopEnable")
+
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+
+        // another call should keep it disabled, no new invocation
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).setPluginEnabled(PluginType.LOOP, true)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopEnable")
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java
deleted file mode 100644
index c690681513..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, NSUpload.class})
-public class ActionLoopResumeTest {
-    ActionLoopResume actionLoopResume = new ActionLoopResume();
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.resumeloop, actionLoopResume.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        Assert.assertEquals("Resume loop", actionLoopResume.shortDescription());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_replay_24dp), actionLoopResume.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        LoopPlugin.getPlugin().suspendTo(DateUtil.now() + T.hours(1).msecs());
-        actionLoopResume.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(false, LoopPlugin.getPlugin().isSuspended());
-        // another call should keep it resumed
-        actionLoopResume.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(false, LoopPlugin.getPlugin().isSuspended());
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockNSUpload();
-        AAPSMocker.mockCommandQueue();
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
new file mode 100644
index 0000000000..c7c9e3b6e6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionLoopResumeTest : ActionsTestBase() {
+
+    lateinit var sut: ActionLoopResume
+
+    @Before
+    fun setup() {
+
+        `when`(virtualPumpPlugin.specialEnableCondition()).thenReturn(true)
+        `when`(resourceHelper.gs(R.string.resumeloop)).thenReturn("Resume loop")
+        `when`(resourceHelper.gs(R.string.notsuspended)).thenReturn("Not suspended")
+
+        sut = ActionLoopResume(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.resumeloop, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Resume loop", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_replay_24dp, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(loopPlugin.isSuspended).thenReturn(true)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopResume")
+        Mockito.verify(loopPlugin, Mockito.times(1)).createOfflineEvent(0)
+
+        // another call should keep it resumed, , no new invocation
+        `when`(loopPlugin.isSuspended).thenReturn(false)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
+        Mockito.verify(configBuilderPlugin, Mockito.times(1)).storeSettings("ActionLoopResume")
+        Mockito.verify(loopPlugin, Mockito.times(1)).createOfflineEvent(0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java
deleted file mode 100644
index 67e22b0d5b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, NSUpload.class})
-public class ActionLoopSuspendTest {
-    ActionLoopSuspend actionLoopSuspend = new ActionLoopSuspend();
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.suspendloop, actionLoopSuspend.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionLoopSuspend.minutes = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-        Assert.assertEquals(null, actionLoopSuspend.shortDescription()); // string not in AAPSMocker
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_pause_circle_outline_24dp), actionLoopSuspend.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        actionLoopSuspend.minutes = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-
-        LoopPlugin.getPlugin().suspendTo(0);
-        actionLoopSuspend.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(true, LoopPlugin.getPlugin().isSuspended());
-        // another call should keep it suspended
-        actionLoopSuspend.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertEquals(true, LoopPlugin.getPlugin().isSuspended());
-    }
-
-    @Test
-    public void applyTest() {
-        ActionLoopSuspend a = new ActionLoopSuspend();
-        a.minutes = new InputDuration(20, InputDuration.TimeUnit.MINUTES);
-        ActionLoopSuspend b = new ActionLoopSuspend();
-        b.apply(a);
-        Assert.assertEquals(20, b.minutes.getMinutes());
-    }
-
-    @Test
-    public void hasDialogTest() {
-        ActionLoopSuspend a = new ActionLoopSuspend();
-        Assert.assertTrue(a.hasDialog());
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockNSUpload();
-        AAPSMocker.mockCommandQueue();
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
new file mode 100644
index 0000000000..2be1761970
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionLoopSuspendTest : ActionsTestBase() {
+
+    lateinit var sut: ActionLoopSuspend
+
+    @Before
+    fun setup() {
+
+        `when`(virtualPumpPlugin.specialEnableCondition()).thenReturn(true)
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(resourceHelper.gs(R.string.suspendloop)).thenReturn("Suspend loop")
+        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min")
+
+        sut = ActionLoopSuspend(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.suspendloop, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        sut.minutes = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        Assert.assertEquals("Suspend loop for %d min", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_pause_circle_outline_24dp, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(loopPlugin.isSuspended).thenReturn(false)
+        sut.minutes = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).suspendLoop(30)
+
+        // another call should keep it suspended, no more invocations
+        `when`(loopPlugin.isSuspended).thenReturn(true)
+        sut.doAction(object : Callback() {
+            override fun run() {}
+        })
+        Mockito.verify(loopPlugin, Mockito.times(1)).suspendLoop(30)
+    }
+
+    @Test fun applyTest() {
+        val a = ActionLoopSuspend(injector)
+        a.minutes = InputDuration(injector, 20, InputDuration.TimeUnit.MINUTES)
+        val b = ActionLoopSuspend(injector)
+        b.apply(a)
+        Assert.assertEquals(20, b.minutes.getMinutes().toLong())
+    }
+
+    @Test fun hasDialogTest() {
+        val a = ActionLoopSuspend(injector)
+        Assert.assertTrue(a.hasDialog())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java
deleted file mode 100644
index d1393c6824..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, NSUpload.class})
-public class ActionNotificationTest {
-    private ActionNotification actionNotification;
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.notification, actionNotification.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionNotification = new ActionNotification();
-        actionNotification.text = new InputString().setValue("Asd");
-        Assert.assertEquals(null, actionNotification.shortDescription()); // not mocked
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_notifications), actionNotification.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        actionNotification.doAction(new Callback() {
-            @Override
-            public void run() {
-                Assert.assertTrue(result.success);
-            }
-        });
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertTrue(actionNotification.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionNotification = new ActionNotification();
-        actionNotification.text = new InputString().setValue("Asd");
-        Assert.assertEquals("{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionNotification\"}", actionNotification.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        actionNotification = new ActionNotification();
-        actionNotification.fromJSON("{\"text\":\"Asd\"}");
-        Assert.assertEquals("Asd", actionNotification.text.getValue());
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockNSUpload();
-
-        actionNotification = new ActionNotification();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
new file mode 100644
index 0000000000..a2422d44d8
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(NSUpload::class, RxBusWrapper::class)
+class ActionNotificationTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rxBus: RxBusWrapper
+
+    private lateinit var sut: ActionNotification
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ActionNotification) {
+                it.resourceHelper = resourceHelper
+                it.rxBus = rxBus
+            }
+            if (it is PumpEnactResult) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+    @Before
+    fun setup() {
+        PowerMockito.mockStatic(NSUpload::class.java)
+        `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
+        `when`(resourceHelper.gs(R.string.notification)).thenReturn("Notification")
+        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.notification_message), ArgumentMatchers.anyString())).thenReturn("Notification: %s")
+
+        sut = ActionNotification(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.notification, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        sut.text = InputString(injector, "Asd")
+        Assert.assertEquals("Notification: %s", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_notifications, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+        Mockito.verify(rxBus, Mockito.times(2)).send(anyObject())
+        PowerMockito.verifyStatic(NSUpload::class.java, Mockito.times(1))
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        sut.text = InputString(injector, "Asd")
+        Assert.assertEquals("{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionNotification\"}", sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        sut.text = InputString(injector, "Asd")
+        sut.fromJSON("{\"text\":\"Asd\"}")
+        Assert.assertEquals("Asd", sut.text.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java
deleted file mode 100644
index da1ce78cc7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, ProfileFunctions.class})
-public class ActionProfileSwitchPercentTest {
-    private ActionProfileSwitchPercent actionProfileSwitchPercent;
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.profilepercentage, actionProfileSwitchPercent.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionProfileSwitchPercent = new ActionProfileSwitchPercent();
-        actionProfileSwitchPercent.pct = new InputPercent().setValue(100);
-        actionProfileSwitchPercent.duration = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-        Assert.assertNull(actionProfileSwitchPercent.shortDescription()); // not mocked
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), actionProfileSwitchPercent.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        actionProfileSwitchPercent.doAction(new Callback() {
-            @Override
-            public void run() {
-                Assert.assertTrue(result.success);
-            }
-        });
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertTrue(actionProfileSwitchPercent.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionProfileSwitchPercent = new ActionProfileSwitchPercent();
-        actionProfileSwitchPercent.pct = new InputPercent().setValue(100);
-        actionProfileSwitchPercent.duration = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-        Assert.assertEquals("{\"data\":{\"percentage\":100,\"durationInMinutes\":30},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionProfileSwitchPercent\"}", actionProfileSwitchPercent.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        actionProfileSwitchPercent = new ActionProfileSwitchPercent();
-        actionProfileSwitchPercent.fromJSON("{\"percentage\":100,\"durationInMinutes\":30}");
-        Assert.assertEquals(100, actionProfileSwitchPercent.pct.getValue(), 0.001d);
-        Assert.assertEquals(30, actionProfileSwitchPercent.duration.getMinutes(), 0.001);
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-
-        actionProfileSwitchPercent = new ActionProfileSwitchPercent();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
new file mode 100644
index 0000000000..1cc417276e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionProfileSwitchPercentTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionProfileSwitchPercent
+
+    @Before
+    fun setup() {
+
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        `when`(resourceHelper.gs(R.string.startprofileforever)).thenReturn("Start profile %d%%")
+        `when`(resourceHelper.gs(R.string.startprofile)).thenReturn("Start profile %d%% for %d min")
+
+        sut = ActionProfileSwitchPercent(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.profilepercentage, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        sut.pct = InputPercent(injector, 100.0)
+        sut.duration = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        Assert.assertNull(sut.shortDescription()) // not mocked
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        sut.pct = InputPercent(injector, 110.0)
+        sut.duration = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+        Mockito.verify(treatmentsPlugin, Mockito.times(1)).doProfileSwitch(30, 110, 0)
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        sut.pct = InputPercent(injector, 100.0)
+        sut.duration = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        Assert.assertEquals("{\"data\":{\"percentage\":100,\"durationInMinutes\":30},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionProfileSwitchPercent\"}", sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        sut.fromJSON("{\"percentage\":100,\"durationInMinutes\":30}")
+        Assert.assertEquals(100.0, sut.pct.value, 0.001)
+        Assert.assertEquals(30.0, sut.duration.getMinutes().toDouble(), 0.001)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.java
deleted file mode 100644
index 28f0278887..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.SPMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, TreatmentsPlugin.class, ProfileFunctions.class, ConfigBuilderPlugin.class, NSProfilePlugin.class})
-public class ActionProfileSwitchTest {
-    TreatmentsPlugin treatmentsPlugin;
-    ProfileSwitch profileAdded;
-    private ActionProfileSwitch actionProfileSwitch;
-    private  String stringJson = "{\"data\":{\"profileToSwitchTo\":\"Test\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionProfileSwitch\"}";
-
-    @Before
-    public void setUp() {
-        AAPSMocker.mockMainApp();
-        SPMocker.prepareMock();
-        SP.putString("profile", AAPSMocker.getValidProfileStore().getData().toString());
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockTreatmentService();
-        AAPSMocker.mockDatabaseHelper();
-        AAPSMocker.mockProfileFunctions();
-
-        treatmentsPlugin = AAPSMocker.mockTreatmentPlugin();
-        NSProfilePlugin profilePlugin = NSProfilePlugin.getPlugin();
-        when(ConfigBuilderPlugin.getPlugin().getActiveProfileInterface())
-                .thenReturn(profilePlugin);
-
-        Mockito.doAnswer(invocation -> {
-            profileAdded = invocation.getArgument(0);
-            return null;
-        }).when(treatmentsPlugin).addToHistoryProfileSwitch(any(ProfileSwitch.class));
-    }
-
-    @Test
-    public void friendlyName() {
-        actionProfileSwitch = new ActionProfileSwitch();
-        Assert.assertEquals(R.string.profilename, actionProfileSwitch.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionProfileSwitch = new ActionProfileSwitch();
-        actionProfileSwitch.inputProfileName.setValue("Test");
-        when(MainApp.gs(anyInt(), anyString())).thenReturn("Change profile to Test");
-        Assert.assertEquals("Change profile to Test", actionProfileSwitch.shortDescription());
-    }
-
-    @Test
-    public void doAction() {
-        PowerMockito.when(ProfileFunctions.getInstance().getProfileName()).thenReturn("Test");
-
-        actionProfileSwitch = new ActionProfileSwitch();
-        actionProfileSwitch.inputProfileName.setValue("someOtherProfile");
-        actionProfileSwitch.profileName = "someProfile";
-
-        actionProfileSwitch.doAction(new Callback() {
-            @Override
-            public void run() {
-                Assert.assertTrue(result.success);
-            }
-        });
-
-    }
-
-    @Test
-    public void hasDialogTest() {
-        actionProfileSwitch = new ActionProfileSwitch();
-        Assert.assertTrue(actionProfileSwitch.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionProfileSwitch = new ActionProfileSwitch();
-        actionProfileSwitch.inputProfileName.setValue("Test");
-        Assert.assertEquals(stringJson, actionProfileSwitch.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        String data = "{\"profileToSwitchTo\":\"Test\"}";
-        actionProfileSwitch = new ActionProfileSwitch();
-        actionProfileSwitch.fromJSON(data);
-        Assert.assertEquals("Test", actionProfileSwitch.profileName);
-    }
-
-    @Test
-    public void iconTest() {
-        actionProfileSwitch = new ActionProfileSwitch();
-        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), actionProfileSwitch.icon());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
new file mode 100644
index 0000000000..f51e667682
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
@@ -0,0 +1,121 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputProfileName
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyInt
+import org.mockito.Mockito.anyString
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(LocalProfilePlugin::class)
+class ActionProfileSwitchTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionProfileSwitch
+
+    private val stringJson = "{\"data\":{\"profileToSwitchTo\":\"Test\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionProfileSwitch\"}"
+
+    @Before fun setUp() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        `when`(resourceHelper.gs(R.string.profilename)).thenReturn("Change profile to")
+        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s")
+        `when`(resourceHelper.gs(R.string.alreadyset)).thenReturn("Already set")
+        `when`(resourceHelper.gs(R.string.notexists)).thenReturn("not exists")
+        `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
+
+        sut = ActionProfileSwitch(injector)
+    }
+
+    @Test fun friendlyName() {
+        Assert.assertEquals(R.string.profilename, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Change profile to %s", sut.shortDescription())
+    }
+
+    @Test fun doAction() {
+        //Empty input
+        `when`(profileFunction.getProfileName()).thenReturn("Test")
+        sut.inputProfileName = InputProfileName(injector, "")
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertFalse(result.success)
+            }
+        })
+
+        //Not initialized profileStore
+        `when`(profileFunction.getProfile()).thenReturn(null)
+        sut.inputProfileName = InputProfileName(injector, "someProfile")
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertFalse(result.success)
+            }
+        })
+
+        //profile already set
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+        `when`(profileFunction.getProfileName()).thenReturn("Test")
+        sut.inputProfileName = InputProfileName(injector, "Test")
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+                Assert.assertEquals("Already set", result.comment)
+            }
+        })
+
+        // profile doesn't exists
+        `when`(activePlugin.activeProfileInterface).thenReturn(localProfilePlugin)
+        `when`(localProfilePlugin.profile).thenReturn(getValidProfileStore())
+        `when`(profileFunction.getProfileName()).thenReturn("Active")
+        sut.inputProfileName = InputProfileName(injector, "Test")
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertFalse(result.success)
+                Assert.assertEquals("not exists", result.comment)
+            }
+        })
+
+        // do profileswitch
+        `when`(activePlugin.activeProfileInterface).thenReturn(localProfilePlugin)
+        `when`(localProfilePlugin.profile).thenReturn(getValidProfileStore())
+        `when`(profileFunction.getProfileName()).thenReturn("Test")
+        sut.inputProfileName = InputProfileName(injector, TESTPROFILENAME)
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+                Assert.assertEquals("OK", result.comment)
+            }
+        })
+        Mockito.verify(treatmentsPlugin, Mockito.times(1)).doProfileSwitch(anyObject(), anyString(), anyInt(), anyInt(), anyInt(), anyLong())
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        sut.inputProfileName = InputProfileName(injector, "Test")
+        Assert.assertEquals(stringJson, sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        val data = "{\"profileToSwitchTo\":\"Test\"}"
+        sut.fromJSON(data)
+        Assert.assertEquals("Test", sut.inputProfileName.value)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.java
deleted file mode 100644
index 7254d85192..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import android.telephony.SmsManager;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputString;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, SmsManager.class})
-public class ActionSendSMSTest {
-    private ActionSendSMS actionSendSMS;
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.sendsmsactiondescription, actionSendSMS.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionSendSMS = new ActionSendSMS();
-        Assert.assertEquals(null, actionSendSMS.shortDescription()); // not mocked
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_notifications), actionSendSMS.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-        actionSendSMS.text = new InputString().setValue("Asd");
-        actionSendSMS.doAction(new Callback() {
-            @Override
-            public void run() {
-                Assert.assertTrue(result.success);
-            }
-        });
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertTrue(actionSendSMS.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionSendSMS = new ActionSendSMS();
-        actionSendSMS.text = new InputString().setValue("Asd");
-        Assert.assertEquals("{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionSendSMS\"}", actionSendSMS.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        actionSendSMS = new ActionSendSMS();
-        actionSendSMS.fromJSON("{\"text\":\"Asd\"}");
-        Assert.assertEquals("Asd", actionSendSMS.text.getValue());
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        mockStatic(SmsManager.class);
-        SmsManager smsManager = mock(SmsManager.class);
-        PowerMockito.when(SmsManager.getDefault()).thenReturn(smsManager);
-        PowerMockito.when(SP.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678");
-        actionSendSMS = new ActionSendSMS();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
new file mode 100644
index 0000000000..0c1a9a1245
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ActionSendSMSTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionSendSMS
+
+    @Before
+    fun setup() {
+
+        `when`(resourceHelper.gs(eq(R.string.sendsmsactionlabel), anyString())).thenReturn("Send SMS: %s")
+        `when`(resourceHelper.gs(R.string.sendsmsactiondescription)).thenReturn("Send SMS to all numbers")
+
+        sut = ActionSendSMS(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.sendsmsactiondescription, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Send SMS: %s", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_notifications, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(smsCommunicatorPlugin.sendNotificationToAllNumbers(anyString())).thenReturn(true)
+        sut.text = InputString(injector, "Asd")
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        sut.text = InputString(injector, "Asd")
+        Assert.assertEquals("{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionSendSMS\"}", sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        sut.fromJSON("{\"text\":\"Asd\"}")
+        Assert.assertEquals("Asd", sut.text.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.java
deleted file mode 100644
index ed1141f0a4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.any;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, TreatmentsPlugin.class, ProfileFunctions.class})
-public class ActionStartTempTargetTest {
-    private ActionStartTempTarget actionStartTempTarget;
-    private TreatmentsPlugin treatmentsPlugin;
-    private TempTarget tempTargetAdded;
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.starttemptarget, actionStartTempTarget.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        actionStartTempTarget = new ActionStartTempTarget();
-        actionStartTempTarget.reason = "Test";
-        actionStartTempTarget.value = new InputTempTarget().setValue(100).setUnits(Constants.MGDL);
-        actionStartTempTarget.duration = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-        Assert.assertEquals("Start temp target: 100mg/dl@null(Test)", actionStartTempTarget.shortDescription());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_cgm_target), actionStartTempTarget.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-
-        actionStartTempTarget.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertNotEquals(null, tempTargetAdded);
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertTrue(actionStartTempTarget.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionStartTempTarget = new ActionStartTempTarget();
-        actionStartTempTarget.reason = "Test";
-        actionStartTempTarget.value = new InputTempTarget().setValue(100).setUnits(Constants.MGDL);
-        actionStartTempTarget.duration = new InputDuration(30, InputDuration.TimeUnit.MINUTES);
-        Assert.assertEquals("{\"data\":{\"reason\":\"Test\",\"durationInMinutes\":30,\"units\":\"mg/dl\",\"value\":100},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStartTempTarget\"}", actionStartTempTarget.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        actionStartTempTarget = new ActionStartTempTarget();
-        actionStartTempTarget.fromJSON("{\"reason\":\"Test\",\"value\":100,\"durationInMinutes\":30,\"units\":\"mg/dl\"}");
-        Assert.assertEquals(Constants.MGDL, actionStartTempTarget.value.getUnits());
-        Assert.assertEquals(100, actionStartTempTarget.value.getValue(), 0.001d);
-        Assert.assertEquals(30, actionStartTempTarget.duration.getMinutes(), 0.001);
-        Assert.assertEquals("Test", actionStartTempTarget.reason);
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-        treatmentsPlugin = AAPSMocker.mockTreatmentPlugin();
-
-        Mockito.doAnswer(invocation -> {
-            tempTargetAdded = invocation.getArgument(0);
-            return null;
-        }).when(treatmentsPlugin).addToHistoryTempTarget(any(TempTarget.class));
-
-        actionStartTempTarget = new ActionStartTempTarget();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
new file mode 100644
index 0000000000..fe4abf1d7c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
@@ -0,0 +1,75 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class)
+class ActionStartTempTargetTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionStartTempTarget
+
+    @Before
+    fun setup() {
+        PowerMockito.mockStatic(MainApp::class.java)
+        `when`(resourceHelper.gs(R.string.starttemptarget)).thenReturn("Start temp target")
+
+        sut = ActionStartTempTarget(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.starttemptarget, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        sut.value = InputTempTarget(injector)
+        sut.value.value = 100.0
+        sut.duration = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        Assert.assertEquals("Start temp target: 100mg/dl@null(Automation)", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.icon_cp_cgm_target, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+        Mockito.verify(treatmentsPlugin, Mockito.times(1)).addToHistoryTempTarget(anyObject())
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        sut.value = InputTempTarget(injector)
+        sut.value.value = 100.0
+        sut.duration = InputDuration(injector, 30, InputDuration.TimeUnit.MINUTES)
+        Assert.assertEquals("{\"data\":{\"durationInMinutes\":30,\"units\":\"mg/dl\",\"value\":100},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStartTempTarget\"}", sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        sut.fromJSON("{\"value\":100,\"durationInMinutes\":30,\"units\":\"mg/dl\"}")
+        Assert.assertEquals(Constants.MGDL, sut.value.units)
+        Assert.assertEquals(100.0, sut.value.value, 0.001)
+        Assert.assertEquals(30.0, sut.duration.getMinutes().toDouble(), 0.001)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.java
deleted file mode 100644
index 4ec52c6c5b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.any;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, TreatmentsPlugin.class})
-public class ActionStopTempTargetTest {
-    ActionStopTempTarget actionStopTempTarget = new ActionStopTempTarget();
-    TreatmentsPlugin treatmentsPlugin;
-    TempTarget tempTargetAdded;
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.stoptemptarget, actionStopTempTarget.friendlyName());
-    }
-
-    @Test
-    public void shortDescriptionTest() {
-        Assert.assertEquals("Stop temp target", actionStopTempTarget.shortDescription());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_stop_24dp), actionStopTempTarget.icon());
-    }
-
-    @Test
-    public void doActionTest() {
-
-        actionStopTempTarget.doAction(new Callback() {
-            @Override
-            public void run() {
-            }
-        });
-        Assert.assertNotEquals(null, tempTargetAdded);
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertFalse(actionStopTempTarget.hasDialog());
-    }
-
-    @Test
-    public void toJSONTest() {
-        actionStopTempTarget = new ActionStopTempTarget();
-        actionStopTempTarget.reason = "Test";
-        Assert.assertEquals("{\"data\":{\"reason\":\"Test\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStopTempTarget\"}", actionStopTempTarget.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        actionStopTempTarget = new ActionStopTempTarget();
-        actionStopTempTarget.fromJSON("{\"reason\":\"Test\"}");
-        Assert.assertEquals("Test", actionStopTempTarget.reason);
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockStrings();
-        treatmentsPlugin = AAPSMocker.mockTreatmentPlugin();
-
-        Mockito.doAnswer(invocation -> {
-            tempTargetAdded = invocation.getArgument(0);
-            return null;
-        }).when(treatmentsPlugin).addToHistoryTempTarget(any(TempTarget.class));
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
new file mode 100644
index 0000000000..069d06cfbe
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.queue.Callback
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class)
+class ActionStopTempTargetTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionStopTempTarget
+
+    @Before
+    fun setup() {
+        `when`(resourceHelper.gs(R.string.stoptemptarget)).thenReturn("Stop temp target")
+
+        sut = ActionStopTempTarget(injector)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.stoptemptarget, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Stop temp target", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_stop_24dp, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+        Mockito.verify(treatmentsPlugin, Mockito.times(1)).addToHistoryTempTarget(anyObject())
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertFalse(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        Assert.assertEquals("{\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStopTempTarget\"}", sut.toJSON())
+    }
+
+    @Test fun fromJSONTest() {
+        sut.fromJSON("{\"reason\":\"Test\"}")
+        Assert.assertNotNull(sut)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.java
deleted file mode 100644
index 4014457c99..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.actions;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.queue.Callback;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({})
-public class ActionTest extends Action {
-
-    @Override
-    public int friendlyName() {
-        return 0;
-    }
-
-    @Override
-    public String shortDescription() {
-        return null;
-    }
-
-    @Override
-    public void doAction(Callback callback) {
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.absent();
-    }
-
-    @Test
-    public void hasDialogTest() {
-        Assert.assertEquals(false, hasDialog());
-        generateDialog(null); // coverage only
-    }
-
-    @Test
-    public void toJSONTest() {
-        Assert.assertEquals("{\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionTest\"}", toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() {
-        Assert.assertEquals(this, fromJSON("any"));
-    }
-
-    @Test
-    public void instantiateTest() throws JSONException {
-        Action action = Action.instantiate(new JSONObject("{\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionTest\"}"));
-        Assert.assertNotEquals(null, action);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt
new file mode 100644
index 0000000000..ca61579dd8
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest
+class ActionTest : ActionsTestBase() {
+
+    @Test
+    fun instantiateTest() {
+        val action: Action? = ActionDummy(injector).instantiate(JSONObject("{\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionDummy\"}"))
+        Assert.assertNotEquals(null, action)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
new file mode 100644
index 0000000000..1afef7136c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
@@ -0,0 +1,99 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+
+@PrepareForTest(VirtualPumpPlugin::class, RxBusWrapper::class, LocalProfilePlugin::class, SmsCommunicatorPlugin::class)
+open class ActionsTestBase : TestBaseWithProfile() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var loopPlugin: LoopPlugin
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var localProfilePlugin : LocalProfilePlugin
+    @Mock lateinit var smsCommunicatorPlugin : SmsCommunicatorPlugin
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ActionStopTempTarget) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePlugin
+            }
+            if (it is ActionStartTempTarget) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePlugin
+            }
+            if (it is ActionSendSMS) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.smsCommunicatorPlugin = smsCommunicatorPlugin
+            }
+            if (it is ActionProfileSwitch) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePlugin
+                it.profileFunction = profileFunction
+            }
+            if (it is ActionProfileSwitchPercent) {
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePlugin
+            }
+            if (it is ActionNotification) {
+                it.resourceHelper = resourceHelper
+                it.rxBus = rxBus
+            }
+            if (it is ActionLoopSuspend) {
+                it.loopPlugin = loopPlugin
+                it.resourceHelper = resourceHelper
+                it.rxBus = rxBus
+            }
+            if (it is ActionLoopResume) {
+                it.loopPlugin = loopPlugin
+                it.resourceHelper = resourceHelper
+                it.configBuilderPlugin = configBuilderPlugin
+                it.rxBus = rxBus
+            }
+            if (it is ActionLoopEnable) {
+                it.loopPlugin = loopPlugin
+                it.resourceHelper = resourceHelper
+                it.configBuilderPlugin = configBuilderPlugin
+                it.rxBus = rxBus
+            }
+            if (it is ActionLoopDisable) {
+                it.loopPlugin = loopPlugin
+                it.resourceHelper = resourceHelper
+                it.configBuilderPlugin = configBuilderPlugin
+                it.commandQueue = commandQueue
+                it.rxBus = rxBus
+            }
+            if (it is PumpEnactResult) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
new file mode 100644
index 0000000000..e62a0ebc77
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ComparatorConnectTest : TriggerTestBase() {
+
+    @Test fun labelsTest() {
+        Assert.assertEquals(2, ComparatorConnect.Compare.labels(resourceHelper).size)
+    }
+
+    @Test fun setValueTest() {
+        val c = ComparatorConnect(injector)
+        c.value = ComparatorConnect.Compare.ON_DISCONNECT
+        Assert.assertEquals(ComparatorConnect.Compare.ON_DISCONNECT, c.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.java
deleted file mode 100644
index ad62bb2835..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class ComparatorExistsTest {
-
-    @Test
-    public void labelsTest() {
-        Assert.assertEquals(2, ComparatorExists.Compare.labels().size());
-    }
-
-    @Test
-    public void getSetValueTest() {
-        ComparatorExists c = new ComparatorExists().setValue(ComparatorExists.Compare.NOT_EXISTS);
-        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, c.getValue());
-    }
-
-    @Before
-    public void prepare() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
new file mode 100644
index 0000000000..99d71cdeab
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ComparatorExistsTest : TriggerTestBase() {
+
+    @Test fun labelsTest() {
+        Assert.assertEquals(2, ComparatorExists.Compare.labels(resourceHelper).size)
+    }
+
+    @Test fun setValueTest() {
+        val c = ComparatorExists(injector)
+        c.value = ComparatorExists.Compare.NOT_EXISTS
+        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, c.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.java
deleted file mode 100644
index ff340319ef..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class ComparatorTest {
-
-    @Test
-    public void checkTest() {
-        Assert.assertTrue(Comparator.Compare.IS_EQUAL.check(1, 1));
-        Assert.assertTrue(Comparator.Compare.IS_LESSER.check(1, 2));
-        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(1, 2));
-        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 2));
-        Assert.assertTrue(Comparator.Compare.IS_GREATER.check(2, 1));
-        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 1));
-        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 2));
-
-        Assert.assertFalse(Comparator.Compare.IS_LESSER.check(2, 1));
-        Assert.assertFalse(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 1));
-        Assert.assertFalse(Comparator.Compare.IS_GREATER.check(1, 2));
-        Assert.assertFalse(Comparator.Compare.IS_EQUAL_OR_GREATER.check(1, 2));
-
-        Assert.assertTrue(Comparator.Compare.IS_NOT_AVAILABLE.check(1, null));
-    }
-
-    @Test
-    public void labelsTest() {
-        Assert.assertEquals(6, Comparator.Compare.labels().size());
-    }
-
-    @Test
-    public void getSetValueTest() {
-        Comparator c = new Comparator().setValue(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_GREATER, c.getValue());
-    }
-
-    @Before
-    public void prepare() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
new file mode 100644
index 0000000000..da8143e7f6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class ComparatorTest : TriggerTestBase() {
+
+    @Test
+    fun checkTest() {
+        Assert.assertTrue(Comparator.Compare.IS_EQUAL.check(1, 1))
+        Assert.assertTrue(Comparator.Compare.IS_LESSER.check(1, 2))
+        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(1, 2))
+        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 2))
+        Assert.assertTrue(Comparator.Compare.IS_GREATER.check(2, 1))
+        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 1))
+        Assert.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 2))
+        Assert.assertFalse(Comparator.Compare.IS_LESSER.check(2, 1))
+        Assert.assertFalse(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 1))
+        Assert.assertFalse(Comparator.Compare.IS_GREATER.check(1, 2))
+        Assert.assertFalse(Comparator.Compare.IS_EQUAL_OR_GREATER.check(1, 2))
+//        Assert.assertTrue(Comparator.Compare.IS_NOT_AVAILABLE.check<Int?>(1, null))
+    }
+
+    @Test
+    fun labelsTest() {
+        Assert.assertEquals(6, Comparator.Compare.labels(resourceHelper).size)
+    }
+
+    @Test
+    fun setValueTest() {
+        val c: Comparator = Comparator(injector).setValue(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_GREATER, c.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.java
deleted file mode 100644
index dd2e335e86..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class})
-public class InputBgTest {
-
-    @Test
-    public void getSetValueTest() {
-        InputBg i = new InputBg().setUnits(Constants.MMOL).setValue(5d);
-        Assert.assertEquals(5d, i.getValue(), 0.01d);
-        Assert.assertEquals(InputBg.MMOL_MIN, i.minValue, 0.01d);
-        i = new InputBg().setValue(100d).setUnits(Constants.MGDL);
-        Assert.assertEquals(100d, i.getValue(), 0.01d);
-        Assert.assertEquals(InputBg.MGDL_MIN, i.minValue, 0.01d);
-        Assert.assertEquals(Constants.MGDL, i.getUnits());
-    }
-
-
-    @Before
-    public void prepare() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt
new file mode 100644
index 0000000000..05b44be32a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputBgTest : TriggerTestBase() {
+
+    @Test
+    fun setValueTest() {
+        var i: InputBg = InputBg(injector).setUnits(Constants.MMOL).setValue(5.0)
+        Assert.assertEquals(5.0, i.value, 0.01)
+        Assert.assertEquals(InputBg.MMOL_MIN, i.minValue, 0.01)
+        i = InputBg(injector).setValue(100.0).setUnits(Constants.MGDL)
+        Assert.assertEquals(100.0, i.value, 0.01)
+        Assert.assertEquals(InputBg.MGDL_MIN, i.minValue, 0.01)
+        Assert.assertEquals(Constants.MGDL, i.units)
+    }
+
+    @Before
+    fun prepare() {
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.java
deleted file mode 100644
index 92ab51579c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class InputDurationTest {
-
-    @Test
-    public void getSetValueTest() {
-        InputDuration i = new InputDuration(5, InputDuration.TimeUnit.MINUTES);
-        Assert.assertEquals(5, i.getValue(), 0.01d);
-        Assert.assertEquals(InputDuration.TimeUnit.MINUTES, i.getUnit());
-        i = i = new InputDuration(5, InputDuration.TimeUnit.HOURS);
-        Assert.assertEquals(5d, i.getValue(), 0.01d);
-        Assert.assertEquals(InputDuration.TimeUnit.HOURS, i.getUnit());
-        Assert.assertEquals(5 * 60, i.getMinutes());
-        i.setMinutes(60);
-        Assert.assertEquals(1, i.getValue(), 0.01d);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt
new file mode 100644
index 0000000000..f52003e3f0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputDurationTest : TriggerTestBase() {
+
+    @Test fun setValueTest() {
+        var i = InputDuration(injector, 5, InputDuration.TimeUnit.MINUTES)
+        Assert.assertEquals(5, i.value)
+        Assert.assertEquals(InputDuration.TimeUnit.MINUTES, i.unit)
+        i = InputDuration(injector, 5, InputDuration.TimeUnit.HOURS)
+        Assert.assertEquals(5, i.value)
+        Assert.assertEquals(InputDuration.TimeUnit.HOURS, i.unit)
+        Assert.assertEquals(5 * 60, i.getMinutes())
+        i.setMinutes(60)
+        Assert.assertEquals(1, i.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.java
deleted file mode 100644
index e2e68ccc28..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class InputInsulinTest {
-
-    @Test
-    public void textWatcherTest() {
-        InputInsulin t = new InputInsulin().setValue(30d);
-        t.textWatcher.beforeTextChanged(null, 0, 0, 0);
-        t.textWatcher.onTextChanged(null, 0, 0, 0);
-        t.textWatcher.afterTextChanged(null);
-        Assert.assertEquals(20d, t.getValue(), 0.01d);
-    }
-
-    @Test
-    public void getSetValueTest() {
-        InputInsulin i = new InputInsulin().setValue(5d);
-        Assert.assertEquals(5d, i.getValue(), 0.01d);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt
new file mode 100644
index 0000000000..97b09bfcd7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputInsulinTest : TriggerTestBase() {
+
+    @Test fun setValueTest() {
+        val i = InputInsulin(injector)
+        i.value = 5.0
+        Assert.assertEquals(5.0, i.value, 0.01)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java
deleted file mode 100644
index 73b06ad70a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class InputPercentTest {
-
-    @Test
-    public void textWatcherTest() {
-        InputPercent t = new InputPercent().setValue(530d);
-        t.textWatcher.beforeTextChanged(null, 0, 0, 0);
-        t.textWatcher.onTextChanged(null, 0, 0, 0);
-        t.textWatcher.afterTextChanged(null);
-        Assert.assertEquals(130d, t.getValue(), 0.01d);
-    }
-
-    @Test
-    public void getSetValueTest() {
-        InputPercent i = new InputPercent().setValue(10d);
-        Assert.assertEquals(10d, i.getValue(), 0.01d);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt
new file mode 100644
index 0000000000..3367bbdfa0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputPercentTest : TriggerTestBase() {
+
+    @Test fun setValueTest() {
+        val i = InputPercent(injector)
+        i.value = 10.0
+        Assert.assertEquals(10.0, i.value, 0.01)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.java
deleted file mode 100644
index 7f257aa883..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, TreatmentsPlugin.class, ProfileFunctions.class})
-public class InputProfileNameTest {
-    String profileName = "Test";
-    InputProfileName inputProfileName = new InputProfileName(profileName);
-
-    @Test
-    public void getSetValue() {
-        inputProfileName = new InputProfileName("Test");
-        Assert.assertEquals("Test", inputProfileName.getValue());
-        inputProfileName.setValue("Test2");
-        Assert.assertEquals("Test2", inputProfileName.getValue());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
new file mode 100644
index 0000000000..f4bc3d07b1
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputProfileNameTest : TriggerTestBase() {
+
+    @Test fun setValue() {
+        val inputProfileName = InputProfileName(injector, "Test")
+        Assert.assertEquals("Test", inputProfileName.value)
+        inputProfileName.value = "Test2"
+        Assert.assertEquals("Test2", inputProfileName.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.java
deleted file mode 100644
index 9d1601c497..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import android.text.Editable;
-import android.text.InputFilter;
-
-import androidx.annotation.NonNull;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class InputStringTest {
-
-    @Test
-    public void textWatcherTest() {
-        InputString t = new InputString().setValue("asd");
-        t.textWatcher.beforeTextChanged(null, 0, 0, 0);
-        t.textWatcher.onTextChanged(null, 0, 0, 0);
-        t.textWatcher.afterTextChanged(new Editable() {
-            @Override
-            public Editable replace(int st, int en, CharSequence source, int start, int end) {
-                return null;
-            }
-
-            @Override
-            public Editable replace(int st, int en, CharSequence text) {
-                return null;
-            }
-
-            @Override
-            public Editable insert(int where, CharSequence text, int start, int end) {
-                return null;
-            }
-
-            @Override
-            public Editable insert(int where, CharSequence text) {
-                return null;
-            }
-
-            @Override
-            public Editable delete(int st, int en) {
-                return null;
-            }
-
-            @Override
-            public Editable append(CharSequence text) {
-                return null;
-            }
-
-            @Override
-            public Editable append(CharSequence text, int start, int end) {
-                return null;
-            }
-
-            @Override
-            public Editable append(char text) {
-                return null;
-            }
-
-            @Override
-            public void clear() {
-
-            }
-
-            @Override
-            public void clearSpans() {
-
-            }
-
-            @Override
-            public void setFilters(InputFilter[] filters) {
-
-            }
-
-            @Override
-            public InputFilter[] getFilters() {
-                return new InputFilter[0];
-            }
-
-            @Override
-            public void getChars(int start, int end, char[] dest, int destoff) {
-
-            }
-
-            @Override
-            public void setSpan(Object what, int start, int end, int flags) {
-
-            }
-
-            @Override
-            public void removeSpan(Object what) {
-
-            }
-
-            @Override
-            public <T> T[] getSpans(int start, int end, Class<T> type) {
-                return null;
-            }
-
-            @Override
-            public int getSpanStart(Object tag) {
-                return 0;
-            }
-
-            @Override
-            public int getSpanEnd(Object tag) {
-                return 0;
-            }
-
-            @Override
-            public int getSpanFlags(Object tag) {
-                return 0;
-            }
-
-            @Override
-            public int nextSpanTransition(int start, int limit, Class type) {
-                return 0;
-            }
-
-            @Override
-            public int length() {
-                return 0;
-            }
-
-            @Override
-            public char charAt(int index) {
-                return 0;
-            }
-
-            @Override
-            public CharSequence subSequence(int start, int end) {
-                return null;
-            }
-
-            @NonNull
-            @Override
-            public String toString() {
-                return "qwerty";
-            }
-        });
-        Assert.assertEquals("qwerty", t.getValue());
-    }
-
-    @Test
-    public void getSetValueTest() {
-        InputString i = new InputString().setValue("asd");
-        Assert.assertEquals("asd", i.getValue());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt
new file mode 100644
index 0000000000..686cf9047b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputStringTest : TriggerTestBase() {
+
+    @Test fun setValueTest() {
+        val i = InputString(injector)
+        i.value = "asd"
+        Assert.assertEquals("asd", i.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.java
deleted file mode 100644
index 008b7a6743..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class})
-public class InputTempTargetTest {
-
-    @Test
-    public void getSetValueTest() {
-        InputTempTarget i = new InputTempTarget().setUnits(Constants.MMOL).setValue(5d);
-        Assert.assertEquals(5d, i.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MIN_TT_MMOL, i.minValue, 0.01d);
-        i = new InputTempTarget().setValue(100d).setUnits(Constants.MGDL);
-        Assert.assertEquals(100d, i.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MIN_TT_MGDL, i.minValue, 0.01d);
-        Assert.assertEquals(Constants.MGDL, i.getUnits());
-    }
-
-
-    @Before
-    public void prepare() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
new file mode 100644
index 0000000000..d98ca75f1c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class InputTempTargetTest : TriggerTestBase() {
+
+    @Test fun setValueTest() {
+        val i = InputTempTarget(injector)
+        i.units = Constants.MMOL
+        i.value = 5.0
+        Assert.assertEquals(5.0, i.value, 0.01)
+        i.units = Constants.MGDL
+        i.value = 100.0
+        Assert.assertEquals(100.0, i.value, 0.01)
+        Assert.assertEquals(Constants.MGDL, i.units)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.java
deleted file mode 100644
index e3e85d8ae4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class LabelWithElementTest {
-
-    @Test
-    public void constructorTest() {
-        LabelWithElement l = new LabelWithElement("A", "B", new InputInsulin());
-        Assert.assertEquals("A", l.textPre);
-        Assert.assertEquals("B", l.textPost);
-        Assert.assertEquals(InputInsulin.class, l.element.getClass());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
new file mode 100644
index 0000000000..f0fcaafe56
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class LabelWithElementTest : TriggerTestBase() {
+
+    @Test
+    fun constructorTest() {
+        val l = LabelWithElement(injector, "A", "B", InputInsulin(injector))
+        Assert.assertEquals("A", l.textPre)
+        Assert.assertEquals("B", l.textPost)
+        Assert.assertEquals(InputInsulin::class.java, l.element!!.javaClass)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.java
deleted file mode 100644
index 12b3aa1b25..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class LayoutBuilderTest {
-
-    @Test
-    public void addTest() {
-        LayoutBuilder layoutBuilder = new LayoutBuilder();
-
-        InputInsulin inputInsulin = new InputInsulin();
-        layoutBuilder.add(inputInsulin);
-        Assert.assertEquals(1, layoutBuilder.mElements.size());
-    }
-
-    @Test
-    public void addConditionalTest() {
-        LayoutBuilder layoutBuilder = new LayoutBuilder();
-
-        InputInsulin inputInsulin = new InputInsulin();
-        layoutBuilder.add(inputInsulin, true);
-        Assert.assertEquals(1, layoutBuilder.mElements.size());
-        layoutBuilder.add(inputInsulin, false);
-        Assert.assertEquals(1, layoutBuilder.mElements.size());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt
new file mode 100644
index 0000000000..f59e84d3ad
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class LayoutBuilderTest : TestBase() {
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
+
+    @Test fun addTest() {
+        val layoutBuilder = LayoutBuilder()
+        val inputInsulin = InputInsulin(injector)
+        layoutBuilder.add(inputInsulin)
+        Assert.assertEquals(1, layoutBuilder.mElements.size)
+    }
+
+    @Test fun addConditionalTest() {
+        val layoutBuilder = LayoutBuilder()
+        val inputInsulin = InputInsulin(injector)
+        layoutBuilder.add(inputInsulin, true)
+        Assert.assertEquals(1, layoutBuilder.mElements.size)
+        layoutBuilder.add(inputInsulin, false)
+        Assert.assertEquals(1, layoutBuilder.mElements.size)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.java
deleted file mode 100644
index 669e5f8982..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.elements;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class StaticLabelTest {
-
-    @Test
-    public void constructor() {
-        StaticLabel sl = new StaticLabel("any");
-        Assert.assertEquals("any", sl.label);
-
-        sl = new StaticLabel(R.string.pumplimit);
-        Assert.assertEquals(MainApp.gs(R.string.pumplimit), sl.label);
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
new file mode 100644
index 0000000000..4b85698d3c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class StaticLabelTest : TriggerTestBase() {
+
+    @Test fun constructor() {
+        var sl = StaticLabel(injector, "any", TriggerDummy(injector))
+        Assert.assertEquals("any", sl.label)
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        sl = StaticLabel(injector, R.string.pumplimit, TriggerDummy(injector))
+        Assert.assertEquals("pump limit", sl.label)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java
deleted file mode 100644
index 47ce6a1d02..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-public class DummyTrigger extends Trigger {
-    private boolean result;
-
-    public DummyTrigger() {
-        this.result = false;
-    }
-
-    public DummyTrigger(boolean result) {
-        this.result = result;
-    }
-
-    @Override
-    public boolean shouldRun() {
-        return result;
-    }
-
-    @Override
-    public String toJSON() { return null; }
-
-    @Override
-    Trigger fromJSON(String data) {
-        return null;
-    }
-
-    @Override
-    public int friendlyName() {
-        return 0;
-    }
-
-    @Override
-    public String friendlyDescription() {
-        return null;
-    }
-
-    @Override
-    public Optional<Integer> icon() {
-        return Optional.absent();
-    }
-
-    @Override
-    public void executed(long time) {
-    }
-
-    @Override
-    public Trigger duplicate() { return new DummyTrigger(result); }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.kt
new file mode 100644
index 0000000000..fbf9213625
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+
+class DummyTrigger(var result: Boolean) : Trigger(HasAndroidInjector { AndroidInjector { } }) {
+
+    override fun shouldRun(): Boolean {
+        return result
+    }
+
+    override fun toJSON(): String {
+        return ""
+    }
+
+    override fun fromJSON(data: String): Trigger {
+        return DummyTrigger(result)
+    }
+
+    override fun friendlyName(): Int {
+        return 0
+    }
+
+    override fun friendlyDescription(): String {
+        return " "
+    }
+
+    override fun icon(): Optional<Int?> {
+        return Optional.absent()
+    }
+
+    override fun duplicate(): Trigger {
+        return DummyTrigger(result)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.java
deleted file mode 100644
index dd2a4a533e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, IobCobCalculatorPlugin.class, SP.class})
-public class TriggerAutosensValueTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        Mockito.when(SP.getDouble(Mockito.eq("openapsama_autosens_max"), anyDouble())).thenReturn(1.2d);
-        Mockito.when(SP.getDouble(Mockito.eq("openapsama_autosens_min"), anyDouble())).thenReturn(0.7d);
-        when(IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Automation trigger")).thenReturn(generateAutosensData());
-        TriggerAutosensValue t = new TriggerAutosensValue().setValue(110).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(110, t.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.getComparator().getValue());
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(100).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(100, t.getValue(), 0.01d);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(50).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(310).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(420).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(20).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerAutosensValue().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-
-        when(IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Automation trigger")).thenReturn(new AutosensData());
-        t = new TriggerAutosensValue().setValue(80).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        // Test autosensData == null and Comparator == IS_NOT_AVAILABLE
-        when(IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Automation trigger")).thenReturn(null);
-        t = new TriggerAutosensValue().comparator(Comparator.Compare.IS_NOT_AVAILABLE);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerAutosensValue().setValue(214).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerAutosensValue t = new TriggerAutosensValue().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerAutosensValue t1 = (TriggerAutosensValue) t.duplicate();
-        Assert.assertEquals(213, t1.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerAutosensValue t = new TriggerAutosensValue().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String ASJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"value\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerAutosensValue\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerAutosensValue t = new TriggerAutosensValue().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(ASJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerAutosensValue t = new TriggerAutosensValue().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerAutosensValue t2 = (TriggerAutosensValue) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(410, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.as), new TriggerAutosensValue().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockSP();
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-    AutosensData generateAutosensData() {
-        AutosensData data = new AutosensData();
-        return data;
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
new file mode 100644
index 0000000000..a91fcf6d06
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
@@ -0,0 +1,125 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, IobCobCalculatorPlugin::class)
+class TriggerAutosensValueTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+    @Test fun shouldRunTest() {
+        `when`(sp.getDouble(Mockito.eq(R.string.key_openapsama_autosens_max), ArgumentMatchers.anyDouble())).thenReturn(1.2)
+        `when`(sp.getDouble(Mockito.eq(R.string.key_openapsama_autosens_min), ArgumentMatchers.anyDouble())).thenReturn(0.7)
+        `when`(iobCobCalculatorPlugin.getLastAutosensData("Automation trigger")).thenReturn(generateAutosensData())
+        var t = TriggerAutosensValue(injector)
+        t.autosens.value = 110.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL
+        Assert.assertEquals(110.0, t.autosens.value, 0.01)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.comparator.value)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 100.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL
+        Assert.assertEquals(100.0, t.autosens.value, 0.01)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 50.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_GREATER
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 310.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 420.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 390.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 390.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_GREATER
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 20.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_GREATER
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 390.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
+        Assert.assertTrue(t.shouldRun())
+        PowerMockito.`when`(iobCobCalculatorPlugin.getLastAutosensData("Automation trigger")).thenReturn(AutosensData(injector))
+        t = TriggerAutosensValue(injector)
+        t.autosens.value = 80.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
+        Assert.assertFalse(t.shouldRun())
+
+        // Test autosensData == null and Comparator == IS_NOT_AVAILABLE
+        PowerMockito.`when`(iobCobCalculatorPlugin.getLastAutosensData("Automation trigger")).thenReturn(null)
+        t = TriggerAutosensValue(injector)
+        t.comparator.value = Comparator.Compare.IS_NOT_AVAILABLE
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test
+    fun copyConstructorTest() {
+        val t = TriggerAutosensValue(injector)
+        t.autosens.value = 213.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
+        val t1 = t.duplicate() as TriggerAutosensValue
+        Assert.assertEquals(213.0, t1.autosens.value, 0.01)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var asJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"value\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerAutosensValue\"}"
+
+    @Test
+    fun toJSONTest() {
+        val t = TriggerAutosensValue(injector)
+        t.autosens.value = 410.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL
+        Assert.assertEquals(asJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t = TriggerAutosensValue(injector)
+        t.autosens.value = 410.0
+        t.comparator.value = Comparator.Compare.IS_EQUAL
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerAutosensValue
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(410.0, t2.autosens.value, 0.01)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.`as`), TriggerAutosensValue(injector).icon())
+    }
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    private fun generateAutosensData(): AutosensData {
+        return AutosensData(injector)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt
new file mode 100644
index 0000000000..f4665f4938
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt
@@ -0,0 +1,50 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorConnect
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class TriggerBTDeviceTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+    var someName = "Headset"
+    var btJson = "{\"data\":{\"comparator\":\"ON_CONNECT\",\"name\":\"Headset\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBTDevice\"}"
+
+    @Test fun shouldRun() {
+        val t: TriggerBTDevice = TriggerBTDevice(injector)
+    }
+
+    @Test fun toJSON() {
+        val t: TriggerBTDevice = TriggerBTDevice(injector)
+        t.btDevice.value = someName
+        Assert.assertEquals(btJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSON() {
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(btJson)) as TriggerBTDevice
+        Assert.assertEquals(ComparatorConnect.Compare.ON_CONNECT, t2.comparator.value)
+        Assert.assertEquals("Headset", t2.btDevice.value)
+    }
+
+    @Test
+    fun icon() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_bluetooth_white_48dp), TriggerBTDevice(injector).icon())
+    }
+
+    @Test fun duplicate() {
+        val t: TriggerBTDevice = TriggerBTDevice(injector).also {
+            it.comparator.value = ComparatorConnect.Compare.ON_DISCONNECT
+            it.btDevice.value = someName
+        }
+        val t1 = t.duplicate() as TriggerBTDevice
+        Assert.assertEquals("Headset", t1.btDevice.value)
+        Assert.assertEquals(ComparatorConnect.Compare.ON_DISCONNECT, t.comparator.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java
deleted file mode 100644
index 1fb94492c9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, IobCobCalculatorPlugin.class})
-public class TriggerBgTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(generateOneCurrentRecordBgData());
-
-        TriggerBg t = new TriggerBg().setUnits(Constants.MMOL).setValue(4.1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(214).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(214).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(214).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(215).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(215).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(215).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(new ArrayList<>());
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBg().comparator(Comparator.Compare.IS_NOT_AVAILABLE);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerBg().setUnits(Constants.MGDL).setValue(214).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerBg t = new TriggerBg().setUnits(Constants.MGDL).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerBg t1 = (TriggerBg) t.duplicate();
-        Assert.assertEquals(213d, t1.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MGDL, t1.getUnits());
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerBg t = new TriggerBg().setUnits(Constants.MGDL).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"bg\":4.1,\"units\":\"mmol\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerBg t = new TriggerBg().setUnits(Constants.MMOL).setValue(4.1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(bgJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerBg t = new TriggerBg().setUnits(Constants.MMOL).setValue(4.1d).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerBg t2 = (TriggerBg) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(4.1d, t2.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MMOL, t2.getUnits());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bgcheck), new TriggerBg().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockProfileFunctions();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-    List<BgReading> generateOneCurrentRecordBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":" + (now - 1) + ",\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
new file mode 100644
index 0000000000..61c1f869ba
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
@@ -0,0 +1,101 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, IobCobCalculatorPlugin::class, ProfileFunction::class)
+class TriggerBgTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before
+    fun prepare() {
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+        `when`(iobCobCalculatorPlugin.dataLock).thenReturn(Unit)
+        PowerMockito.mockStatic(DateUtil::class.java)
+        `when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test
+    fun shouldRunTest() {
+        `when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOneCurrentRecordBgData())
+        var t: TriggerBg = TriggerBg(injector).setUnits(Constants.MMOL).setValue(4.1).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(214.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(214.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(214.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(215.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(215.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(215.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+        `when`(iobCobCalculatorPlugin.bgReadings).thenReturn(ArrayList())
+        t = TriggerBg(injector).setUnits(Constants.MGDL).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBg(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test
+    fun copyConstructorTest() {
+        val t: TriggerBg = TriggerBg(injector).setUnits(Constants.MGDL).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerBg
+        Assert.assertEquals(213.0, t1.bg.value, 0.01)
+        Assert.assertEquals(Constants.MGDL, t1.bg.units)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"bg\":4.1,\"units\":\"mmol\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\"}"
+
+    @Test
+    fun toJSONTest() {
+        val t: TriggerBg = TriggerBg(injector).setUnits(Constants.MMOL).setValue(4.1).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(bgJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerBg = TriggerBg(injector).setUnits(Constants.MMOL).setValue(4.1).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerBg
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(4.1, t2.bg.value, 0.01)
+        Assert.assertEquals(Constants.MMOL, t2.bg.units)
+    }
+
+    @Test
+    fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bgcheck), TriggerBg(injector).icon())
+    }
+
+    private fun generateOneCurrentRecordBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":" + (now - 1) + ",\"direction\":\"Flat\"}"))))
+        return list
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.java
deleted file mode 100644
index 1d3a45a05e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, TreatmentsPlugin.class})
-public class TriggerBolusAgoTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        when(DateUtil.now()).thenReturn(now); // set current time to now + 10 min
-        TriggerBolusAgo t = new TriggerBolusAgo().setValue(110).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-        when(TreatmentsPlugin.getPlugin().getLastBolusTime(false)).thenReturn(now); // Set last bolus time to now
-        when(DateUtil.now()).thenReturn(now + (10*60*1000)); // set current time to now + 10 min
-        t = new TriggerBolusAgo().setValue(110).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(110, t.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.getComparator().getValue());
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(10).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(10, t.getValue(), 0.01d);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(310).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(420).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(2).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerBolusAgo().setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-
-        when(TreatmentsPlugin.getPlugin().getLastBolusTime(false)).thenReturn(0l); // Set last bolus time to 0
-        t = new TriggerBolusAgo().comparator(Comparator.Compare.IS_NOT_AVAILABLE);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerBolusAgo().setValue(214).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerBolusAgo t = new TriggerBolusAgo().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerBolusAgo t1 = (TriggerBolusAgo) t.duplicate();
-        Assert.assertEquals(213, t1.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerBolusAgo t = new TriggerBolusAgo().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String LBJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"minutesAgo\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBolusAgo\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerBolusAgo t = new TriggerBolusAgo().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(LBJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerBolusAgo t = new TriggerBolusAgo().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerBolusAgo t2 = (TriggerBolusAgo) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(410, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_bolus), new TriggerBolusAgo().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockProfileFunctions();
-        PowerMockito.mockStatic(DateUtil.class);
-        AAPSMocker.mockTreatmentPlugin();
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
new file mode 100644
index 0000000000..fbc4cd8a8b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -0,0 +1,84 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, TreatmentsPlugin::class)
+class TriggerBolusAgoTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test
+    fun shouldRunTest() {
+        `when`(treatmentsPlugin.getLastBolusTime(false)).thenReturn(now) // Set last bolus time to now
+        `when`(DateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
+        var t = TriggerBolusAgo(injector).setValue(110).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(110, t.minutesAgo.value)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.comparator.value)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(10).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(10, t.minutesAgo.value)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(310).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(420).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(2).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerBolusAgo(injector).setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        PowerMockito.`when`(treatmentsPlugin.getLastBolusTime(false)).thenReturn(0L) // Set last bolus time to 0
+        t = TriggerBolusAgo(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerBolusAgo = TriggerBolusAgo(injector).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerBolusAgo
+        Assert.assertEquals(213, t1.minutesAgo.value)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var lbJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"minutesAgo\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBolusAgo\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerBolusAgo = TriggerBolusAgo(injector).setValue(410).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(lbJson, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t: TriggerBolusAgo = TriggerBolusAgo(injector).setValue(410).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerBolusAgo
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(410, t2.minutesAgo.value)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.icon_bolus), TriggerBolusAgo(injector).icon())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.java
deleted file mode 100644
index 725cc6cfd5..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, IobCobCalculatorPlugin.class, SP.class, L.class})
-public class TriggerCOBTest {
-
-    long now = 1514766900000L;
-    IobCobCalculatorPlugin iobCobCalculatorPlugin;
-
-    @Test
-    public void shouldRunTest() {
-        // COB value is 6
-        PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "AutomationTriggerCOB")).thenReturn(new CobInfo(6d, 2d));        TriggerCOB t = new TriggerCOB().setValue(1).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerCOB().setValue(6).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerCOB().setValue(5).comparator(Comparator.Compare.IS_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerCOB().setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerCOB().setValue(6).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerCOB().setValue(1).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerCOB().setValue(10).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerCOB().setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        t = new TriggerCOB().setValue(1).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerCOB t = new TriggerCOB().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerCOB t1 = (TriggerCOB) t.duplicate();
-        Assert.assertEquals(213d, t.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerCOB t = new TriggerCOB().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"carbs\":4},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCOB\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerCOB t = new TriggerCOB().setValue(4).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(bgJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerCOB t = new TriggerCOB().setValue(4).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerCOB t2 = (TriggerCOB) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(4, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bolus_carbs), new TriggerCOB().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        iobCobCalculatorPlugin = AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-        when(SP.getInt(any(), any())).thenReturn(48);
-    }
-
-    public CobInfo generateCobInfo(){
-        return new CobInfo(6d, 0d);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
new file mode 100644
index 0000000000..b864e0aed8
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
@@ -0,0 +1,79 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, IobCobCalculatorPlugin::class)
+class TriggerCOBTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+        PowerMockito.`when`(sp.getInt(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt())).thenReturn(48)
+    }
+
+    @Test fun shouldRunTest() {
+        // COB value is 6
+        PowerMockito.`when`(iobCobCalculatorPlugin.getCobInfo(false, "AutomationTriggerCOB")).thenReturn(CobInfo(6.0, 2.0))
+        var t: TriggerCOB = TriggerCOB(injector).setValue(1.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerCOB(injector).setValue(6.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerCOB(injector).setValue(5.0).comparator(Comparator.Compare.IS_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerCOB(injector).setValue(5.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerCOB(injector).setValue(6.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerCOB(injector).setValue(1.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerCOB(injector).setValue(10.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerCOB(injector).setValue(5.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerCOB = TriggerCOB(injector).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertEquals(213.0, t.cob.value, 0.01)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"carbs\":4},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCOB\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerCOB = TriggerCOB(injector).setValue(4.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(bgJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerCOB = TriggerCOB(injector).setValue(4.0).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerCOB
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(4.0, t2.cob.value, 0.01)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bolus_carbs), TriggerCOB(injector).icon())
+    }
+
+    fun generateCobInfo(): CobInfo {
+        return CobInfo(6.0, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java
deleted file mode 100644
index 1e6fbcc848..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, L.class, SP.class})
-public class TriggerConnectorTest {
-
-    @Test
-    public void testTriggerList() {
-        TriggerConnector t = new TriggerConnector();
-        TriggerConnector t2 = new TriggerConnector();
-        TriggerConnector t3 = new TriggerConnector();
-
-        Assert.assertTrue(t.size() == 0);
-
-        t.add(t2);
-        Assert.assertTrue(t.size() == 1);
-        Assert.assertEquals(t2, t.get(0));
-
-        t.add(t3);
-        Assert.assertTrue(t.size() == 2);
-        Assert.assertEquals(t2, t.get(0));
-        Assert.assertEquals(t3, t.get(1));
-
-        Assert.assertTrue(t.remove(t2));
-        Assert.assertTrue(t.size() == 1);
-        Assert.assertEquals(t3, t.get(0));
-
-        Assert.assertTrue(t.shouldRun());
-    }
-
-    @Test
-    public void testListTriggerOR() {
-        TriggerConnector t = new TriggerConnector(TriggerConnector.Type.OR);
-        t.add(new DummyTrigger(false));
-        t.add(new DummyTrigger(false));
-        Assert.assertFalse(t.shouldRun());
-
-        t.add(new DummyTrigger(true));
-        t.add(new DummyTrigger(false));
-        Assert.assertTrue(t.shouldRun());
-    }
-
-    @Test
-    public void testListTriggerXOR() {
-        TriggerConnector t = new TriggerConnector(TriggerConnector.Type.XOR);
-        t.add(new DummyTrigger(false));
-        t.add(new DummyTrigger(false));
-        Assert.assertFalse(t.shouldRun());
-
-        t.add(new DummyTrigger(true));
-        t.add(new DummyTrigger(false));
-        Assert.assertTrue(t.shouldRun());
-
-        t.add(new DummyTrigger(true));
-        t.add(new DummyTrigger(false));
-        Assert.assertFalse(t.shouldRun());
-    }
-
-    @Test
-    public void testListTriggerAND() {
-        TriggerConnector t = new TriggerConnector(TriggerConnector.Type.AND);
-        t.add(new DummyTrigger(true));
-        t.add(new DummyTrigger(true));
-        Assert.assertTrue(t.shouldRun());
-
-        t.add(new DummyTrigger(true));
-        t.add(new DummyTrigger(false));
-        Assert.assertFalse(t.shouldRun());
-    }
-
-    static public final String empty = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}";
-    static public final String oneItem = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\"]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerConnector t = new TriggerConnector();
-        Assert.assertEquals(empty, t.toJSON());
-        t.add(new TriggerConnector());
-        Assert.assertEquals(oneItem, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerConnector t = new TriggerConnector();
-        t.add(new TriggerConnector());
-
-        TriggerConnector t2 = (TriggerConnector) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(1, t2.size());
-        Assert.assertTrue(t2.get(0) instanceof TriggerConnector);
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt
new file mode 100644
index 0000000000..386e77b89f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class TriggerConnectorTest : TriggerTestBase() {
+
+    @Test fun testTriggerList() {
+        val t = TriggerConnector(injector)
+        val t2 = TriggerConnector(injector)
+        val t3 = TriggerConnector(injector)
+        Assert.assertTrue(t.size() == 0)
+        t.list.add(t2)
+        Assert.assertTrue(t.size() == 1)
+        Assert.assertEquals(t2, t.list.get(0))
+        t.list.add(t3)
+        Assert.assertTrue(t.size() == 2)
+        Assert.assertEquals(t2, t.list.get(0))
+        Assert.assertEquals(t3, t.list.get(1))
+        Assert.assertTrue(t.list.remove(t2))
+        Assert.assertTrue(t.size() == 1)
+        Assert.assertEquals(t3, t.list.get(0))
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test fun testListTriggerOR() {
+        val t = TriggerConnector(injector, TriggerConnector.Type.OR)
+        t.list.add(TriggerDummy(injector))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertFalse(t.shouldRun())
+        t.list.add(TriggerDummy(injector, true))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test fun testListTriggerXOR() {
+        val t = TriggerConnector(injector, TriggerConnector.Type.XOR)
+        t.list.add(TriggerDummy(injector))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertFalse(t.shouldRun())
+        t.list.add(TriggerDummy(injector, true))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertTrue(t.shouldRun())
+        t.list.add(TriggerDummy(injector, true))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun testListTriggerAND() {
+        val t = TriggerConnector(injector, TriggerConnector.Type.AND)
+        t.list.add(TriggerDummy(injector, true))
+        t.list.add(TriggerDummy(injector, true))
+        Assert.assertTrue(t.shouldRun())
+        t.list.add(TriggerDummy(injector, true))
+        t.list.add(TriggerDummy(injector))
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun toJSONTest() {
+        val t = TriggerConnector(injector)
+        Assert.assertEquals(empty, t.toJSON())
+        t.list.add(TriggerConnector(injector))
+        Assert.assertEquals(oneItem, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t = TriggerConnector(injector)
+        t.list.add(TriggerConnector(injector))
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerConnector
+        Assert.assertEquals(1, t2.size().toLong())
+        Assert.assertTrue(t2.list[0] is TriggerConnector)
+    }
+
+    companion object {
+        const val empty = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"
+        const val oneItem = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\"]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java
deleted file mode 100644
index 3ee983511c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, IobCobCalculatorPlugin.class, GlucoseStatus.class})
-public class TriggerDeltaTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(generateValidBgData());
-        //Test if time passed is less than 5 min
-        TriggerDelta t = new TriggerDelta().setUnits(Constants.MGDL).setValue(-3d, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER).lastRun(now-1);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(73d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        Assert.assertEquals(DeltaType.LONG_AVERAGE, t.getType());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(-2d, DeltaType.SHORT_AVERAGE).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        Assert.assertEquals(DeltaType.SHORT_AVERAGE, t.getType());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(-3d, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        Assert.assertEquals(DeltaType.DELTA, t.getType());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(2d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(2d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MMOL).setValue(0.3d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MMOL).setValue(0.1d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MMOL).setValue(-0.5d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerDelta().setUnits(Constants.MMOL).setValue(-0.2d, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(new ArrayList<>());
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(213, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerDelta().comparator(Comparator.Compare.IS_NOT_AVAILABLE);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerDelta().setUnits(Constants.MGDL).setValue(214, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerDelta t = new TriggerDelta().setUnits(Constants.MGDL).setValue(213, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerDelta t1 = (TriggerDelta) t.duplicate();
-        Assert.assertEquals(213d, t1.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MGDL, t1.getUnits());
-        Assert.assertEquals(DeltaType.DELTA, t.getType());
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerDelta t = new TriggerDelta().setUnits(Constants.MGDL).setValue(213, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String deltaJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"deltaType\":\"DELTA\",\"units\":\"mmol\",\"value\":4.1},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerDelta t = new TriggerDelta().setUnits(Constants.MMOL).setValue(4.1d, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(deltaJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerDelta t = new TriggerDelta().setUnits(Constants.MMOL).setValue(4.1d, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerDelta t2 = (TriggerDelta) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(4.1d, t2.getValue(), 0.01d);
-        Assert.assertEquals(Constants.MMOL, t2.getUnits());
-        Assert.assertEquals(DeltaType.DELTA, t2.getType());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_auto_delta), new TriggerDelta().icon());
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockApplicationContext();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-    @Test
-    public void initializerTest(){
-        TriggerDelta t = new TriggerDelta();
-        Assert.assertTrue(t.getUnits().equals(Constants.MGDL));
-    }
-
-    List<BgReading> generateValidBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))); // +2
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))); // +3
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))); // +4
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
new file mode 100644
index 0000000000..47422cd41f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
@@ -0,0 +1,116 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, IobCobCalculatorPlugin::class, ProfileFunction::class)
+class TriggerDeltaTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+        `when`(iobCobCalculatorPlugin.dataLock).thenReturn(Unit)
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+    }
+
+    @Test fun shouldRunTest() {
+        `when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateValidBgData())
+        var t = TriggerDelta(injector).units(Constants.MGDL).setValue(73.0, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        Assert.assertEquals(DeltaType.LONG_AVERAGE, t.delta.deltaType)
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(-2.0, DeltaType.SHORT_AVERAGE).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        Assert.assertEquals(DeltaType.SHORT_AVERAGE, t.delta.deltaType)
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(-3.0, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        Assert.assertEquals(DeltaType.DELTA, t.delta.deltaType)
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(2.0, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(2.0, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(0.3, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(0.1, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(-0.5, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(-0.2, DeltaType.LONG_AVERAGE).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        `when`(iobCobCalculatorPlugin.bgReadings).thenReturn(ArrayList())
+        t = TriggerDelta(injector).units(Constants.MGDL).setValue(213.0, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerDelta(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerDelta = TriggerDelta(injector).units(Constants.MGDL).setValue(213.0, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerDelta
+        Assert.assertEquals(213.0, t1.delta.value, 0.01)
+        Assert.assertEquals(Constants.MGDL, t1.units)
+        Assert.assertEquals(DeltaType.DELTA, t.delta.deltaType)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var deltaJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"deltaType\":\"DELTA\",\"units\":\"mg/dl\",\"value\":4.1},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta\"}"
+
+    @Test
+    fun toJSONTest() {
+        val t: TriggerDelta = TriggerDelta(injector).units(Constants.MGDL).setValue(4.1, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(deltaJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerDelta = TriggerDelta(injector).units(Constants.MMOL).setValue(4.1, DeltaType.DELTA).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerDelta
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(4.1, t2.delta.value, 0.01)
+        Assert.assertEquals(Constants.MMOL, t2.units)
+        Assert.assertEquals(DeltaType.DELTA, t2.delta.deltaType)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.icon_auto_delta), TriggerDelta(injector).icon())
+    }
+
+    @Test fun initializerTest() {
+        val t = TriggerDelta(injector)
+        Assert.assertTrue(t.units == Constants.MGDL)
+    }
+
+    private fun generateValidBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+        return list
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java
deleted file mode 100644
index db39c05d2c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, IobCobCalculatorPlugin.class})
-public class TriggerIobTest {
-
-    long now = 1514766900000L;
-    IobCobCalculatorPlugin iobCobCalculatorPlugin;
-
-    @Test
-    public void shouldRunTest() {
-        PowerMockito.when(iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(anyLong(), any(Profile.class))).thenReturn(generateIobRecordData());
-
-        TriggerIob t = new TriggerIob().setValue(1.1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerIob().setValue(1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(0.8d).comparator(Comparator.Compare.IS_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(0.8d).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(0.9d).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(1.2d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(1.1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerIob().setValue(1d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerIob().setValue(0.9d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        t = new TriggerIob().setValue(1d).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerIob t = new TriggerIob().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerIob t1 = (TriggerIob) t.duplicate();
-        Assert.assertEquals(213d, t.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerIob t = new TriggerIob().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"insulin\":4.1,\"lastRun\":0},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerIob\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerIob t = new TriggerIob().setValue(4.1d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(bgJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerIob t = new TriggerIob().setValue(4.1d).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerIob t2 = (TriggerIob) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(4.1d, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_capslock), new TriggerIob().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        iobCobCalculatorPlugin = AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockProfileFunctions();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-    IobTotal generateIobRecordData() {
-        IobTotal iobTotal = new IobTotal(1);
-        iobTotal.iob = 1;
-        return iobTotal;
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt
new file mode 100644
index 0000000000..7df8805f20
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt
@@ -0,0 +1,84 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, IobCobCalculatorPlugin::class)
+class TriggerIobTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        `when`(DateUtil.now()).thenReturn(now)
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+    }
+
+    @Test fun shouldRunTest() {
+        `when`(iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Profile::class.java))).thenReturn(generateIobRecordData())
+        var t: TriggerIob = TriggerIob(injector).setValue(1.1).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerIob(injector).setValue(1.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(0.8).comparator(Comparator.Compare.IS_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(0.8).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(0.9).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(1.2).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(1.1).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerIob(injector).setValue(1.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerIob(injector).setValue(0.9).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerIob = TriggerIob(injector).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertEquals(213.0, t.insulin.value, 0.01)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"insulin\":4.1},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerIob\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerIob = TriggerIob(injector).setValue(4.1).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(bgJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerIob = TriggerIob(injector).setValue(4.1).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerIob
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(4.1, t2.insulin.value, 0.01)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_capslock), TriggerIob(injector).icon())
+    }
+
+    private fun generateIobRecordData(): IobTotal {
+        val iobTotal = IobTotal(1)
+        iobTotal.iob = 1.0
+        return iobTotal
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.java
deleted file mode 100644
index dcd98fb2e8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import android.location.Location;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.InputLocationMode;
-import info.nightscout.androidaps.services.LocationService;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, LocationService.class})
-
-public class TriggerLocationTest {
-
-    long now = 1514766900000L;
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        PowerMockito.mockStatic(LocationService.class);
-        when(DateUtil.now()).thenReturn(now);
-        PowerMockito.spy(LocationService.class);
-        PowerMockito.when(LocationService.getLastLocation()).thenReturn(mockedLocation());
-
-
-        MockitoAnnotations.initMocks(this);
-
-    }
-
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.latitude.setValue(213);
-        t.longitude.setValue(212);
-        t.distance.setValue(2);
-        t.modeSelected.setValue(InputLocationMode.Mode.INSIDE);
-
-
-        TriggerLocation t1 = (TriggerLocation) t.duplicate();
-        Assert.assertEquals(213d, t1.latitude.getValue(), 0.01d);
-        Assert.assertEquals(212d, t1.longitude.getValue(), 0.01d);
-        Assert.assertEquals(2d, t1.distance.getValue(), 0.01d);
-        Assert.assertEquals(InputLocationMode.Mode.INSIDE, t1.modeSelected.getValue());
-    }
-
-    @Test
-    public void shouldRunTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.latitude.setValue(213);
-        t.longitude.setValue(212);
-        t.distance.setValue(2);
-//        t.modeSelected.setValue(InputLocationMode.Mode.OUTSIDE);
-        PowerMockito.when(LocationService.getLastLocation()).thenReturn(null);
-        Assert.assertFalse(t.shouldRun());
-        PowerMockito.when(LocationService.getLastLocation()).thenReturn(mockedLocation());
-        Assert.assertTrue(t.shouldRun());
-        t.lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-        t = new TriggerLocation();
-        t.distance.setValue(-500);
-        Assert.assertFalse(t.shouldRun());
-
-        //Test of GOING_IN - last mode should be OUTSIDE, and current mode should be INSIDE
-        t = new TriggerLocation();
-        t.distance.setValue(50);
-        t.lastMode = t.currentMode(55d);
-        PowerMockito.when(LocationService.getLastLocation()).thenReturn(null);
-        PowerMockito.when(LocationService.getLastLocation()).thenReturn(mockedLocationOut());
-        t.modeSelected.setValue(InputLocationMode.Mode.GOING_IN);
-        Assert.assertEquals(t.lastMode, InputLocationMode.Mode.OUTSIDE);
-        Assert.assertEquals(t.currentMode(5d), InputLocationMode.Mode.INSIDE);
-        Assert.assertTrue(t.shouldRun());
-
-        //Test of GOING_OUT - last mode should be INSIDE, and current mode should be OUTSIDE
-        // Currently unavailable due to problems with Location mocking
-    }
-
-    String locationJson = "{\"data\":{\"mode\":\"OUTSIDE\",\"distance\":2,\"lastRun\":0,\"latitude\":213,\"name\":\"\",\"longitude\":212},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerLocation\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.latitude.setValue(213);
-        t.longitude.setValue(212);
-        t.distance.setValue(2);
-        t.modeSelected = t.modeSelected.setValue(InputLocationMode.Mode.OUTSIDE);
-        Assert.assertEquals(locationJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerLocation t = new TriggerLocation();
-        t.latitude.setValue(213);
-        t.longitude.setValue(212);
-        t.distance.setValue(2);
-        t.modeSelected.setValue(InputLocationMode.Mode.INSIDE);
-
-        TriggerLocation t2 = (TriggerLocation) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(t.latitude.getValue(), t2.latitude.getValue(), 0.01d);
-        Assert.assertEquals(t.longitude.getValue(), t2.longitude.getValue(), 0.01d);
-        Assert.assertEquals(t.distance.getValue(), t2.distance.getValue(), 0.01d);
-        Assert.assertEquals(t.modeSelected.getValue(), t2.modeSelected.getValue());
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.location, new TriggerLocation().friendlyName());
-    }
-
-    @Test
-    public void friendlyDescriptionTest() {
-        Assert.assertEquals(null, new TriggerLocation().friendlyDescription()); //not mocked    }
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_location_on), new TriggerLocation().icon());
-
-    }
-
-    @Test
-    public void setLatitudeTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.setLatitude(212);
-        Assert.assertEquals(t.latitude.getValue(), 212, 0d);
-    }
-
-    @Test
-    public void setLongitudeTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.setLongitude(213);
-        Assert.assertEquals(t.longitude.getValue(), 213, 0d);
-    }
-
-    @Test
-    public void setdistanceTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.setdistance(2);
-        Assert.assertEquals(t.distance.getValue(), 2, 0d);
-    }
-
-    @Test
-    public void setModeTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.setMode(InputLocationMode.Mode.INSIDE);
-        Assert.assertEquals(t.modeSelected.getValue(), InputLocationMode.Mode.INSIDE);
-    }
-
-    @Test
-    public void lastRunTest() {
-        TriggerLocation t = new TriggerLocation();
-        t.lastRun(now);
-        Assert.assertEquals(t.lastRun, 1514766900000L, 0d);
-    }
-
-    public Location mockedLocation() {
-        Location newLocation = new Location("test");
-        newLocation.setLatitude(10);
-        newLocation.setLongitude(11);
-        newLocation.setAccuracy(1f);
-        return newLocation;
-    }
-
-    public Location mockedLocationOut() {
-        Location newLocation = new Location("test");
-        newLocation.setLatitude(12f);
-        newLocation.setLongitude(13f);
-        newLocation.setAccuracy(1f);
-        return newLocation;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt
new file mode 100644
index 0000000000..30e6081b29
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt
@@ -0,0 +1,127 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.location.Location
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.InputLocationMode
+import info.nightscout.androidaps.services.LocationService
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, LocationService::class)
+class TriggerLocationTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.mockStatic(LocationService::class.java)
+        `when`(DateUtil.now()).thenReturn(now)
+        PowerMockito.spy(LocationService::class.java)
+        `when`(locationDataContainer.lastLocation).thenReturn(mockedLocation())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t = TriggerLocation(injector)
+        t.latitude.setValue(213.0)
+        t.longitude.setValue(212.0)
+        t.distance.setValue(2.0)
+        t.modeSelected.value = InputLocationMode.Mode.INSIDE
+        val t1 = t.duplicate() as TriggerLocation
+        Assert.assertEquals(213.0, t1.latitude.value, 0.01)
+        Assert.assertEquals(212.0, t1.longitude.value, 0.01)
+        Assert.assertEquals(2.0, t1.distance.value, 0.01)
+        Assert.assertEquals(InputLocationMode.Mode.INSIDE, t1.modeSelected.value)
+    }
+
+    @Test fun shouldRunTest() {
+        var t = TriggerLocation(injector)
+        t.latitude.setValue(213.0)
+        t.longitude.setValue(212.0)
+        t.distance.setValue(2.0)
+        //        t.modeSelected.setValue(InputLocationMode.Mode.OUTSIDE);
+        `when`(locationDataContainer.lastLocation).thenReturn(null)
+        Assert.assertFalse(t.shouldRun())
+        `when`(locationDataContainer.lastLocation).thenReturn(mockedLocation())
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerLocation(injector)
+        t.distance.setValue(-500.0)
+        Assert.assertFalse(t.shouldRun())
+
+        //Test of GOING_IN - last mode should be OUTSIDE, and current mode should be INSIDE
+        t = TriggerLocation(injector)
+        t.distance.setValue(50.0)
+        t.lastMode = t.currentMode(55.0)
+        `when`(locationDataContainer.lastLocation).thenReturn(null)
+        `when`(locationDataContainer.lastLocation).thenReturn(mockedLocationOut())
+        t.modeSelected.value = InputLocationMode.Mode.GOING_IN
+        Assert.assertEquals(t.lastMode, InputLocationMode.Mode.OUTSIDE)
+        Assert.assertEquals(t.currentMode(5.0), InputLocationMode.Mode.INSIDE)
+        Assert.assertTrue(t.shouldRun())
+
+        //Test of GOING_OUT - last mode should be INSIDE, and current mode should be OUTSIDE
+        // Currently unavailable due to problems with Location mocking
+    }
+
+    private var locationJson = "{\"data\":{\"mode\":\"OUTSIDE\",\"distance\":2,\"latitude\":213,\"name\":\"\",\"longitude\":212},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerLocation\"}"
+    @Test fun toJSONTest() {
+        val t = TriggerLocation(injector)
+        t.latitude.setValue(213.0)
+        t.longitude.setValue(212.0)
+        t.distance.setValue(2.0)
+        t.modeSelected.value = InputLocationMode.Mode.OUTSIDE
+//        t.modeSelected = t.modeSelected.value
+        Assert.assertEquals(locationJson, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t = TriggerLocation(injector)
+        t.latitude.setValue(213.0)
+        t.longitude.setValue(212.0)
+        t.distance.setValue(2.0)
+        t.modeSelected.value = InputLocationMode.Mode.INSIDE
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerLocation
+        Assert.assertEquals(t.latitude.value, t2.latitude.value, 0.01)
+        Assert.assertEquals(t.longitude.value, t2.longitude.value, 0.01)
+        Assert.assertEquals(t.distance.value, t2.distance.value, 0.01)
+        Assert.assertEquals(t.modeSelected.value, t2.modeSelected.value)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.location.toLong(), TriggerLocation(injector).friendlyName().toLong())
+    }
+
+    @Test fun friendlyDescriptionTest() {
+        Assert.assertEquals(null, TriggerLocation(injector).friendlyDescription()) //not mocked    }
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_location_on), TriggerLocation(injector).icon())
+    }
+
+    private fun mockedLocation(): Location {
+        val newLocation = Location("test")
+        newLocation.latitude = 10.0
+        newLocation.longitude = 11.0
+        newLocation.accuracy = 1f
+        return newLocation
+    }
+
+    private fun mockedLocationOut(): Location {
+        val newLocation = Location("test")
+        newLocation.latitude = 12.0
+        newLocation.longitude = 13.0
+        newLocation.accuracy = 1f
+        return newLocation
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java
deleted file mode 100644
index 4b83495937..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, L.class})
-public class TriggerProfilePercentTest {
-
-    private long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-
-        TriggerProfilePercent t = new TriggerProfilePercent().setValue(101d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(100d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(100d).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(90d).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(100d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(101d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerProfilePercent().setValue(215d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(110d).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerProfilePercent().setValue(90d).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun());
-
-        // already run
-        t = new TriggerProfilePercent().setValue(101d).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerProfilePercent t = new TriggerProfilePercent().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerProfilePercent t1 = (TriggerProfilePercent) t.duplicate();
-        Assert.assertEquals(213d, t1.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerProfilePercent t = new TriggerProfilePercent().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1L, t.getLastRun());
-    }
-
-    private String bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"percentage\":110},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerProfilePercent t = new TriggerProfilePercent().setValue(110d).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(bgJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerProfilePercent t = new TriggerProfilePercent().setValue(120d).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerProfilePercent t2 = (TriggerProfilePercent) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(120d, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), new TriggerProfilePercent().icon());
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.profilepercentage, new TriggerProfilePercent().friendlyName()); // not mocked
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockL();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
new file mode 100644
index 0000000000..9a03087c4e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
@@ -0,0 +1,78 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class)
+class TriggerProfilePercentTest : TriggerTestBase() {
+
+    private val now = 1514766900000L
+
+    @Before fun mock() {
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test fun shouldRunTest() {
+        var t: TriggerProfilePercent = TriggerProfilePercent(injector).setValue(101.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(100.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(100.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(90.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(100.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(101.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(215.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(110.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerProfilePercent(injector).setValue(90.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerProfilePercent = TriggerProfilePercent(injector).setValue(213.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerProfilePercent
+        Assert.assertEquals(213.0, t1.pct.value, 0.01)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private val bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"percentage\":110},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerProfilePercent = TriggerProfilePercent(injector).setValue(110.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(bgJson, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t: TriggerProfilePercent = TriggerProfilePercent(injector).setValue(120.0).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerProfilePercent
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(120.0, t2.pct.value, 0.01)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), TriggerProfilePercent(injector).icon())
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.profilepercentage.toLong(), TriggerProfilePercent(injector).friendlyName().toLong()) // not mocked
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.java
deleted file mode 100644
index 9ba61af960..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, TreatmentsPlugin.class, ConfigBuilderPlugin.class, System.class})
-public class TriggerPumpLastConnectionTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-//        System.currentTimeMillis() is always 0
-//        and so is every last connection time
-        VirtualPumpPlugin virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
-        Assert.assertEquals(0L, virtualPumpPlugin.lastDataTime());
-        TriggerPumpLastConnection t = new TriggerPumpLastConnection().setValue(110).comparator(Comparator.Compare.IS_EQUAL).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-        when(DateUtil.now()).thenReturn(now + (10*60*1000)); // set current time to now + 10 min
-        t = new TriggerPumpLastConnection().setValue(110).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(110, t.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.getComparator().getValue());
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerPumpLastConnection().setValue(10).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(10, t.getValue(), 0.01d);
-        Assert.assertFalse(t.shouldRun()); // 0 == 10 -> FALSE
-        t = new TriggerPumpLastConnection().setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER);
-        Assert.assertTrue(t.shouldRun()); // 5 => 0 -> TRUE
-        t = new TriggerPumpLastConnection().setValue(310).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        Assert.assertFalse(t.shouldRun()); // 310 <= 0 -> FALSE
-        t = new TriggerPumpLastConnection().setValue(420).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertFalse(t.shouldRun()); // 420 == 0 -> FALSE
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerPumpLastConnection t = new TriggerPumpLastConnection().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerPumpLastConnection t1 = (TriggerPumpLastConnection) t.duplicate();
-        Assert.assertEquals(213, t1.getValue(), 0.01d);
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    @Test
-    public void executeTest() {
-        TriggerPumpLastConnection t = new TriggerPumpLastConnection().setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        t.executed(1);
-        Assert.assertEquals(1l, t.getLastRun());
-    }
-
-    String LBJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"minutesAgo\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerPumpLastConnection\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerPumpLastConnection t = new TriggerPumpLastConnection().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(LBJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerPumpLastConnection t = new TriggerPumpLastConnection().setValue(410).comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerPumpLastConnection t2 = (TriggerPumpLastConnection) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals(410, t2.getValue(), 0.01d);
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.remove), new TriggerPumpLastConnection().icon());
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.automation_trigger_pump_last_connection_label, new TriggerPumpLastConnection().friendlyName());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
new file mode 100644
index 0000000000..d834fcd642
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
@@ -0,0 +1,82 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, VirtualPumpPlugin::class)
+class TriggerPumpLastConnectionTest : TriggerTestBase() {
+
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    var now = 1514766900000L
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test
+    fun shouldRunTest() {
+//        System.currentTimeMillis() is always 0
+//        and so is every last connection time
+        PowerMockito.`when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        Assert.assertEquals(0L, virtualPumpPlugin.lastDataTime())
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
+        var t = TriggerPumpLastConnection(injector).setValue(110).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(110, t.minutesAgo.value)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.comparator.value)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerPumpLastConnection(injector).setValue(10).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(10, t.minutesAgo.value)
+        Assert.assertFalse(t.shouldRun()) // 0 == 10 -> FALSE
+        t = TriggerPumpLastConnection(injector).setValue(5).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun()) // 5 => 0 -> TRUE
+        t = TriggerPumpLastConnection(injector).setValue(310).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun()) // 310 <= 0 -> FALSE
+        t = TriggerPumpLastConnection(injector).setValue(420).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun()) // 420 == 0 -> FALSE
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerPumpLastConnection = TriggerPumpLastConnection(injector).setValue(213).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerPumpLastConnection
+        Assert.assertEquals(213, t1.minutesAgo.value)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var lbJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"minutesAgo\":410},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerPumpLastConnection\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerPumpLastConnection = TriggerPumpLastConnection(injector).setValue(410).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(lbJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerPumpLastConnection = TriggerPumpLastConnection(injector).setValue(410).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerPumpLastConnection
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(410, t2.minutesAgo.value)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.remove), TriggerPumpLastConnection(injector).icon())
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.automation_trigger_pump_last_connection_label.toLong(), TriggerPumpLastConnection(injector).friendlyName().toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.java
deleted file mode 100644
index c9b463dfd0..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.GregorianCalendar;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, DateUtil.class, GregorianCalendar.class})
-public class TriggerRecurringTimeTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-
-        // limit by validTo
-        TriggerRecurringTime t = new TriggerRecurringTime().hour(1).minute(34).validTo(1);
-        t.setAll(true);
-        Assert.assertFalse(t.shouldRun());
-
-        // scheduled 1 min before
-//        t = new TriggerRecurringTime().hour(1).minute(34);
-//        t.setAll(true);
-//        Assert.assertTrue(t.shouldRun());
-
-        // already run
-        t = new TriggerRecurringTime().hour(1).minute(34).lastRun(now - 1);
-        t.setAll(true);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    String timeJson = "{\"data\":{\"WEDNESDAY\":false,\"MONDAY\":false,\"THURSDAY\":false,\"lastRun\":1514766840000,\"SUNDAY\":false,\"hour\":0,\"TUESDAY\":false,\"FRIDAY\":false,\"SATURDAY\":false,\"minute\":0,\"validTo\":0},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerRecurringTime\"}";
-
-    @Test
-    public void toJSONTest() throws JSONException {
-        TriggerRecurringTime t = new TriggerRecurringTime().lastRun(now - T.mins(1).msecs());
-        Assert.assertEquals(timeJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerRecurringTime t = new TriggerRecurringTime().lastRun(now - T.mins(1).msecs());
-
-        TriggerRecurringTime t2 = (TriggerRecurringTime) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(now - T.mins(1).msecs(), t2.lastRun);    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-        GregorianCalendar calendar = new GregorianCalendar();
-        calendar.setTimeInMillis(now);
-        when(DateUtil.gregorianCalendar()).thenReturn(calendar);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
new file mode 100644
index 0000000000..566a0b4c7b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class)
+class TriggerRecurringTimeTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+//        val calendar = GregorianCalendar()
+//        calendar.timeInMillis = now
+//        PowerMockito.`when`(DateUtil.gregorianCalendar()).thenReturn(calendar)
+    }
+
+    @Test fun shouldRunTest() {
+
+        // limit by validTo
+        var t: TriggerRecurringTime = TriggerRecurringTime(injector).time(94)
+        t.days.setAll(true)
+        Assert.assertFalse(t.shouldRun())
+
+        // scheduled 1 min before
+//        t = new TriggerRecurringTime().hour(1).minute(34);
+//        t.setAll(true);
+//        Assert.assertTrue(t.shouldRun());
+
+        // already run
+        t = TriggerRecurringTime(injector).time(94)
+        t.days.setAll(true)
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    private var timeJson = "{\"data\":{\"WEDNESDAY\":false,\"MONDAY\":false,\"THURSDAY\":false,\"SUNDAY\":false,\"TUESDAY\":false,\"FRIDAY\":false,\"SATURDAY\":false,\"time\":4444},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerRecurringTime\"}"
+
+    @Test
+    fun toJSONTest() {
+        val t = TriggerRecurringTime(injector).time(4444)
+        Assert.assertEquals(timeJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t = TriggerRecurringTime(injector).time(4444)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerRecurringTime
+        Assert.assertEquals(4444, t2.time.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java
deleted file mode 100644
index 03c7e5cda2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ProfileFunctions.class, DateUtil.class, TreatmentsPlugin.class})
-public class TriggerTempTargetTest {
-
-    TreatmentsPlugin treatmentsPlugin;
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        when(treatmentsPlugin.getTempTargetFromHistory()).thenReturn(null);
-
-        TriggerTempTarget t = new TriggerTempTarget().comparator(ComparatorExists.Compare.EXISTS);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerTempTarget().comparator(ComparatorExists.Compare.NOT_EXISTS);
-        Assert.assertTrue(t.shouldRun());
-
-        when(treatmentsPlugin.getTempTargetFromHistory()).thenReturn(new TempTarget());
-
-        t = new TriggerTempTarget().comparator(ComparatorExists.Compare.NOT_EXISTS);
-        Assert.assertFalse(t.shouldRun());
-        t = new TriggerTempTarget().comparator(ComparatorExists.Compare.EXISTS);
-        Assert.assertTrue(t.shouldRun());
-
-        t = new TriggerTempTarget().comparator(ComparatorExists.Compare.EXISTS).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerTempTarget t = new TriggerTempTarget().comparator(ComparatorExists.Compare.NOT_EXISTS);
-        TriggerTempTarget t1 = (TriggerTempTarget) t.duplicate();
-        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, t.getComparator().getValue());
-    }
-
-    String ttJson = "{\"data\":{\"comparator\":\"EXISTS\",\"lastRun\":0},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTempTarget\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerTempTarget t = new TriggerTempTarget().comparator(ComparatorExists.Compare.EXISTS);
-        Assert.assertEquals(ttJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerTempTarget t = new TriggerTempTarget().comparator(ComparatorExists.Compare.NOT_EXISTS);
-
-        TriggerTempTarget t2 = (TriggerTempTarget) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, t2.getComparator().getValue());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_tab), new TriggerTempTarget().icon());
-    }
-
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        treatmentsPlugin = AAPSMocker.mockTreatmentPlugin();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt
new file mode 100644
index 0000000000..9632e3aa78
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class, TreatmentsPlugin::class)
+class TriggerTempTargetTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test fun shouldRunTest() {
+        `when`(treatmentsPlugin.tempTargetFromHistory).thenReturn(null)
+        var t: TriggerTempTarget = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.EXISTS)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
+        Assert.assertTrue(t.shouldRun())
+        PowerMockito.`when`(treatmentsPlugin.tempTargetFromHistory).thenReturn(TempTarget())
+        t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.EXISTS)
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerTempTarget = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
+        val t1 = t.duplicate() as TriggerTempTarget
+        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, t1.comparator.value)
+    }
+
+    private var ttJson = "{\"data\":{\"comparator\":\"EXISTS\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTempTarget\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerTempTarget = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.EXISTS)
+        Assert.assertEquals(ttJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerTempTarget = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerTempTarget
+        Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, t2.comparator.value)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_tab), TriggerTempTarget(injector).icon())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
new file mode 100644
index 0000000000..d130d031f2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -0,0 +1,76 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.services.LastLocationDataContainer
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Before
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+
+@PrepareForTest(LastLocationDataContainer::class, AutomationPlugin::class)
+open class TriggerTestBase : TestBaseWithProfile() {
+
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var sp: SP
+    @Mock lateinit var locationDataContainer: LastLocationDataContainer
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Mock lateinit var context: Context
+    @Mock lateinit var automationPlugin: AutomationPlugin
+
+    lateinit var receiverStatusStore: ReceiverStatusStore
+
+    @Before
+    fun prepareMock1() {
+        receiverStatusStore = ReceiverStatusStore(context, rxBus)
+    }
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Trigger) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = RxBusWrapper()
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+                it.sp = sp
+                it.locationDataContainer = locationDataContainer
+                it.treatmentsPlugin = treatmentsPlugin
+                it.activePlugin = activePlugin
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+            if (it is TriggerBg) {
+                it.profileFunction = profileFunction
+            }
+            if (it is TriggerBTDevice) {
+                it.context = context
+                it.automationPlugin = automationPlugin
+            }
+            if (it is TriggerWifiSsid) {
+                it.receiverStatusStore = receiverStatusStore
+            }
+            if (it is InputBg) {
+                it.profileFunction = profileFunction
+            }
+            if (it is GlucoseStatus) {
+                it.aapsLogger = aapsLogger
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+            if (it is StaticLabel) {
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.java
deleted file mode 100644
index 6b36cc1fd3..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.GregorianCalendar;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, DateUtil.class, GregorianCalendar.class})
-public class TriggerTimeRangeTest {
-
-    int now = 754;
-    int timeZoneOffset = (int) (DateUtil.getTimeZoneOffsetMs() / 60000);
-
-    String timeJson = "{\"data\":{\"lastRun\":0,\"start\":753,\"end\":784},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTimeRange\"}";
-
-    @Test
-    public void shouldRunTest() {
-
-        TriggerTimeRange t;
-        now = now + timeZoneOffset;
-        // range starts 1 min in the future
-        t = new TriggerTimeRange().period(now + 1 - timeZoneOffset, now + 30 - timeZoneOffset);
-        Assert.assertEquals(false, t.shouldRun());
-
-        // range starts 30 min back
-        t = new TriggerTimeRange().period(now - 30 - timeZoneOffset, now + 30 - timeZoneOffset);
-        Assert.assertEquals(true, t.shouldRun());
-
-        // Period is all day long
-        t = new TriggerTimeRange().period(1, 1440);
-        Assert.assertEquals(true, t.shouldRun());
-
-        // already run
-        t = new TriggerTimeRange().lastRun((long) (now  - 1)*60000);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    @Test
-    public void toJSONTest() {
-        TriggerTimeRange t = new TriggerTimeRange().period(now - 1 - timeZoneOffset , now + 30 - timeZoneOffset);
-        Assert.assertEquals(timeJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerTimeRange t = new TriggerTimeRange().period(120 , 180);
-
-        TriggerTimeRange t2 = (TriggerTimeRange) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(timeZoneOffset + now - 1, t2.period(753 , 360).getStart());
-        Assert.assertEquals(timeZoneOffset + 360, t2.period(753 , 360).getEnd());
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerTimeRange t = new TriggerTimeRange();
-        t.period(now, now + 30);
-
-        TriggerTimeRange t1 = (TriggerTimeRange) t.duplicate();
-//        Assert.assertEquals(now, t1.getRunAt(), 0.01d);
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.time_range, new TriggerTimeRange().friendlyName());
-    }
-
-    @Test
-    public void friendlyDescriptionTest() {
-        Assert.assertEquals(null, new TriggerTimeRange().friendlyDescription()); //not mocked    }
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_access_alarm_24dp), new TriggerTimeRange().icon());
-
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn((long) now * 60000);
-
-        GregorianCalendar calendar = new GregorianCalendar();
-        calendar.setTimeInMillis((long) now * 60000);
-        when(DateUtil.gregorianCalendar()).thenReturn(calendar);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt
new file mode 100644
index 0000000000..dba3ddce80
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt
@@ -0,0 +1,77 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.MidnightTime
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class)
+class TriggerTimeRangeTest : TriggerTestBase() {
+
+    var now = 754 // in minutes from midnight
+    private var timeJson = "{\"data\":{\"start\":753,\"end\":784},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTimeRange\"}"
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        val nowMills = MidnightTime.calcPlusMinutes(now)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(nowMills)
+    }
+
+    @Test
+    fun shouldRunTest() {
+        // range starts 1 min in the future
+        var t: TriggerTimeRange = TriggerTimeRange(injector).period(now + 1, now + 30)
+        Assert.assertEquals(false, t.shouldRun())
+
+        // range starts 30 min back
+        t = TriggerTimeRange(injector).period(now - 30, now + 30)
+        Assert.assertEquals(true, t.shouldRun())
+
+        // Period is all day long
+        t = TriggerTimeRange(injector).period(1, 1440)
+        Assert.assertEquals(true, t.shouldRun())
+    }
+
+    @Test
+    fun toJSONTest() {
+        val t: TriggerTimeRange = TriggerTimeRange(injector).period(now - 1, now + 30)
+        Assert.assertEquals(timeJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerTimeRange = TriggerTimeRange(injector).period(120, 180)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerTimeRange
+        Assert.assertEquals(now - 1, t2.period(753, 360).range.start)
+        Assert.assertEquals(360, t2.period(753, 360).range.end)
+    }
+
+    @Test fun copyConstructorTest() {
+        val t = TriggerTimeRange(injector)
+        t.period(now, now + 30)
+        val t1 = t.duplicate() as TriggerTimeRange
+        Assert.assertEquals(now, t1.range.start)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.time_range.toLong(), TriggerTimeRange(injector).friendlyName().toLong())
+    }
+
+    @Test fun friendlyDescriptionTest() {
+        Assert.assertEquals(null, TriggerTimeRange(injector).friendlyDescription()) //not mocked    }
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_access_alarm_24dp), TriggerTimeRange(injector).icon())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java
deleted file mode 100644
index b4b1794481..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.GregorianCalendar;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, DateUtil.class, GregorianCalendar.class})
-public class TriggerTimeTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-
-        // scheduled 1 min before
-        TriggerTime t = new TriggerTime().runAt(now - T.mins(1).msecs());
-        Assert.assertTrue(t.shouldRun());
-
-        // scheduled 1 min in the future
-        t = new TriggerTime().runAt(now + T.mins(1).msecs());
-        Assert.assertFalse(t.shouldRun());
-
-        // already run
-        t = new TriggerTime().runAt(now - T.mins(1).msecs()).lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-    }
-
-    String timeJson = "{\"data\":{\"runAt\":1514766840000,\"lastRun\":0},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTime\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerTime t = new TriggerTime().runAt(now - T.mins(1).msecs());
-        Assert.assertEquals(timeJson, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerTime t = new TriggerTime().runAt(now - T.mins(1).msecs());
-
-        TriggerTime t2 = (TriggerTime) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(now - T.mins(1).msecs(), t2.getRunAt());
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerTime t = new TriggerTime();
-        t.runAt(now);
-
-        TriggerTime t1 = (TriggerTime) t.duplicate();
-        Assert.assertEquals(now, t1.getRunAt(), 0.01d);
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.time, new TriggerTime().friendlyName());
-    }
-
-    @Test
-    public void friendlyDescriptionTest() {
-        Assert.assertEquals(null, new TriggerTime().friendlyDescription()); //not mocked    }
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_access_alarm_24dp), new TriggerTime().icon());
-
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-
-        GregorianCalendar calendar = new GregorianCalendar();
-        calendar.setTimeInMillis(now);
-        when(DateUtil.gregorianCalendar()).thenReturn(calendar);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt
new file mode 100644
index 0000000000..e5b993c193
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt
@@ -0,0 +1,69 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DateUtil::class)
+class TriggerTimeTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test fun shouldRunTest() {
+
+        // scheduled 1 min before
+        var t: TriggerTime = TriggerTime(injector).runAt(now - T.mins(1).msecs())
+        Assert.assertTrue(t.shouldRun())
+
+        // scheduled 1 min in the future
+        t = TriggerTime(injector).runAt(now + T.mins(1).msecs())
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    private var timeJson = "{\"data\":{\"runAt\":1514766840000},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTime\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerTime = TriggerTime(injector).runAt(now - T.mins(1).msecs())
+        Assert.assertEquals(timeJson, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t: TriggerTime = TriggerTime(injector).runAt(now - T.mins(1).msecs())
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerTime
+        Assert.assertEquals(now - T.mins(1).msecs(), t2.time.value)
+    }
+
+    @Test fun copyConstructorTest() {
+        val t = TriggerTime(injector)
+        t.runAt(now)
+        val t1 = t.duplicate() as TriggerTime
+        Assert.assertEquals(now, t1.time.value)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.time.toLong(), TriggerTime(injector).friendlyName().toLong())
+    }
+
+    @Test fun friendlyDescriptionTest() {
+        Assert.assertEquals(null, TriggerTime(injector).friendlyDescription()) //not mocked    }
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_access_alarm_24dp), TriggerTime(injector).icon())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java
deleted file mode 100644
index d6eef521ed..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package info.nightscout.androidaps.plugins.general.automation.triggers;
-
-import com.google.common.base.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator;
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
-import info.nightscout.androidaps.utils.DateUtil;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, NetworkChangeReceiver.class, DateUtil.class})
-public class TriggerWifiSsidTest {
-
-    long now = 1514766900000L;
-
-    @Test
-    public void shouldRunTest() {
-        EventNetworkChange e = new EventNetworkChange();
-        when(NetworkChangeReceiver.getLastEvent()).thenReturn(e);
-
-        TriggerWifiSsid t = new TriggerWifiSsid().setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL);
-
-        e.setWifiConnected(false);
-        Assert.assertFalse(t.shouldRun());
-
-        e.setWifiConnected(true);
-        e.setSsid("otherSSID");
-        Assert.assertFalse(t.shouldRun());
-
-        e.setWifiConnected(true);
-        e.setSsid("aSSID");
-        Assert.assertTrue(t.shouldRun());
-
-        t.lastRun(now - 1);
-        Assert.assertFalse(t.shouldRun());
-
-        t = new TriggerWifiSsid().setValue("aSSID").comparator(Comparator.Compare.IS_NOT_AVAILABLE);
-        e.setWifiConnected(false);
-        Assert.assertTrue(t.shouldRun());
-
-        // no network data
-        when(NetworkChangeReceiver.getLastEvent()).thenReturn(null);
-        Assert.assertFalse(t.shouldRun());
-    }
-
-    @Test
-    public void copyConstructorTest() {
-        TriggerWifiSsid t = new TriggerWifiSsid().setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL_OR_LESSER);
-        TriggerWifiSsid t1 = (TriggerWifiSsid) t.duplicate();
-        Assert.assertEquals("aSSID", t1.getValue());
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.getComparator().getValue());
-    }
-
-    String json = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"ssid\":\"aSSID\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerWifiSsid\"}";
-
-    @Test
-    public void toJSONTest() {
-        TriggerWifiSsid t = new TriggerWifiSsid().setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL);
-        Assert.assertEquals(json, t.toJSON());
-    }
-
-    @Test
-    public void fromJSONTest() throws JSONException {
-        TriggerWifiSsid t = new TriggerWifiSsid().setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL);
-
-        TriggerWifiSsid t2 = (TriggerWifiSsid) Trigger.instantiate(new JSONObject(t.toJSON()));
-        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.getComparator().getValue());
-        Assert.assertEquals("aSSID", t2.getValue());
-    }
-
-    @Test
-    public void iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.ic_network_wifi), new TriggerWifiSsid().icon());
-    }
-
-    @Test
-    public void friendlyNameTest() {
-        Assert.assertEquals(R.string.ns_wifi_ssids, new TriggerWifiSsid().friendlyName());
-    }
-
-    @Test
-    public void friendlyDescriptionTest() {
-        Assert.assertEquals(null, new TriggerWifiSsid().friendlyDescription()); //not mocked
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-
-        PowerMockito.mockStatic(NetworkChangeReceiver.class);
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(now);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt
new file mode 100644
index 0000000000..7dcdac3ea4
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.receivers.NetworkChangeReceiver
+import info.nightscout.androidaps.utils.DateUtil
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(NetworkChangeReceiver::class, DateUtil::class)
+class TriggerWifiSsidTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before fun mock() {
+        PowerMockito.mockStatic(NetworkChangeReceiver::class.java)
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+    }
+
+    @Test fun shouldRunTest() {
+        val e = EventNetworkChange()
+        receiverStatusStore.lastNetworkEvent = e
+        var t: TriggerWifiSsid = TriggerWifiSsid(injector).setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL)
+        e.wifiConnected = false
+        Assert.assertFalse(t.shouldRun())
+        e.wifiConnected = true
+        e.ssid = "otherSSID"
+        Assert.assertFalse(t.shouldRun())
+        e.wifiConnected = true
+        e.ssid = "aSSID"
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerWifiSsid(injector).setValue("aSSID").comparator(Comparator.Compare.IS_NOT_AVAILABLE)
+        e.wifiConnected = false
+        Assert.assertTrue(t.shouldRun())
+
+        // no network data
+        receiverStatusStore.lastNetworkEvent = null
+        Assert.assertFalse(t.shouldRun())
+    }
+
+    @Test fun copyConstructorTest() {
+        val t: TriggerWifiSsid = TriggerWifiSsid(injector).setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerWifiSsid
+        Assert.assertEquals("aSSID", t1.ssid.value)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    var json = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"ssid\":\"aSSID\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerWifiSsid\"}"
+    @Test fun toJSONTest() {
+        val t: TriggerWifiSsid = TriggerWifiSsid(injector).setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(json, t.toJSON())
+    }
+
+    @Test @Throws(JSONException::class) fun fromJSONTest() {
+        val t: TriggerWifiSsid = TriggerWifiSsid(injector).setValue("aSSID").comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerWifiSsid
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals("aSSID", t2.ssid.value)
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_network_wifi), TriggerWifiSsid(injector).icon())
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.ns_wifi_ssids.toLong(), TriggerWifiSsid(injector).friendlyName().toLong())
+    }
+
+    @Test fun friendlyDescriptionTest() {
+        Assert.assertEquals(null, TriggerWifiSsid(injector).friendlyDescription()) //not mocked
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialogTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialogTest.java
deleted file mode 100644
index 11f01d2486..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialogTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal.Dialogs;
-
-import android.content.Context;
-
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.SPMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-import static info.nightscout.androidaps.plugins.general.careportal.CareportalFragment.PROFILESWITCH;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SP.class, MainApp.class, ConfigBuilderPlugin.class, Context.class, NSUpload.class, TreatmentsPlugin.class, TreatmentService.class, DatabaseHelper.class})
-public class NewNSTreatmentDialogTest {
-
-    NewNSTreatmentDialog dialog;
-    ProfileSwitch profileSwitchUpload = null;
-
-    @Test
-    public void createNSTreatmentTest() throws Exception {
-        // Test profile creation
-        doAnswer(invocation -> {
-            ProfileSwitch ps = invocation.getArgument(0);
-            profileSwitchUpload = ps;
-            return null;
-        }).when(NSUpload.class, "uploadProfileSwitch", ArgumentMatchers.any());
-        dialog.setOptions(PROFILESWITCH, R.string.careportal_profileswitch);
-        dialog.profileStore = AAPSMocker.getValidProfileStore();
-        dialog.eventTime = new Date();
-        JSONObject data = new JSONObject();
-        data.put("eventType", CareportalEvent.PROFILESWITCH);
-        data.put("profile", AAPSMocker.TESTPROFILENAME);
-        data.put("duration", 0);
-        data.put("percentage", 110);
-        data.put("timeshift", 0);
-        dialog.createNSTreatment(data);
-
-        // Profile should be sent to NS
-        Assert.assertEquals(AAPSMocker.TESTPROFILENAME, profileSwitchUpload.profileName);
-    }
-
-    @Before
-    public void prepareMock() throws Exception {
-        AAPSMocker.mockMainApp();
-        SPMocker.prepareMock();
-        SP.putString("profile", AAPSMocker.getValidProfileStore().getData().toString());
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        PowerMockito.mockStatic(NSUpload.class);
-        AAPSMocker.mockTreatmentService();
-        AAPSMocker.mockDatabaseHelper();
-
-        NSProfilePlugin profilePlugin = NSProfilePlugin.getPlugin();
-        when(ConfigBuilderPlugin.getPlugin().getActiveProfileInterface())
-                .thenReturn(profilePlugin);
-
-        dialog = new NewNSTreatmentDialog();
-
-        PowerMockito.spy(System.class);
-        when(System.currentTimeMillis()).thenReturn(1000L);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt
new file mode 100644
index 0000000000..0755190d2b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.general.maintenance.formats.ClassicPrefsFormat
+import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs
+import info.nightscout.androidaps.testing.mockers.AAPSMocker
+import info.nightscout.androidaps.testing.utils.SingleStringStorage
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.hamcrest.CoreMatchers
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.io.File
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(AAPSMocker::class, MainApp::class, File::class)
+
+class ClassicPrefsFormatTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+
+    @Before
+    fun mock() {
+        AAPSMocker.prepareMock()
+        AAPSMocker.resetMockedSharedPrefs()
+    }
+
+    @Test
+    fun preferenceLoadingTest() {
+        val test = "key1::val1\nkeyB::valB"
+
+        val classicFormat = ClassicPrefsFormat(resourceHelper, SingleStringStorage(test))
+        val prefs = classicFormat.loadPreferences(AAPSMocker.getMockedFile(), "")
+
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(2))
+        Assert.assertThat(prefs.values["key1"], CoreMatchers.`is`("val1"))
+        Assert.assertThat(prefs.values["keyB"], CoreMatchers.`is`("valB"))
+        Assert.assertNull(prefs.values["key3"])
+    }
+
+    @Test
+    fun preferenceSavingTest() {
+        val storage = SingleStringStorage("")
+        val classicFormat = ClassicPrefsFormat(resourceHelper, storage)
+        val prefs = Prefs(
+            mapOf(
+                "key1" to "A",
+                "keyB" to "2"
+            ),
+            mapOf()
+        )
+
+        classicFormat.savePreferences(AAPSMocker.getMockedFile(), prefs)
+    }
+
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt
new file mode 100644
index 0000000000..16c2f4b0ef
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt
@@ -0,0 +1,226 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.general.maintenance.formats.*
+import info.nightscout.androidaps.testing.mockers.AAPSMocker
+import info.nightscout.androidaps.testing.utils.SingleStringStorage
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.hamcrest.CoreMatchers
+import org.json.JSONException
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PowerMockIgnore
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.io.File
+
+@PowerMockIgnore("javax.crypto.*")
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(AAPSMocker::class, MainApp::class, File::class, ResourceHelper::class)
+
+class EncryptedPrefsFormatTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+
+    @Before
+    fun mock() {
+        AAPSMocker.prepareMock()
+        AAPSMocker.resetMockedSharedPrefs()
+        Mockito.`when`(resourceHelper.gs(ArgumentMatchers.anyInt())).thenReturn("mock translation")
+    }
+
+    @Test
+    fun preferenceLoadingTest() {
+        val frozenPrefs = "{\n" +
+            "  \"metadata\": {},\n" +
+            "  \"security\": {\n" +
+            "    \"salt\": \"9581d7a9e56d8127ad6b74a876fa60b192b1c6f4343d857bc07e3874589f2fc9\",\n" +
+            "    \"file_hash\": \"9122fd04a4938030b62f6b9d6dda63a11c265e673c4aecbcb6dcd62327c025bb\",\n" +
+            "    \"content_hash\": \"23f999f6e6d325f649b61871fe046a94e110bf1587ff070fb66a0f8085b2760c\",\n" +
+            "    \"algorithm\": \"v1\"\n" +
+            "  },\n" +
+            "  \"format\": \"aaps_encrypted\",\n" +
+            "  \"content\": \"DJ5+HP/gq7icRQhbG9PEBJCMuNwBssIytfEQPCNkzn7PHMfMZuc09vYQg3qzFkmULLiotg==\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(2))
+        Assert.assertThat(prefs.values["key1"], CoreMatchers.`is`("A"))
+        Assert.assertThat(prefs.values["keyB"], CoreMatchers.`is`("2"))
+
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.FILE_FORMAT]?.status, CoreMatchers.`is`(PrefsStatus.OK))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.FILE_FORMAT]?.value, CoreMatchers.`is`(EncryptedPrefsFormat.FORMAT_KEY_ENC))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.ENCRYPTION]?.status, CoreMatchers.`is`(PrefsStatus.OK))
+    }
+
+    @Test
+    fun preferenceSavingTest() {
+        val storage = SingleStringStorage("")
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = Prefs(
+            mapOf(
+                "key1" to "A",
+                "keyB" to "2"
+            ),
+            mapOf(
+                PrefsMetadataKey.ENCRYPTION to PrefMetadata(EncryptedPrefsFormat.FORMAT_KEY_ENC, PrefsStatus.OK)
+            )
+        )
+        encryptedFormat.savePreferences(AAPSMocker.getMockedFile(), prefs, "sikret")
+        aapsLogger.debug(storage.contents)
+    }
+
+    @Test
+    fun importExportStabilityTest() {
+        val storage = SingleStringStorage("")
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefsIn = Prefs(
+            mapOf(
+                "testpref1" to "--1--",
+                "testpref2" to "another"
+            ),
+            mapOf(
+                PrefsMetadataKey.ENCRYPTION to PrefMetadata(EncryptedPrefsFormat.FORMAT_KEY_ENC, PrefsStatus.OK)
+            )
+        )
+        encryptedFormat.savePreferences(AAPSMocker.getMockedFile(), prefsIn, "tajemnica")
+        val prefsOut = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "tajemnica")
+
+        Assert.assertThat(prefsOut.values.size, CoreMatchers.`is`(2))
+        Assert.assertThat(prefsOut.values["testpref1"], CoreMatchers.`is`("--1--"))
+        Assert.assertThat(prefsOut.values["testpref2"], CoreMatchers.`is`("another"))
+
+        Assert.assertThat(prefsOut.metadata[PrefsMetadataKey.FILE_FORMAT]?.status, CoreMatchers.`is`(PrefsStatus.OK))
+        Assert.assertThat(prefsOut.metadata[PrefsMetadataKey.FILE_FORMAT]?.value, CoreMatchers.`is`(EncryptedPrefsFormat.FORMAT_KEY_ENC))
+        Assert.assertThat(prefsOut.metadata[PrefsMetadataKey.ENCRYPTION]?.status, CoreMatchers.`is`(PrefsStatus.OK))
+    }
+
+    @Test
+    fun wrongPasswordTest() {
+        val frozenPrefs = "{\n" +
+            "  \"metadata\": {},\n" +
+            "  \"security\": {\n" +
+            "    \"salt\": \"9581d7a9e56d8127ad6b74a876fa60b192b1c6f4343d857bc07e3874589f2fc9\",\n" +
+            "    \"file_hash\": \"9122fd04a4938030b62f6b9d6dda63a11c265e673c4aecbcb6dcd62327c025bb\",\n" +
+            "    \"content_hash\": \"23f999f6e6d325f649b61871fe046a94e110bf1587ff070fb66a0f8085b2760c\",\n" +
+            "    \"algorithm\": \"v1\"\n" +
+            "  },\n" +
+            "  \"format\": \"aaps_encrypted\",\n" +
+            "  \"content\": \"DJ5+HP/gq7icRQhbG9PEBJCMuNwBssIytfEQPCNkzn7PHMfMZuc09vYQg3qzFkmULLiotg==\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "it-is-NOT-right-secret")
+
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(0))
+
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.FILE_FORMAT]?.status, CoreMatchers.`is`(PrefsStatus.OK))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.FILE_FORMAT]?.value, CoreMatchers.`is`(EncryptedPrefsFormat.FORMAT_KEY_ENC))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.ENCRYPTION]?.status, CoreMatchers.`is`(PrefsStatus.ERROR))
+    }
+
+    @Test
+    fun tamperedMetadataTest() {
+        val frozenPrefs = "{\n" +
+            "  \"metadata\": {" +
+            "      \"created-by\":\"I am legit, trust me, no-one lies on internets!\"" +
+            "  },\n" +
+            "  \"security\": {\n" +
+            "    \"salt\": \"9581d7a9e56d8127ad6b74a876fa60b192b1c6f4343d857bc07e3874589f2fc9\",\n" +
+            "    \"file_hash\": \"9122fd04a4938030b62f6b9d6dda63a11c265e673c4aecbcb6dcd62327c025bb\",\n" +
+            "    \"content_hash\": \"23f999f6e6d325f649b61871fe046a94e110bf1587ff070fb66a0f8085b2760c\",\n" +
+            "    \"algorithm\": \"v1\"\n" +
+            "  },\n" +
+            "  \"format\": \"aaps_encrypted\",\n" +
+            "  \"content\": \"DJ5+HP/gq7icRQhbG9PEBJCMuNwBssIytfEQPCNkzn7PHMfMZuc09vYQg3qzFkmULLiotg==\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+
+        // contents were not tampered and we can decrypt them
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(2))
+
+        // but checksum fails on metadata, so overall security fails
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.ENCRYPTION]?.status, CoreMatchers.`is`(PrefsStatus.ERROR))
+    }
+
+    @Test
+    fun tamperedContentsTest() {
+        val frozenPrefs = "{\n" +
+            "  \"metadata\": {},\n" +
+            "  \"security\": {\n" +
+            "    \"salt\": \"9581d7a9e56d8127ad6b74a876fa60b192b1c6f4343d857bc07e3874589f2fc9\",\n" +
+            "    \"file_hash\": \"9122fd04a4938030b62f6b9d6dda63a11c265e673c4aecbcb6dcd62327c025bb\",\n" +
+            "    \"content_hash\": \"23f999f6e6d325f649b61871fe046a94e110bf1587ff070fb66a0f8085b2760a\",\n" +
+            "    \"algorithm\": \"v1\"\n" +
+            "  },\n" +
+            "  \"format\": \"aaps_encrypted\",\n" +
+            "  \"content\": \"DJ5+HP/gq7icRQhbG9PEBJCMuNwBssIytfEQPCNkzn7PHMfMZuc09vYQg3qzFkmULLiotg==\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(0))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.ENCRYPTION]?.status, CoreMatchers.`is`(PrefsStatus.ERROR))
+    }
+
+    @Test
+    fun missingFieldsTest() {
+        val frozenPrefs = "{\n" +
+            "  \"format\": \"aaps_encrypted\",\n" +
+            "  \"content\": \"lets get rid of metadata and security!\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        val prefs = encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+
+        Assert.assertThat(prefs.values.size, CoreMatchers.`is`(0))
+        Assert.assertThat(prefs.metadata[PrefsMetadataKey.FILE_FORMAT]?.status, CoreMatchers.`is`(PrefsStatus.ERROR))
+    }
+
+    @Test(expected = PrefFormatError::class)
+    fun garbageInputTest() {
+        val frozenPrefs = "whatever man, i duno care"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+    }
+
+    @Test(expected = PrefFormatError::class)
+    fun unknownFormatTest() {
+        val frozenPrefs = "{\n" +
+            "  \"metadata\": {},\n" +
+            "  \"security\": {\n" +
+            "    \"salt\": \"9581d7a9e56d8127ad6b74a876fa60b192b1c6f4343d857bc07e3874589f2fc9\",\n" +
+            "    \"file_hash\": \"9122fd04a4938030b62f6b9d6dda63a11c265e673c4aecbcb6dcd62327c025bb\",\n" +
+            "    \"content_hash\": \"23f999f6e6d325f649b61871fe046a94e110bf1587ff070fb66a0f8085b2760c\",\n" +
+            "    \"algorithm\": \"v1\"\n" +
+            "  },\n" +
+            "  \"format\": \"aaps_9000_new_format\",\n" +
+            "  \"content\": \"DJ5+HP/gq7icRQhbG9PEBJCMuNwBssIytfEQPCNkzn7PHMfMZuc09vYQg3qzFkmULLiotg==\"\n" +
+            "}"
+
+        val storage = SingleStringStorage(frozenPrefs)
+        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, storage)
+        encryptedFormat.loadPreferences(AAPSMocker.getMockedFile(), "sikret")
+    }
+
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.java
deleted file mode 100644
index 9405816e8b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance;
-
-import org.junit.Test;
-
-import java.io.File;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class MaintenancePluginTest {
-
-    private MaintenancePlugin sut = new MaintenancePlugin();
-
-    @Test
-    public void getLogfilesTest() {
-        String logDirectory = "src/test/res/logger";
-
-        List<File> logs = sut.getLogfiles(logDirectory, 2);
-        assertEquals(2, logs.size());
-        assertEquals("AndroidAPS.log", logs.get(0).getName());
-        assertEquals("AndroidAPS.2018-01-03_01-01-00.1.zip", logs.get(1).getName());
-
-        logs = sut.getLogfiles(logDirectory, 10);
-        assertEquals(4, logs.size());
-    }
-
-
-    @Test
-    public void zipLogsTest() {
-        String logDirectory = "src/test/res/logger";
-        List<File> logs = sut.getLogfiles(logDirectory, 2);
-
-        String name = "AndroidAPS.log.zip";
-
-        File zipFile = new File("build/" + name);
-        zipFile = sut.zipLogs(zipFile, logs);
-
-        assertTrue(zipFile.exists());
-        assertTrue(zipFile.isFile());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
new file mode 100644
index 0000000000..e66c001aee
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.general.maintenance
+
+import android.content.Context
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.io.File
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(NSSettingsStatus::class, BuildHelper::class)
+class MaintenancePluginTest : TestBase() {
+
+    @Mock lateinit var injector: HasAndroidInjector
+    @Mock lateinit var context: Context
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+    @Mock lateinit var nsSettingsStatus: NSSettingsStatus
+    @Mock lateinit var buildHelper: BuildHelper
+
+    lateinit var sut: MaintenancePlugin
+
+    @Before
+    fun mock() {
+        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper)
+    }
+
+    @Test fun logfilesTest() {
+        val logDirectory = "src/test/res/logger"
+        var logs = sut.getLogFiles(logDirectory, 2)
+        Assert.assertEquals(2, logs.size)
+        Assert.assertEquals("AndroidAPS.log", logs[0].name)
+        Assert.assertEquals("AndroidAPS.2018-01-03_01-01-00.1.zip", logs[1].name)
+        logs = sut.getLogFiles(logDirectory, 10)
+        Assert.assertEquals(4, logs.size)
+    }
+
+    @Test
+    fun zipLogsTest() {
+        val logDirectory = "src/test/res/logger"
+        val logs = sut.getLogFiles(logDirectory, 2)
+        val name = "AndroidAPS.log.zip"
+        var zipFile = File("build/$name")
+        zipFile = sut.zipLogs(zipFile, logs)
+        Assert.assertTrue(zipFile.exists())
+        Assert.assertTrue(zipFile.isFile)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java
deleted file mode 100644
index b0fde44b08..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventChargingState;
-import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, Context.class})
-public class NsClientReceiverDelegateTest {
-
-    private NsClientReceiverDelegate sut;
-
-    @Before
-    public void prepare() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-
-        sut = new NsClientReceiverDelegate();
-    }
-
-    @Test
-    public void testCalculateStatusChargingState() {
-        PowerMockito.mockStatic(SP.class);
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(false);
-        EventChargingState ev = new EventChargingState(true);
-        assertTrue(sut.calculateStatus(ev));
-        ev = new EventChargingState(false);
-        assertTrue(sut.calculateStatus(ev));
-
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(true);
-        ev = new EventChargingState(true);
-        assertTrue(sut.calculateStatus(ev));
-        ev = new EventChargingState(false);
-        assertTrue(!sut.calculateStatus(ev));
-    }
-
-    @Test
-    public void testCalculateStatusNetworkState() {
-        PowerMockito.mockStatic(SP.class);
-        // wifiOnly = false
-        // allowRoaming = false as well
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(false);
-        when(SP.getString(anyInt(), anyString())).thenReturn("");
-        EventNetworkChange ev = new EventNetworkChange();
-        ev.setSsid("<unknown ssid>");
-
-        ev.setMobileConnected(true);
-        ev.setWifiConnected(true);
-        assertTrue(sut.calculateStatus(ev));
-
-        ev.setSsid("test");
-        when(SP.getString(anyInt(), anyString())).thenReturn("\"test\"");
-        assertTrue(sut.calculateStatus(ev));
-
-        ev.setSsid("\"test\"");
-        assertTrue(sut.calculateStatus(ev));
-        
-        ev.setWifiConnected(false);
-        assertTrue(sut.calculateStatus(ev));
-
-        // wifiOnly = true
-        // allowRoaming = true as well
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(true);
-        ev.setWifiConnected(true);
-        assertTrue(sut.calculateStatus(ev));
-        ev.setWifiConnected(false);
-        assertTrue(!sut.calculateStatus(ev));
-
-        // wifiOnly = false
-        // allowRoaming = false as well
-        when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(false);
-        ev.setWifiConnected(false);
-        ev.setRoaming(true);
-        assertTrue(!sut.calculateStatus(ev));
-
-        // wifiOnly = false
-        // allowRoaming = true
-        when(SP.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false);
-        when(SP.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true);
-        ev.setWifiConnected(false);
-        ev.setRoaming(true);
-        assertTrue(sut.calculateStatus(ev));
-
-        // wifiOnly = true
-        // allowRoaming = true
-        when(SP.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true);
-        when(SP.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true);
-        ev.setWifiConnected(false);
-        ev.setRoaming(true);
-        assertTrue(!sut.calculateStatus(ev));
-
-        // wifiOnly = true
-        // allowRoaming = true
-        when(SP.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true);
-        when(SP.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true);
-        ev.setWifiConnected(true);
-        ev.setRoaming(true);
-        assertTrue(sut.calculateStatus(ev));
-
-        // wifiOnly = false
-        // allowRoaming = false
-        when(SP.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false);
-        when(SP.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(false);
-        ev.setWifiConnected(true);
-        ev.setRoaming(true);
-        assertTrue(sut.calculateStatus(ev));
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
new file mode 100644
index 0000000000..7388178df6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
@@ -0,0 +1,132 @@
+package info.nightscout.androidaps.plugins.general.nsclient
+
+import android.content.Context
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.events.EventChargingState
+import info.nightscout.androidaps.events.EventNetworkChange
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, SP::class, Context::class)
+class NsClientReceiverDelegateTest : TestBase() {
+
+    @Mock lateinit var context: Context
+    @Mock lateinit var sp: SP
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    lateinit var receiverStatusStore: ReceiverStatusStore
+    val rxBus: RxBusWrapper = RxBusWrapper()
+
+    private var sut: NsClientReceiverDelegate? = null
+
+    @Before fun prepare() {
+        receiverStatusStore = ReceiverStatusStore(context, rxBus)
+        `when`(sp.getLong(anyInt(), anyLong())).thenReturn(0L)
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
+        `when`(sp.getInt(anyInt(), anyInt())).thenReturn(0)
+        `when`(sp.getString(anyInt(), anyString())).thenReturn("")
+
+        sut = NsClientReceiverDelegate(rxBus, resourceHelper, sp, receiverStatusStore)
+    }
+
+    @Test fun testCalculateStatusChargingState() {
+        PowerMockito.mockStatic(SP::class.java)
+        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
+        var ev = EventChargingState(true)
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev = EventChargingState(false)
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(true)
+        ev = EventChargingState(true)
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev = EventChargingState(false)
+        Assert.assertTrue(!sut!!.calculateStatus(ev))
+    }
+
+    @Test fun testCalculateStatusNetworkState() {
+        PowerMockito.mockStatic(SP::class.java)
+        // wifiOnly = false
+        // allowRoaming = false as well
+        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
+        Mockito.`when`(sp.getString(ArgumentMatchers.anyInt(), ArgumentMatchers.anyString())).thenReturn("")
+        val ev = EventNetworkChange()
+        ev.ssid = "<unknown ssid>"
+        ev.mobileConnected = true
+        ev.wifiConnected = true
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev.ssid = "test"
+        Mockito.`when`(sp.getString(ArgumentMatchers.anyInt(), ArgumentMatchers.anyString())).thenReturn("\"test\"")
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev.ssid = "\"test\""
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev.wifiConnected = false
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+
+        // wifiOnly = true
+        // allowRoaming = true as well
+        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(true)
+        ev.wifiConnected = true
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+        ev.wifiConnected = false
+        Assert.assertTrue(!sut!!.calculateStatus(ev))
+
+        // wifiOnly = false
+        // allowRoaming = false as well
+        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
+        ev.wifiConnected = false
+        ev.roaming = true
+        Assert.assertTrue(!sut!!.calculateStatus(ev))
+
+        // wifiOnly = false
+        // allowRoaming = true
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        ev.wifiConnected = false
+        ev.roaming = true
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+
+        // wifiOnly = true
+        // allowRoaming = true
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        ev.wifiConnected = false
+        ev.roaming = true
+        Assert.assertTrue(!sut!!.calculateStatus(ev))
+
+        // wifiOnly = true
+        // allowRoaming = true
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        ev.wifiConnected = true
+        ev.roaming = true
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+
+        // wifiOnly = false
+        // allowRoaming = false
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
+        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(false)
+        ev.wifiConnected = true
+        ev.roaming = true
+        Assert.assertTrue(sut!!.calculateStatus(ev))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
deleted file mode 100644
index 4d0ed00415..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.stubbing.Answer;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SmsCommunicatorPlugin.class, L.class, SP.class, MainApp.class, DateUtil.class})
-
-public class AuthRequestTest {
-    private SmsCommunicatorPlugin smsCommunicatorPlugin;
-    private Sms sentSms;
-    private boolean actionCalled = false;
-
-    @Test
-    public void doTests() {
-        Sms requester = new Sms("aNumber", "aText");
-        SmsAction action = new SmsAction() {
-            @Override
-            public void run() {
-                actionCalled = true;
-            }
-        };
-
-        // Check if SMS requesting code is sent
-        AuthRequest authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
-
-        Assert.assertEquals(sentSms.getPhoneNumber(), "aNumber");
-        Assert.assertEquals(sentSms.getText(), "Request text");
-
-        // wrong reply
-        actionCalled = false;
-        authRequest.action("EFG");
-        Assert.assertEquals(sentSms.getPhoneNumber(), "aNumber");
-        Assert.assertEquals(sentSms.getText(), "Wrong code. Command cancelled.");
-        Assert.assertFalse(actionCalled);
-
-        // correct reply
-        authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
-        actionCalled = false;
-        authRequest.action("ABC");
-        Assert.assertTrue(actionCalled);
-        // second time action should not be called
-        actionCalled = false;
-        authRequest.action("ABC");
-        Assert.assertFalse(actionCalled);
-
-        // test timed out message
-        long now = 10000;
-        when(DateUtil.now()).thenReturn(now);
-        authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
-        actionCalled = false;
-        when(DateUtil.now()).thenReturn(now + T.mins(Constants.SMS_CONFIRM_TIMEOUT).msecs() + 1);
-        authRequest.action("ABC");
-        Assert.assertFalse(actionCalled);
-    }
-
-    @Before
-    public void prepareTests() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-
-        mockStatic(DateUtil.class);
-
-        smsCommunicatorPlugin = mock(SmsCommunicatorPlugin.class);
-        doAnswer((Answer) invocation -> {
-            sentSms = invocation.getArgument(0);
-            return null;
-        }).when(smsCommunicatorPlugin).sendSMS(any(Sms.class));
-
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
new file mode 100644
index 0000000000..83fb044221
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
@@ -0,0 +1,95 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.invocation.InvocationOnMock
+import org.mockito.stubbing.Answer
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(SmsCommunicatorPlugin::class, DateUtil::class, OneTimePassword::class)
+class AuthRequestTest : TestBase() {
+
+    @Mock lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var otp: OneTimePassword
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is AuthRequest) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.smsCommunicatorPlugin = smsCommunicatorPlugin
+                it.otp = otp
+            }
+        }
+    }
+
+    private var sentSms: Sms? = null
+    private var actionCalled = false
+
+    @Before fun prepareTests() {
+        `when`(resourceHelper.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
+        PowerMockito.doAnswer(Answer { invocation: InvocationOnMock ->
+            sentSms = invocation.getArgument(0)
+            null
+        } as Answer<*>).`when`(smsCommunicatorPlugin).sendSMS(anyObject())
+    }
+
+    @Test fun doTests() {
+        val requester = Sms("aNumber", "aText")
+        val action: SmsAction = object : SmsAction() {
+            override fun run() {
+                actionCalled = true
+            }
+        }
+
+        // Check if SMS requesting code is sent
+        var authRequest = AuthRequest(injector, requester, "Request text", "ABC", action)
+        Assert.assertEquals(sentSms!!.phoneNumber, "aNumber")
+        Assert.assertEquals(sentSms!!.text, "Request text")
+
+        // wrong reply
+        actionCalled = false
+        authRequest.action("EFG")
+        Assert.assertEquals(sentSms!!.phoneNumber, "aNumber")
+        Assert.assertEquals(sentSms!!.text, "Wrong code. Command cancelled.")
+        Assert.assertFalse(actionCalled)
+
+        // correct reply
+        authRequest = AuthRequest(injector, requester, "Request text", "ABC", action)
+        actionCalled = false
+        authRequest.action("ABC")
+        Assert.assertTrue(actionCalled)
+        // second time action should not be called
+        actionCalled = false
+        authRequest.action("ABC")
+        Assert.assertFalse(actionCalled)
+
+        // test timed out message
+        val now: Long = 10000
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
+        authRequest = AuthRequest(injector, requester, "Request text", "ABC", action)
+        actionCalled = false
+        PowerMockito.`when`(DateUtil.now()).thenReturn(now + T.mins(Constants.SMS_CONFIRM_TIMEOUT).msecs() + 1)
+        authRequest.action("ABC")
+        Assert.assertFalse(actionCalled)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
deleted file mode 100644
index f6a4712b72..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import android.telephony.SmsMessage;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-
-public class SmsActionTest {
-    String result = "";
-
-    @Test
-    public void doTests() {
-
-        SmsAction smsAction = new SmsAction() {
-            @Override
-            public void run() {
-                result = "A";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "A");
-
-        smsAction = new SmsAction(1d) {
-            @Override
-            public void run() {
-                result = "B";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "B");
-        Assert.assertEquals(smsAction.aDouble(), 1d, 0.000001d);
-
-        smsAction = new SmsAction(1d, 2) {
-            @Override
-            public void run() {
-                result = "C";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "C");
-        Assert.assertEquals(smsAction.aDouble(), 1d, 0.000001d);
-        Assert.assertEquals(smsAction.secondInteger(), 2);
-
-        smsAction = new SmsAction("aString", 3) {
-            @Override
-            public void run() {
-                result = "D";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "D");
-        Assert.assertEquals(smsAction.aString(), "aString");
-        Assert.assertEquals(smsAction.secondInteger(), 3);
-
-        smsAction = new SmsAction(4) {
-            @Override
-            public void run() {
-                result = "E";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "E");
-        Assert.assertEquals(smsAction.anInteger(), 4);
-
-        smsAction = new SmsAction(5, 6) {
-            @Override
-            public void run() {
-                result = "F";
-            }
-        };
-        smsAction.run();
-        Assert.assertEquals(result, "F");
-        Assert.assertEquals(smsAction.anInteger(), 5);
-        Assert.assertEquals(smsAction.secondInteger(), 6);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt
new file mode 100644
index 0000000000..29fa359f51
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class SmsActionTest {
+
+    var result = ""
+    @Test fun doTests() {
+        var smsAction: SmsAction = object : SmsAction() {
+            override fun run() {
+                result = "A"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "A")
+        smsAction = object : SmsAction(1.0) {
+            override fun run() {
+                result = "B"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "B")
+        Assert.assertEquals(smsAction.aDouble(), 1.0, 0.000001)
+        smsAction = object : SmsAction(1.0, 2) {
+            override fun run() {
+                result = "C"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "C")
+        Assert.assertEquals(smsAction.aDouble(), 1.0, 0.000001)
+        Assert.assertEquals(smsAction.secondInteger().toLong(), 2)
+        smsAction = object : SmsAction("aString", 3) {
+            override fun run() {
+                result = "D"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "D")
+        Assert.assertEquals(smsAction.aString(), "aString")
+        Assert.assertEquals(smsAction.secondInteger().toLong(), 3)
+        smsAction = object : SmsAction(4) {
+            override fun run() {
+                result = "E"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "E")
+        Assert.assertEquals(smsAction.anInteger().toLong(), 4)
+        smsAction = object : SmsAction(5, 6) {
+            override fun run() {
+                result = "F"
+            }
+        }
+        smsAction.run()
+        Assert.assertEquals(result, "F")
+        Assert.assertEquals(smsAction.anInteger().toLong(), 5)
+        Assert.assertEquals(smsAction.secondInteger().toLong(), 6)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
deleted file mode 100644
index 84b7f4c3fa..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
+++ /dev/null
@@ -1,967 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import android.telephony.SmsManager;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.logging.L;
-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.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.XdripCalibrations;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({
-        L.class, SP.class, MainApp.class, DateUtil.class, ProfileFunctions.class,
-        TreatmentsPlugin.class, SmsManager.class, IobCobCalculatorPlugin.class,
-        CommandQueue.class, ConfigBuilderPlugin.class, NSUpload.class, ProfileInterface.class,
-        LocalProfilePlugin.class, XdripCalibrations.class, VirtualPumpPlugin.class, LoopPlugin.class
-})
-
-public class SmsCommunicatorPluginTest {
-
-    private SmsCommunicatorPlugin smsCommunicatorPlugin;
-    private LoopPlugin loopPlugin;
-
-    private boolean hasBeenRun = false;
-
-    private VirtualPumpPlugin virtualPumpPlugin;
-
-    @Test
-    public void processSettingsTest() {
-        // called from constructor
-        Assert.assertEquals("1234", smsCommunicatorPlugin.getAllowedNumbers().get(0));
-        Assert.assertEquals("5678", smsCommunicatorPlugin.getAllowedNumbers().get(1));
-        Assert.assertEquals(2, smsCommunicatorPlugin.getAllowedNumbers().size());
-    }
-
-    @Test
-    public void isCommandTest() {
-        Assert.assertTrue(smsCommunicatorPlugin.isCommand("BOLUS", ""));
-        smsCommunicatorPlugin.setMessageToConfirm(null);
-        Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", ""));
-        smsCommunicatorPlugin.setMessageToConfirm(new AuthRequest(smsCommunicatorPlugin, new Sms("1234", "ddd"), "RequestText", "ccode", new SmsAction() {
-            @Override
-            public void run() {
-            }
-        }));
-        Assert.assertTrue(smsCommunicatorPlugin.isCommand("BLB", "1234"));
-        Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", "2345"));
-        smsCommunicatorPlugin.setMessageToConfirm(null);
-    }
-
-    @Test
-    public void isAllowedNumberTest() {
-        Assert.assertTrue(smsCommunicatorPlugin.isAllowedNumber("5678"));
-        Assert.assertFalse(smsCommunicatorPlugin.isAllowedNumber("56"));
-    }
-
-    @Test
-    public void processSmsTest() {
-        Sms sms;
-
-        // SMS from not allowed number should be ignored
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("12", "aText");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertTrue(sms.getIgnored());
-        Assert.assertEquals("aText", smsCommunicatorPlugin.getMessages().get(0).getText());
-
-        //UNKNOWN
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "UNKNOWN");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("UNKNOWN", smsCommunicatorPlugin.getMessages().get(0).getText());
-
-        //BG
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BG");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BG", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("IOB:"));
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Last BG: 100"));
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("COB: 10(2)g"));
-
-        // LOOP : test remote control disabled
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP STATUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Remote command is not allowed"));
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //LOOP STATUS : disabled
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP STATUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP STATUS : suspended
-        when(loopPlugin.minutesToEndOfSuspend()).thenReturn(10);
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(true);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP STATUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP STATUS : enabled
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP STATUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP : wrong format
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP DISABLE : already disabled
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP DISABLE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP DISABLE : from enabled
-        hasBeenRun = false;
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        doAnswer((Answer) invocation -> {
-            hasBeenRun = true;
-            return null;
-        }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP DISABLE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.getMessages().get(1).getText());
-        Assert.assertTrue(hasBeenRun);
-
-        //LOOP ENABLE : already enabled
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP ENABLE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP ENABLE : from disabled
-        hasBeenRun = false;
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
-        doAnswer((Answer) invocation -> {
-            hasBeenRun = true;
-            return null;
-        }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, true);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP ENABLE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
-        Assert.assertTrue(hasBeenRun);
-
-        //LOOP RESUME : already enabled
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP RESUME");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP SUSPEND 1 2: wrong format
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP SUSPEND 1 2");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP SUSPEND 1 2", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP SUSPEND 0 : wrong duration
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP SUSPEND 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP SUSPEND 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //LOOP SUSPEND 100 : suspend for 100 min + correct answer
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP SUSPEND 100");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To suspend loop for 100 minutes reply with code "));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.getMessages().get(3).getText());
-
-        //LOOP SUSPEND 200 : limit to 180 min + wrong answer
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP SUSPEND 200");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP SUSPEND 200", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To suspend loop for 180 minutes reply with code "));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        // ignore from other number
-        smsCommunicatorPlugin.processSms(new Sms("5678", passCode));
-        smsCommunicatorPlugin.processSms(new Sms("1234", "XXXX"));
-        Assert.assertEquals("XXXX", smsCommunicatorPlugin.getMessages().get(3).getText());
-        Assert.assertEquals("Wrong code. Command cancelled.", smsCommunicatorPlugin.getMessages().get(4).getText());
-        //then correct code should not work
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(5).getText());
-        Assert.assertEquals(6, smsCommunicatorPlugin.getMessages().size()); // processed as common message
-
-        //LOOP BLABLA
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "LOOP BLABLA");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("LOOP BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //TREATMENTS REFRESH
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TREATMENTS REFRESH");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("TREATMENTS REFRESH", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("TREATMENTS REFRESH"));
-
-        //TREATMENTS BLA BLA
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TREATMENTS BLA BLA");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("TREATMENTS BLA BLA", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //TREATMENTS BLABLA
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TREATMENTS BLABLA");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("TREATMENTS BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //NSCLIENT RESTART
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "NSCLIENT RESTART");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("NSCLIENT RESTART", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("NSCLIENT RESTART"));
-
-        //NSCLIENT BLA BLA
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "NSCLIENT BLA BLA");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("NSCLIENT BLA BLA", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //NSCLIENT BLABLA
-        when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "NSCLIENT BLABLA");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("NSCLIENT BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PUMP
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PUMP");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PUMP", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //HELP
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "HELP");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("HELP", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("PUMP"));
-
-        //HELP PUMP
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "HELP PUMP");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("HELP PUMP", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("PUMP"));
-
-        //SMS : wrong format
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "SMS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("SMS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //SMS STOP
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "SMS DISABLE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("SMS DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To disable the SMS Remote Service reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone."));
-
-        //TARGET : wrong format
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TARGET");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.getIgnored());
-        Assert.assertEquals("TARGET", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //TARGET MEAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TARGET MEAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("TARGET MEAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To set the Temp Target"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("set successfully"));
-
-        //TARGET STOP/CANCEL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "TARGET STOP");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("TARGET STOP", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To cancel Temp Target reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Temp Target canceled successfully"));
-    }
-
-    @Test
-    public void processProfileTest() {
-        Sms sms;
-
-        //PROFILE
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //PROFILE
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE LIST (no profile interface)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE LIST");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Not configured", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        ProfileInterface profileInterface = mock(LocalProfilePlugin.class);
-        when(ConfigBuilderPlugin.getPlugin().getActiveProfileInterface()).thenReturn(profileInterface);
-
-        //PROFILE LIST (no profile defined)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE LIST");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Not configured", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(profileInterface.getProfile()).thenReturn(AAPSMocker.getValidProfileStore());
-
-        //PROFILE STATUS
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE STATUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals(AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE LIST
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE LIST");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("1. " + AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE 2 (non existing)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE 2");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 2", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE 1 0(wrong percentage)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE 1 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE 0(wrong index)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //PROFILE 1(OK)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To switch profile to someProfile 100% reply with code"));
-
-        //PROFILE 1 90(OK)
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "PROFILE 1 90");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1 90", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To switch profile to someProfile 90% reply with code"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Profile switch created", smsCommunicatorPlugin.getMessages().get(3).getText());
-    }
-
-    @Test
-    public void processBasalTest() {
-        Sms sms;
-
-        //BASAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //BASAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //BASAL CANCEL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL CANCEL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL CANCEL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To stop temp basal reply with code"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Temp basal canceled"));
-
-        //BASAL a%
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL a%");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL a%", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //BASAL 10% 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL 10% 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 10% 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyBasalPercentConstraints(any(), any())).thenReturn(new Constraint<>(20));
-
-        //BASAL 20% 20
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL 20% 20");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 20% 20", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start basal 20% for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Temp basal 20% for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
-
-        //BASAL a
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL a");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL a", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //BASAL 1 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL 1 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyBasalConstraints(any(), any())).thenReturn(new Constraint<>(1d));
-
-        //BASAL 1 20
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BASAL 1 20");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 1 20", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start basal 1.00U/h for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Temp basal 1.00U/h for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
-
-    }
-
-    @Test
-    public void processExtendedTest() {
-        Sms sms;
-
-        //EXTENDED
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //EXTENDED
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //EXTENDED CANCEL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED CANCEL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED CANCEL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To stop extended bolus reply with code"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Extended bolus canceled"));
-
-        //EXTENDED a%
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED a%");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED a%", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
-
-        //EXTENDED 1 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED 1 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //EXTENDED 1 20
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "EXTENDED 1 20");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED 1 20", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start extended bolus 1.00U for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Extended bolus 1.00U for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
-    }
-
-    @Test
-    public void processBolusTest() {
-        Sms sms;
-
-        //BOLUS
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //BOLUS
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
-
-        when(DateUtil.now()).thenReturn(1000L);
-        //BOLUS 1
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(0d));
-
-        when(DateUtil.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L);
-
-        //BOLUS 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //BOLUS a
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS a");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS a", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
-
-        when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
-
-        //BOLUS 1
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To deliver bolus 1.00U reply with code"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Bolus 1.00U delivered successfully"));
-
-        //BOLUS 1 (Suspended pump)
-        smsCommunicatorPlugin.setLastRemoteBolusTime(0);
-        when(virtualPumpPlugin.isSuspended()).thenReturn(true);
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.getMessages().get(1).getText());
-        when(virtualPumpPlugin.isSuspended()).thenReturn(false);
-
-        //BOLUS 1 a
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 1 a");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1 a", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //BOLUS 1 MEAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "BOLUS 1 MEAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1 MEAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To deliver meal bolus 1.00U reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Meal Bolus 1.00U delivered successfully\nVirtual Pump\nTarget 5.0 for 45 minutes", smsCommunicatorPlugin.getMessages().get(3).getText());
-    }
-
-    @Test
-    public void processCalTest() {
-        Sms sms;
-
-        //CAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //CAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CAL");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        //CAL 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CAL 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(XdripCalibrations.sendIntent(any())).thenReturn(true);
-        //CAL 1
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CAL 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To send calibration 1.00 reply with code"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertEquals("Calibration sent. Receiving must be enabled in xDrip.", smsCommunicatorPlugin.getMessages().get(3).getText());
-    }
-
-    @Test
-    public void processCarbsTest() {
-        Sms sms;
-
-        when(DateUtil.now()).thenReturn(1000000L);
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false);
-        //CAL
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
-
-        //CARBS
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyCarbsConstraints(any())).thenReturn(new Constraint<>(0));
-
-        //CARBS 0
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 0");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 0", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
-
-        when(MainApp.getConstraintChecker().applyCarbsConstraints(any())).thenReturn(new Constraint<>(1));
-
-        //CARBS 1
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 1");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at"));
-        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
-
-        //CARBS 1 a
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 1 a");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 1 a", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Wrong format"));
-
-        //CARBS 1 00
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 1 00");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 1 00", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Wrong format"));
-
-        //CARBS 1 12:01
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 1 12:01");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 1 12:01", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at 12:01PM reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
-
-        //CARBS 1 3:01AM
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        sms = new Sms("1234", "CARBS 1 3:01AM");
-        smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CARBS 1 3:01AM", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at 03:01AM reply with code"));
-        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
-        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
-        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
-    }
-
-    @Test
-    public void sendNotificationToAllNumbers() {
-        smsCommunicatorPlugin.setMessages(new ArrayList<>());
-        smsCommunicatorPlugin.sendNotificationToAllNumbers("abc");
-        Assert.assertEquals("abc", smsCommunicatorPlugin.getMessages().get(0).getText());
-        Assert.assertEquals("abc", smsCommunicatorPlugin.getMessages().get(1).getText());
-    }
-
-    @Before
-    public void prepareTests() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockProfileFunctions();
-        AAPSMocker.mockTreatmentPlugin();
-        AAPSMocker.mockTreatmentService();
-        AAPSMocker.mockIobCobCalculatorPlugin();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-        AAPSMocker.mockNSUpload();
-        AAPSMocker.mockConstraintsChecker();
-
-        BgReading reading = new BgReading();
-        reading.value = 100;
-        List<BgReading> bgList = new ArrayList<>();
-        bgList.add(reading);
-        PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getBgReadings()).thenReturn(bgList);
-        PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB")).thenReturn(new CobInfo(10d, 2d));
-
-        mockStatic(XdripCalibrations.class);
-        spy(DateUtil.class);
-        mockStatic(SmsManager.class);
-        SmsManager smsManager = mock(SmsManager.class);
-        when(SmsManager.getDefault()).thenReturn(smsManager);
-
-        when(SP.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678");
-        smsCommunicatorPlugin = SmsCommunicatorPlugin.INSTANCE;
-        smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true);
-
-        mockStatic(LoopPlugin.class);
-        loopPlugin = mock(LoopPlugin.class);
-        when(LoopPlugin.getPlugin()).thenReturn(loopPlugin);
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(1);
-            callback.result = new PumpEnactResult().success(true);
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).cancelTempBasal(anyBoolean(), any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(0);
-            callback.result = new PumpEnactResult().success(true);
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).cancelExtended(any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(1);
-            callback.result = new PumpEnactResult().success(true);
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).readStatus(anyString(), any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(1);
-            callback.result = new PumpEnactResult().success(true).bolusDelivered(1);
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).bolus(any(DetailedBolusInfo.class), any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(4);
-            callback.result = new PumpEnactResult().success(true).isPercent(true).percent(invocation.getArgument(0)).duration(invocation.getArgument(1));
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).tempBasalPercent(anyInt(), anyInt(), anyBoolean(), any(), any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(4);
-            callback.result = new PumpEnactResult().success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1));
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).tempBasalAbsolute(anyDouble(), anyInt(), anyBoolean(), any(), any(Callback.class));
-
-        Mockito.doAnswer(invocation -> {
-            Callback callback = invocation.getArgument(2);
-            callback.result = new PumpEnactResult().success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1));
-            callback.run();
-            return null;
-        }).when(AAPSMocker.queue).extendedBolus(anyDouble(), anyInt(), any(Callback.class));
-
-        virtualPumpPlugin = mock(VirtualPumpPlugin.class);
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
-        when(virtualPumpPlugin.shortStatus(anyBoolean())).thenReturn("Virtual Pump");
-        when(virtualPumpPlugin.isSuspended()).thenReturn(false);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
new file mode 100644
index 0000000000..d5b7ddd5f5
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -0,0 +1,989 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import android.telephony.SmsManager
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
+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.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentService
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyDouble
+import org.mockito.invocation.InvocationOnMock
+import org.mockito.stubbing.Answer
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, FabricPrivacy::class, VirtualPumpPlugin::class, XdripCalibrations::class, SmsManager::class, CommandQueue::class, LocalProfilePlugin::class, DateUtil::class, IobCobCalculatorPlugin::class, OneTimePassword::class)
+class SmsCommunicatorPluginTest : TestBaseWithProfile() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var loopPlugin: LoopPlugin
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var localProfilePlugin: LocalProfilePlugin
+    @Mock lateinit var treatmentService: TreatmentService
+    @Mock lateinit var otp: OneTimePassword
+    @Mock lateinit var xdripCalibrations: XdripCalibrations
+
+    var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is PumpEnactResult) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+            }
+            if (it is BgReading) {
+                it.aapsLogger = aapsLogger
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+            }
+            if (it is AuthRequest) {
+                it.aapsLogger = aapsLogger
+                it.smsCommunicatorPlugin = smsCommunicatorPlugin
+                it.resourceHelper = resourceHelper
+                it.otp = otp
+            }
+            if (it is GlucoseStatus) {
+                it.aapsLogger = aapsLogger
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+        }
+    }
+
+    private lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    private var hasBeenRun = false
+
+    @Before fun prepareTests() {
+        val reading = BgReading(injector)
+        reading.value = 100.0
+        val bgList: MutableList<BgReading> = ArrayList()
+        bgList.add(reading)
+
+        `when`(iobCobCalculatorPlugin.dataLock).thenReturn(Unit)
+        `when`(iobCobCalculatorPlugin.bgReadings).thenReturn(bgList)
+        `when`(iobCobCalculatorPlugin.getCobInfo(false, "SMS COB")).thenReturn(CobInfo(10.0, 2.0))
+        `when`(iobCobCalculatorPlugin.lastBg()).thenReturn(reading)
+
+        PowerMockito.spy(DateUtil::class.java)
+        PowerMockito.mockStatic(SmsManager::class.java)
+        val smsManager = PowerMockito.mock(SmsManager::class.java)
+        `when`(SmsManager.getDefault()).thenReturn(smsManager)
+        `when`(sp.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678")
+
+        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculatorPlugin, xdripCalibrations, otp)
+        smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true)
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(1)
+            callback.result = PumpEnactResult(injector).success(true)
+            callback.run()
+            null
+        }.`when`(commandQueue).cancelTempBasal(ArgumentMatchers.anyBoolean(), ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(0)
+            callback.result = PumpEnactResult(injector).success(true)
+            callback.run()
+            null
+        }.`when`(commandQueue).cancelExtended(ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(1)
+            callback.result = PumpEnactResult(injector).success(true)
+            callback.run()
+            null
+        }.`when`(commandQueue).readStatus(ArgumentMatchers.anyString(), ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(1)
+            callback.result = PumpEnactResult(injector).success(true).bolusDelivered(1.0)
+            callback.run()
+            null
+        }.`when`(commandQueue).bolus(anyObject(), ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(4)
+            callback.result = PumpEnactResult(injector).success(true).isPercent(true).percent(invocation.getArgument(0)).duration(invocation.getArgument(1))
+            callback.run()
+            null
+        }.`when`(commandQueue).tempBasalPercent(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean(), anyObject(), ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(4)
+            callback.result = PumpEnactResult(injector).success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1))
+            callback.run()
+            null
+        }.`when`(commandQueue).tempBasalAbsolute(ArgumentMatchers.anyDouble(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean(), anyObject(), ArgumentMatchers.any(Callback::class.java))
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            val callback = invocation.getArgument<Callback>(2)
+            callback.result = PumpEnactResult(injector).success(true).isPercent(false).absolute(invocation.getArgument(0)).duration(invocation.getArgument(1))
+            callback.run()
+            null
+        }.`when`(commandQueue).extendedBolus(ArgumentMatchers.anyDouble(), ArgumentMatchers.anyInt(), ArgumentMatchers.any(Callback::class.java))
+
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+
+        `when`(virtualPumpPlugin.shortStatus(ArgumentMatchers.anyBoolean())).thenReturn("Virtual Pump")
+        `when`(virtualPumpPlugin.isSuspended).thenReturn(false)
+
+        `when`(treatmentsPlugin.lastCalculationTreatments).thenReturn(IobTotal(0))
+        `when`(treatmentsPlugin.lastCalculationTempBasals).thenReturn(IobTotal(0))
+        `when`(treatmentsPlugin.service).thenReturn(treatmentService)
+
+        `when`(activePlugin.activeProfileInterface).thenReturn(localProfilePlugin)
+
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+
+        `when`(resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
+        `when`(resourceHelper.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
+        `when`(resourceHelper.gs(R.string.sms_iob)).thenReturn("IOB:")
+        `when`(resourceHelper.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
+        `when`(resourceHelper.gs(R.string.sms_minago)).thenReturn("%1\$dmin ago")
+        `when`(resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
+        `when`(resourceHelper.gs(R.string.smscommunicator_stopsmswithcode)).thenReturn("To disable the SMS Remote Service reply with code %1\$s.\\n\\nKeep in mind that you\\'ll able to reactivate it directly from the AAPS master smartphone only.")
+        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2\$s.")
+        `when`(resourceHelper.gs(R.string.smscommunicator_temptargetwithcode)).thenReturn("To set the Temp Target %1\$s reply with code %2\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_temptargetcancel)).thenReturn("To cancel Temp Target reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.")
+        `when`(resourceHelper.gs(R.string.smscommunicator_tt_set)).thenReturn("Target %1\$s for %2\$d minutes set successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully")
+        `when`(resourceHelper.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1\$d m)")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopisdisabled)).thenReturn("Loop is disabled")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled")
+        `when`(resourceHelper.gs(R.string.wrongformat)).thenReturn("Wrong format")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled)).thenReturn("Loop has been disabled")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)).thenReturn("Loop has been enabled")
+        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopresumed)).thenReturn("Loop resumed")
+        `when`(resourceHelper.gs(R.string.smscommunicator_wrongduration)).thenReturn("Wrong duration")
+        `when`(resourceHelper.gs(R.string.smscommunicator_suspendreplywithcode)).thenReturn("To suspend loop for %1\$d minutes reply with code %2\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopsuspended)).thenReturn("Loop suspended")
+        `when`(resourceHelper.gs(R.string.smscommunicator_unknowncommand)).thenReturn("Unknown command or wrong reply")
+        `when`(resourceHelper.gs(R.string.notconfigured)).thenReturn("Not configured")
+        `when`(resourceHelper.gs(R.string.smscommunicator_profilereplywithcode)).thenReturn("To switch profile to %1\$s %2\$d%% reply with code %3\$s")
+        `when`(resourceHelper.gs(R.string.profileswitchcreated)).thenReturn("Profile switch created")
+        `when`(resourceHelper.gs(R.string.smscommunicator_basalstopreplywithcode)).thenReturn("To stop temp basal reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_basalpctreplywithcode)).thenReturn("To start basal %1\$d%% for %2\$d min reply with code %3\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent)).thenReturn("Temp basal %1\$d%% for %2\$d min started successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_basalreplywithcode)).thenReturn("To start basal %1$.2fU/h for %2\$d min reply with code %3\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalset)).thenReturn("Temp basal %1$.2fU/h for %2\$d min started successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_extendedstopreplywithcode)).thenReturn("To stop extended bolus reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_extendedcanceled)).thenReturn("Extended bolus canceled")
+        `when`(resourceHelper.gs(R.string.smscommunicator_extendedreplywithcode)).thenReturn("To start extended bolus %1$.2fU for %2\$d min reply with code %3\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_extendedset)).thenReturn("Extended bolus %1$.2fU for %2\$d min started successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_bolusreplywithcode)).thenReturn("To deliver bolus %1$.2fU reply with code %2\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_bolusdelivered)).thenReturn("Bolus %1$.2fU delivered successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_remotebolusnotallowed)).thenReturn("Remote bolus not available. Try again later.")
+        `when`(resourceHelper.gs(R.string.smscommunicator_calibrationreplywithcode)).thenReturn("To send calibration %1$.2f reply with code %2\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.")
+        `when`(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode)).thenReturn("To enter %1\$dg at %2\$s reply with code %3\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_carbsset)).thenReturn("Carbs %1\$dg entered successfully")
+        `when`(resourceHelper.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet")
+        `when`(resourceHelper.gs(R.string.pumpsuspended)).thenReturn("Pump suspended")
+        `when`(resourceHelper.gs(R.string.sms_delta)).thenReturn("Delta:")
+        `when`(resourceHelper.gs(R.string.sms_bolus)).thenReturn("Bolus:")
+        `when`(resourceHelper.gs(R.string.sms_basal)).thenReturn("Basal:")
+        `when`(resourceHelper.gs(R.string.cob)).thenReturn("COB")
+        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered)).thenReturn("Meal Bolus %1\$.2fU delivered successfully")
+        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1\$s for %2\$d minutes")
+        `when`(resourceHelper.gs(R.string.sms_actualbg)).thenReturn("BG:")
+        `when`(resourceHelper.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
+    }
+
+    @Test
+    fun processSettingsTest() {
+        // called from constructor
+        Assert.assertEquals("1234", smsCommunicatorPlugin.allowedNumbers.get(0))
+        Assert.assertEquals("5678", smsCommunicatorPlugin.allowedNumbers.get(1))
+        Assert.assertEquals(2, smsCommunicatorPlugin.allowedNumbers.size)
+    }
+
+    @Test
+    fun isCommandTest() {
+        Assert.assertTrue(smsCommunicatorPlugin.isCommand("BOLUS", ""))
+        smsCommunicatorPlugin.messageToConfirm = null
+        Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", ""))
+        smsCommunicatorPlugin.messageToConfirm = AuthRequest(injector, Sms("1234", "ddd"), "RequestText", "ccode", object : SmsAction() {
+            override fun run() {}
+        })
+        Assert.assertTrue(smsCommunicatorPlugin.isCommand("BLB", "1234"))
+        Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", "2345"))
+        smsCommunicatorPlugin.messageToConfirm = null
+    }
+
+    @Test fun _isAllowedNumberTest() {
+        Assert.assertTrue(smsCommunicatorPlugin.isAllowedNumber("5678"))
+        Assert.assertFalse(smsCommunicatorPlugin.isAllowedNumber("56"))
+    }
+
+    @Test fun processSmsTest() {
+        var sms: Sms
+
+        // SMS from not allowed number should be ignored
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("12", "aText")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertTrue(sms.ignored)
+        Assert.assertEquals("aText", smsCommunicatorPlugin.messages[0].text)
+
+        //UNKNOWN
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "UNKNOWN")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("UNKNOWN", smsCommunicatorPlugin.messages[0].text)
+
+        //BG
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BG")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BG", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("IOB:"))
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("Last BG: 100"))
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("COB: 10(2)g"))
+
+        // LOOP : test remote control disabled
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP STATUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("Remote command is not allowed"))
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //LOOP STATUS : disabled
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP STATUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP STATUS : suspended
+        PowerMockito.`when`(loopPlugin.minutesToEndOfSuspend()).thenReturn(10)
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP STATUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP STATUS : enabled
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP STATUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP : wrong format
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP DISABLE : already disabled
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP DISABLE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP DISABLE : from enabled
+        hasBeenRun = false
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.doAnswer(Answer { _: InvocationOnMock? ->
+            hasBeenRun = true
+            null
+        } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP DISABLE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages[1].text)
+        Assert.assertTrue(hasBeenRun)
+
+        //LOOP ENABLE : already enabled
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP ENABLE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP ENABLE : from disabled
+        hasBeenRun = false
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        PowerMockito.doAnswer(Answer { _: InvocationOnMock? ->
+            hasBeenRun = true
+            null
+        } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP ENABLE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages[1].text)
+        Assert.assertTrue(hasBeenRun)
+
+        //LOOP RESUME : already enabled
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP RESUME")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP SUSPEND 1 2: wrong format
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP SUSPEND 1 2")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP SUSPEND 1 2", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP SUSPEND 0 : wrong duration
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP SUSPEND 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP SUSPEND 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages[1].text)
+
+        //LOOP SUSPEND 100 : suspend for 100 min + correct answer
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP SUSPEND 100")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To suspend loop for 100 minutes reply with code "))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.messages[3].text)
+
+        //LOOP SUSPEND 200 : limit to 180 min + wrong answer
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP SUSPEND 200")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP SUSPEND 200", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To suspend loop for 180 minutes reply with code "))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        // ignore from other number
+        smsCommunicatorPlugin.processSms(Sms("5678", passCode))
+        smsCommunicatorPlugin.processSms(Sms("1234", "XXXX"))
+        Assert.assertEquals("XXXX", smsCommunicatorPlugin.messages[3].text)
+        Assert.assertEquals("Wrong code. Command cancelled.", smsCommunicatorPlugin.messages[4].text)
+        //then correct code should not work
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[5].text)
+        Assert.assertEquals(6, smsCommunicatorPlugin.messages.size.toLong()) // processed as common message
+
+        //LOOP BLABLA
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "LOOP BLABLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("LOOP BLABLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //TREATMENTS REFRESH
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TREATMENTS REFRESH")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("TREATMENTS REFRESH", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("TREATMENTS REFRESH"))
+
+        //TREATMENTS BLA BLA
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TREATMENTS BLA BLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("TREATMENTS BLA BLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //TREATMENTS BLABLA
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TREATMENTS BLABLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("TREATMENTS BLABLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //NSCLIENT RESTART
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "NSCLIENT RESTART")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("NSCLIENT RESTART", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("NSCLIENT RESTART"))
+
+        //NSCLIENT BLA BLA
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "NSCLIENT BLA BLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("NSCLIENT BLA BLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //NSCLIENT BLABLA
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "NSCLIENT BLABLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("NSCLIENT BLABLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PUMP
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PUMP", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.messages[1].text)
+
+        //HELP
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "HELP")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("HELP", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("PUMP"))
+
+        //HELP PUMP
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "HELP PUMP")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("HELP PUMP", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("PUMP"))
+
+        //SMS : wrong format
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "SMS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("SMS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //SMS STOP
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "SMS DISABLE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("SMS DISABLE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To disable the SMS Remote Service reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone."))
+
+        //TARGET : wrong format
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TARGET")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("TARGET", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //TARGET MEAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TARGET MEAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("TARGET MEAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To set the Temp Target"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("set successfully"))
+
+        //TARGET STOP/CANCEL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "TARGET STOP")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("TARGET STOP", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To cancel Temp Target reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("Temp Target canceled successfully"))
+    }
+
+    @Test fun processProfileTest() {
+        var sms: Sms
+
+        //PROFILE
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //PROFILE
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE LIST (no profile defined)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE LIST")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Not configured", smsCommunicatorPlugin.messages[1].text)
+
+        `when`(localProfilePlugin.profile).thenReturn(getValidProfileStore())
+        `when`(profileFunction.getProfileName()).thenReturn(TESTPROFILENAME)
+
+        //PROFILE STATUS
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE STATUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE STATUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals(TESTPROFILENAME, smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE LIST
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE LIST")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("1. " + TESTPROFILENAME, smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE 2 (non existing)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE 2")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE 2", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE 1 0(wrong percentage)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE 1 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE 1 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE 0(wrong index)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PROFILE 1(OK)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To switch profile to someProfile 100% reply with code"))
+
+        //PROFILE 1 90(OK)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PROFILE 1 90")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("PROFILE 1 90", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To switch profile to someProfile 90% reply with code"))
+        val passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Profile switch created", smsCommunicatorPlugin.messages[3].text)
+    }
+
+    @Test fun processBasalTest() {
+        var sms: Sms
+
+        //BASAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //BASAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //BASAL CANCEL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL CANCEL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL CANCEL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To stop temp basal reply with code"))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("Temp basal canceled"))
+
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+        //BASAL a%
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL a%")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL a%", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //BASAL 10% 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL 10% 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL 10% 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(Constraint<Int>(20))
+
+        //BASAL 20% 20
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL 20% 20")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL 20% 20", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To start basal 20% for 20 min reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Temp basal 20% for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages[3].text)
+
+        //BASAL a
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL a")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL a", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //BASAL 1 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL 1 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL 1 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(Constraint<Double>(1.0))
+
+        //BASAL 1 20
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BASAL 1 20")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BASAL 1 20", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To start basal 1.00U/h for 20 min reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Temp basal 1.00U/h for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages[3].text)
+    }
+
+    @Test fun processExtendedTest() {
+        var sms: Sms
+
+        //EXTENDED
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //EXTENDED
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //EXTENDED CANCEL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED CANCEL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED CANCEL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To stop extended bolus reply with code"))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("Extended bolus canceled"))
+
+        //EXTENDED a%
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED a%")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED a%", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(Constraint<Double>(1.0))
+
+        //EXTENDED 1 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED 1 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED 1 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //EXTENDED 1 20
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "EXTENDED 1 20")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("EXTENDED 1 20", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To start extended bolus 1.00U for 20 min reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Extended bolus 1.00U for 20 min started successfully\nnull\nVirtual Pump", smsCommunicatorPlugin.messages[3].text)
+    }
+
+    @Test fun processBolusTest() {
+        var sms: Sms
+
+        //BOLUS
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //BOLUS
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint<Double>(1.0))
+        PowerMockito.`when`(DateUtil.now()).thenReturn(1000L)
+        `when`(sp.getLong(R.string.key_smscommunicator_remotebolusmindistance, T.msecs(Constants.remoteBolusMinDistance).mins())).thenReturn(15L)
+        //BOLUS 1
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint<Double>(0.0))
+        PowerMockito.`when`(DateUtil.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L)
+
+        //BOLUS 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //BOLUS a
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS a")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS a", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(Constraint<Double>(1.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint<Double>(1.0))
+
+        //BOLUS 1
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To deliver bolus 1.00U reply with code"))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.contains("Bolus 1.00U delivered successfully"))
+
+        //BOLUS 1 (Suspended pump)
+        smsCommunicatorPlugin.lastRemoteBolusTime = 0
+        PowerMockito.`when`(virtualPumpPlugin.isSuspended).thenReturn(true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.messages[1].text)
+        PowerMockito.`when`(virtualPumpPlugin.isSuspended).thenReturn(false)
+
+        //BOLUS 1 a
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 1 a")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 1 a", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+        //BOLUS 1 MEAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "BOLUS 1 MEAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("BOLUS 1 MEAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To deliver meal bolus 1.00U reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Meal Bolus 1.00U delivered successfully\nVirtual Pump\nTarget 5.0 for 45 minutes", smsCommunicatorPlugin.messages[3].text)
+    }
+
+    @Test fun processCalTest() {
+        var sms: Sms
+
+        //CAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //CAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CAL")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CAL", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //CAL 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CAL 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CAL 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        PowerMockito.`when`(xdripCalibrations.sendIntent(ArgumentMatchers.anyDouble())).thenReturn(true)
+        //CAL 1
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CAL 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CAL 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To send calibration 1.00 reply with code"))
+        val passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Calibration sent. Receiving must be enabled in xDrip.", smsCommunicatorPlugin.messages[3].text)
+    }
+
+    @Test fun processCarbsTest() {
+        var sms: Sms
+        PowerMockito.`when`(DateUtil.now()).thenReturn(1000000L)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false)
+        //CAL
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages[1].text)
+        `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
+
+        //CARBS
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(Constraint<Int>(0))
+
+        //CARBS 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 0", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(Constraint<Int>(1))
+
+        //CARBS 1
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 1")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 1", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To enter 1g at"))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.startsWith("Carbs 1g entered successfully"))
+
+        //CARBS 1 a
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 1 a")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 1 a", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("Wrong format"))
+
+        //CARBS 1 00
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 1 00")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 1 00", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("Wrong format"))
+
+        //CARBS 1 12:01
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 1 12:01")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 1 12:01", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To enter 1g at 12:01PM reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.startsWith("Carbs 1g entered successfully"))
+
+        //CARBS 1 3:01AM
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "CARBS 1 3:01AM")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertEquals("CARBS 1 3:01AM", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To enter 1g at 03:01AM reply with code"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[3].text.startsWith("Carbs 1g entered successfully"))
+    }
+
+    @Test fun sendNotificationToAllNumbers() {
+        smsCommunicatorPlugin.messages = ArrayList()
+        smsCommunicatorPlugin.sendNotificationToAllNumbers("abc")
+        Assert.assertEquals("abc", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("abc", smsCommunicatorPlugin.messages[1].text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
deleted file mode 100644
index a406a35f9d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import android.telephony.SmsMessage;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SmsMessage.class, MainApp.class})
-
-public class SmsTest {
-
-    @Test
-    public void doTests() {
-        SmsMessage smsMessage = mock(SmsMessage.class);
-        when(smsMessage.getOriginatingAddress()).thenReturn("aNumber");
-        when(smsMessage.getMessageBody()).thenReturn("aBody");
-
-        Sms sms = new Sms(smsMessage);
-        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
-        Assert.assertEquals(sms.getText(), "aBody");
-        Assert.assertTrue(sms.getReceived());
-
-        sms = new Sms("aNumber", "aBody");
-        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
-        Assert.assertEquals(sms.getText(), "aBody");
-        Assert.assertTrue(sms.getSent());
-
-        sms = new Sms("aNumber", R.string.insulin_unit_shortname);
-        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
-        Assert.assertEquals(sms.getText(), MainApp.gs(R.string.insulin_unit_shortname));
-        Assert.assertTrue(sms.getSent());
-
-        Assert.assertEquals(sms.toString(), "SMS from aNumber: U");
-    }
-
-    @Before
-    public void prepareTests() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt
new file mode 100644
index 0000000000..8224865402
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import android.telephony.SmsMessage
+import info.nightscout.androidaps.TestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(SmsMessage::class)
+class SmsTest : TestBase() {
+
+    @Test fun doTests() {
+        val smsMessage = PowerMockito.mock(SmsMessage::class.java)
+        PowerMockito.`when`(smsMessage.originatingAddress).thenReturn("aNumber")
+        PowerMockito.`when`(smsMessage.messageBody).thenReturn("aBody")
+        var sms = Sms(smsMessage)
+        Assert.assertEquals(sms.phoneNumber, "aNumber")
+        Assert.assertEquals(sms.text, "aBody")
+        Assert.assertTrue(sms.received)
+        sms = Sms("aNumber", "aBody")
+        Assert.assertEquals(sms.phoneNumber, "aNumber")
+        Assert.assertEquals(sms.text, "aBody")
+        Assert.assertTrue(sms.sent)
+        sms = Sms("aNumber", "U")
+        Assert.assertEquals(sms.phoneNumber, "aNumber")
+        Assert.assertEquals(sms.text, "U")
+        Assert.assertTrue(sms.sent)
+        Assert.assertEquals(sms.toString(), "SMS from aNumber: U")
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.java
deleted file mode 100644
index 0e859b93e2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package info.nightscout.androidaps.plugins.insulin;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Created by triplem on 07.01.18.
- */
-
-public class InsulinOrefBasePluginTest extends InsulinOrefBasePlugin {
-
-    private int peak;
-    private double dia;
-
-    private boolean shortDiaNotificationSend;
-
-    @Before
-    public void setUp() throws Exception {
-        this.peak = 0;
-        this.dia = InsulinOrefBasePlugin.MIN_DIA;
-        this.shortDiaNotificationSend = false;
-    }
-
-    @Test
-    public void testGetDia() throws Exception {
-        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
-
-        this.dia = InsulinOrefBasePlugin.MIN_DIA + 1;
-        assertEquals(InsulinOrefBasePlugin.MIN_DIA + 1, this.getDia(), 0);
-
-        this.dia = InsulinOrefBasePlugin.MIN_DIA - 1;
-        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
-        assertTrue(this.shortDiaNotificationSend);
-    }
-
-    @Test
-    public void testIobCalcForTreatment() {
-        Treatment treatment = new Treatment();
-        Iob expected = new Iob();
-
-        assertEquals(expected, this.iobCalcForTreatment(treatment, 0, 0d));
-
-        this.peak = 30;
-        this.dia = 4;
-        long time = System.currentTimeMillis();
-
-        // check directly after bolus
-        treatment.date = time;
-        treatment.insulin = 10d;
-        assertEquals(10d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
-
-        // check after 1 hour
-        treatment.date = time - 1 * 60 * 60 * 1000; // 1 hour
-        treatment.insulin = 10d;
-        assertEquals(3.92, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
-
-        // check after 2 hour
-        treatment.date = time - 2 * 60 * 60 * 1000; // 1 hour
-        treatment.insulin = 10d;
-        assertEquals(0.77, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
-
-        // check after 3 hour
-        treatment.date = time - 3 * 60 * 60 * 1000; // 1 hour
-        treatment.insulin = 10d;
-        assertEquals(0.10, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
-
-        // check after dia
-        treatment.date = time - 4 * 60 * 60 * 1000;
-        treatment.insulin = 10d;
-        assertEquals(0d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
-    }
-
-
-    /**
-     * this method is implemented to allow tests of the iobCalcForTreatment calculation
-      * @return
-     */
-    @Override
-    int getPeak() {
-        return this.peak;
-    }
-
-     /**
-     * Userdefined Dia is implemented to allow tests of the getDia method
-     *
-     * @return
-     */
-    public double getUserDefinedDia() {
-        return this.dia;
-    }
-
-    void sendShortDiaNotification(double dia) {
-        this.shortDiaNotificationSend = true;
-    }
-
-    @Override
-    public int getId() {
-        return 0;
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return null;
-    }
-
-    @Override
-    String commentStandardText() {
-        return null;
-    }
-
-
-    // the following methods are implemented, but not needed...
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
new file mode 100644
index 0000000000..d3eb07a25d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
@@ -0,0 +1,125 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Iob
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.Companion.MIN_DIA
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+
+class InsulinOrefBasePluginTest {
+
+    var testPeak = 0
+    var testUserDefinedDia = 0.0
+    var shortDiaNotificationSend = false
+
+    inner class InsulinBaseTest(
+        injector: HasAndroidInjector,
+        resourceHelper: ResourceHelper,
+        profileFunction: ProfileFunction,
+        rxBus: RxBusWrapper,
+        aapsLogger: AAPSLogger
+    ) : InsulinOrefBasePlugin(
+        injector, resourceHelper, profileFunction, rxBus, aapsLogger
+    ) {
+
+        override fun sendShortDiaNotification(dia: Double) {
+            shortDiaNotificationSend = true
+        }
+
+        override val userDefinedDia: Double
+            get() = testUserDefinedDia
+
+        override val peak: Int
+            get() = testPeak
+
+        override fun commentStandardText(): String = ""
+        override fun getId(): Int = 0
+        override fun getFriendlyName(): String = ""
+    }
+
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    private lateinit var sut: InsulinBaseTest
+
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var aapsLogger: AAPSLogger
+    @Mock lateinit var activePlugin: ActivePluginProvider
+
+    private var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Treatment) {
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+                it.activePlugin = activePlugin
+            }
+        }
+    }
+
+    @Before
+    fun setUp() {
+        sut = InsulinBaseTest(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+    }
+
+    @Test
+    fun testGetDia() {
+        Assert.assertEquals(MIN_DIA, sut.dia, 0.0)
+        testUserDefinedDia = MIN_DIA + 1
+        Assert.assertEquals(MIN_DIA + 1, sut.dia, 0.0)
+        testUserDefinedDia = MIN_DIA - 1
+        Assert.assertEquals(MIN_DIA, sut.dia, 0.0)
+        Assert.assertTrue(shortDiaNotificationSend)
+    }
+
+    @Test
+    fun minDiaTes() {
+        Assert.assertEquals(5.0, MIN_DIA, 0.0001)
+    }
+
+    @Test
+    fun testIobCalcForTreatment() {
+        val treatment = Treatment(injector) //TODO: this should be a separate sut. I'd prefer a separate class.
+        val expected = Iob()
+        Assert.assertEquals(expected, sut.iobCalcForTreatment(treatment, 0, 0.0))
+        testPeak = 30
+        testUserDefinedDia = 4.0
+        val time = System.currentTimeMillis()
+        // check directly after bolus
+        treatment.date = time
+        treatment.insulin = 10.0
+        Assert.assertEquals(10.0, sut.iobCalcForTreatment(treatment, time).iobContrib, 0.1)
+        // check after 1 hour
+        treatment.date = time - 1 * 60 * 60 * 1000 // 1 hour
+        treatment.insulin = 10.0
+        Assert.assertEquals(3.92, sut.iobCalcForTreatment(treatment, time).iobContrib, 0.1)
+        // check after 2 hour
+        treatment.date = time - 2 * 60 * 60 * 1000 // 1 hour
+        treatment.insulin = 10.0
+        Assert.assertEquals(0.77, sut.iobCalcForTreatment(treatment, time).iobContrib, 0.1)
+        // check after 3 hour
+        treatment.date = time - 3 * 60 * 60 * 1000 // 1 hour
+        treatment.insulin = 10.0
+        Assert.assertEquals(0.10, sut.iobCalcForTreatment(treatment, time).iobContrib, 0.1)
+        // check after dia
+        treatment.date = time - 4 * 60 * 60 * 1000
+        treatment.insulin = 10.0
+        Assert.assertEquals(0.0, sut.iobCalcForTreatment(treatment, time).iobContrib, 0.1)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
new file mode 100644
index 0000000000..e34407fcfe
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
@@ -0,0 +1,73 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+
+/**
+ * Created by adrian on 2019-12-25.
+ */
+
+class InsulinOrefFreePeakPluginTest : TestBase() {
+
+    lateinit var sut: InsulinOrefFreePeakPlugin
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var profileFunction: ProfileFunction
+
+    private var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+        }
+    }
+
+    @Before
+    fun setup() {
+        sut = InsulinOrefFreePeakPlugin(
+            injector,
+            sp,
+            resourceHelper,
+            profileFunction,
+            rxBus,
+            aapsLogger)
+    }
+
+    @Test
+    fun `simple peak test`() {
+        `when`(sp.getInt(eq(R.string.key_insulin_oref_peak), anyInt())).thenReturn(90)
+        assertEquals(90, sut.peak)
+    }
+
+    @Test
+    fun getIdTest() {
+        assertEquals(InsulinInterface.OREF_FREE_PEAK, sut.id)
+    }
+
+    @Test
+    fun commentStandardTextTest() {
+        `when`(sp.getInt(eq(R.string.key_insulin_oref_peak), anyInt())).thenReturn(90)
+        `when`(resourceHelper.gs(eq(R.string.insulin_peak_time))).thenReturn("Peak Time [min]")
+        assertEquals("Peak Time [min]: 90", sut.commentStandardText())
+    }
+
+    @Test
+    fun getFriendlyNameTest() {
+        `when`(resourceHelper.gs(eq(R.string.free_peak_oref))).thenReturn("Free-Peak Oref")
+        assertEquals("Free-Peak Oref", sut.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
new file mode 100644
index 0000000000..a7aea711c3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+
+class InsulinOrefRapidActingPluginTest {
+
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    private lateinit var sut: InsulinOrefRapidActingPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var aapsLogger: AAPSLogger
+
+    private var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+        }
+    }
+
+    @Before
+    fun setup() {
+        sut = InsulinOrefRapidActingPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+    }
+
+    @Test
+    fun `simple peak test`() {
+        assertEquals(75, sut.peak)
+    }
+
+    @Test
+    fun getIdTest() {
+        assertEquals(InsulinInterface.OREF_RAPID_ACTING, sut.id)
+    }
+
+    @Test
+    fun commentStandardTextTest() {
+        `when`(resourceHelper.gs(eq(R.string.fastactinginsulincomment))).thenReturn("Novorapid, Novolog, Humalog")
+        assertEquals("Novorapid, Novolog, Humalog", sut.commentStandardText())
+    }
+
+    @Test
+    fun getFriendlyNameTest() {
+        `when`(resourceHelper.gs(eq(R.string.rapid_acting_oref))).thenReturn("Rapid-Acting Oref")
+        assertEquals("Rapid-Acting Oref", sut.friendlyName)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
new file mode 100644
index 0000000000..7d02e4be21
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+
+class InsulinOrefUltraRapidActingPluginTest {
+
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    private lateinit var sut: InsulinOrefUltraRapidActingPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var aapsLogger: AAPSLogger
+
+    private var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+        }
+    }
+
+    @Before
+    fun setup() {
+        sut = InsulinOrefUltraRapidActingPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+    }
+
+    @Test
+    fun `simple peak test`() {
+        assertEquals(55, sut.peak)
+    }
+
+    @Test
+    fun getIdTest() {
+        assertEquals(InsulinInterface.OREF_ULTRA_RAPID_ACTING, sut.id)
+    }
+
+    @Test
+    fun commentStandardTextTest() {
+        `when`(resourceHelper.gs(eq(R.string.ultrafastactinginsulincomment))).thenReturn("Fiasp")
+        assertEquals("Fiasp", sut.commentStandardText())
+    }
+
+    @Test
+    fun getFriendlyNameTest() {
+        `when`(resourceHelper.gs(eq(R.string.ultrarapid_oref))).thenReturn("Ultra-Rapid Oref")
+        assertEquals("Ultra-Rapid Oref", sut.friendlyName)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java
deleted file mode 100644
index 6d91bea911..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by mike on 26.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, IobCobCalculatorPlugin.class, DateUtil.class})
-public class GlucoseStatusTest {
-    IobCobCalculatorPlugin iobCobCalculatorPlugin;
-
-    @Test
-    public void toStringShouldBeOverloaded() {
-        GlucoseStatus glucoseStatus = new GlucoseStatus();
-        Assert.assertEquals(true, glucoseStatus.log().contains("Delta"));
-    }
-
-    @Test
-    public void roundtest() {
-        GlucoseStatus glucoseStatus = new GlucoseStatus();
-        glucoseStatus.glucose = 100.11111;
-        Assert.assertEquals(100.1, glucoseStatus.round().glucose, 0.0001);
-    }
-
-    @Test
-    public void calculateValidGlucoseStatus() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateValidBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Assert.assertEquals(214d, glucoseStatus.glucose, 0.001d);
-        Assert.assertEquals(-2d, glucoseStatus.delta, 0.001d);
-        Assert.assertEquals(-2.5d, glucoseStatus.short_avgdelta, 0.001d); // -2 -2.5 -3 deltas are relative to current value
-        Assert.assertEquals(-2.5d, glucoseStatus.avgdelta, 0.001d); // the same as short_avgdelta
-        Assert.assertEquals(-2d, glucoseStatus.long_avgdelta, 0.001d); // -2 -2 -2 -2
-        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
-    }
-
-    @Test
-    public void calculateMostRecentGlucoseStatus() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateMostRecentBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Assert.assertEquals(215d, glucoseStatus.glucose, 0.001d); // (214+216) / 2
-        Assert.assertEquals(-1.0d, glucoseStatus.delta, 0.001d);
-        Assert.assertEquals(-1.0d, glucoseStatus.short_avgdelta, 0.001d);
-        Assert.assertEquals(-1.0d, glucoseStatus.avgdelta, 0.001d);
-        Assert.assertEquals(0d, glucoseStatus.long_avgdelta, 0.001d);
-        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date, even when averaging
-    }
-
-    @Test
-    public void oneRecordShouldProduceZeroDeltas() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateOneCurrentRecordBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
-        Assert.assertEquals(214d, glucoseStatus.glucose, 0.001d);
-        Assert.assertEquals(0d, glucoseStatus.delta, 0.001d);
-        Assert.assertEquals(0d, glucoseStatus.short_avgdelta, 0.001d); // -2 -2.5 -3 deltas are relative to current value
-        Assert.assertEquals(0d, glucoseStatus.avgdelta, 0.001d); // the same as short_avgdelta
-        Assert.assertEquals(0d, glucoseStatus.long_avgdelta, 0.001d); // -2 -2 -2 -2
-        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
-    }
-
-    @Test
-    public void insuffientDataShouldReturnNull() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateInsufficientBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Assert.assertEquals(null, glucoseStatus);
-    }
-
-    @Test
-    public void oldDataShouldReturnNull() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateOldBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        Assert.assertEquals(null, glucoseStatus);
-    }
-
-    @Test
-    public void returnOldDataIfAllowed() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateOldBgData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData(true);
-        Assert.assertNotEquals(null, glucoseStatus);
-    }
-
-    @Test
-    public void averageShouldNotFailOnEmptyArray() {
-        Assert.assertEquals(0d, GlucoseStatus.average(new ArrayList<>()), 0.001d);
-    }
-
-    @Test
-    public void calculateGlucoseStatusForLibreTestBgData() {
-        when(iobCobCalculatorPlugin.getBgReadings()).thenReturn(generateLibreTestData());
-
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-
-        Assert.assertEquals(100d, glucoseStatus.glucose, 0.001d); //
-        Assert.assertEquals(-10d, glucoseStatus.delta, 0.001d);
-        Assert.assertEquals(-10d, glucoseStatus.short_avgdelta, 0.001d);
-        Assert.assertEquals(-10d, glucoseStatus.avgdelta, 0.001d);
-        Assert.assertEquals(-10d, glucoseStatus.long_avgdelta, 0.001d);
-        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
-    }
-
-    @Before
-    public void initMocking() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        iobCobCalculatorPlugin = AAPSMocker.mockIobCobCalculatorPlugin();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(1514766900000L + T.mins(1).msecs());
-    }
-
-    // [{"mgdl":214,"mills":1521895773113,"device":"xDrip-DexcomG5","direction":"Flat","filtered":191040,"unfiltered":205024,"noise":1,"rssi":100},{"mgdl":219,"mills":1521896073352,"device":"xDrip-DexcomG5","direction":"Flat","filtered":200160,"unfiltered":209760,"noise":1,"rssi":100},{"mgdl":222,"mills":1521896372890,"device":"xDrip-DexcomG5","direction":"Flat","filtered":207360,"unfiltered":212512,"noise":1,"rssi":100},{"mgdl":220,"mills":1521896673062,"device":"xDrip-DexcomG5","direction":"Flat","filtered":211488,"unfiltered":210688,"noise":1,"rssi":100},{"mgdl":193,"mills":1521896972933,"device":"xDrip-DexcomG5","direction":"Flat","filtered":212384,"unfiltered":208960,"noise":1,"rssi":100},{"mgdl":181,"mills":1521897273336,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":210592,"unfiltered":204320,"noise":1,"rssi":100},{"mgdl":176,"mills":1521897572875,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":206720,"unfiltered":197440,"noise":1,"rssi":100},{"mgdl":168,"mills":1521897872929,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":201024,"unfiltered":187904,"noise":1,"rssi":100},{"mgdl":161,"mills":1521898172814,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":193376,"unfiltered":178144,"noise":1,"rssi":100},{"mgdl":148,"mills":1521898472879,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":183264,"unfiltered":161216,"noise":1,"rssi":100},{"mgdl":139,"mills":1521898772862,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":170784,"unfiltered":148928,"noise":1,"rssi":100},{"mgdl":132,"mills":1521899072896,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":157248,"unfiltered":139552,"noise":1,"rssi":100},{"mgdl":125,"mills":1521899372834,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":144416,"unfiltered":129616.00000000001,"noise":1,"rssi":100},{"mgdl":128,"mills":1521899973456,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130240.00000000001,"unfiltered":133536,"noise":1,"rssi":100},{"mgdl":132,"mills":1521900573287,"device":"xDrip-DexcomG5","direction":"Flat","filtered":133504,"unfiltered":138720,"noise":1,"rssi":100},{"mgdl":127,"mills":1521900873711,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136480,"unfiltered":132992,"noise":1,"rssi":100},{"mgdl":127,"mills":1521901180151,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136896,"unfiltered":132128,"noise":1,"rssi":100},{"mgdl":125,"mills":1521901473582,"device":"xDrip-DexcomG5","direction":"Flat","filtered":134624,"unfiltered":129696,"noise":1,"rssi":100},{"mgdl":120,"mills":1521901773597,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130704.00000000001,"unfiltered":123376,"noise":1,"rssi":100},{"mgdl":116,"mills":1521902075855,"device":"xDrip-DexcomG5","direction":"Flat","filtered":126272,"unfiltered":118448,"noise":1,"rssi":100}]
-    List<BgReading> generateValidBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))); // +2
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))); // +3
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))); // +4
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-
-    List<BgReading> generateMostRecentBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766800000,\"direction\":\"Flat\"}")))); // +2
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-
-    List<BgReading> generateInsufficientBgData() {
-        List<BgReading> list = new ArrayList<>();
-        return list;
-    }
-
-    List<BgReading> generateOldBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-
-    List<BgReading> generateOneCurrentRecordBgData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-    List<BgReading> generateLibreTestData() {
-        List<BgReading> list = new ArrayList<>();
-        try {
-            long end_time = 1514766900000L;
-            double latest_reading = 100d;
-            // Now
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time) + ",\"direction\":\"Flat\"}"))));
-            // One minute ago
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time - (1000 * 60 * 1)) + ",\"direction\":\"Flat\"}"))));
-            // Two minutes ago
-            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading) + ",\"mills\":" + (end_time - (1000 * 60 * 2)) + ",\"direction\":\"Flat\"}"))));
-
-            // Three minutes and beyond at constant rate
-            for (int i=3; i < 50; i++) {
-                list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading + (i*2)) + ",\"mills\":" + (end_time - (1000 * 60 * i)) + ",\"direction\":\"Flat\"}"))));
-            }
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
new file mode 100644
index 0000000000..d0a5f7ebeb
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
@@ -0,0 +1,203 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
+import org.json.JSONException
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+/**
+ * Created by mike on 26.03.2018.
+ */
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(IobCobCalculatorPlugin::class, DateUtil::class)
+class GlucoseStatusTest : TestBase() {
+
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is GlucoseStatus) {
+                it.aapsLogger = aapsLogger
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+        }
+    }
+
+    @Test fun toStringShouldBeOverloaded() {
+        val glucoseStatus = GlucoseStatus(injector)
+        Assert.assertEquals(true, glucoseStatus.log().contains("Delta"))
+    }
+
+    @Test fun roundTest() {
+        val glucoseStatus = GlucoseStatus(injector)
+        glucoseStatus.glucose = 100.11111
+        Assert.assertEquals(100.1, glucoseStatus.round().glucose, 0.0001)
+    }
+
+    @Test fun calculateValidGlucoseStatus() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateValidBgData())
+        val glucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
+        Assert.assertEquals(-2.0, glucoseStatus.delta, 0.001)
+        Assert.assertEquals(-2.5, glucoseStatus.short_avgdelta, 0.001) // -2 -2.5 -3 deltas are relative to current value
+        Assert.assertEquals(-2.5, glucoseStatus.avgdelta, 0.001) // the same as short_avgdelta
+        Assert.assertEquals(-2.0, glucoseStatus.long_avgdelta, 0.001) // -2 -2 -2 -2
+        Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
+    }
+
+    @Test fun calculateMostRecentGlucoseStatus() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateMostRecentBgData())
+        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        Assert.assertEquals(215.0, glucoseStatus.glucose, 0.001) // (214+216) / 2
+        Assert.assertEquals(-1.0, glucoseStatus.delta, 0.001)
+        Assert.assertEquals(-1.0, glucoseStatus.short_avgdelta, 0.001)
+        Assert.assertEquals(-1.0, glucoseStatus.avgdelta, 0.001)
+        Assert.assertEquals(0.0, glucoseStatus.long_avgdelta, 0.001)
+        Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date, even when averaging
+    }
+
+    @Test fun oneRecordShouldProduceZeroDeltas() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOneCurrentRecordBgData())
+        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
+        Assert.assertEquals(0.0, glucoseStatus.delta, 0.001)
+        Assert.assertEquals(0.0, glucoseStatus.short_avgdelta, 0.001) // -2 -2.5 -3 deltas are relative to current value
+        Assert.assertEquals(0.0, glucoseStatus.avgdelta, 0.001) // the same as short_avgdelta
+        Assert.assertEquals(0.0, glucoseStatus.long_avgdelta, 0.001) // -2 -2 -2 -2
+        Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
+    }
+
+    @Test fun insuffientDataShouldReturnNull() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateInsufficientBgData())
+        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).glucoseStatusData
+        Assert.assertEquals(null, glucoseStatus)
+    }
+
+    @Test fun oldDataShouldReturnNull() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOldBgData())
+        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).glucoseStatusData
+        Assert.assertEquals(null, glucoseStatus)
+    }
+
+    @Test fun returnOldDataIfAllowed() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateOldBgData())
+        val glucoseStatus: GlucoseStatus? = GlucoseStatus(injector).getGlucoseStatusData(true)
+        Assert.assertNotEquals(null, glucoseStatus)
+    }
+
+    @Test fun averageShouldNotFailOnEmptyArray() {
+        Assert.assertEquals(0.0, GlucoseStatus.average(ArrayList()), 0.001)
+    }
+
+    @Test fun calculateGlucoseStatusForLibreTestBgData() {
+        PowerMockito.`when`(iobCobCalculatorPlugin.bgReadings).thenReturn(generateLibreTestData())
+        val glucoseStatus: GlucoseStatus = GlucoseStatus(injector).glucoseStatusData!!
+        Assert.assertEquals(100.0, glucoseStatus.glucose, 0.001) //
+        Assert.assertEquals(-10.0, glucoseStatus.delta, 0.001)
+        Assert.assertEquals(-10.0, glucoseStatus.short_avgdelta, 0.001)
+        Assert.assertEquals(-10.0, glucoseStatus.avgdelta, 0.001)
+        Assert.assertEquals(-10.0, glucoseStatus.long_avgdelta, 0.001)
+        Assert.assertEquals(1514766900000L, glucoseStatus.date) // latest date
+    }
+
+    @Before
+    fun initMocking() {
+        PowerMockito.mockStatic(DateUtil::class.java)
+        PowerMockito.`when`(DateUtil.now()).thenReturn(1514766900000L + T.mins(1).msecs())
+        `when`(iobCobCalculatorPlugin.dataLock).thenReturn(Unit)
+    }
+
+    // [{"mgdl":214,"mills":1521895773113,"device":"xDrip-DexcomG5","direction":"Flat","filtered":191040,"unfiltered":205024,"noise":1,"rssi":100},{"mgdl":219,"mills":1521896073352,"device":"xDrip-DexcomG5","direction":"Flat","filtered":200160,"unfiltered":209760,"noise":1,"rssi":100},{"mgdl":222,"mills":1521896372890,"device":"xDrip-DexcomG5","direction":"Flat","filtered":207360,"unfiltered":212512,"noise":1,"rssi":100},{"mgdl":220,"mills":1521896673062,"device":"xDrip-DexcomG5","direction":"Flat","filtered":211488,"unfiltered":210688,"noise":1,"rssi":100},{"mgdl":193,"mills":1521896972933,"device":"xDrip-DexcomG5","direction":"Flat","filtered":212384,"unfiltered":208960,"noise":1,"rssi":100},{"mgdl":181,"mills":1521897273336,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":210592,"unfiltered":204320,"noise":1,"rssi":100},{"mgdl":176,"mills":1521897572875,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":206720,"unfiltered":197440,"noise":1,"rssi":100},{"mgdl":168,"mills":1521897872929,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":201024,"unfiltered":187904,"noise":1,"rssi":100},{"mgdl":161,"mills":1521898172814,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":193376,"unfiltered":178144,"noise":1,"rssi":100},{"mgdl":148,"mills":1521898472879,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":183264,"unfiltered":161216,"noise":1,"rssi":100},{"mgdl":139,"mills":1521898772862,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":170784,"unfiltered":148928,"noise":1,"rssi":100},{"mgdl":132,"mills":1521899072896,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":157248,"unfiltered":139552,"noise":1,"rssi":100},{"mgdl":125,"mills":1521899372834,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":144416,"unfiltered":129616.00000000001,"noise":1,"rssi":100},{"mgdl":128,"mills":1521899973456,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130240.00000000001,"unfiltered":133536,"noise":1,"rssi":100},{"mgdl":132,"mills":1521900573287,"device":"xDrip-DexcomG5","direction":"Flat","filtered":133504,"unfiltered":138720,"noise":1,"rssi":100},{"mgdl":127,"mills":1521900873711,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136480,"unfiltered":132992,"noise":1,"rssi":100},{"mgdl":127,"mills":1521901180151,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136896,"unfiltered":132128,"noise":1,"rssi":100},{"mgdl":125,"mills":1521901473582,"device":"xDrip-DexcomG5","direction":"Flat","filtered":134624,"unfiltered":129696,"noise":1,"rssi":100},{"mgdl":120,"mills":1521901773597,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130704.00000000001,"unfiltered":123376,"noise":1,"rssi":100},{"mgdl":116,"mills":1521902075855,"device":"xDrip-DexcomG5","direction":"Flat","filtered":126272,"unfiltered":118448,"noise":1,"rssi":100}]
+    private fun generateValidBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        try {
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+        } catch (e: JSONException) {
+            throw RuntimeException(e)
+        }
+        return list
+    }
+
+    private fun generateMostRecentBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        try {
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766800000,\"direction\":\"Flat\"}")))) // +2
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}"))))
+        } catch (e: JSONException) {
+            throw RuntimeException(e)
+        }
+        return list
+    }
+
+    private fun generateInsufficientBgData(): List<BgReading> {
+        return ArrayList()
+    }
+
+    private fun generateOldBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        try {
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+        } catch (e: JSONException) {
+            throw RuntimeException(e)
+        }
+        return list
+    }
+
+    private fun generateOneCurrentRecordBgData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        try {
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+        } catch (e: JSONException) {
+            throw RuntimeException(e)
+        }
+        return list
+    }
+
+    private fun generateLibreTestData(): List<BgReading> {
+        val list: MutableList<BgReading> = ArrayList()
+        try {
+            val endTime = 1514766900000L
+            val latestReading = 100.0
+            // Now
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":$latestReading,\"mills\":$endTime,\"direction\":\"Flat\"}"))))
+            // One minute ago
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 1) + ",\"direction\":\"Flat\"}"))))
+            // Two minutes ago
+            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 2) + ",\"direction\":\"Flat\"}"))))
+
+            // Three minutes and beyond at constant rate
+            for (i in 3..49) {
+                list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + (latestReading + i * 2) + ",\"mills\":" + (endTime - 1000 * 60 * i) + ",\"direction\":\"Flat\"}"))))
+            }
+        } catch (e: JSONException) {
+            throw RuntimeException(e)
+        }
+        return list
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
deleted file mode 100644
index 4cd57f93ad..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
+++ /dev/null
@@ -1,457 +0,0 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.T;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class, L.class})
-public class IobCobCalculatorPluginTest {
-
-    IobCobCalculatorPlugin iobCobCalculatorPlugin = IobCobCalculatorPlugin.getPlugin();
-
-    @Test
-    public void isAbout5minDataTest() {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        // Super data should not be touched
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        // too much shifted data should return false
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(9).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData());
-
-        // too much shifted and missing data should return false
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(9).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData());
-
-        // too much shifted and missing data should return false
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(83).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(78).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(73).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(68).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(63).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(58).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(53).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(48).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(43).plus(T.secs(40)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(38).plus(T.secs(33)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(33).plus(T.secs(1)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(28).plus(T.secs(0)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(23).plus(T.secs(0)).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(16).plus(T.secs(36)).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData());
-
-        // slighly shifted data should return true
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs() - T.secs(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        // slighly shifted and missing data should return true
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs() - T.secs(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-    }
-
-    @Test
-    public void createBucketedData5minTest() throws Exception {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        // Super data should not be touched
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(bgReadingList.get(0).date, iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(bgReadingList.get(3).date, iobCobCalculatorPlugin.getBucketedData().get(3).date);
-        Assert.assertEquals(bgReadingList.size(), iobCobCalculatorPlugin.getBucketedData().size());
-
-        // Missing value should be replaced
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(bgReadingList.get(0).date, iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(bgReadingList.get(2).date, iobCobCalculatorPlugin.getBucketedData().get(3).date);
-        Assert.assertEquals(bgReadingList.size() + 1, iobCobCalculatorPlugin.getBucketedData().size());
-
-        // drift should be cleared
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs() + T.secs(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs() + T.secs(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs() - T.secs(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(0).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(T.mins(15).msecs(), iobCobCalculatorPlugin.getBucketedData().get(1).date);
-        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.getBucketedData().get(2).date);
-        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.getBucketedData().get(3).date);
-        Assert.assertEquals(bgReadingList.size(), iobCobCalculatorPlugin.getBucketedData().size());
-
-        // bucketed data should return null if not enough bg data
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(30).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(null, iobCobCalculatorPlugin.getBucketedData());
-
-        // data should be reconstructed
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(50).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(45).msecs()).value(90));
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(40));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.getBucketedData().get(6).date);
-        Assert.assertEquals(7, iobCobCalculatorPlugin.getBucketedData().size());
-
-        Assert.assertEquals(100, iobCobCalculatorPlugin.getBucketedData().get(0).value, 1);
-        Assert.assertEquals(90, iobCobCalculatorPlugin.getBucketedData().get(1).value, 1);
-        Assert.assertEquals(50, iobCobCalculatorPlugin.getBucketedData().get(5).value, 1);
-        Assert.assertEquals(40, iobCobCalculatorPlugin.getBucketedData().get(6).value, 1);
-
-        // non 5min data should be reconstructed
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(50).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(48).msecs()).value(96));
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(40));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.getBucketedData().get(6).date);
-        Assert.assertEquals(7, iobCobCalculatorPlugin.getBucketedData().size());
-
-        Assert.assertEquals(100, iobCobCalculatorPlugin.getBucketedData().get(0).value, 1);
-        Assert.assertEquals(90, iobCobCalculatorPlugin.getBucketedData().get(1).value, 1);
-        Assert.assertEquals(50, iobCobCalculatorPlugin.getBucketedData().get(5).value, 1);
-        Assert.assertEquals(40, iobCobCalculatorPlugin.getBucketedData().get(6).value, 1);
-
-        //bucketed data should be null if no bg data available
-        iobCobCalculatorPlugin.setBgReadings(null);
-        iobCobCalculatorPlugin.createBucketedData();
-        Assert.assertEquals(null, iobCobCalculatorPlugin.getBucketedData());
-
-        // real data gap test
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T13:34:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T13:14:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T13:09:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T13:04:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:59:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:54:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:49:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:44:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:39:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:34:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:24:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:09:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T12:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:59:55Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:09:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T11:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:09:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T10:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:35:05Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:30:17Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:09:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T09:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:40:02Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:09:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T08:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:30:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:25:17Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:14:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:09:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T07:04:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:59:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:54:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:10:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T06:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:49:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:34:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:29:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:24:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:19:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:14:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:09:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T05:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:50:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:44:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:39:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:34:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:29:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:24:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:19:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:14:57Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:10:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T04:04:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T03:59:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T03:54:56Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T03:50:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-09-05T03:44:57Z")).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData());
-
-        iobCobCalculatorPlugin.createBucketedData();
-        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T13:34:57Z").getTime(), iobCobCalculatorPlugin.getBucketedData().get(0).date);
-        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T03:44:57Z").getTime(), iobCobCalculatorPlugin.getBucketedData().get(iobCobCalculatorPlugin.getBucketedData().size() - 1).date);
-
-        // 5min 4sec data
-        bgReadingList.clear();
-
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:33:40Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:28:36Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:23:32Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:18:28Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:13:24Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:08:19Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T06:03:16Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:58:11Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:53:07Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:48:03Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:42:58Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:37:54Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:32:51Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:27:46Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:22:42Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:17:38Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:12:33Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:07:29Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T05:02:26Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T04:57:21Z")).value(100));
-        bgReadingList.add(new BgReading().date(DateUtil.fromISODateString("2018-10-05T04:52:17Z")).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData());
-    }
-
-    @Test
-    public void getBgReadingsTest() {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(bgReadingList, iobCobCalculatorPlugin.getBgReadings());
-    }
-
-    @Test
-    public void roundUpTimeTest() {
-        Assert.assertEquals(T.mins(3).msecs(), iobCobCalculatorPlugin.roundUpTime(T.secs(155).msecs()));
-    }
-
-    @Test
-    public void findNewerTest() {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(8).msecs()).date);
-        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(5).msecs()).date);
-        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(10).msecs()).date);
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(20).msecs()).date);
-        Assert.assertEquals(null, iobCobCalculatorPlugin.findNewer(T.mins(22).msecs()));
-    }
-
-    @Test
-    public void findOlderTest() {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-
-        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(8).msecs()).date);
-        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(5).msecs()).date);
-        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(10).msecs()).date);
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(20).msecs()).date);
-        Assert.assertEquals(null, iobCobCalculatorPlugin.findOlder(T.mins(4).msecs()));
-    }
-
-    @Test
-    public void findPreviousTimeFromBucketedDataTest() {
-        List<BgReading> bgReadingList = new ArrayList<>();
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        iobCobCalculatorPlugin.createBucketedData();
-        Assert.assertEquals(null, iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(1000));
-
-        // Super data should not be touched
-        bgReadingList.clear();
-        bgReadingList.add(new BgReading().date(T.mins(20).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(15).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(10).msecs()).value(100));
-        bgReadingList.add(new BgReading().date(T.mins(5).msecs()).value(100));
-
-        iobCobCalculatorPlugin.setBgReadings(bgReadingList);
-        iobCobCalculatorPlugin.createBucketedData();
-
-        Assert.assertEquals(null, iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(4).msecs()));
-        Assert.assertEquals((Long) T.mins(5).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(6).msecs()));
-        Assert.assertEquals((Long) T.mins(20).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(20).msecs()));
-        Assert.assertEquals((Long) T.mins(20).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(25).msecs()));
-    }
-
-    @Before
-    public void doMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockL();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
new file mode 100644
index 0000000000..a21990f406
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
@@ -0,0 +1,436 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(FabricPrivacy::class)
+class IobCobCalculatorPluginTest : TestBase() {
+
+    @Mock lateinit var sp: SP
+    private val rxBus: RxBusWrapper = RxBusWrapper()
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+    @Mock lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
+    @Mock lateinit var sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var fabricPrivacy: FabricPrivacy
+
+    lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is BgReading) {
+                it.aapsLogger = aapsLogger
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+            }
+        }
+    }
+
+    @Before
+    fun mock() {
+        iobCobCalculatorPlugin = IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction, activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy)
+    }
+
+    @Test
+    fun isAbout5minDataTest() {
+        val bgReadingList: MutableList<BgReading> = ArrayList()
+
+        // Super data should not be touched
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+
+        // too much shifted data should return false
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(9).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
+
+        // too much shifted and missing data should return false
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(9).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
+
+        // too much shifted and missing data should return false
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(83).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(78).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(73).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(68).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(63).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(58).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(53).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(48).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(43).plus(T.secs(40)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(38).plus(T.secs(33)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(33).plus(T.secs(1)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(28).plus(T.secs(0)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(23).plus(T.secs(0)).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(16).plus(T.secs(36)).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
+
+        // slightly shifted data should return true
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs() - T.secs(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+
+        // slightly shifted and missing data should return true
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs() - T.secs(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+    }
+
+    @Test
+    fun createBucketedData5minTest() {
+        val bgReadingList: MutableList<BgReading> = ArrayList()
+
+        // Super data should not be touched
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(bgReadingList[3].date, iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(bgReadingList.size.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
+
+        // Missing value should be replaced
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(bgReadingList[2].date, iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(bgReadingList.size + 1.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
+
+        // drift should be cleared
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs() + T.secs(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs() + T.secs(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs() - T.secs(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(0).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(T.mins(15).msecs(), iobCobCalculatorPlugin.bucketedData[1].date)
+        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.bucketedData[2].date)
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(bgReadingList.size.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
+
+        // bucketed data should return null if not enough bg data
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(30).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(null, iobCobCalculatorPlugin.bucketedData)
+
+        // data should be reconstructed
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(50).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(45).msecs()).value(90.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(40.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].date)
+        Assert.assertEquals(7, iobCobCalculatorPlugin.bucketedData.size.toLong())
+        Assert.assertEquals(100.0, iobCobCalculatorPlugin.bucketedData[0].value, 1.0)
+        Assert.assertEquals(90.0, iobCobCalculatorPlugin.bucketedData[1].value, 1.0)
+        Assert.assertEquals(50.0, iobCobCalculatorPlugin.bucketedData[5].value, 1.0)
+        Assert.assertEquals(40.0, iobCobCalculatorPlugin.bucketedData[6].value, 1.0)
+
+        // non 5min data should be reconstructed
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(50).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(48).msecs()).value(96.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(40.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].date)
+        Assert.assertEquals(7, iobCobCalculatorPlugin.bucketedData.size.toLong())
+        Assert.assertEquals(100.0, iobCobCalculatorPlugin.bucketedData[0].value, 1.0)
+        Assert.assertEquals(90.0, iobCobCalculatorPlugin.bucketedData[1].value, 1.0)
+        Assert.assertEquals(50.0, iobCobCalculatorPlugin.bucketedData[5].value, 1.0)
+        Assert.assertEquals(40.0, iobCobCalculatorPlugin.bucketedData[6].value, 1.0)
+
+        //bucketed data should be null if no bg data available
+        iobCobCalculatorPlugin.bgReadings = null
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(null, iobCobCalculatorPlugin.bucketedData)
+
+        // real data gap test
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T13:34:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T13:14:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T13:09:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T13:04:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:59:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:54:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:49:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:44:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:39:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:34:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:24:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:09:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T12:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:59:55Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:09:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T11:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:09:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T10:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:35:05Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:30:17Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:09:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T09:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:40:02Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:09:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T08:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:30:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:25:17Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:14:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:09:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T07:04:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:59:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:54:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:10:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T06:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:49:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:34:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:29:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:24:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:19:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:14:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:09:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T05:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:50:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:44:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:39:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:34:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:29:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:24:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:19:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:14:57Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:10:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T04:04:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:59:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:54:56Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:50:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:44:57Z")).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T13:34:57Z").time, iobCobCalculatorPlugin.bucketedData[0].date)
+        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T03:44:57Z").time, iobCobCalculatorPlugin.bucketedData[iobCobCalculatorPlugin.bucketedData.size - 1].date)
+
+        // 5min 4sec data
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:33:40Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:28:36Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:23:32Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:18:28Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:13:24Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:08:19Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T06:03:16Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:58:11Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:53:07Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:48:03Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:42:58Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:37:54Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:32:51Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:27:46Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:22:42Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:17:38Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:12:33Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:07:29Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T05:02:26Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T04:57:21Z")).value(100.0))
+        bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-10-05T04:52:17Z")).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
+    }
+
+    @Test
+    fun bgReadingsTest() {
+        val bgReadingList: List<BgReading> = ArrayList()
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(bgReadingList, iobCobCalculatorPlugin.bgReadings)
+    }
+
+    @Test
+    fun roundUpTimeTest() {
+        Assert.assertEquals(T.mins(3).msecs(), IobCobCalculatorPlugin.roundUpTime(T.secs(155).msecs()))
+    }
+
+    @Test
+    fun findNewerTest() {
+        val bgReadingList: MutableList<BgReading> = ArrayList()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(8).msecs())!!.date)
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(5).msecs())!!.date)
+        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(10).msecs())!!.date)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findNewer(T.mins(20).msecs())!!.date)
+        Assert.assertEquals(null, iobCobCalculatorPlugin.findNewer(T.mins(22).msecs()))
+    }
+
+    @Test
+    fun findOlderTest() {
+        val bgReadingList: MutableList<BgReading> = ArrayList()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(8).msecs())!!.date)
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(5).msecs())!!.date)
+        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(10).msecs())!!.date)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findOlder(T.mins(20).msecs())!!.date)
+        Assert.assertEquals(null, iobCobCalculatorPlugin.findOlder(T.mins(4).msecs()))
+    }
+
+    @Test
+    fun findPreviousTimeFromBucketedDataTest() {
+        val bgReadingList: MutableList<BgReading> = ArrayList()
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(null, iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(1000))
+
+        // Super data should not be touched
+        bgReadingList.clear()
+        bgReadingList.add(BgReading(injector).date(T.mins(20).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(15).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(10).msecs()).value(100.0))
+        bgReadingList.add(BgReading(injector).date(T.mins(5).msecs()).value(100.0))
+        iobCobCalculatorPlugin.bgReadings = bgReadingList
+        iobCobCalculatorPlugin.createBucketedData()
+        Assert.assertEquals(null, iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(4).msecs()))
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(6).msecs()))
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(20).msecs()))
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.findPreviousTimeFromBucketedData(T.mins(25).msecs()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java
deleted file mode 100644
index 8e7784f5b8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.combo;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, CommandQueue.class})
-public class ComboPluginTest {
-
-    ComboPlugin comboPlugin;
-
-    @Test
-    public void invalidBasalRateOnComboPumpShouldLimitLoopInvokation() throws Exception {
-        comboPlugin.setPluginEnabled(PluginType.PUMP, true);
-        comboPlugin.setValidBasalRateProfileSelectedOnPump(false);
-
-        Constraint<Boolean> c = new Constraint<>(true);
-        c = comboPlugin.isLoopInvocationAllowed(c);
-        Assert.assertEquals("Combo: No valid basal rate read from pump", c.getReasons());
-        Assert.assertEquals(Boolean.FALSE, c.value());
-        comboPlugin.setPluginEnabled(PluginType.PUMP, false);
-    }
-
-    @Test
-    public void calculateFakePumpTimestamp() throws Exception {
-        long now = System.currentTimeMillis();
-        long pumpTimestamp = now - now % 1000;
-        // same timestamp, different bolus leads to different fake timestamp
-        Assert.assertNotEquals(
-                comboPlugin.calculateFakeBolusDate(new Bolus(pumpTimestamp, 0.1, true)),
-                comboPlugin.calculateFakeBolusDate(new Bolus(pumpTimestamp, 0.3, true))
-        );
-        // different timestamp, same bolus leads to different fake timestamp
-        Assert.assertNotEquals(
-                comboPlugin.calculateFakeBolusDate(new Bolus(pumpTimestamp, 0.3, true)),
-                comboPlugin.calculateFakeBolusDate(new Bolus(pumpTimestamp + 60 * 1000, 0.3, true))
-        );
-        // generated timestamp has second-precision
-        Bolus bolus = new Bolus(pumpTimestamp, 0.2, true);
-        long calculatedTimestamp = comboPlugin.calculateFakeBolusDate(bolus);
-        assertEquals(calculatedTimestamp, calculatedTimestamp - calculatedTimestamp % 1000);
-    }
-
-    @Before
-    public void prepareMocks() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockCommandQueue();
-
-        comboPlugin = ComboPlugin.getPlugin();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
new file mode 100644
index 0000000000..6b349711f0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
@@ -0,0 +1,88 @@
+package info.nightscout.androidaps.plugins.pump.combo
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, Context::class, CommandQueue::class)
+class ComboPluginTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var sp: SP
+    @Mock lateinit var context: Context
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+        }
+    }
+
+    private lateinit var comboPlugin: ComboPlugin
+
+    @Before
+    fun prepareMocks() {
+        `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
+        comboPlugin = ComboPlugin(injector, aapsLogger, RxBusWrapper(), resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
+    }
+
+    @Test
+    fun invalidBasalRateOnComboPumpShouldLimitLoopInvocation() {
+        comboPlugin.setPluginEnabled(PluginType.PUMP, true)
+        comboPlugin.setValidBasalRateProfileSelectedOnPump(false)
+        var c = Constraint(true)
+        c = comboPlugin.isLoopInvocationAllowed(c)
+        Assert.assertEquals("Combo: No valid basal rate read from pump", c.getReasons(aapsLogger))
+        Assert.assertEquals(false, c.value())
+        comboPlugin.setPluginEnabled(PluginType.PUMP, false)
+    }
+
+    @Test
+    fun calculateFakePumpTimestamp() {
+        val now = System.currentTimeMillis()
+        val pumpTimestamp = now - now % 1000
+        // same timestamp, different bolus leads to different fake timestamp
+        Assert.assertNotEquals(
+            comboPlugin.calculateFakeBolusDate(Bolus(pumpTimestamp, 0.1, true)),
+            comboPlugin.calculateFakeBolusDate(Bolus(pumpTimestamp, 0.3, true))
+        )
+        // different timestamp, same bolus leads to different fake timestamp
+        Assert.assertNotEquals(
+            comboPlugin.calculateFakeBolusDate(Bolus(pumpTimestamp, 0.3, true)),
+            comboPlugin.calculateFakeBolusDate(Bolus(pumpTimestamp + 60 * 1000, 0.3, true))
+        )
+        // generated timestamp has second-precision
+        val bolus = Bolus(pumpTimestamp, 0.2, true)
+        val calculatedTimestamp = comboPlugin.calculateFakeBolusDate(bolus)
+        Assert.assertEquals(calculatedTimestamp, calculatedTimestamp - calculatedTimestamp % 1000)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
index d0944d23bc..28117e5583 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
@@ -1,26 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
-import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.logging.AAPSLogger
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers
-import org.mockito.Mockito
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
+import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-class DetailedBolusInfoStorageTest {
+class DetailedBolusInfoStorageTest : TestBase() {
 
     private val info1 = DetailedBolusInfo()
     private val info2 = DetailedBolusInfo()
     private val info3 = DetailedBolusInfo()
 
+    lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    
     init {
         info1.date = 1000000
         info1.insulin = 3.0
@@ -30,75 +29,64 @@ class DetailedBolusInfoStorageTest {
         info3.insulin = 5.0
     }
 
+    @Before
+    fun prepare() {
+        detailedBolusInfoStorage = DetailedBolusInfoStorage(aapsLogger)
+    }
+
     private fun setUp() {
-        DetailedBolusInfoStorage.store.clear()
-        DetailedBolusInfoStorage.add(info1)
-        DetailedBolusInfoStorage.add(info2)
-        DetailedBolusInfoStorage.add(info3)
+        detailedBolusInfoStorage.store.clear()
+        detailedBolusInfoStorage.add(info1)
+        detailedBolusInfoStorage.add(info2)
+        detailedBolusInfoStorage.add(info3)
     }
 
     @Test
     fun add() {
-        DetailedBolusInfoStorage.store.clear()
-        assertEquals(0, DetailedBolusInfoStorage.store.size)
-        DetailedBolusInfoStorage.add(info1)
-        assertEquals(1, DetailedBolusInfoStorage.store.size)
+        detailedBolusInfoStorage.store.clear()
+        assertEquals(0, detailedBolusInfoStorage.store.size)
+        detailedBolusInfoStorage.add(info1)
+        assertEquals(1, detailedBolusInfoStorage.store.size)
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun findDetailedBolusInfo() {
-        prepareMainApp()
-        prepareSP()
-        prepareLogging()
 
         // Look for exact bolus
         setUp()
-        var d: DetailedBolusInfo? = DetailedBolusInfoStorage.findDetailedBolusInfo(1000000, 4.0)
+        var d: DetailedBolusInfo? = detailedBolusInfoStorage.findDetailedBolusInfo(1000000, 4.0)
         assertEquals(4.0, d!!.insulin, 0.01)
-        assertEquals(2, DetailedBolusInfoStorage.store.size)
+        assertEquals(2, detailedBolusInfoStorage.store.size)
         // Look for exact bolus
         setUp()
-        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1000000, 3.0)
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1000000, 3.0)
         assertEquals(3.0, d!!.insulin, 0.01)
-        assertEquals(2, DetailedBolusInfoStorage.store.size)
+        assertEquals(2, detailedBolusInfoStorage.store.size)
         // With less insulin (bolus not delivered completely). Should return first one matching date
         setUp()
-        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1000500, 2.0)
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1000500, 2.0)
         assertEquals(3.0, d!!.insulin, 0.01)
-        assertEquals(2, DetailedBolusInfoStorage.store.size)
+        assertEquals(2, detailedBolusInfoStorage.store.size)
         // With less insulin (bolus not delivered completely). Should return first one matching date
         setUp()
-        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1000500, 3.5)
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1000500, 3.5)
         assertEquals(4.0, d!!.insulin, 0.01)
-        assertEquals(2, DetailedBolusInfoStorage.store.size)
+        assertEquals(2, detailedBolusInfoStorage.store.size)
         // With more insulin should return null
         setUp()
-        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1000500, 4.5)
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1000500, 4.5)
         assertNull(d)
-        assertEquals(3, DetailedBolusInfoStorage.store.size)
+        assertEquals(3, detailedBolusInfoStorage.store.size)
         // With more than one minute off should return null
         setUp()
-        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1070000, 4.0)
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1070000, 4.0)
         assertNull(d)
-        assertEquals(3, DetailedBolusInfoStorage.store.size)
+        assertEquals(3, detailedBolusInfoStorage.store.size)
+        // Use last, if bolus size is the same
+        setUp()
+        d = detailedBolusInfoStorage.findDetailedBolusInfo(1070000, 5.0)
+        assertEquals(5.0, d!!.insulin, 0.01)
+        assertEquals(2, detailedBolusInfoStorage.store.size)
 
     }
-
-    private fun prepareMainApp() {
-        PowerMockito.mockStatic(MainApp::class.java)
-        val mainApp = Mockito.mock<MainApp>(MainApp::class.java)
-        Mockito.`when`(MainApp.instance()).thenReturn(mainApp)
-        Mockito.`when`(MainApp.gs(ArgumentMatchers.anyInt())).thenReturn("some dummy string")
-    }
-
-    private fun prepareSP() {
-        PowerMockito.mockStatic(SP::class.java)
-    }
-
-    private fun prepareLogging() {
-        PowerMockito.mockStatic(L::class.java)
-        Mockito.`when`(L.isEnabled(Mockito.any())).thenReturn(true)
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java
deleted file mode 100644
index 322655caaa..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
-
-import android.content.Context;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, SP.class})
-public class DanaRPluginTest {
-
-    DanaRPlugin danaRPlugin;
-
-    @Test
-    public void basalRateShouldBeLimited() throws Exception {
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Double> c = new Constraint<>(Constants.REALLYHIGHBASALRATE);
-        danaRPlugin.applyBasalConstraints(c, AAPSMocker.getValidProfile());
-        Assert.assertEquals(0.8d, c.value());
-        Assert.assertEquals("DanaR: Limiting basal rate to 0.80 U/h because of pump limit", c.getReasons());
-        Assert.assertEquals("DanaR: Limiting basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Test
-    public void percentBasalRateShouldBeLimited() throws Exception {
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Integer> c = new Constraint<>(Constants.REALLYHIGHPERCENTBASALRATE);
-        danaRPlugin.applyBasalPercentConstraints(c, AAPSMocker.getValidProfile());
-        Assert.assertEquals((Integer) 200, c.value());
-        Assert.assertEquals("DanaR: Limiting percent rate to 200% because of pump limit", c.getReasons());
-        Assert.assertEquals("DanaR: Limiting percent rate to 200% because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Before
-    public void prepareMocks() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockCommandQueue();
-
-        when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
-
-        danaRPlugin = DanaRPlugin.getPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
new file mode 100644
index 0000000000..44ee4019c3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -0,0 +1,74 @@
+package info.nightscout.androidaps.plugins.pump.danaR
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(SP::class, ConstraintChecker::class)
+class DanaRPluginTest : TestBaseWithProfile() {
+
+    @Mock lateinit var context: Context
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var sp: SP
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    lateinit var danaRPump: DanaRPump
+
+    private lateinit var danaRPlugin: DanaRPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector { }
+    }
+
+    @Before
+    fun prepareMocks() {
+        `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump)
+    }
+
+    @Test @Throws(Exception::class)
+    fun basalRateShouldBeLimited() {
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        danaRPlugin.applyBasalConstraints(c, validProfile)
+        Assert.assertEquals(0.8, c.value(), 0.01)
+        Assert.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test @Throws(Exception::class)
+    fun percentBasalRateShouldBeLimited() {
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        danaRPlugin.applyBasalPercentConstraints(c, validProfile)
+        Assert.assertEquals(200, c.value())
+        Assert.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
new file mode 100644
index 0000000000..20c5bf6038
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Before
+import org.mockito.Mock
+
+open class DanaRTestBase : TestBase() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var injector: HasAndroidInjector
+
+    lateinit var danaRPump: DanaRPump
+
+    fun createArray(length: Int, fillWith: Byte): ByteArray {
+        val ret = ByteArray(length)
+        for (i in 0 until length) {
+            ret[i] = fillWith
+        }
+        return ret
+    }
+
+    fun createArray(length: Int, fillWith: Double): Array<Double> {
+        val ret = Array(length) { 0.0 }
+        for (i in 0 until length) {
+            ret[i] = fillWith
+        }
+        return ret
+    }
+
+    fun putIntToArray(array: ByteArray, position: Int, value: Int): ByteArray {
+        array[6 + position + 1] = (value and 0xFF).toByte()
+        array[6 + position] = ((value and 0xFF00) shr 8).toByte()
+        return array
+    }
+
+    fun putByteToArray(array: ByteArray, position: Int, value: Byte): ByteArray {
+        array[6 + position] = value
+        return array
+    }
+
+    @Before
+    fun setup() {
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java
deleted file mode 100644
index bc94fe0f30..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/31/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MessageHashTableRTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MessageHashTableR messageHashTable = MessageHashTableR.INSTANCE;
-        MessageBase testMessage = messageHashTable.findMessage(0x41f2);
-        assertEquals("CMD_HISTORY_ALL", testMessage.getMessageName());
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
new file mode 100644
index 0000000000..e2ad047b78
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class MessageHashTableRTest : DanaRTestBase() {
+
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test fun runTest() {
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin)
+        val testMessage = messageHashTable.findMessage(0x41f2)
+        Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java
deleted file mode 100644
index c2d283952d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MessageOriginalNamesTest {
-    @Test
-    public void runTest() {
-        MessageOriginalNames packet = new MessageOriginalNames();
-        String testName = packet.getName(0x41f2);
-        assertEquals("CMD_HISTORY_ALL", testName);
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt
new file mode 100644
index 0000000000..0b9c519177
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.TestBase
+import org.junit.Assert
+import org.junit.Test
+
+class MessageOriginalNamesTest : TestBase() {
+
+    @Test
+    fun getNameTest() {
+        Assert.assertEquals("CMD_CONNECT", MessageOriginalNames.getName(0x3001))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java
deleted file mode 100644
index 289df3d186..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgBolusProgressTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-        Treatment t = new Treatment();
-        MsgBolusProgress packet = new MsgBolusProgress(3D, t);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-
-        int valueRequested = (((byte) 1 << 8) + ((byte) 1 + 0));
-        assertEquals(valueRequested, packet.progress,0d);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
new file mode 100644
index 0000000000..7c10c200ce
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgBolusProgressTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    val rxBus = RxBusWrapper()
+
+    @Test fun runTest() {
+        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
+        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
+        danaRPump.bolusAmountToBeDelivered = 3.0
+        val packet = MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump)
+
+        // test message decoding
+        val array = ByteArray(100)
+        putIntToArray(array, 0, 2 * 100)
+        packet.handleMessage(array)
+        Assert.assertEquals(1.0, danaRPump.bolusingTreatment?.insulin!!, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java
deleted file mode 100644
index c057804279..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgBolusStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgBolusStart packet = new MsgBolusStart();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-        packet = new MsgBolusStart();
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(false, packet.failed);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
new file mode 100644
index 0000000000..87cec753d7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class)
+class MsgBolusStartTest : DanaRTestBase() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+
+    @Test fun runTest() {
+        `when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
+        val packet = MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 1.0)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+
+        putByteToArray(array, 0, 2)
+        packet.handleMessage(array)
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java
deleted file mode 100644
index e3e2f75d69..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgBolusStartWithSpeedTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgBolusStartWithSpeed packet = new MsgBolusStartWithSpeed();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-        packet = new MsgBolusStartWithSpeed();
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(false, packet.failed);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
new file mode 100644
index 0000000000..34c0024a99
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class)
+class MsgBolusStartWithSpeedTest : DanaRTestBase() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+
+    @Test fun runTest() {
+        Mockito.`when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
+        val packet = MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+
+        putByteToArray(array, 0, 2)
+        packet.handleMessage(array)
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java
deleted file mode 100644
index 4032ef7dad..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgBolusStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-        Treatment t = new Treatment();
-        MsgBolusStop packet = new MsgBolusStop(1d,t);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.stopped);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
new file mode 100644
index 0000000000..3e813c1328
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgBolusStopTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    val rxBus = RxBusWrapper()
+
+    @Test fun runTest() {
+        `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
+        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector {  } })
+        val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(ByteArray(100))
+        Assert.assertEquals(true, danaRPump.bolusStopped)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java
deleted file mode 100644
index 83dbdcd12c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, DanaRPlugin.class})
-public class MsgCheckValueTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        Treatment t = new Treatment();
-        MsgCheckValue packet = new MsgCheckValue();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 3));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(DanaRPump.EXPORT_MODEL, pump.model);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
new file mode 100644
index 0000000000..ec3588fbe7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgCheckValueTest : DanaRTestBase() {
+
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+
+    @Test fun runTest() {
+        val packet = MsgCheckValue(aapsLogger, danaRPump, danaRPlugin)
+
+        // test message decoding
+        val array = ByteArray(100)
+        putByteToArray(array, 0, DanaRPump.EXPORT_MODEL.toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.model)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java
deleted file mode 100644
index 45664cdfb7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/28/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgErrorTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockNSUpload();
-        MsgError packet = new MsgError();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-        // bigger than 8 - no error
-        packet = new MsgError();
-        packet.handleMessage(createArray(34, (byte) 10));
-        assertEquals(false, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
new file mode 100644
index 0000000000..2c372c4c21
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(NSUpload::class)
+class MsgErrorTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    val rxBus = RxBusWrapper()
+
+    @Test fun runTest() {
+        PowerMockito.mockStatic(NSUpload::class.java)
+        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaRPump)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+        // bigger than 8 - no error
+        putByteToArray(array, 0, 10)
+        packet.handleMessage(array)
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java
deleted file mode 100644
index ce8c7d73da..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryAlarmTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryAlarm packet = new MsgHistoryAlarm();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
new file mode 100644
index 0000000000..afb5e6ec6c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryAlarmTest : DanaRTestBase() {
+
+    val rxBus = RxBusWrapper()
+
+    @Test fun runTest() {
+        val packet = MsgHistoryAlarm(aapsLogger, rxBus)
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java
deleted file mode 100644
index a46031cab6..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryAllDoneTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryAllDone packet = new MsgHistoryAllDone();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.received);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
new file mode 100644
index 0000000000..7da9c4c241
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryAllDoneTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryAllDone(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(ByteArray(0))
+        Assert.assertEquals(true, danaRPump.historyDoneReceived)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java
deleted file mode 100644
index 2bfec9baee..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryAllTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockDatabaseHelper();
-        MsgHistoryAll packet = new MsgHistoryAll();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(false, packet.failed);
-        // passing an bigger number
-        packet.handleMessage(createArray(34, (byte) 17));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
new file mode 100644
index 0000000000..47401ff67b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.db.DatabaseHelper
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(MainApp::class)
+class MsgHistoryAllTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        PowerMockito.mockStatic(MainApp::class.java)
+        `when`(MainApp.getDbHelper()).thenReturn(PowerMockito.mock(DatabaseHelper::class.java))
+        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper())
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(false, packet.failed)
+        // passing an bigger number
+        putByteToArray(array, 0, 17)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java
deleted file mode 100644
index fb62f54c65..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryBasalHourTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryBasalHour packet = new MsgHistoryBasalHour();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
new file mode 100644
index 0000000000..dd7d81502a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryBasalHourTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java
deleted file mode 100644
index 0ac6701014..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryBolusTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryBolus packet = new MsgHistoryBolus();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
new file mode 100644
index 0000000000..5edd07ed2e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryBolusTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java
deleted file mode 100644
index bdfe09cff7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryCarboTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryCarbo packet = new MsgHistoryCarbo();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
new file mode 100644
index 0000000000..225ea67259
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryCarboTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java
deleted file mode 100644
index 545affec29..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryDailyInsulinTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryDailyInsulin packet = new MsgHistoryDailyInsulin();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
new file mode 100644
index 0000000000..b6ef8be268
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryDailyInsulinTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java
deleted file mode 100644
index e55086da70..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryDoneTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryDone packet = new MsgHistoryDone();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
new file mode 100644
index 0000000000..8530b9baec
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryDoneTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryDone(aapsLogger, danaRPump)
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java
deleted file mode 100644
index 45df7ee04d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryErrorTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryError packet = new MsgHistoryError();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
new file mode 100644
index 0000000000..756139c88b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryErrorTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryError(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java
deleted file mode 100644
index 333f6a218a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryGlucoseTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryGlucose packet = new MsgHistoryGlucose();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
new file mode 100644
index 0000000000..e460432652
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryGlucoseTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java
deleted file mode 100644
index 14d9de653b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryNewDoneTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryNewDone packet = new MsgHistoryNewDone();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
new file mode 100644
index 0000000000..c5c9ec4f11
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryNewDoneTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryNewDone(aapsLogger, danaRPump)
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java
deleted file mode 100644
index a43e12cd13..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryNewTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryNew packet = new MsgHistoryNew();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
new file mode 100644
index 0000000000..52d000d56d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryNewTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java
deleted file mode 100644
index 2fd30fd09d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistoryRefillTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistoryRefill packet = new MsgHistoryRefill();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
new file mode 100644
index 0000000000..1a2014cb2b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistoryRefillTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java
deleted file mode 100644
index 77737ef245..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class MsgHistorySuspendTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgHistorySuspend packet = new MsgHistorySuspend();
-        // nothing left to test
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
new file mode 100644
index 0000000000..5863a7596c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgHistorySuspendTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper())
+        // nothing left to test
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
deleted file mode 100644
index 959d114098..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgInitConnStatusBasicTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-       MsgInitConnStatusBasic packet = new MsgInitConnStatusBasic();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(true, pump.pumpSuspended);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
new file mode 100644
index 0000000000..eba32dbf35
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgInitConnStatusBasicTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusBasic(aapsLogger, danaRPump)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.pumpSuspended)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
deleted file mode 100644
index f7860fbaa2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgInitConnStatusBolusTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgInitConnStatusBolus packet = new MsgInitConnStatusBolus();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        // message bigger than 22
-        assertEquals(true, packet.failed);
-        packet.handleMessage(createArray(20, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(true, pump.isExtendedBolusEnabled);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
new file mode 100644
index 0000000000..28039329a7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgInitConnStatusBolusTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump)
+
+        // test message decoding
+        var array = ByteArray(100)
+
+        // message bigger than 22
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+        array = ByteArray(20)
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.isExtendedBolusEnabled)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
deleted file mode 100644
index 0b1d956ded..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, ConfigBuilderPlugin.class})
-public class MsgInitConnStatusOptionTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConfigBuilder();
-        MsgInitConnStatusOption packet = new MsgInitConnStatusOption();
-
-        // test message decoding
-        packet.handleMessage(createArray(20, (byte) 1));
-        // message smaller than 21
-        assertEquals(true, packet.failed);
-        packet.handleMessage(createArray(22, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(false, pump.isPasswordOK());
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
new file mode 100644
index 0000000000..3b2f7b9045
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(VirtualPumpPlugin::class)
+class MsgInitConnStatusOptionTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        `when`(activePlugin.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
+        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, activePlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(20, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // message smaller than 21
+        packet.handleMessage(createArray(22, 1.toByte()))
+        Assert.assertEquals(false, danaRPump.isPasswordOK)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
deleted file mode 100644
index b5ef46e9b2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, ConfigBuilderPlugin.class})
-public class MsgInitConnStatusTimeTest {
-    @Test
-    public void runTest() {
-        MsgInitConnStatusTime packet = new MsgInitConnStatusTime();
-
-        // test message decoding
-        packet.handleMessage(createArray(20, (byte) 1));
-        // message smaller than 10
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(15, (byte) 1));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
new file mode 100644
index 0000000000..cfb55eaae7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class)
+class MsgInitConnStatusTimeTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue)
+
+        // test message decoding
+        packet.handleMessage(createArray(20, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // message smaller than 10
+        packet.handleMessage(createArray(15, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
deleted file mode 100644
index ada4d9a1fb..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgPCCommStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgPCCommStart packet = new MsgPCCommStart();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
new file mode 100644
index 0000000000..8a4856ffab
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgPCCommStartTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgPCCommStart(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
deleted file mode 100644
index 81b9c32aa1..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgPCCommStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgPCCommStop packet = new MsgPCCommStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
new file mode 100644
index 0000000000..89b3c6a334
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgPCCommStopTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgPCCommStop(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
deleted file mode 100644
index ca87435a7a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetActivateBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetActivateBasalProfile packet = new MsgSetActivateBasalProfile((byte) 1);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
new file mode 100644
index 0000000000..47875c29a7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetActivateBasalProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetActivateBasalProfile(aapsLogger, 1.toByte())
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
deleted file mode 100644
index ed4fb83a10..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetBasalProfile packet = new MsgSetBasalProfile((byte) 1, createArray(24,1));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
new file mode 100644
index 0000000000..9f6dbeb07e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetBasalProfileTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgSetBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper, 1.toByte(), Array(24) { 1.0 })
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
deleted file mode 100644
index 72cbb54516..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetCarbsEntryTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetCarbsEntry packet = new MsgSetCarbsEntry(System.currentTimeMillis(), 10);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
new file mode 100644
index 0000000000..2de9486752
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetCarbsEntryTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), 10)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
deleted file mode 100644
index 87ace6198a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetExtendedBolusStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConstraintsChecker();
-        MsgSetExtendedBolusStart packet = new MsgSetExtendedBolusStart(2D, (byte) 2);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
new file mode 100644
index 0000000000..8971cee5f3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class)
+class MsgSetExtendedBolusStartTest : DanaRTestBase() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+
+    @Test fun runTest() {
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        val packet = MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 2.0, 2.toByte())
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
deleted file mode 100644
index 21391e47b4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetExtendedBolusStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetExtendedBolusStop packet = new MsgSetExtendedBolusStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
new file mode 100644
index 0000000000..5ed8ed4dcb
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetExtendedBolusStopTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetExtendedBolusStop(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
deleted file mode 100644
index cfb17d9ab5..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetSingleBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetSingleBasalProfile packet = new MsgSetSingleBasalProfile(createArray(24, 2));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
new file mode 100644
index 0000000000..36fdee444e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetSingleBasalProfileTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgSetSingleBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper,  createArray(24, 2.0))
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
deleted file mode 100644
index e6b6123805..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTempBasalStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTempBasalStart packet = new MsgSetTempBasalStart(250, 1);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
new file mode 100644
index 0000000000..cee42aea82
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetTempBasalStartTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetTempBasalStart(aapsLogger, 250, 1)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
deleted file mode 100644
index 1bd0ea8299..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTempBasalStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTempBasalStop packet = new MsgSetTempBasalStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
deleted file mode 100644
index 0214cf58f9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTimeTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTime packet = new MsgSetTime(new Date(System.currentTimeMillis()));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
new file mode 100644
index 0000000000..067d368591
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class MsgSetTimeTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetTime(aapsLogger, Date(System.currentTimeMillis()))
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
deleted file mode 100644
index 71447a258b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetUserOptionsTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetUserOptions packet = new MsgSetUserOptions();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
new file mode 100644
index 0000000000..d151b539c0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetUserOptionsTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetUserOptions(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
deleted file mode 100644
index 3d523ebf6c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingActiveProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingActiveProfile packet = new MsgSettingActiveProfile();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 1), pump.activeProfile);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
new file mode 100644
index 0000000000..3af752abe9
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingActiveProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingActiveProfile(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaRPump.activeProfile)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
deleted file mode 100644
index b1877a5611..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingBasalProfileAllTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingBasalProfileAll packet = new MsgSettingBasalProfileAll();
-
-        // test message decoding
-        packet.handleMessage(createArray(400, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
new file mode 100644
index 0000000000..2d38ce7bd7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingBasalProfileAllTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingBasalProfileAll(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(400, 1.toByte()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
deleted file mode 100644
index 7d1583a73b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingBasalTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingBasal packet = new MsgSettingBasal();
-
-        // test message decoding
-        packet.handleMessage(createArray(100, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        int expected = MessageBase.intFromBuff(createArray(100, (byte) 1), 2 * 1, 2);
-        assertEquals((double) expected/100d, pump.pumpProfiles[pump.activeProfile][1], 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
new file mode 100644
index 0000000000..158a364a6d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRPlugin::class)
+class MsgSettingBasalTest : DanaRTestBase() {
+
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+
+    @Test fun runTest() {
+        `when`(danaRPlugin.getPumpDescription()).thenReturn(PumpDescription())
+        val packet = MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(100, 1.toByte()))
+        val expected = MessageBase.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
+        Assert.assertEquals(expected.toDouble() / 100.0, danaRPump.pumpProfiles!![danaRPump.activeProfile][1], 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
deleted file mode 100644
index c0428a886e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingGlucoseTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingGlucose packet = new MsgSettingGlucose();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(1, pump.units);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
new file mode 100644
index 0000000000..99da2bbc92
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingGlucoseTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingGlucose(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(1, danaRPump.units)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
deleted file mode 100644
index 8da983b213..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingMaxValuesTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingMaxValues packet = new MsgSettingMaxValues();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2) / 100d, pump.maxBolus,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
new file mode 100644
index 0000000000..07500d1ce5
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingMaxValuesTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingMaxValues(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaRPump.maxBolus, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
deleted file mode 100644
index 2ba1be66a7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingMealTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingMeal packet = new MsgSettingMeal();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 1), 0, 1) / 100d, pump.bolusStep, 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
new file mode 100644
index 0000000000..a56270ad09
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
+class MsgSettingMealTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+
+    @Test fun runTest() {
+        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRKoreanPlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaRPump.bolusStep, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
deleted file mode 100644
index d65da6805f..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingProfileRatiosAllTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingProfileRatiosAll packet = new MsgSettingProfileRatiosAll();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.morningCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
new file mode 100644
index 0000000000..be2f65f3ad
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.morningCIR)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
deleted file mode 100644
index bcb9734c04..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingProfileRatiosTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingProfileRatios packet = new MsgSettingProfileRatios();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.currentCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
new file mode 100644
index 0000000000..080aef2a8d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingProfileRatiosTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingProfileRatios(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
deleted file mode 100644
index fa21a2a197..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingPumpTimeTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingPumpTime packet = new MsgSettingPumpTime();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        byte[] bytes = createArray(34, (byte) 7);
-        long time =
-                new Date(
-                        100 + MessageBase.intFromBuff(bytes, 5, 1),
-                        MessageBase.intFromBuff(bytes, 4, 1) - 1,
-                        MessageBase.intFromBuff(bytes, 3, 1),
-                        MessageBase.intFromBuff(bytes, 2, 1),
-                        MessageBase.intFromBuff(bytes, 1, 1),
-                        MessageBase.intFromBuff(bytes, 0, 1)
-                ).getTime();
-        packet.handleMessage(bytes);
-        pump = DanaRPump.getInstance();
-        assertEquals(time, pump.pumpTime);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
new file mode 100644
index 0000000000..7a40b86a07
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingPumpTimeTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingPumpTime(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        val bytes = createArray(34, 7.toByte())
+        val time = Date(
+            100 + MessageBase.intFromBuff(bytes, 5, 1),
+            MessageBase.intFromBuff(bytes, 4, 1) - 1,
+            MessageBase.intFromBuff(bytes, 3, 1),
+            MessageBase.intFromBuff(bytes, 2, 1),
+            MessageBase.intFromBuff(bytes, 1, 1),
+            MessageBase.intFromBuff(bytes, 0, 1)
+        ).time
+        packet.handleMessage(bytes)
+        Assert.assertEquals(time, danaRPump.pumpTime)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
deleted file mode 100644
index aa8999ced4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingShippingInfoTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingShippingInfo packet = new MsgSettingShippingInfo();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals(MessageBase.stringFromBuff(createArray(34, (byte) 7), 0, 10), pump.serialNumber);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
new file mode 100644
index 0000000000..7f9e2ea6c3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingShippingInfoTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingShippingInfo(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaRPump.serialNumber)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
deleted file mode 100644
index bb60b0da1e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingUserOptionsTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingUserOptions packet = new MsgSettingUserOptions();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(48, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((byte) 7 & 255 , pump.lcdOnTimeSec);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
new file mode 100644
index 0000000000..f18dde576b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import kotlin.experimental.and
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingUserOptionsTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingUserOptions(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(48, 7.toByte()))
+        Assert.assertEquals(7, danaRPump.lcdOnTimeSec)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
deleted file mode 100644
index 06ac6d5e7c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBasicTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusBasic packet = new MsgStatusBasic();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 3) / 750d, pump.dailyTotalUnits,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
new file mode 100644
index 0000000000..b627d55c86
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBasicTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusBasic(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
deleted file mode 100644
index dd5751d1b3..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBolusExtendedTest {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusBolusExtended packet = new MsgStatusBolusExtended();
-        // test message decoding
-        //TODO Find a way to mock treatments plugin
-//        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-//        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 2, 2)/100d, pump.extendedBolusAmount,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
new file mode 100644
index 0000000000..d2e2336ac2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBolusExtendedTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test
+    fun runTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        val packet = MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin)
+        // test message decoding
+        val array = ByteArray(100)
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
deleted file mode 100644
index c91409b237..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusProfile packet = new MsgStatusProfile();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.currentCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
new file mode 100644
index 0000000000..4af9c12894
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusProfile(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
deleted file mode 100644
index 4bb51a1a00..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Created by Rumen Georgiev on 8/31/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTempBasalTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusTempBasal packet = new MsgStatusTempBasal();
-        DanaRPump pump = DanaRPump.getInstance();
-        // test message decoding
-        // Calling context.getResources() before super.onCreate() returns nullPointerException
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
new file mode 100644
index 0000000000..703b9b1e3b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTempBasalTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test fun runTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        val packet = MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin)
+        // test message decoding
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
deleted file mode 100644
index 7d30e8da09..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatus packet = new MsgStatus();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 3) / 750d, pump.dailyTotalUnits,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
new file mode 100644
index 0000000000..8bde4483c0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatus(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java
deleted file mode 100644
index f325cf8477..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/31/2018.
- */
-public class RecordTypesTest {
-    @Test
-    public void runTest() {
-        RecordTypes packet = new RecordTypes();
-        assertEquals((byte) 0x01, packet.RECORD_TYPE_BOLUS);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt
new file mode 100644
index 0000000000..51f06e7ec9
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+
+class RecordTypesTest {
+
+    @Test fun runTest() {
+        Assert.assertEquals(1.toByte(), RecordTypes.RECORD_TYPE_BOLUS)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
new file mode 100644
index 0000000000..5dd1c1a3b0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -0,0 +1,75 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(SP::class, ConstraintChecker::class)
+class DanaRKoreanPluginTest : TestBaseWithProfile() {
+
+    @Mock lateinit var context: Context
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var sp: SP
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    lateinit var danaRPump: DanaRPump
+
+    private lateinit var danaRPlugin: DanaRKoreanPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector { }
+    }
+
+    @Before
+    fun prepareMocks() {
+        `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue)
+    }
+
+    @Test @Throws(Exception::class)
+    fun basalRateShouldBeLimited() {
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        danaRPlugin.applyBasalConstraints(c, validProfile)
+        Assert.assertEquals(0.8, c.value(), 0.01)
+        Assert.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test @Throws(Exception::class)
+    fun percentBasalRateShouldBeLimited() {
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        danaRPlugin.applyBasalPercentConstraints(c, validProfile)
+        Assert.assertEquals(200, c.value())
+        Assert.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
new file mode 100644
index 0000000000..90397dc87b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class MessageHashTableRKoreanTest : DanaRSTestBase() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    @Test fun runTest() {
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin)
+        val testMessage = messageHashTable.findMessage(0x41f2)
+        Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java
deleted file mode 100644
index 269a6a0304..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 23.03.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, SP.class})
-public class DanaRSPluginTest {
-
-    DanaRSPlugin danaRSPlugin;
-
-    @Test
-    public void basalRateShouldBeLimited() throws Exception {
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Double> c = new Constraint<>(Constants.REALLYHIGHBASALRATE);
-        danaRSPlugin.applyBasalConstraints(c, AAPSMocker.getValidProfile());
-        assertEquals(Double.valueOf(0.8d), c.value());
-        assertEquals("DanaRS: Limiting basal rate to 0.80 U/h because of pump limit", c.getReasons());
-        assertEquals("DanaRS: Limiting basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Test
-    public void percentBasalRateShouldBeLimited() throws Exception {
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Integer> c = new Constraint<>(Constants.REALLYHIGHPERCENTBASALRATE);
-        danaRSPlugin.applyBasalPercentConstraints(c, AAPSMocker.getValidProfile());
-        assertEquals((Integer) 200, c.value());
-        assertEquals("DanaRS: Limiting percent rate to 200% because of pump limit", c.getReasons());
-        assertEquals("DanaRS: Limiting percent rate to 200% because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Before
-    public void prepareMocks() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockCommandQueue();
-
-        when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
-
-        danaRSPlugin = DanaRSPlugin.getPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
new file mode 100644
index 0000000000..a9a13dbc90
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.plugins.pump.danaRS
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, RxBusWrapper::class, DetailedBolusInfoStorage::class)
+class DanaRSPluginTest : DanaRSTestBase() {
+
+    @Mock lateinit var context: Context
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    private lateinit var danaRSPlugin: DanaRSPlugin
+
+    @Test
+    fun basalRateShouldBeLimited() {
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        danaRSPlugin.applyBasalConstraints(c, validProfile)
+        Assert.assertEquals(java.lang.Double.valueOf(0.8), c.value(), 0.0001)
+        Assert.assertEquals("DanaRS: limitingbasalratio", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaRS: limitingbasalratio", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test
+    fun percentBasalRateShouldBeLimited() {
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        danaRSPlugin.applyBasalPercentConstraints(c, validProfile)
+        Assert.assertEquals(200, c.value())
+        Assert.assertEquals("DanaRS: limitingpercentrate", c.getReasons(aapsLogger))
+        Assert.assertEquals("DanaRS: limitingpercentrate", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Before
+    fun prepareMocks() {
+        Mockito.`when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
+        Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
+        Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
+
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java
deleted file mode 100644
index b498fb8bbc..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, DanaRSMessageHashTable.class})
-public class DanaRSMessageHashTableTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-//        HashMap<Integer, DanaRS_Packet> messages = new DanaRSMessageHashTable().messages;
-        DanaRS_Packet forTesting = new DanaRS_Packet_APS_Set_Event_History();
-        DanaRS_Packet testPacket = DanaRSMessageHashTable.findMessage(forTesting.getCommand());
-        assertEquals(BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY, testPacket.getOpCode());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
new file mode 100644
index 0000000000..34f7c64def
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class DanaRSMessageHashTableTest : DanaRSTestBase() {
+
+    @Mock lateinit var danaRSPlugin: DanaRSPlugin
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    @Test
+    fun runTest() {
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+
+        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage)
+        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
+        val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
+        Assert.assertEquals(BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt
new file mode 100644
index 0000000000..a118af1b85
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Before
+import org.mockito.Mock
+
+open class DanaRSTestBase : TestBaseWithProfile() {
+
+    @Mock lateinit var sp: SP
+    @Mock lateinit var injector: HasAndroidInjector
+
+    lateinit var danaRPump: DanaRPump
+
+    fun createArray(length: Int, fillWith: Byte): ByteArray {
+        val ret = ByteArray(length)
+        for (i in 0 until length) {
+            ret[i] = fillWith
+        }
+        return ret
+    }
+
+    fun createArray(length: Int, fillWith: Double): Array<Double> {
+        val ret = Array(length) { 0.0 }
+        for (i in 0 until length) {
+            ret[i] = fillWith
+        }
+        return ret
+    }
+
+    fun putIntToArray(array: ByteArray, position: Int, value: Int): ByteArray {
+        array[DanaRS_Packet.DATA_START + position] = (value and 0xFF).toByte()
+        array[DanaRS_Packet.DATA_START + position + 1] = ((value and 0xFF00) shr 8).toByte()
+        return array
+    }
+
+    fun putByteToArray(array: ByteArray, position: Int, value: Byte): ByteArray {
+        array[DanaRS_Packet.DATA_START + position] = value
+        return array
+    }
+
+    @Before
+    fun setup() {
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
deleted file mode 100644
index c249f9c618..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by mike on 20.11.2017.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        // under 100% should last 30 min
-        DanaRS_Packet_APS_Basal_Set_Temporary_Basal packet = new DanaRS_Packet_APS_Basal_Set_Temporary_Basal();
-        packet.setParams(0);
-        assertEquals(0, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM30MIN, packet.temporaryBasalDuration);
-        //constructor with param
-        packet = new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(10);
-        assertEquals(10, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM30MIN, packet.temporaryBasalDuration);
-        packet = new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(20, true, false);
-        assertEquals(20, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-        // over 100% should last 15 min
-        packet.setParams(150);
-        assertEquals(150, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-        // test low hard limit
-        packet.setParams(-1);
-        assertEquals(0, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM30MIN, packet.temporaryBasalDuration);
-        // test high hard limit
-        packet.setParams(550);
-        assertEquals(500, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-        // test setting 15 min
-        packet.setParams(50, true, false);
-        assertEquals(50, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-        // test setting 30 min
-        packet.setParams(50, false, true);
-        assertEquals(50, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM30MIN, packet.temporaryBasalDuration);
-        // over 200% set always 15 min
-        packet.setParams(250, false, true);
-        assertEquals(250, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-        // test low hard limit
-        packet.setParams(-1, false, true);
-        assertEquals(0, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM30MIN, packet.temporaryBasalDuration);
-        // test high hard limit
-        packet.setParams(550, false, true);
-        assertEquals(500, packet.temporaryBasalRatio);
-        assertEquals(packet.PARAM15MIN, packet.temporaryBasalDuration);
-
-        // test message generation
-        packet.setParams(260, true, false);
-        byte[] generatedCode = packet.getRequestParams();
-        assertEquals(3, generatedCode.length);
-        assertEquals((byte) 4, generatedCode[0]);
-        assertEquals((byte) 1, generatedCode[1]);
-        assertEquals((byte) packet.PARAM15MIN, generatedCode[2]);
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__APS_SET_TEMPORARY_BASAL", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
new file mode 100644
index 0000000000..835a56be84
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+
+        // under 100% should last 30 min
+        var packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0)
+        Assert.assertEquals(0, packet.temporaryBasalRatio)
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        //constructor with param
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 10)
+        Assert.assertEquals(10, packet.temporaryBasalRatio)
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        // over 100% should last 15 min
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 150)
+        Assert.assertEquals(150, packet.temporaryBasalRatio)
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
+        // test low hard limit
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, -1)
+        Assert.assertEquals(0, packet.temporaryBasalRatio)
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        // test high hard limit
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 550)
+        Assert.assertEquals(500, packet.temporaryBasalRatio)
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
+        // test message generation
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 260)
+        val generatedCode = packet.requestParams
+        Assert.assertEquals(3, generatedCode.size.toLong())
+        Assert.assertEquals(4.toByte(), generatedCode[0])
+        Assert.assertEquals(1.toByte(), generatedCode[1])
+        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN.toUByte(), generatedCode[2].toUByte())
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__APS_SET_TEMPORARY_BASAL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
deleted file mode 100644
index a866ce73a7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import info.AAPSMocker;
-import info.SPMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by Rumen on 31.07.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SP.class, MainApp.class, ConfigBuilderPlugin.class, Context.class, NSUpload.class, TreatmentsPlugin.class, TreatmentService.class, DatabaseHelper.class, DateUtil.class})
-public class DanaRS_Packet_APS_History_EventsTest extends DanaRS_Packet_APS_History_Events {
-
-    @Test
-    public void runTest() {
-        DanaRS_Packet_APS_History_Events testPacket = new DanaRS_Packet_APS_History_Events(DateUtil.now());
-        // test getRequestedParams
-        byte[] returnedValues = testPacket.getRequestParams();
-        byte[] expectedValues = getCalender(DateUtil.now());
-        //year
-        assertEquals(expectedValues[0], returnedValues[0]);
-        //month
-        assertEquals(expectedValues[1], returnedValues[1]);
-        //day of month
-        assertEquals(expectedValues[2], returnedValues[2]);
-        // hour
-        assertEquals(expectedValues[3], returnedValues[3]);
-        // minute
-        assertEquals(expectedValues[4], returnedValues[4]);
-        // second
-        assertEquals(expectedValues[5], returnedValues[5]);
-
-        // test message decoding
-        testPacket.handleMessage(createArray(50, (byte) 0));
-        assertEquals(false, failed);
-//        testPacket.handleMessage(createArray(50, (byte) 1));
-//        assertEquals(true, done);
-
-        assertEquals("APS_HISTORY_EVENTS", getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith) {
-        byte[] ret = new byte[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    public byte[] getCalender(long from) {
-        GregorianCalendar cal = new GregorianCalendar();
-        if (from != 0)
-            cal.setTimeInMillis(from);
-        else
-            cal.set(2000, 0, 1, 0, 0, 0);
-        byte[] ret = new byte[6];
-        ret[0] = (byte) ((cal.get(Calendar.YEAR) - 1900 - 100) & 0xff);
-        ret[1] = (byte) ((cal.get(Calendar.MONTH) + 1) & 0xff);
-        ret[2] = (byte) ((cal.get(Calendar.DAY_OF_MONTH)) & 0xff);
-        ret[3] = (byte) ((cal.get(Calendar.HOUR_OF_DAY)) & 0xff);
-        ret[4] = (byte) ((cal.get(Calendar.MINUTE)) & 0xff);
-        ret[5] = (byte) ((cal.get(Calendar.SECOND)) & 0xff);
-
-        return ret;
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        SPMocker.prepareMock();
-        SP.putString("profile", AAPSMocker.getValidProfileStore().getData().toString());
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        PowerMockito.mockStatic(NSUpload.class);
-        AAPSMocker.mockDatabaseHelper();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(5456465445L);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
new file mode 100644
index 0000000000..1072c72e09
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class, DetailedBolusInfoStorage::class)
+class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var danaRSPlugin: DanaRSPlugin
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    @Test fun runTest() {
+        val now = DateUtil.now()
+
+        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, now)
+        // test getRequestedParams
+        val returnedValues = testPacket.requestParams
+        val expectedValues = getCalender(now)
+        //year
+        Assert.assertEquals(expectedValues[0], returnedValues[0])
+        //month
+        Assert.assertEquals(expectedValues[1], returnedValues[1])
+        //day of month
+        Assert.assertEquals(expectedValues[2], returnedValues[2])
+        // hour
+        Assert.assertEquals(expectedValues[3], returnedValues[3])
+        // minute
+        Assert.assertEquals(expectedValues[4], returnedValues[4])
+        // second
+        Assert.assertEquals(expectedValues[5], returnedValues[5])
+        // test message decoding
+        testPacket.handleMessage(createArray(50, 0.toByte()))
+        Assert.assertEquals(false, testPacket.failed)
+        Assert.assertEquals("APS_HISTORY_EVENTS", testPacket.friendlyName)
+    }
+
+    fun getCalender(from: Long): ByteArray {
+        val cal = GregorianCalendar()
+        if (from != 0L) cal.timeInMillis = from else cal[2000, 0, 1, 0, 0] = 0
+        val ret = ByteArray(6)
+        ret[0] = (cal[Calendar.YEAR] - 1900 - 100 and 0xff).toByte()
+        ret[1] = (cal[Calendar.MONTH] + 1 and 0xff).toByte()
+        ret[2] = (cal[Calendar.DAY_OF_MONTH] and 0xff).toByte()
+        ret[3] = (cal[Calendar.HOUR_OF_DAY] and 0xff).toByte()
+        ret[4] = (cal[Calendar.MINUTE] and 0xff).toByte()
+        ret[5] = (cal[Calendar.SECOND] and 0xff).toByte()
+        return ret
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
deleted file mode 100644
index 49820441be..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by Rumen on 31.07.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, DateUtil.class})
-public class DanaRS_Packet_APS_Set_Event_HistoryTest {
-
-    @Test
-    public void runTest() {
-        // test for negative carbs
-        DanaRS_Packet_APS_Set_Event_History historyTest = new DanaRS_Packet_APS_Set_Event_History(DanaRPump.CARBS, DateUtil.now(), -1, 0);
-        byte[] testparams = historyTest.getRequestParams();
-        assertEquals((byte) 0, testparams[8]);
-        // 5g carbs
-        historyTest = new DanaRS_Packet_APS_Set_Event_History(DanaRPump.CARBS, DateUtil.now(), 5, 0);
-        testparams = historyTest.getRequestParams();
-        assertEquals((byte) 5, testparams[8]);
-        // 150g carbs
-        historyTest = new DanaRS_Packet_APS_Set_Event_History(DanaRPump.CARBS, DateUtil.now(), 150, 0);
-        testparams = historyTest.getRequestParams();
-        assertEquals((byte) 150, testparams[8]);
-        // test low hard limit
-        // test high hard limit
-
-        // test message generation
-        historyTest = new DanaRS_Packet_APS_Set_Event_History(DanaRPump.CARBS, DateUtil.now(), 5, 0);
-        testparams = historyTest.getRequestParams();
-        assertEquals((byte) 5, testparams[8]);
-        assertEquals(11, testparams.length);
-        assertEquals((byte) DanaRPump.CARBS, testparams[0]);
-
-        // test message decoding
-        historyTest.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, historyTest.failed);
-        historyTest.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, historyTest.failed);
-
-        assertEquals("APS_SET_EVENT_HISTORY", historyTest.getFriendlyName());
-    }
-
-    @Before
-    public void prepareTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        PowerMockito.mockStatic(DateUtil.class);
-        when(DateUtil.now()).thenReturn(5456465445L);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
new file mode 100644
index 0000000000..33e343ee08
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
+
+    @Test fun runTest() { // test for negative carbs
+        val now = DateUtil.now()
+        var historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, -1, 0)
+        var testparams = historyTest.requestParams
+        Assert.assertEquals(0.toByte(), testparams[8])
+        // 5g carbs
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        testparams = historyTest.requestParams
+        Assert.assertEquals(5.toByte(), testparams[8])
+        // 150g carbs
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 150, 0)
+        testparams = historyTest.requestParams
+        Assert.assertEquals(150.toByte(), testparams[8])
+        // test message generation
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        testparams = historyTest.requestParams
+        Assert.assertEquals(5.toByte(), testparams[8])
+        Assert.assertEquals(11, testparams.size)
+        Assert.assertEquals(DanaRPump.CARBS.toByte(), testparams[0])
+        // test message decoding
+        historyTest.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, historyTest.failed)
+        historyTest.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, historyTest.failed)
+        Assert.assertEquals("APS_SET_EVENT_HISTORY", historyTest.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
deleted file mode 100644
index 762403142f..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Get_Basal_RateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Get_Basal_Rate packet = new DanaRS_Packet_Basal_Get_Basal_Rate();
-
-        // test message decoding
-        // rate is 0.01
-        packet.handleMessage(createArray(100, (byte) 1));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(100, (byte) 5));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__GET_BASAL_RATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
new file mode 100644
index 0000000000..2c5b7ffec1
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class)
+class DanaRS_Packet_Basal_Get_Basal_RateTest : DanaRSTestBase() {
+
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)
+        // test message decoding
+        // rate is 0.01
+        val array = ByteArray(100)
+        putIntToArray(array, 0, (1.0 * 100).toInt())
+        putByteToArray(array, 2, (0.05 * 100).toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(1.0, danaRPump.maxBasal, 0.0)
+        Assert.assertEquals(0.05, danaRPump.basalStep, 0.0)
+        Assert.assertTrue(packet.failed)
+        Assert.assertEquals("BASAL__GET_BASAL_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
deleted file mode 100644
index 8feee88e7a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 31.07.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Get_Profile_Basal_RateTest extends DanaRS_Packet_Basal_Get_Profile_Basal_Rate {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        // test if pumpRofile array is set right
-        double basal01 = byteArrayToInt(getBytes(createArray(50, (byte) 1), 2, 2)) / 100d;
-        double basal05 = byteArrayToInt(getBytes(createArray(50, (byte) 5), 2, 2)) / 100d;
-        double basal12 = byteArrayToInt(getBytes(createArray(50, (byte) 12), 2, 2)) / 100d;
-        // basal rate > 1U/hr
-        double basal120 = byteArrayToInt(getBytes(createArray(50, (byte) 120), 2, 2)) / 100d;
-        DanaRS_Packet_Basal_Get_Profile_Basal_Rate testPacket = new DanaRS_Packet_Basal_Get_Profile_Basal_Rate(1);
-        byte[] params = testPacket.getRequestParams();
-        assertEquals((byte) 1, params[0]);
-        testPacket.handleMessage(createArray(50, (byte) 0));
-        assertEquals(0.0d,  testPacket.pump.pumpProfiles[1][1],0);
-        testPacket.handleMessage(createArray(50, (byte) 1));
-        assertEquals(basal01,  testPacket.pump.pumpProfiles[1][2],0);
-        testPacket.handleMessage(createArray(50, (byte) 5));
-        assertEquals(basal05,  testPacket.pump.pumpProfiles[1][1],0);
-        testPacket.handleMessage(createArray(50, (byte) 12));
-        assertEquals(basal12,  testPacket.pump.pumpProfiles[1][1],0);
-        testPacket.handleMessage(createArray(50, (byte) 120));
-        assertEquals(basal120,  testPacket.pump.pumpProfiles[1][1],0);
-
-        assertEquals("BASAL__GET_PROFILE_BASAL_RATE", getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
new file mode 100644
index 0000000000..59e6356f16
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Get_Profile_Basal_RateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val testPacket = DanaRS_Packet_Basal_Get_Profile_Basal_Rate(aapsLogger, danaRPump, 1)
+        // test if pumpProfile array is set right
+        val basal01 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 1.toByte()), 2, 2)) / 100.0
+        val basal05 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 5.toByte()), 2, 2)) / 100.0
+        val basal12 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 12.toByte()), 2, 2)) / 100.0
+        // basal rate > 1U/hr
+        val basal120 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 120.toByte()), 2, 2)) / 100.0
+        val params = testPacket.requestParams
+        assertEquals(1.toByte(), params[0])
+        testPacket.handleMessage(createArray(50, 0.toByte()))
+        assertEquals(0.0, danaRPump.pumpProfiles!![1][1], 0.0)
+        testPacket.handleMessage(createArray(50, 1.toByte()))
+        assertEquals(basal01, danaRPump.pumpProfiles!![1][2], 0.0)
+        testPacket.handleMessage(createArray(50, 5.toByte()))
+        assertEquals(basal05, danaRPump.pumpProfiles!![1][1], 0.0)
+        testPacket.handleMessage(createArray(50, 12.toByte()))
+        assertEquals(basal12, danaRPump.pumpProfiles!![1][1], 0.0)
+        testPacket.handleMessage(createArray(50, 120.toByte()))
+        assertEquals(basal120, danaRPump.pumpProfiles!![1][1], 0.0)
+        assertEquals("BASAL__GET_PROFILE_BASAL_RATE", testPacket.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
deleted file mode 100644
index 2aeb278110..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Get_Profile_NumberTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Get_Profile_Number packet = new DanaRS_Packet_Basal_Get_Profile_Number();
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        // if data.length > 4 should return fail
-
-        assertEquals("BASAL__GET_PROFILE_NUMBER", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
new file mode 100644
index 0000000000..f8468573cd
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Get_Profile_NumberTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump)
+
+        val array = ByteArray(100)
+        putByteToArray(array, 0, 1.toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(1, danaRPump.activeProfile)
+        Assert.assertEquals("BASAL__GET_PROFILE_NUMBER", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
deleted file mode 100644
index 1233762ab1..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Get_Temporary_Basal_State packet = new DanaRS_Packet_Basal_Get_Temporary_Basal_State();
-
-        // test message decoding
-        packet.handleMessage(createArray(50,(byte) 0));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(50,(byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__TEMPORARY_BASAL_STATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith) {
-        byte[] ret = new byte[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
new file mode 100644
index 0000000000..f8e3472c8e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump)
+        // test message decoding
+        val array = ByteArray(100)
+        putByteToArray(array, 0, 1.toByte())
+        putByteToArray(array, 1, 1.toByte())
+        putByteToArray(array, 2, 230.toByte())
+        putByteToArray(array, 3, 150.toByte())
+        putIntToArray(array, 4, 1)
+        packet.handleMessage(array)
+        Assert.assertTrue(packet.failed)
+        Assert.assertTrue(danaRPump.isTempBasalInProgress)
+        Assert.assertEquals(300, danaRPump.tempBasalPercent)
+        Assert.assertEquals(15 * 60, danaRPump.tempBasalTotalSec)
+        Assert.assertEquals("BASAL__TEMPORARY_BASAL_STATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
deleted file mode 100644
index 443c467b53..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Basal_RateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        // test message decoding
-        DanaRS_Packet_Basal_Set_Basal_Rate packet = new DanaRS_Packet_Basal_Set_Basal_Rate(createArray(24, 5));
-        byte[] requested = packet.getRequestParams();
-        byte lookingFor = (byte) ((5 * 100) & 0xff);
-        assertEquals(lookingFor, requested[24]);
-        lookingFor = (byte) ((500 >>> 8) & 0xff);
-        assertEquals(lookingFor, requested[25]);
-        packet.handleMessage(createArray(3, (byte) 0));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(3, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__SET_BASAL_RATE", packet.getFriendlyName());
-    }
-
-    double[] createArray(int length, double fillWith) {
-        double[] ret = new double[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    byte[] createArray(int length, byte fillWith) {
-        byte[] ret = new byte[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
new file mode 100644
index 0000000000..d4e2b2de06
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Basal_RateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        // test message decoding
+        val packet = DanaRS_Packet_Basal_Set_Basal_Rate(aapsLogger, createArray(24, 5.0))
+        val requested = packet.requestParams
+        var lookingFor = (5 * 100 and 0xff).toByte()
+        Assert.assertEquals(lookingFor, requested[24])
+        lookingFor = (500 ushr 8 and 0xff).toByte()
+        Assert.assertEquals(lookingFor, requested[25])
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(3, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__SET_BASAL_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
deleted file mode 100644
index 9595376aae..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal packet = new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal();
-
-        // test message decoding
-        packet.handleMessage(createArray(3,(byte) 0));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(3,(byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__CANCEL_TEMPORARY_BASAL", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith) {
-        byte[] ret = new byte[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
new file mode 100644
index 0000000000..4c127cf437
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger)
+        // test message decoding
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(3, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__CANCEL_TEMPORARY_BASAL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
deleted file mode 100644
index 019661cc3c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Profile_Basal_RateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Basal_Set_Profile_Basal_Rate packet = new DanaRS_Packet_Basal_Set_Profile_Basal_Rate(1, createArray(24,1));
-
-        // test params
-        byte[] testparams =packet.getRequestParams();
-        // is profile 1
-        assertEquals((byte) 1, testparams[0]);
-        // is value 100
-        assertEquals((byte) 100, testparams[3]);
-
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__SET_PROFILE_BASAL_RATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
new file mode 100644
index 0000000000..d2d918726f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Profile_Basal_RateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 1, createArray(24, 1.0))
+        // test params
+        val testparams = packet.requestParams
+        // is profile 1
+        Assert.assertEquals(1.toByte(), testparams[0])
+        // is value 100
+        Assert.assertEquals(100.toByte(), testparams[3])
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__SET_PROFILE_BASAL_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
deleted file mode 100644
index 6df9e00187..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Profile_NumberTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Basal_Set_Profile_Number packet = new DanaRS_Packet_Basal_Set_Profile_Number(1);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        // is profile 1
-        assertEquals((byte) 1, testparams[0]);
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__SET_PROFILE_NUMBER", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
new file mode 100644
index 0000000000..8b15bf2863
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Profile_NumberTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 1)
+        // test params
+        val testparams = packet.requestParams
+        // is profile 1
+        Assert.assertEquals(1.toByte(), testparams[0])
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__SET_PROFILE_NUMBER", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
deleted file mode 100644
index 3fe67fadc4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Suspend_OffTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Set_Suspend_Off packet = new DanaRS_Packet_Basal_Set_Suspend_Off();
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__SET_SUSPEND_OFF", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
new file mode 100644
index 0000000000..aa6d5832ad
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Suspend_OffTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Set_Suspend_Off(aapsLogger)
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__SET_SUSPEND_OFF", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
deleted file mode 100644
index 55b6697ce1..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Suspend_OnTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Set_Suspend_On packet = new DanaRS_Packet_Basal_Set_Suspend_On();
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BASAL__SET_SUSPEND_ON", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
new file mode 100644
index 0000000000..cb12a85d1d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Suspend_OnTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Basal_Set_Suspend_On(aapsLogger)
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BASAL__SET_SUSPEND_ON", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
deleted file mode 100644
index 333f35e5d2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 02.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor("info.nightscout.androidaps.logging.L")
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Basal_Set_Temporary_BasalTest extends DanaRS_Packet_Basal_Set_Temporary_Basal {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Basal_Set_Temporary_Basal testPacket = new DanaRS_Packet_Basal_Set_Temporary_Basal(50, 20);
-        // params
-        byte[] params = testPacket.getRequestParams();
-        // is ratio 50
-        assertEquals(50, params[0]);
-        // is duration 20
-        assertEquals(20, params[1]);
-
-        // test message decoding
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, failed);
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 1});
-        assertEquals(true, failed);
-
-        assertEquals("BASAL__SET_TEMPORARY_BASAL", getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
new file mode 100644
index 0000000000..d15dff5c39
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Basal_Set_Temporary_BasalTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val testPacket = DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, 50, 20)
+        // params
+        val params = testPacket.requestParams
+        // is ratio 50
+        Assert.assertEquals(50.toByte(), params[0])
+        // is duration 20
+        Assert.assertEquals(20.toByte(), params[1])
+        // test message decoding
+        testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, testPacket.failed)
+        testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(true, testPacket.failed)
+        Assert.assertEquals("BASAL__SET_TEMPORARY_BASAL", testPacket.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
deleted file mode 100644
index 73e67f6830..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Bolus_OptionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Bolus_Get_Bolus_Option packet = new DanaRS_Packet_Bolus_Get_Bolus_Option();
-
-        // test message decoding
-        DanaRPump pump = DanaRPump.getInstance();
-        //if dataArray is 1 pump.isExtendedBolusEnabled should be true
-        packet.handleMessage(createArray(21,(byte) 1));
-        assertEquals(false, packet.failed);
-        //Are options saved to pump
-        assertEquals(false, !pump.isExtendedBolusEnabled);
-        assertEquals(1, pump.bolusCalculationOption);
-        assertEquals(1, pump.missedBolusConfig);
-
-        packet.handleMessage(createArray(21,(byte) 0));
-        assertEquals(true, packet.failed);
-        //Are options saved to pump
-        assertEquals(true, !pump.isExtendedBolusEnabled);
-
-        assertEquals("BOLUS__GET_BOLUS_OPTION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith) {
-        byte[] ret = new byte[length];
-        for (int i = 0; i < length; i++) {
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
new file mode 100644
index 0000000000..1b83b1df86
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class)
+class DanaRS_Packet_Bolus_Get_Bolus_OptionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)
+        // test message decoding
+        //if dataArray is 1 pump.isExtendedBolusEnabled should be true
+        packet.handleMessage(createArray(21, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        //Are options saved to pump
+        Assert.assertEquals(false, !danaRPump.isExtendedBolusEnabled)
+        Assert.assertEquals(1, danaRPump.bolusCalculationOption)
+        Assert.assertEquals(1, danaRPump.missedBolusConfig)
+        packet.handleMessage(createArray(21, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        //Are options saved to pump
+        Assert.assertEquals(true, !danaRPump.isExtendedBolusEnabled)
+        Assert.assertEquals("BOLUS__GET_BOLUS_OPTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
deleted file mode 100644
index 1d9ce053be..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_CIR_CF_Array packet = new DanaRS_Packet_Bolus_Get_CIR_CF_Array();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        // are pump units MG/DL ???
-        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(DanaRPump.UNITS_MGDL, testPump.units);
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, (byte) 3));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__GET_CIR_CF_ARRAY", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
new file mode 100644
index 0000000000..19f9fc5fbd
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        // are pump units MG/DL ???
+        Assert.assertEquals(DanaRPump.UNITS_MGDL, danaRPump.units)
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 3.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__GET_CIR_CF_ARRAY", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
deleted file mode 100644
index b724209408..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Calculation_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Calculation_Information packet = new DanaRS_Packet_Bolus_Get_Calculation_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-
-        // test message decoding
-        packet.handleMessage(createArray(24, (byte) 0));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(24, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__GET_CALCULATION_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
new file mode 100644
index 0000000000..4a805821b1
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Calculation_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(24, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(24, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__GET_CALCULATION_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
deleted file mode 100644
index d7ad9c6d59..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information packet = new DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-
-        // test message decoding
-        packet.handleMessage(createArray(24, (byte) 0));
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(24, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
new file mode 100644
index 0000000000..b344cf3ade
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(24, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(24, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
deleted file mode 100644
index 1d3b1bb146..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Dual_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Dual_Bolus packet = new DanaRS_Packet_Bolus_Get_Dual_Bolus();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        double testValue = 0d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        assertEquals(testValue != 0d, packet.failed);
-        testValue = 1d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        // is pump.bolustep set to 1
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((((byte)testValue & 0x000000FF) << 8) + ((byte) testValue & 0x000000FF), pump.bolusStep, 0);
-        assertEquals(testValue != 0d, packet.failed);
-
-        assertEquals("BOLUS__GET_DUAL_BOLUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
new file mode 100644
index 0000000000..315ac6f045
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Dual_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Dual_Bolus(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+
+        val array = ByteArray(20)
+        putByteToArray(array, 0, 1)
+        putIntToArray(array, 1, (1.0 * 100).toInt())
+        putIntToArray(array, 3, (0.55 * 100).toInt())
+        putIntToArray(array, 5, (40.0 * 100).toInt())
+        packet.handleMessage(array)
+        Assert.assertTrue(packet.failed)
+        Assert.assertEquals(1.0, danaRPump.bolusStep, 0.0)
+        Assert.assertEquals(0.55, danaRPump.extendedBolusAbsoluteRate, 0.0)
+        Assert.assertEquals(40.0, danaRPump.maxBolus, 0.0)
+
+        Assert.assertEquals("BOLUS__GET_DUAL_BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
deleted file mode 100644
index 920ba7cc86..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Bolus packet = new DanaRS_Packet_Bolus_Get_Extended_Bolus();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        double testValue = 0d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        assertEquals(testValue != 0d, packet.failed);
-        testValue = 1d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        // is pump.bolustep set to 1
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(testValue / 100d, pump.bolusStep, 0);
-        assertEquals(testValue != 0d, packet.failed);
-
-        assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
new file mode 100644
index 0000000000..a62d960cdc
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        var testValue = 0.0
+        packet.handleMessage(createArray(10, testValue.toByte()))
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        testValue = 1.0
+        packet.handleMessage(createArray(10, testValue.toByte()))
+        // is pump.bolustep set to 1
+        Assert.assertEquals(testValue / 100.0, danaRPump.bolusStep, 0.0)
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
deleted file mode 100644
index 23bdc76cb4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Bolus_State packet = new DanaRS_Packet_Bolus_Get_Extended_Bolus_State();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        double testValue = 0d;
-        packet.handleMessage(createArray(11, (byte) testValue));
-        assertEquals(testValue != 0d, packet.failed);
-        testValue = 1d;
-        packet.handleMessage(createArray(11, (byte) testValue));
-        // is extended bolus in progress
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(testValue == 1, pump.isExtendedInProgress);
-        assertEquals(testValue != 0d, packet.failed);
-
-        assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
new file mode 100644
index 0000000000..c950a2b8e7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        var testValue = 0.0
+        packet.handleMessage(createArray(11, testValue.toByte()))
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        testValue = 1.0
+        packet.handleMessage(createArray(11, testValue.toByte()))
+        // is extended bolus in progress
+        Assert.assertEquals(testValue == 1.0, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
deleted file mode 100644
index 91a2fb4c51..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State packet = new DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        // isExtendedinprogres should be false
-        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, testPump.isExtendedInProgress);
-//        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, (byte) 1));
-        testPump = DanaRPump.getInstance();
-        assertEquals(true, testPump.isExtendedInProgress);
-
-        assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
new file mode 100644
index 0000000000..4dab05c2cf
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        // isExtendedinprogres should be false
+        Assert.assertEquals(false, danaRPump.isExtendedInProgress)
+        //        assertEquals(false, packet.failed);
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
deleted file mode 100644
index e329dee330..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Initial_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Initial_Bolus packet = new DanaRS_Packet_Bolus_Get_Initial_Bolus();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        // should fail only if all the initialbolusses are 0
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, !packet.failed);
-//        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, (byte) 1));
-        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-        assertEquals(valueRequested /100d, packet.initialBolusValue04, 0);
-        assertEquals(true, !packet.failed);
-
-        assertEquals("BOLUS__GET_BOLUS_RATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
new file mode 100644
index 0000000000..c9f2529bb7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Initial_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        // should fail only if all the initialbolusses are 0
+        Assert.assertEquals(false, !packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, !packet.failed)
+        Assert.assertEquals("BOLUS__GET_BOLUS_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
deleted file mode 100644
index 8240ae6aff..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Step_Bolus_Information packet = new DanaRS_Packet_Bolus_Get_Step_Bolus_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
new file mode 100644
index 0000000000..86239a8ea1
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        val valueRequested: Int = (1 and 0x000000FF shl 8) + (1 and 0x000000FF)
+        Assert.assertEquals(valueRequested / 100.0, danaRPump.lastBolusAmount, 0.0)
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
deleted file mode 100644
index bc2010bd7b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Bolus_OptionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Bolus_Option packet = new DanaRS_Packet_Bolus_Set_Bolus_Option(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(0, testparams[18]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_BOLUS_OPTION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
new file mode 100644
index 0000000000..b79f14552b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Bolus_OptionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(0.toByte(), testparams[18])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_BOLUS_OPTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
deleted file mode 100644
index 14e522ab67..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_CIR_CF_Array packet = new DanaRS_Packet_Bolus_Set_CIR_CF_Array(0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(0, testparams[18]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_CIR_CF_ARRAY", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
new file mode 100644
index 0000000000..df29bd2439
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(0.toByte(), testparams[18])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_CIR_CF_ARRAY", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
deleted file mode 100644
index 5e16f6ef2e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Dual_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Dual_Bolus packet = new DanaRS_Packet_Bolus_Set_Dual_Bolus(0d, 0d, 1);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(1, testparams[4]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_DUAL_BOLUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
new file mode 100644
index 0000000000..0e60b237d7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Dual_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger, 0.0, 0.0, 1)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(1.toByte(), testparams[4])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_DUAL_BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
deleted file mode 100644
index 630e94e046..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Extended_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Extended_Bolus packet = new DanaRS_Packet_Bolus_Set_Extended_Bolus(1d, 1);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(100, testparams[0]);
-        assertEquals(1, testparams[2]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_EXTENDED_BOLUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
new file mode 100644
index 0000000000..173a87b423
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Extended_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, 1.0, 1)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(100.toByte(), testparams[0])
+        Assert.assertEquals(1.toByte(), testparams[2])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_EXTENDED_BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
deleted file mode 100644
index 23da9c8863..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel packet = new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_EXTENDED_BOLUS_CANCEL", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
new file mode 100644
index 0000000000..adf2ec11f2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_EXTENDED_BOLUS_CANCEL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
deleted file mode 100644
index ca75e03954..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Initial_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Initial_Bolus packet = new DanaRS_Packet_Bolus_Set_Initial_Bolus(0d, 0d, 0d, 100d);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(1, testparams[6]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_BOLUS_RATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
new file mode 100644
index 0000000000..29513ced1a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Initial_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger, 0, 0, 0, 100)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(100.toByte(), testparams[6])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_BOLUS_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
deleted file mode 100644
index 1889ff9611..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 31.07.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Start packet = new DanaRS_Packet_Bolus_Set_Step_Bolus_Start();
-
-      // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(0, testparams[2]);
-
-      // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_STEP_BOLUS_START", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
new file mode 100644
index 0000000000..420b0a73d8
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
+
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var context: Context
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    private lateinit var danaRSPlugin: DanaRSPlugin
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(0.toByte(), testparams[2])
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_STEP_BOLUS_START", packet.friendlyName)
+    }
+
+    @Before
+    fun mock() {
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
deleted file mode 100644
index f41a686201..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 31.07.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest extends DanaRS_Packet_Bolus_Set_Step_Bolus_Stop {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Stop testPacket = new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(1d , new Treatment());
-        // test message decoding
-        testPacket.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, testPacket.failed);
-        testPacket.handleMessage(new byte[]{(byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1});
-        assertEquals(true, testPacket.failed);
-
-        assertEquals("BOLUS__SET_STEP_BOLUS_STOP", getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
new file mode 100644
index 0000000000..d4854c12cd
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class)
+class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
+
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var danaRSPlugin: DanaRSPlugin
+
+    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Treatment) {
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+                it.activePlugin = activePlugin
+            }
+        }
+    }
+
+    @Test fun runTest() {
+        `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
+
+        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
+        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        // test message decoding
+        testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, testPacket.failed)
+        testPacket.handleMessage(byteArrayOf(1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte()))
+        Assert.assertEquals(true, testPacket.failed)
+        Assert.assertEquals("BOLUS__SET_STEP_BOLUS_STOP", testPacket.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
deleted file mode 100644
index 019cd89459..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Etc_Keep_ConnectionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Etc_Keep_Connection packet = new DanaRS_Packet_Etc_Keep_Connection();
-
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("ETC__KEEP_CONNECTION", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
new file mode 100644
index 0000000000..e1b90f30da
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Etc_Keep_ConnectionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Etc_Keep_Connection(aapsLogger)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("ETC__KEEP_CONNECTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
deleted file mode 100644
index 69a314fbb8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Etc_Set_History_SaveTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Etc_Set_History_Save packet = new DanaRS_Packet_Etc_Set_History_Save(0,0,0,0,0,0,0,0,2);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(2, testparams[8]);
-        assertEquals((byte) (2 >>> 8), testparams[9]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("ETC__SET_HISTORY_SAVE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
new file mode 100644
index 0000000000..a089eafd9a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Etc_Set_History_SaveTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Etc_Set_History_Save(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 2)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(2.toByte(), testparams[8])
+        Assert.assertEquals((2 ushr 8).toByte(), testparams[9])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("ETC__SET_HISTORY_SAVE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
deleted file mode 100644
index 907e93020e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Delivery_StatusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Delivery_Status packet = new DanaRS_Packet_General_Delivery_Status();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // everything ok :)
-        packet.handleMessage(createArray(15, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(15, (byte) 161));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__DELIVERY_STATUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
new file mode 100644
index 0000000000..fd32e3ca30
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Delivery_StatusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_General_Delivery_Status(aapsLogger)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(15, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(15, 161.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__DELIVERY_STATUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
deleted file mode 100644
index ae1c669ab8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_More_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_More_Information packet = new DanaRS_Packet_General_Get_More_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(13, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_More_Information();
-        packet.handleMessage(createArray(15, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(15, (byte) 161));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__GET_MORE_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
new file mode 100644
index 0000000000..327aa1c8a6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(13, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        packet.handleMessage(createArray(15, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(15, 161.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__GET_MORE_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
deleted file mode 100644
index a3ea700b0f..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_PasswordTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_Password packet = new DanaRS_Packet_General_Get_Password();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_Password();
-        packet.handleMessage(createArray(15, (byte) 0));
-        assertEquals(false, packet.failed);
-
-//        packet.handleMessage(createArray(15, (byte) 161));
-//        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__GET_PASSWORD", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
new file mode 100644
index 0000000000..88f3ac3496
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Get_PasswordTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump)
+        packet.handleMessage(createArray(15, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("REVIEW__GET_PASSWORD", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
deleted file mode 100644
index b3dde0b102..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_Pump_CheckTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_Pump_Check packet = new DanaRS_Packet_General_Get_Pump_Check();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_Pump_Check();
-        packet.handleMessage(createArray(15, (byte) 0));
-        assertEquals(false, packet.failed);
-
-//        packet.handleMessage(createArray(15, (byte) 161));
-//        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__GET_PUMP_CHECK", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
new file mode 100644
index 0000000000..5248c2b699
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class)
+class DanaRS_Packet_General_Get_Pump_CheckTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)
+        packet.handleMessage(createArray(15, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("REVIEW__GET_PUMP_CHECK", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
deleted file mode 100644
index c85a044326..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_Shipping_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_Shipping_Information packet = new DanaRS_Packet_General_Get_Shipping_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_Shipping_Information();
-        packet.handleMessage(createArray(18, (byte) 0));
-        assertEquals(false, packet.failed);
-
-//        packet.handleMessage(createArray(15, (byte) 161));
-//        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
new file mode 100644
index 0000000000..3de89db27b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // everything ok :)
+        packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        packet.handleMessage(createArray(18, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
deleted file mode 100644
index c0984484fe..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_Today_Delivery_TotalTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_Today_Delivery_Total packet = new DanaRS_Packet_General_Get_Today_Delivery_Total();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_Today_Delivery_Total();
-        packet.handleMessage(createArray(18, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(15, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals( (((1 & 0x000000FF) << 8) + (1 & 0x000000FF)) /100d, pump.dailyTotalUnits,0);
-
-        assertEquals("REVIEW__GET_TODAY_DELIVERY_TOTAL", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
new file mode 100644
index 0000000000..1e89db2771
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Get_Today_Delivery_TotalTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump)
+        packet.handleMessage(createArray(18, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(15, 1.toByte()))
+        Assert.assertEquals(((1 and 0x000000FF shl 8) + (1 and 0x000000FF)) / 100.0, danaRPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals("REVIEW__GET_TODAY_DELIVERY_TOTAL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
deleted file mode 100644
index 38cf72ecef..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Get_User_Time_Change_FlagTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Get_User_Time_Change_Flag packet = new DanaRS_Packet_General_Get_User_Time_Change_Flag();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Get_User_Time_Change_Flag();
-        packet.handleMessage(createArray(18, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        assertEquals("REVIEW__GET_USER_TIME_CHANGE_FLAG", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
new file mode 100644
index 0000000000..18f89e1096
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Get_User_Time_Change_FlagTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger)
+        packet.handleMessage(createArray(18, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("REVIEW__GET_USER_TIME_CHANGE_FLAG", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
deleted file mode 100644
index 7bf08f3afb..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Initial_Screen_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Initial_Screen_Information packet = new DanaRS_Packet_General_Initial_Screen_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet = new DanaRS_Packet_General_Initial_Screen_Information();
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(false, packet.failed);
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(true, pump.pumpSuspended);
-
-
-        assertEquals("REVIEW__INITIAL_SCREEN_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
new file mode 100644
index 0000000000..15e9f8e99b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Initial_Screen_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        var packet = DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump)
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        // test for the length message
+        packet.handleMessage(createArray(1, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet = DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump)
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals(true, danaRPump.pumpSuspended)
+        Assert.assertEquals("REVIEW__INITIAL_SCREEN_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
deleted file mode 100644
index 82ef16cf88..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Set_History_Upload_ModeTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Set_History_Upload_Mode packet = new DanaRS_Packet_General_Set_History_Upload_Mode(1);
-
-        // test params
-        assertEquals(1, packet.getRequestParams()[0]);
-
-        // test message decoding
-        packet.handleMessage(createArray(3, (byte) 0));
-        assertEquals(false, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__SET_HISTORY_UPLOAD_MODE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
new file mode 100644
index 0000000000..d918e9d682
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Set_History_Upload_ModeTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1)
+        // test params
+        Assert.assertEquals(1.toByte(), packet.requestParams[0])
+        // test message decoding
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__SET_HISTORY_UPLOAD_MODE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
deleted file mode 100644
index ab0fd095bc..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear packet = new DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(3, (byte) 0));
-        assertEquals(false, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
new file mode 100644
index 0000000000..45e472af3c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(aapsLogger)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java
deleted file mode 100644
index a2539de7af..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 09.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_AlarmTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Alarm packet = new DanaRS_Packet_History_Alarm(System.currentTimeMillis());
-
-        assertEquals("REVIEW__ALARM", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
new file mode 100644
index 0000000000..743d3f66e7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__ALARM", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
deleted file mode 100644
index 2551cf2281..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 09.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_All_HistoryTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_All_History packet = new DanaRS_Packet_History_All_History(System.currentTimeMillis());
-
-        assertEquals("REVIEW__ALL_HISTORY", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
new file mode 100644
index 0000000000..1f7dd00783
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_All_HistoryTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_All_History(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__ALL_HISTORY", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java
deleted file mode 100644
index 32fe887b64..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 09.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_BasalTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Basal packet = new DanaRS_Packet_History_Basal(System.currentTimeMillis());
-
-        assertEquals("REVIEW__BASAL", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
new file mode 100644
index 0000000000..8451e90b0f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_BasalTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Basal(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__BASAL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
deleted file mode 100644
index 3534cc4828..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 09.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_Blood_GlucoseTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Blood_Glucose packet = new DanaRS_Packet_History_Blood_Glucose(System.currentTimeMillis());
-
-        assertEquals("REVIEW__BLOOD_GLUCOSE", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
new file mode 100644
index 0000000000..0442ea98b9
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_Blood_GlucoseTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__BLOOD_GLUCOSE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java
deleted file mode 100644
index 856b43a589..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Bolus packet = new DanaRS_Packet_History_Bolus(System.currentTimeMillis());
-
-        assertEquals("REVIEW__BOLUS", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
new file mode 100644
index 0000000000..badaa0aa10
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Bolus(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
deleted file mode 100644
index 876315389d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_CarbohydrateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Carbohydrate packet = new DanaRS_Packet_History_Carbohydrate(System.currentTimeMillis());
-
-        assertEquals("REVIEW__CARBOHYDRATE", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
new file mode 100644
index 0000000000..22a99fcc53
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_CarbohydrateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__CARBOHYDRATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java
deleted file mode 100644
index 847563e2dd..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_DailyTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Daily packet = new DanaRS_Packet_History_Daily(System.currentTimeMillis());
-
-        assertEquals("REVIEW__DAILY", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
new file mode 100644
index 0000000000..91d4bea862
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_DailyTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Daily(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__DAILY", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java
deleted file mode 100644
index db5e201b74..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_PrimeTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Prime packet = new DanaRS_Packet_History_Prime(System.currentTimeMillis());
-
-        assertEquals("REVIEW__PRIME", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
new file mode 100644
index 0000000000..19c8d2ef4e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_PrimeTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Prime(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__PRIME", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java
deleted file mode 100644
index 7faa893bcf..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_RefillTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Refill packet = new DanaRS_Packet_History_Refill(System.currentTimeMillis());
-
-        assertEquals("REVIEW__REFILL", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
new file mode 100644
index 0000000000..8b75ec344f
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_RefillTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Refill(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__REFILL", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java
deleted file mode 100644
index d8f51ffb88..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_SuspendTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Suspend packet = new DanaRS_Packet_History_Suspend(System.currentTimeMillis());
-
-        assertEquals("REVIEW__SUSPEND", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
new file mode 100644
index 0000000000..66b06f4ed7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_SuspendTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Suspend(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__SUSPEND", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java
deleted file mode 100644
index 87fedbdb96..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_History_TemporaryTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_History_Temporary packet = new DanaRS_Packet_History_Temporary(System.currentTimeMillis());
-
-        assertEquals("REVIEW__TEMPORARY", packet.getFriendlyName());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
new file mode 100644
index 0000000000..a4e436a373
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_History_TemporaryTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_History_Temporary(aapsLogger, rxBus, System.currentTimeMillis())
+        Assert.assertEquals("REVIEW__TEMPORARY", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
deleted file mode 100644
index 079eb7e752..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, NSUpload.class})
-public class DanaRS_Packet_Notify_AlarmTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockNSUpload();
-        DanaRS_Packet_Notify_Alarm packet = new DanaRS_Packet_Notify_Alarm();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // handlemessage testing fails on non-eror byte because of NSUpload not properly mocked
-        packet.handleMessage(createArray(17, (byte) 0x01));
-        assertEquals(false, packet.failed);
-        // no error
-        packet.handleMessage(createArray(17, (byte) 0));
-        assertEquals(true, packet.failed);
-
-        assertEquals("NOTIFY__ALARM", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
new file mode 100644
index 0000000000..8aba3da2ba
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(NSUpload::class)
+class DanaRS_Packet_Notify_AlarmTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+// handlemessage testing fails on non-eror byte because of NSUpload not properly mocked
+        packet.handleMessage(createArray(17, 0x01.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // no error
+        packet.handleMessage(createArray(17, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("NOTIFY__ALARM", packet.friendlyName)
+    }
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(NSUpload::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
deleted file mode 100644
index 0d209edb33..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Notify_Delivery_CompleteTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-        DanaRS_Packet_Notify_Delivery_Complete packet = new DanaRS_Packet_Notify_Delivery_Complete(0.5d,new Treatment());
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(17, (byte) 0));
-        assertEquals(true, packet.done);
-
-        assertEquals("NOTIFY__DELIVERY_COMPLETE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
new file mode 100644
index 0000000000..a7246493e6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyDouble
+import org.mockito.Mockito.anyInt
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(RxBusWrapper::class)
+class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
+
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var danaRSPlugin: DanaRSPlugin
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var activePlugin: ActivePluginProvider
+
+    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Treatment) {
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+                it.activePlugin = activePlugin
+            }
+        }
+    }
+
+    @Test fun runTest() {
+        `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
+
+        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
+        val packet = DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(17, 0.toByte()))
+        Assert.assertEquals(true, danaRSPlugin.bolusDone)
+        Assert.assertEquals("NOTIFY__DELIVERY_COMPLETE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
deleted file mode 100644
index ce3554cf74..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockStrings();
-        DanaRS_Packet_Notify_Delivery_Rate_Display packet = new DanaRS_Packet_Notify_Delivery_Rate_Display(1, new Treatment());
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // 0% delivered
-        packet.handleMessage(createArray(17, (byte) 0));
-        assertEquals(true, packet.failed);
-        // 100 % delivered
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(false, packet.failed);
-
-        assertEquals("NOTIFY__DELIVERY_RATE_DISPLAY", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
new file mode 100644
index 0000000000..06f69cadbd
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, RxBusWrapper::class, DetailedBolusInfoStorage::class)
+class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
+
+    @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var context: Context
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    private lateinit var danaRSPlugin: DanaRSPlugin
+
+    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Treatment) {
+                it.defaultValueHelper = defaultValueHelper
+                it.resourceHelper = resourceHelper
+                it.profileFunction = profileFunction
+                it.activePlugin = activePlugin
+            }
+        }
+    }
+
+    @Test fun runTest() {
+        `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
+        // val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(1.0, Treatment(treatmentInjector))
+        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+// 0% delivered
+        packet.handleMessage(createArray(17, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // 100 % delivered
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("NOTIFY__DELIVERY_RATE_DISPLAY", packet.friendlyName)
+    }
+
+    @Before
+    fun mock() {
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
deleted file mode 100644
index a49c0d4f25..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Notify_Missed_Bolus_AlarmTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Notify_Missed_Bolus_Alarm packet = new DanaRS_Packet_Notify_Missed_Bolus_Alarm();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(6, (byte) 0));
-        assertEquals(false, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(6, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("NOTIFY__MISSED_BOLUS_ALARM", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
new file mode 100644
index 0000000000..9583c89d4e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Notify_Missed_Bolus_AlarmTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(6, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(6, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("NOTIFY__MISSED_BOLUS_ALARM", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
deleted file mode 100644
index 0a55071800..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Option_Get_Pump_TimeTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Option_Get_Pump_Time packet = new DanaRS_Packet_Option_Get_Pump_Time();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(8, (byte) 0));
-        assertEquals(false, packet.failed);
-        // this should fail
-        packet.handleMessage(createArray(8, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("OPTION__GET_PUMP_TIME", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
new file mode 100644
index 0000000000..8f74812e9e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(8, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // this should fail
+        packet.handleMessage(createArray(8, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("OPTION__GET_PUMP_TIME", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
deleted file mode 100644
index 371263018b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Option_Get_User_OptionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Option_Get_User_Option packet = new DanaRS_Packet_Option_Get_User_Option();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(20, (byte) 0));
-        assertEquals(true, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(20, (byte) 5));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(5, pump.lcdOnTimeSec);
-        assertEquals(false, packet.failed);
-
-        assertEquals("OPTION__GET_USER_OPTION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
new file mode 100644
index 0000000000..32e3b051c6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Option_Get_User_OptionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(20, 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(20, 5.toByte()))
+        Assert.assertEquals(5, danaRPump.lcdOnTimeSec)
+        Assert.assertEquals(false, packet.failed)
+        Assert.assertEquals("OPTION__GET_USER_OPTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
deleted file mode 100644
index e2a18bcf3c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Option_Set_Pump_TimeTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Option_Set_Pump_Time packet = new DanaRS_Packet_Option_Set_Pump_Time(new Date());
-
-        // test params
-        byte[] params = packet.getRequestParams();
-        assertEquals((byte) (new Date().getDate() & 0xff) , params[2]);
-
-        // test message decoding
-        packet.handleMessage(createArray(3, (byte) 0));
-        assertEquals(false, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("OPTION__SET_PUMP_TIME", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
new file mode 100644
index 0000000000..5fd034e5b6
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.utils.DateUtil
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Option_Set_Pump_TimeTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now())
+        // test params
+        val params = packet.requestParams
+        Assert.assertEquals((Date().date and 0xff).toByte(), params[2])
+        // test message decoding
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("OPTION__SET_PUMP_TIME", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
deleted file mode 100644
index 5d9b550b9f..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Option_Set_User_OptionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Option_Set_User_Option packet = new DanaRS_Packet_Option_Set_User_Option();
-
-        // test params
-        byte[] params = packet.getRequestParams();
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((byte) (pump.lcdOnTimeSec & 0xff) ,params[3]);
-
-        // test message decoding
-        packet.handleMessage(createArray(3, (byte) 0));
-        assertEquals(false, packet.failed);
-        // everything ok :)
-        packet.handleMessage(createArray(17, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("OPTION__SET_USER_OPTION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
new file mode 100644
index 0000000000..30d076e037
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Option_Set_User_OptionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Option_Set_User_Option(aapsLogger, danaRPump)
+        // test params
+        val params = packet.requestParams
+        Assert.assertEquals((danaRPump.lcdOnTimeSec and 0xff).toByte(), params[3])
+        // test message decoding
+        packet.handleMessage(createArray(3, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // everything ok :)
+        packet.handleMessage(createArray(17, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("OPTION__SET_USER_OPTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
deleted file mode 100644
index d266754c4e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/9/2018.
- */
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Review_Bolus_AvgTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Review_Bolus_Avg packet = new DanaRS_Packet_Review_Bolus_Avg();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(12, (byte) 0));
-        assertEquals(false, packet.failed);
-        // every average equals 1
-        packet.handleMessage(createArray(12, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__BOLUS_AVG", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
new file mode 100644
index 0000000000..ff5dc4ce80
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Review_Bolus_AvgTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Review_Bolus_Avg(aapsLogger)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(12, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // every average equals 1
+        packet.handleMessage(createArray(12, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__BOLUS_AVG", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java
deleted file mode 100644
index 71ae9b1d51..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2;
-
-import android.content.Context;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 01.08.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, SP.class})
-public class DanaRv2PluginTest {
-    DanaRv2Plugin danaRv2Plugin;
-
-    @Test
-    public void getPlugin() {
-        danaRv2Plugin.getPlugin();
-    }
-
-    @Test
-    public void basalRateShouldBeLimited() throws Exception {
-        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Double> c = new Constraint<>(Constants.REALLYHIGHBASALRATE);
-        danaRv2Plugin.applyBasalConstraints(c, AAPSMocker.getValidProfile());
-        Assert.assertEquals(0.8d, c.value());
-        Assert.assertEquals("DanaRv2: Limiting basal rate to 0.80 U/h because of pump limit", c.getReasons());
-        Assert.assertEquals("DanaRv2: Limiting basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Test
-    public void percentBasalRateShouldBeLimited() throws Exception {
-        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true);
-        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true);
-        DanaRPump.getInstance().maxBasal = 0.8d;
-
-        Constraint<Integer> c = new Constraint<>(Constants.REALLYHIGHPERCENTBASALRATE);
-        danaRv2Plugin.applyBasalPercentConstraints(c, AAPSMocker.getValidProfile());
-        Assert.assertEquals((Integer) 200, c.value());
-        Assert.assertEquals("DanaRv2: Limiting percent rate to 200% because of pump limit", c.getReasons());
-        Assert.assertEquals("DanaRv2: Limiting percent rate to 200% because of pump limit", c.getMostLimitedReasons());
-    }
-
-    @Before
-    public void prepareMocks() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockCommandQueue();
-
-//        when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
-
-        danaRv2Plugin = DanaRv2Plugin.getPlugin();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
new file mode 100644
index 0000000000..dca4d1e3ad
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -0,0 +1,75 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class DanaRv2PluginTest : TestBaseWithProfile() {
+
+    @Mock lateinit var context: Context
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var sp: info.nightscout.androidaps.utils.sharedPreferences.SP
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+
+    lateinit var danaRPump: DanaRPump
+
+    private lateinit var danaRv2Plugin: DanaRv2Plugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector { }
+    }
+
+    @Before
+    fun prepareMocks() {
+        `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
+        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, detailedBolusInfoStorage)
+    }
+
+    @Test
+    fun basalRateShouldBeLimited() {
+        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        danaRv2Plugin.applyBasalConstraints(c, validProfile)
+        org.junit.Assert.assertEquals(0.8, c.value(), 0.01)
+        org.junit.Assert.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
+        org.junit.Assert.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+
+    @Test
+    fun percentBasalRateShouldBeLimited() {
+        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
+        danaRPump.maxBasal = 0.8
+        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        danaRv2Plugin.applyBasalPercentConstraints(c, validProfile)
+        org.junit.Assert.assertEquals(200, c.value())
+        org.junit.Assert.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
+        org.junit.Assert.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java
deleted file mode 100644
index 0dc1f174c9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MessageHashTable_rv2Test {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        MessageHashTableRv2 hashTableRv2 = MessageHashTableRv2.INSTANCE;
-
-        MessageBase forTesting = new MsgStatusAPS_v2();
-        MessageBase testPacket = MessageHashTableRv2.INSTANCE.findMessage(forTesting.getCommand());
-        assertEquals(0xE001, testPacket.getCommand());
-        // try putting another command
-        MessageBase testMessage = new MessageBase();
-        testMessage.SetCommand(0xE005);
-        hashTableRv2.put(testMessage);
-        assertEquals(0xE005, hashTableRv2.findMessage(0xE005).getCommand());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
new file mode 100644
index 0000000000..8cf2f1c9df
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+class MessageHashTable_rv2Test : DanaRTestBase() {
+
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test
+    fun runTest() {
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin)
+        val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaRPump)
+        val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
+        Assert.assertEquals(0xE001, testPacket.command.toLong())
+        // try putting another command
+        val testMessage = MessageBase()
+        testMessage.SetCommand(0xE005)
+        messageHashTableRv2.put(testMessage)
+        Assert.assertEquals(0xE005, messageHashTableRv2.findMessage(0xE005).command.toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java
deleted file mode 100644
index d7910d313d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, ConfigBuilderPlugin.class, CommandQueue.class})
-public class MsgCheckValue_v2Test {
-    @Test
-    public void runTest() {
-        Treatment t = new Treatment();
-        MsgCheckValue_v2 packet = new MsgCheckValue_v2();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 3));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(DanaRPump.EXPORT_MODEL, pump.model);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
new file mode 100644
index 0000000000..71a361e8c5
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, DanaRv2Plugin::class)
+class MsgCheckValue_v2Test : DanaRTestBase() {
+
+    val rxBus = RxBusWrapper()
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    @Test
+    fun runTest() {
+        val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
+        // test message decoding
+        packet.handleMessage(createArray(34, 3.toByte()))
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.model)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java
deleted file mode 100644
index fc70670e31..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, TreatmentsPlugin.class, TreatmentService.class})
-public class MsgHistoryEvents_v2Test {
-    @Test
-    public void runTest() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockDatabaseHelper();
-        AAPSMocker.mockTreatmentPlugin();
-        AAPSMocker.mockTreatmentService();
-        MsgHistoryEvents_v2 packet = new MsgHistoryEvents_v2();
-
-        // test message decoding
-        //last message in history
-        packet.handleMessage(createArray(34, (byte) 0xFF));
-        assertEquals(true, packet.done);
-        // passing an bigger number
-        packet = new MsgHistoryEvents_v2();
-        packet.handleMessage(createArray(34, (byte) 17));
-        assertEquals(false, packet.done);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
new file mode 100644
index 0000000000..51e0a5585a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DetailedBolusInfoStorage::class)
+class MsgHistoryEvents_v2Test : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test @Throws(Exception::class) fun runTest() {
+        var packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), treatmentsPlugin, 0)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 0xFF.toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRv2Plugin.eventsLoadingDone)
+        // passing an bigger number
+        putByteToArray(array, 0, 0x01.toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(false, danaRv2Plugin.eventsLoadingDone)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
deleted file mode 100644
index 8835ee341e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by mike on 20.11.2017.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class})
-public class MsgSetAPSTempBasalStart_v2Test extends MsgSetAPSTempBasalStart_v2 {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-
-        // under 100% should last 30 min
-        setParams(0);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // over 100% should last 15 min
-        setParams(150);
-        assertEquals(150, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test low hard limit
-        setParams(-1);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test high hard limit
-        setParams(550);
-        assertEquals(500, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test setting 15 min
-        setParams(50, true, false);
-        assertEquals(50, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test setting 30 min
-        setParams(50, false, true);
-        assertEquals(50, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // over 200% set always 15 min
-        setParams(250, false, true);
-        assertEquals(250, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test low hard limit
-        setParams(-1, false, true);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test high hard limit
-        setParams(550, false, true);
-        assertEquals(500, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-
-        // test message decoding
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0});
-        assertEquals(true, failed);
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 1});
-        assertEquals(false, failed);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
new file mode 100644
index 0000000000..92ea976697
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase.intFromBuff
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetAPSTempBasalStart_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+
+        // test low hard limit
+        var packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
+        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test high hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
+        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test setting 15 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
+        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test setting 30 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
+        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        // over 200% set always 15 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
+        Assert.assertEquals(250, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test low hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
+        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        // test high hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
+        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
deleted file mode 100644
index d554c33e8d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetHistoryEntry_v2Test {
-    @Test
-    public void runTest() {
-
-        MsgSetHistoryEntry_v2 initializerTest = new MsgSetHistoryEntry_v2((byte) 1, System.currentTimeMillis(), 1, 0);
-        MsgSetHistoryEntry_v2 packet = new MsgSetHistoryEntry_v2();
-        // test message decoding
-        // != 1 fails
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(true, packet.failed);
-        // passing an bigger number
-        packet = new MsgSetHistoryEntry_v2();
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(false, packet.failed);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
new file mode 100644
index 0000000000..34b0fc8b7b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetHistoryEntry_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+        var packet = MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
+        // test message decoding
+        // != 1 fails
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
deleted file mode 100644
index 63e7011603..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.SP;
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusAPS_v2Test {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusAPS_v2 packet = new MsgStatusAPS_v2();
-        // test iob
-        //TODO Find a way to mock treatments plugin
-        byte[] testArray = createArray(34, (byte) 7);
-        double iob = MessageBase.intFromBuff(testArray, 0, 2) / 100d;
-        packet.handleMessage(testArray);
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(iob, pump.iob, 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
new file mode 100644
index 0000000000..c873d4619b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusAPS_v2Test : DanaRTestBase() {
+
+    @Test
+    fun runTest() {
+        val packet = MsgStatusAPS_v2(aapsLogger, danaRPump)
+        // test iob
+        //TODO Find a way to mock treatments plugin
+        val testArray = createArray(34, 7.toByte())
+        val iob = MessageBase.intFromBuff(testArray, 0, 2) / 100.0
+        packet.handleMessage(testArray)
+        Assert.assertEquals(iob, danaRPump.iob, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
deleted file mode 100644
index 2f12a15240..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 30.10.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBolusExtended_v2Test {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusBolusExtended_v2 packet = new MsgStatusBolusExtended_v2();
-        // test message decoding
-        //TODO Find a way to mock treatments plugin
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 2, 2)/100d, pump.extendedBolusAmount,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
new file mode 100644
index 0000000000..2f55887d29
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
+
+    @Test
+    fun runTest() {
+        val packet = MsgStatusBolusExtended_v2(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaRPump.extendedBolusAmount, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
deleted file mode 100644
index 8cb45dc5ee..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTempBasal_v2Test {
-    @Test
-    public void runTest() {
-        MsgStatusTempBasal_v2 packet = new MsgStatusTempBasal_v2();
-        DanaRPump pump = DanaRPump.getInstance();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, pump.isTempBasalInProgress);
-        // passing an bigger number
-        packet = new MsgStatusTempBasal_v2();
-
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(false, pump.isTempBasalInProgress);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
new file mode 100644
index 0000000000..fa98c68830
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTempBasal_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusTempBasal_v2(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
index 6ceb3cc438..cd395842bd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
@@ -6,7 +6,6 @@ import org.junit.Before;
 
 import java.util.List;
 
-import info.AAPSMocker;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage;
@@ -31,7 +30,7 @@ public class MedtronicHistoryDataUTest {
     MedtronicPumpHistoryDecoder decoder = new MedtronicPumpHistoryDecoder();
 
 
-    // Logger LOGGER = LoggerFactory.getLogger(MedtronicHistoryDataUTest.class);
+    // Logger LOGGER = StacktraceLoggerWrapper.getLogger(MedtronicHistoryDataUTest.class);
 
     //@Before
     public void setup() {
@@ -48,7 +47,6 @@ public class MedtronicHistoryDataUTest {
         // }
 
 
-        AAPSMocker.mockMainApp();
     }
 
 
@@ -56,12 +54,6 @@ public class MedtronicHistoryDataUTest {
     public void prepareMocks() throws Exception {
 
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "trace");
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockCommandQueue();
 
         when(SP.getString(R.string.key_danars_address, "")).thenReturn("");
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
index 69277e673c..6511117e9b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
@@ -1,29 +1,21 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
 
-import static org.mockito.Mockito.when;
-
 import junit.framework.Assert;
 
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-import info.AAPSMocker;
-import info.SPMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
 
+import static org.mockito.Mockito.when;
+
 /**
  * Created by andy on 6/16/18.
  */
@@ -35,11 +27,11 @@ public class BasalProfileUTest {
     // MainApp mainApp = new MainApp();
     @Before
     public void initMocking() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockDatabaseHelper();
+//        AAPSMocker.mockMainApp();
+//        AAPSMocker.mockStrings();
+//        AAPSMocker.mockDatabaseHelper();
 
-        SPMocker.prepareMock();
+//        SPMocker.prepareMock();
 
         PowerMockito.mockStatic(DateUtil.class);
         when(DateUtil.now()).thenReturn(1514766900000L + T.mins(1).msecs());
@@ -56,10 +48,10 @@ public class BasalProfileUTest {
 
         BasalProfile basalProfile = new BasalProfile();
         byte[] data = { //
-        0x48, 0x00, 0x00, 0x40, 0x00, 0x02, 0x38, 0x00, 0x04, 0x3A, 0x00, 0x06, 0x32, 0x00, 0x0C, 0x26, 0x00, //
-        0x10, 0x2E, 0x00, 0x14, 0x32, 0x00, 0x18, 0x26, 0x00, 0x1A, 0x1A, 0x00, 0x20, 0x14, 0x00, 0x2A, 0x00, //
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+                0x48, 0x00, 0x00, 0x40, 0x00, 0x02, 0x38, 0x00, 0x04, 0x3A, 0x00, 0x06, 0x32, 0x00, 0x0C, 0x26, 0x00, //
+                0x10, 0x2E, 0x00, 0x14, 0x32, 0x00, 0x18, 0x26, 0x00, 0x1A, 0x1A, 0x00, 0x20, 0x14, 0x00, 0x2A, 0x00, //
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
         basalProfile.setRawData(data);
 
@@ -91,7 +83,7 @@ public class BasalProfileUTest {
         Assert.assertTrue(MedtronicUtil.isSame(0.5d, profilesByHour[23]));
 
         System.out.println("Basals by hour: "
-            + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
+                + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
     }
 
 
@@ -99,17 +91,17 @@ public class BasalProfileUTest {
     public void testProfileByDay2() {
         BasalProfile basalProfile = new BasalProfile();
         byte[] data = { //
-        0x32, 0x00, 0x00, 0x2C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+                0x32, 0x00, 0x00, 0x2C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
         basalProfile.setRawData(data);
 
         Double[] profilesByHour = basalProfile.getProfilesByHour();
 
         System.out.println("Basals by hour: "
-            + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
+                + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
 
     }
 
@@ -118,14 +110,14 @@ public class BasalProfileUTest {
     public void testProfileByDayZero() {
         BasalProfile basalProfile = new BasalProfile();
         byte[] data = { //
-        0x00 };
+                0x00};
 
         basalProfile.setRawData(data);
 
         Double[] profilesByHour = basalProfile.getProfilesByHour();
 
         System.out.println("Basals by hour: "
-            + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
+                + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
 
     }
 
@@ -134,14 +126,14 @@ public class BasalProfileUTest {
     public void testProfileByDayZeroZero3F() {
         BasalProfile basalProfile = new BasalProfile();
         byte[] data = { //
-        0x00, 0x00, 0x3f };
+                0x00, 0x00, 0x3f};
 
         basalProfile.setRawData(data);
 
         Double[] profilesByHour = basalProfile.getProfilesByHour();
 
         System.out.println("Basals by hour: "
-            + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
+                + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
 
     }
 
@@ -152,11 +144,11 @@ public class BasalProfileUTest {
         MedtronicUtil.getPumpStatus().pumpType = PumpType.Medtronic_522_722;
 
         byte[] data = {
-            0, 72, 0, 2, 64, 0, 4, 56, 0, 6, 58, 0, 8, 58, 0, 10, 58, 0, 12, 50, 0, 14, 50, 0, 16, 38, 0, 18, 38, 0,
-            20, 46, 0, 22, 46, 0, 24, 50, 0, 26, 38, 0, 28, 38, 0, 30, 38, 0, 32, 26, 0, 34, 26, 0, 36, 26, 0, 38, 26,
-            0, 40, 26, 0, 42, 20, 0, 44, 20, 0, 46, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+                0, 72, 0, 2, 64, 0, 4, 56, 0, 6, 58, 0, 8, 58, 0, 10, 58, 0, 12, 50, 0, 14, 50, 0, 16, 38, 0, 18, 38, 0,
+                20, 46, 0, 22, 46, 0, 24, 50, 0, 26, 38, 0, 28, 38, 0, 30, 38, 0, 32, 26, 0, 34, 26, 0, 36, 26, 0, 38, 26,
+                0, 40, 26, 0, 42, 20, 0, 44, 20, 0, 46, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
         BasalProfile basalProfile = new BasalProfile();
         basalProfile.setRawDataFromHistory(data);
@@ -164,7 +156,7 @@ public class BasalProfileUTest {
         Double[] profilesByHour = basalProfile.getProfilesByHour();
 
         System.out.println("Basals by hour: "
-            + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
+                + (profilesByHour == null ? "null" : BasalProfile.getProfilesByHourToString(profilesByHour)));
 
         // 1.800 1.600 1.400 1.450 1.450 1.450 1.250 1.250 0.950 0.950 1.150 1.150 1.250 0.950 0.950 0.950 0.650 0.650
         // 0.650 0.650 0.650 0.500 0.500 0.500
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java
deleted file mode 100644
index 0a9d68c1ad..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.virtual;
-
-import android.content.Context;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * Created by andy on 5/13/18.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, SP.class})
-public class VirtualPumpPluginUTest {
-
-
-    VirtualPumpPlugin virtualPumpPlugin;
-
-
-
-    @Before
-    public void prepareMocks() throws Exception {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockStrings();
-        AAPSMocker.mockCommandQueue();
-        AAPSMocker.mockSP();
-
-        virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
-    }
-
-
-    @Test
-    public void getPumpType() {
-    }
-
-    @Test
-    public void refreshConfiguration() {
-
-        when(SP.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo");
-
-        virtualPumpPlugin.refreshConfiguration();
-
-        Assert.assertEquals(PumpType.AccuChekCombo, virtualPumpPlugin.getPumpType());
-    }
-
-
-    @Test
-    public void refreshConfigurationTwice() {
-
-        when(SP.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo");
-
-        virtualPumpPlugin.refreshConfiguration();
-
-        when(SP.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo");
-
-        virtualPumpPlugin.refreshConfiguration();
-
-        Assert.assertEquals(PumpType.AccuChekCombo, virtualPumpPlugin.getPumpType());
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
new file mode 100644
index 0000000000..7a8c732c62
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.virtual
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(FabricPrivacy::class)
+class VirtualPumpPluginUTest : TestBase() {
+
+    val rxBus = RxBusWrapper()
+    @Mock lateinit var fabricPrivacy: FabricPrivacy
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    @Before
+    fun prepareMocks() {
+        virtualPumpPlugin = VirtualPumpPlugin(HasAndroidInjector { AndroidInjector { } }, aapsLogger, rxBus, fabricPrivacy, resourceHelper, sp, profileFunction, treatmentsPlugin, commandQueue)
+    }
+
+    @Test
+    fun refreshConfiguration() {
+        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        virtualPumpPlugin.refreshConfiguration()
+        Assert.assertEquals(PumpType.AccuChekCombo, virtualPumpPlugin.pumpType)
+    }
+
+    @Test
+    fun refreshConfigurationTwice() {
+        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        virtualPumpPlugin.refreshConfiguration()
+        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        virtualPumpPlugin.refreshConfiguration()
+        Assert.assertEquals(PumpType.AccuChekCombo, virtualPumpPlugin.pumpType)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.java
deleted file mode 100644
index 4a7fba4287..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.sensitivity;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class})
-public class AbstractSensitivityPluginTest {
-
-    private class SensitivityTestClass extends AbstractSensitivityPlugin {
-
-        public SensitivityTestClass() {
-            super(null);
-        }
-
-        public SensitivityTestClass(PluginDescription pluginDescription) {
-            super(pluginDescription);
-        }
-
-        @Override
-        public AutosensResult detectSensitivity(IobCobCalculatorPlugin plugin, long fromTime, long toTime) {
-            return null;
-        }
-    }
-
-    @Test
-    public void fillResultTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-
-        SensitivityTestClass sut = new SensitivityTestClass();
-
-        AutosensResult ar = sut.fillResult(1d, 1d, "1",
-                "1.2", "1", 12, 0.7d, 1.2d);
-        assertEquals(1, ar.ratio, 0.01);
-
-        ar = sut.fillResult(1.2d, 1d, "1",
-                "1.2", "1", 40, 0.7d, 1.2d);
-        assertEquals(1.16, ar.ratio, 0.01);
-
-        ar = sut.fillResult(1.2d, 1d, "1",
-                "1.2", "1", 50, 0.7d, 1.2d);
-        assertEquals(1.2, ar.ratio, 0.01);
-
-        ar = sut.fillResult(1.2d, 1d, "1",
-                "1.2", "1", 50, 0.7d, 1.1d);
-        assertEquals(1.1, ar.ratio, 0.01);
-    }
-
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
new file mode 100644
index 0000000000..000a718c01
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.sensitivity
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class AbstractSensitivityPluginTest : TestBase() {
+
+    @Mock lateinit var pluginDescription: PluginDescription
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+
+    private inner class SensitivityTestClass(pluginDescription: PluginDescription, aapsLogger: AAPSLogger, resourceHelper: ResourceHelper, sp: SP) : AbstractSensitivityPlugin(pluginDescription, HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, resourceHelper, sp) {
+
+        override fun detectSensitivity(plugin: IobCobCalculatorPlugin, fromTime: Long, toTime: Long): AutosensResult {
+            return AutosensResult()
+        }
+    }
+
+    @Test
+    fun fillResultTest() {
+        val sut = SensitivityTestClass(pluginDescription, aapsLogger, resourceHelper, sp)
+        var ar = sut.fillResult(1.0, 1.0, "1",
+            "1.2", "1", 12, 0.7, 1.2)
+        Assert.assertEquals(1.0, ar.ratio, 0.01)
+        ar = sut.fillResult(1.2, 1.0, "1",
+            "1.2", "1", 40, 0.7, 1.2)
+        Assert.assertEquals(1.16, ar.ratio, 0.01)
+        ar = sut.fillResult(1.2, 1.0, "1",
+            "1.2", "1", 50, 0.7, 1.2)
+        Assert.assertEquals(1.2, ar.ratio, 0.01)
+        ar = sut.fillResult(1.2, 1.0, "1",
+            "1.2", "1", 50, 0.7, 1.1)
+        Assert.assertEquals(1.1, ar.ratio, 0.01)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt
new file mode 100644
index 0000000000..2fcd7b9a96
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.source
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+
+class GlimpPluginTest : TestBase() {
+    private lateinit var glimpPlugin: GlimpPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Before
+    fun setup() {
+        glimpPlugin = GlimpPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger)
+    }
+
+    @Test fun advancedFilteringSupported() {
+        Assert.assertEquals(false, glimpPlugin.advancedFilteringSupported())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
new file mode 100644
index 0000000000..f80d5db9e0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.source
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MM640GPluginTest : TestBase() {
+
+    private lateinit var mM640gPlugin: MM640gPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Before
+    fun setup() {
+        mM640gPlugin = MM640gPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger)
+    }
+
+    @Test fun advancedFilteringSupported() {
+        Assert.assertEquals(false, mM640gPlugin.advancedFilteringSupported())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
new file mode 100644
index 0000000000..3cbdb53a7e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.source
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class NSClientPluginTest : TestBase() {
+
+    private lateinit var nsClientSourcePlugin: NSClientSourcePlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var sp: SP
+
+    @Before
+    fun setup() {
+        nsClientSourcePlugin = NSClientSourcePlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger, sp)
+    }
+
+    @Test fun advancedFilteringSupported() {
+        Assert.assertEquals(false, nsClientSourcePlugin.advancedFilteringSupported())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceGlimpPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceGlimpPluginTest.java
deleted file mode 100644
index 9f3dc7e4d5..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceGlimpPluginTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class SourceGlimpPluginTest {
-
-    @Test
-    public void getPlugin() {
-        Assert.assertNotEquals(null, SourceGlimpPlugin.getPlugin());
-    }
-
-    @Test
-    public void advancedFilteringSupported() {
-        Assert.assertEquals(false, SourceGlimpPlugin.getPlugin().advancedFilteringSupported());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceMM640gPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceMM640gPluginTest.java
deleted file mode 100644
index efe366c0d9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceMM640gPluginTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class SourceMM640gPluginTest {
-
-    @Test
-    public void getPlugin() {
-        Assert.assertNotEquals(null, SourceMM640gPlugin.getPlugin());
-    }
-
-    @Test
-    public void advancedFilteringSupported() {
-        Assert.assertEquals(false, SourceMM640gPlugin.getPlugin().advancedFilteringSupported());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceNSClientPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceNSClientPluginTest.java
deleted file mode 100644
index be23f25d83..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceNSClientPluginTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class SourceNSClientPluginTest {
-
-    @Test
-    public void getPlugin() {
-        Assert.assertNotEquals(null, SourceNSClientPlugin.getPlugin());
-    }
-
-    @Test
-    public void advancedFilteringSupported() {
-        Assert.assertEquals(false, SourceNSClientPlugin.getPlugin().advancedFilteringSupported());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceXdripPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceXdripPluginTest.java
deleted file mode 100644
index f9a165c0b9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/SourceXdripPluginTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.source;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-public class SourceXdripPluginTest {
-
-    @Test
-    public void getPlugin() {
-        Assert.assertNotEquals(null, SourceXdripPlugin.getPlugin());
-    }
-
-    @Test
-    public void advancedFilteringSupported() {
-        Assert.assertEquals(false, SourceXdripPlugin.getPlugin().advancedFilteringSupported());
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
new file mode 100644
index 0000000000..ed1dc9c91d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.source
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class XdripPluginTest : TestBase() {
+
+    private lateinit var xdripPlugin: XdripPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Before
+    fun setup() {
+        xdripPlugin = XdripPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger)
+    }
+
+    @Test fun advancedFilteringSupported() {
+        Assert.assertEquals(false, xdripPlugin.advancedFilteringSupported())
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
deleted file mode 100644
index baaccd95b3..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package info.nightscout.androidaps.queue;
-
-import android.content.Context;
-
-import junit.framework.Assert;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.data.ConstraintChecker;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.androidaps.utils.ToastUtils;
-
-import static info.nightscout.androidaps.utils.DateUtil.now;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by mike on 14.01.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, ToastUtils.class, Context.class, TreatmentsPlugin.class})
-public class CommandQueueTest extends CommandQueue {
-
-    String validProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}";
-    Profile profile = new Profile(new JSONObject(validProfile), Constants.MGDL);
-
-    public CommandQueueTest() throws JSONException {
-    }
-
-    @Test
-    public void doTests() throws Exception {
-        prepareMock(0d, 0);
-
-        // start with empty queue
-        Assert.assertEquals(0, size());
-
-        // add bolus command
-        bolus(new DetailedBolusInfo(), null);
-        Assert.assertEquals(1, size());
-
-        // add READSTATUS
-        readStatus("anyString", null);
-        Assert.assertEquals(2, size());
-
-        // adding another bolus should remove the first one (size still == 2)
-        bolus(new DetailedBolusInfo(), null);
-        Assert.assertEquals(2, size());
-
-        // clear the queue should reset size
-        clear();
-        Assert.assertEquals(0, size());
-
-        // add tempbasal
-        tempBasalAbsolute(0, 30, true, profile, null);
-        Assert.assertEquals(1, size());
-
-        // add tempbasal percent. it should replace previous TEMPBASAL
-        tempBasalPercent(0, 30, true, profile, null);
-        Assert.assertEquals(1, size());
-
-        // add extended bolus
-        extendedBolus(1, 30, null);
-        Assert.assertEquals(2, size());
-
-        // add cancel temp basal should remove previous 2 temp basal setting
-        extendedBolus(1, 30, null);
-        Assert.assertEquals(2, size());
-
-        // cancel extended bolus should replace previous extended
-        extendedBolus(1, 30, null);
-        Assert.assertEquals(2, size());
-
-        // add setProfile
-        setProfile(profile, null);
-        Assert.assertEquals(3, size());
-
-        // add loadHistory
-        loadHistory((byte) 0, null);
-        Assert.assertEquals(4, size());
-
-        // add loadEvents
-        loadEvents(null);
-        Assert.assertEquals(5, size());
-
-        clear();
-        tempBasalAbsolute(0, 30, true, profile, null);
-        pickup();
-        Assert.assertEquals(0, size());
-        Assert.assertNotNull(performing);
-        Assert.assertEquals(Command.CommandType.TEMPBASAL, performing.commandType);
-        resetPerforming();
-        Assert.assertNull(performing);
-    }
-
-    private void prepareMock(Double insulin, Integer carbs) throws Exception {
-        ConstraintChecker constraintChecker = mock(ConstraintChecker.class);
-
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockConfigBuilder();
-        PumpInterface pump = VirtualPumpPlugin.getPlugin();
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-
-        when(MainApp.getConstraintChecker()).thenReturn(constraintChecker);
-        when(MainApp.isEngineeringModeOrRelease()).thenReturn(true);
-        Constraint<Double> bolusConstraint = new Constraint<>(0d);
-        when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(bolusConstraint);
-        when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(bolusConstraint);
-        Constraint<Integer> carbsConstraint = new Constraint<>(0);
-        when(MainApp.getConstraintChecker().applyCarbsConstraints(any())).thenReturn(carbsConstraint);
-        Constraint<Double> rateConstraint = new Constraint<>(0d);
-        when(MainApp.getConstraintChecker().applyBasalConstraints(any(), any())).thenReturn(rateConstraint);
-        Constraint<Integer> percentageConstraint = new Constraint<>(0);
-        when(MainApp.getConstraintChecker().applyBasalPercentConstraints(any(), any())).thenReturn(percentageConstraint);
-
-        PowerMockito.mockStatic(ToastUtils.class);
-        Context context = mock(Context.class);
-        String message = null;
-        PowerMockito.doNothing().when(ToastUtils.class, "showToastInUiThread", context, message);
-
-        when(MainApp.gs(0)).thenReturn("");
-
-        PowerMockito.mockStatic(TreatmentsPlugin.class);
-        TreatmentsPlugin treatmentsPlugin = mock(TreatmentsPlugin.class);
-        when(TreatmentsPlugin.getPlugin()).thenReturn(treatmentsPlugin);
-        when(treatmentsPlugin.getLastBolusTime()).thenReturn(new Date(100, 0,1 ).getTime());
-    }
-
-    @Override
-    protected synchronized void notifyAboutNewCommand() {
-    }
-
-    @Override
-    protected void showBolusProgressDialog(Double insulin, Context context) {
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        return false;
-    }
-
-    @Test
-    public void callingCancelAllBolusesClearsQueue() throws Exception {
-        // given
-        prepareMock(0d, 0);
-        Assert.assertEquals(0, size());
-
-        DetailedBolusInfo smb = new DetailedBolusInfo();
-        smb.lastKnownBolusTime = now();
-        smb.isSMB = true;
-        bolus(smb, null);
-
-        bolus(new DetailedBolusInfo(), null);
-        Assert.assertEquals(2, size());
-
-        // when
-        cancelAllBoluses();
-
-        // then
-        Assert.assertEquals(0, size());
-    }
-
-    @Test
-    public void smbIsRejectedIfABolusIsQueued() throws Exception {
-        // given
-        prepareMock(0d, 0);
-        Assert.assertEquals(0, size());
-
-        // when
-        bolus(new DetailedBolusInfo(), null);
-
-        DetailedBolusInfo smb = new DetailedBolusInfo();
-        smb.isSMB = true;
-        boolean queued = bolus(smb, null);
-
-        // then
-        Assert.assertFalse(queued);
-        Assert.assertEquals(size(), 1);
-    }
-
-    @Test
-    public void smbIsRejectedIfLastKnownBolusIsOutdated() throws Exception {
-        // given
-        prepareMock(0d, 0);
-        Assert.assertEquals(0, size());
-
-        // when
-        DetailedBolusInfo bolus = new DetailedBolusInfo();
-        bolus.isSMB = true;
-        bolus.lastKnownBolusTime = 0;
-        boolean queued = bolus(bolus, null);
-
-        // then
-        Assert.assertFalse(queued);
-        Assert.assertEquals(size(), 0);
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
new file mode 100644
index 0000000000..4e81ef83b4
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
@@ -0,0 +1,199 @@
+package info.nightscout.androidaps.queue
+
+import android.content.Context
+import dagger.Lazy
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class, ToastUtils::class, Context::class, TreatmentsPlugin::class, FabricPrivacy::class)
+class CommandQueueTest : TestBaseWithProfile() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var lazyActivePlugin: Lazy<ActivePluginProvider>
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var context: Context
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+    @Mock lateinit var sp: SP
+
+    private val buildHelper = BuildHelper()
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is Command) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
+    lateinit var commandQueue: CommandQueue
+
+    @Before
+    fun prepare() {
+        commandQueue = CommandQueue(injector, aapsLogger, rxBus, resourceHelper, constraintChecker, profileFunction, lazyActivePlugin, context, sp, buildHelper, fabricPrivacy)
+
+        val pumpDescription = PumpDescription()
+        pumpDescription.basalMinimumRate = 0.1
+
+        `when`(lazyActivePlugin.get()).thenReturn(activePlugin)
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+        `when`(virtualPumpPlugin.isThisProfileSet(anyObject())).thenReturn(false)
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        `when`(treatmentsPlugin.lastBolusTime).thenReturn(Date(100, 0, 1).time)
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
+
+        val bolusConstraint = Constraint(0.0)
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(bolusConstraint)
+        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(bolusConstraint)
+        val carbsConstraint = Constraint(0)
+        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(carbsConstraint)
+        val rateConstraint = Constraint(0.0)
+        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint)
+        val percentageConstraint = Constraint(0)
+        `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(percentageConstraint)
+    }
+
+    /*
+        @Test
+        fun doTests() {
+
+            // start with empty queue
+            Assert.assertEquals(0, commandQueue.size())
+
+            // add bolus command
+            commandQueue.bolus(DetailedBolusInfo(), null)
+            Assert.assertEquals(1, commandQueue.size())
+
+            // add READSTATUS
+            commandQueue.readStatus("anyString", null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // adding another bolus should remove the first one (size still == 2)
+            commandQueue.bolus(DetailedBolusInfo(), null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // clear the queue should reset size
+            commandQueue.clear()
+            Assert.assertEquals(0, commandQueue.size())
+
+            // add tempbasal
+            commandQueue.tempBasalAbsolute(0.0, 30, true, validProfile, null)
+            Assert.assertEquals(1, commandQueue.size())
+
+            // add tempbasal percent. it should replace previous TEMPBASAL
+            commandQueue.tempBasalPercent(0, 30, true, validProfile, null)
+            Assert.assertEquals(1, commandQueue.size())
+
+            // add extended bolus
+            commandQueue.extendedBolus(1.0, 30, null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // add cancel temp basal should remove previous 2 temp basal setting
+            commandQueue.extendedBolus(1.0, 30, null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // cancel extended bolus should replace previous extended
+            commandQueue.extendedBolus(1.0, 30, null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // add setProfile
+            // TODO: this crash the test
+    //        commandQueue.setProfile(validProfile, null)
+    //        Assert.assertEquals(3, commandQueue.size())
+
+            // add loadHistory
+            commandQueue.loadHistory(0.toByte(), null)
+            Assert.assertEquals(3, commandQueue.size())
+
+            // add loadEvents
+            commandQueue.loadEvents(null)
+            Assert.assertEquals(4, commandQueue.size())
+            commandQueue.clear()
+            commandQueue.tempBasalAbsolute(0.0, 30, true, validProfile, null)
+            commandQueue.pickup()
+            Assert.assertEquals(0, commandQueue.size())
+            Assert.assertNotNull(commandQueue.performing)
+            Assert.assertEquals(Command.CommandType.TEMPBASAL, commandQueue.performing?.commandType)
+            commandQueue.resetPerforming()
+            Assert.assertNull(commandQueue.performing)
+        }
+
+        @Test
+        fun callingCancelAllBolusesClearsQueue() {
+            // given
+            Assert.assertEquals(0, commandQueue.size())
+            val smb = DetailedBolusInfo()
+            smb.lastKnownBolusTime = DateUtil.now()
+            smb.isSMB = true
+            commandQueue.bolus(smb, null)
+            commandQueue.bolus(DetailedBolusInfo(), null)
+            Assert.assertEquals(2, commandQueue.size())
+
+            // when
+            commandQueue.cancelAllBoluses()
+
+            // then
+            Assert.assertEquals(0, commandQueue.size())
+        }
+
+        @Test
+        fun smbIsRejectedIfABolusIsQueued() {
+            // given
+            Assert.assertEquals(0, commandQueue.size())
+
+            // when
+            commandQueue.bolus(DetailedBolusInfo(), null)
+            val smb = DetailedBolusInfo()
+            smb.isSMB = true
+            val queued: Boolean = commandQueue.bolus(smb, null)
+
+            // then
+            Assert.assertFalse(queued)
+            Assert.assertEquals(commandQueue.size(), 1)
+        }
+    */
+    @Test
+    fun smbIsRejectedIfLastKnownBolusIsOutdated() {
+        // given
+        Assert.assertEquals(0, commandQueue.size())
+
+        // when
+        val bolus = DetailedBolusInfo()
+        bolus.isSMB = true
+        bolus.lastKnownBolusTime = 0
+        val queued: Boolean = commandQueue.bolus(bolus, null)
+
+        // then
+        Assert.assertFalse(queued)
+        Assert.assertEquals(commandQueue.size(), 0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java b/app/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java
new file mode 100644
index 0000000000..3b495af147
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import org.mockito.ArgumentMatchers;
+import org.mockito.invocation.InvocationOnMock;
+import org.powermock.api.mockito.PowerMockito;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.testing.mocks.SharedPreferencesMock;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+public class AAPSMocker {
+
+    private static final Map<String, SharedPreferences> mockedSharedPrefs = new HashMap<>();
+
+    public static void prepareMock() throws Exception {
+        Context mockedContext = mock(Context.class);
+        mockStatic(MainApp.class, InvocationOnMock::callRealMethod);
+
+        PowerMockito.when(mockedContext, "getSharedPreferences",  ArgumentMatchers.anyString(), ArgumentMatchers.anyInt()).thenAnswer(invocation -> {
+
+            final String key = invocation.getArgument(0);
+            if (mockedSharedPrefs.containsKey(key)) {
+                return mockedSharedPrefs.get(key);
+            } else {
+                SharedPreferencesMock newPrefs = new SharedPreferencesMock();
+                mockedSharedPrefs.put(key, newPrefs);
+                return newPrefs;
+            }
+        });
+
+        resetMockedSharedPrefs();
+    }
+
+    public static void resetMockedSharedPrefs() {
+        mockedSharedPrefs.clear();
+    }
+
+    public static File getMockedFile() {
+        File file = mock(File.class);
+        when(file.exists()).thenReturn(true);
+        when(file.canRead()).thenReturn(true);
+        when(file.canWrite()).thenReturn(true);
+        return file;
+    }
+
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java b/app/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java
new file mode 100644
index 0000000000..5b0736a450
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java
@@ -0,0 +1,158 @@
+package info.nightscout.androidaps.testing.mocks;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class SharedPreferencesMock implements SharedPreferences {
+
+    private final EditorInternals editor = new EditorInternals();
+
+    class EditorInternals implements Editor {
+
+        Map<String, Object> innerMap = new HashMap<>();
+
+        @Override
+        public Editor putString(String k, @Nullable String v) {
+            innerMap.put(k, v);
+            return this;
+        }
+
+        @Override
+        public Editor putStringSet(String k, @Nullable Set<String> set) {
+            innerMap.put(k, set);
+            return this;
+        }
+
+        @Override
+        public Editor putInt(String k, int i) {
+            innerMap.put(k, i);
+            return this;
+        }
+
+        @Override
+        public Editor putLong(String k, long l) {
+            innerMap.put(k, l);
+            return this;
+        }
+
+        @Override
+        public Editor putFloat(String k, float v) {
+            innerMap.put(k, v);
+            return this;
+        }
+
+        @Override
+        public Editor putBoolean(String k, boolean b) {
+            innerMap.put(k, b);
+            return this;
+        }
+
+        @Override
+        public Editor remove(String k) {
+            innerMap.remove(k);
+            return this;
+        }
+
+        @Override
+        public Editor clear() {
+            innerMap.clear();
+            return this;
+        }
+
+        @Override
+        public boolean commit() {
+            return true;
+        }
+
+        @Override
+        public void apply() {
+
+        }
+    }
+
+    @Override
+    public Map<String, ?> getAll() {
+        return editor.innerMap;
+    }
+
+    @Nullable
+    @Override
+    public String getString(String k, @Nullable String s) {
+        if (editor.innerMap.containsKey(k)) {
+            return (String) editor.innerMap.get(k);
+        } else {
+            return s;
+        }
+    }
+
+    @Nullable
+    @Override
+    public Set<String> getStringSet(String k, @Nullable Set<String> set) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Set<String>) editor.innerMap.get(k);
+        } else {
+            return set;
+        }
+    }
+
+    @Override
+    public int getInt(String k, int i) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Integer) editor.innerMap.get(k);
+        } else {
+            return i;
+        }
+    }
+
+    @Override
+    public long getLong(String k, long l) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Long) editor.innerMap.get(k);
+        } else {
+            return l;
+        }
+    }
+
+    @Override
+    public float getFloat(String k, float v) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Float) editor.innerMap.get(k);
+        } else {
+            return v;
+        }
+    }
+
+    @Override
+    public boolean getBoolean(String k, boolean b) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Boolean) editor.innerMap.get(k);
+        } else {
+            return b;
+        }
+    }
+
+    @Override
+    public boolean contains(String k) {
+        return editor.innerMap.containsKey(k);
+    }
+
+    @Override
+    public Editor edit() {
+        return editor;
+    }
+
+    @Override
+    public void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener onSharedPreferenceChangeListener) {
+
+    }
+
+    @Override
+    public void unregisterOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener onSharedPreferenceChangeListener) {
+
+    }
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/testing/utils/SingleStringStorage.kt b/app/src/test/java/info/nightscout/androidaps/testing/utils/SingleStringStorage.kt
new file mode 100644
index 0000000000..8a3b06d56e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/testing/utils/SingleStringStorage.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.testing.utils
+
+import info.nightscout.androidaps.utils.storage.Storage
+import java.io.File
+
+class SingleStringStorage : Storage {
+
+    var contents: String = ""
+
+    constructor(contents: String) {
+        this.contents = contents
+    }
+
+    override fun getFileContents(file: File): String {
+        return contents
+    }
+
+    override fun putFileContents(file: File, putContents: String) {
+        contents = putContents
+    }
+
+    override fun toString(): String {
+        return contents
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java b/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
deleted file mode 100644
index 43bdbc48b7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.data.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by kuchjir on 12/12/2017.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, GlucoseStatus.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class, ConstraintChecker.class, ProfileFunctions.class})
-public class BolusWizardTest {
-    private static final double PUMP_BOLUS_STEP = 0.1;
-
-    @Test
-    /** Should calculate the same bolus when different blood glucose but both in target range */
-    public void shouldCalculateTheSameBolusWhenBGsInRange() throws Exception {
-        Profile profile = setupProfile(4d, 8d, 20d, 12d);
-
-        BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 4.2, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForBg42 = bw.getCalculatedTotalInsulin();
-        bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForBg54 = bw.getCalculatedTotalInsulin();
-        Assert.assertEquals(bolusForBg42, bolusForBg54);
-    }
-
-    @Test
-    public void shouldCalculateHigherBolusWhenHighBG() throws Exception {
-        Profile profile = setupProfile(4d, 8d, 20d, 12d);
-
-        BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 9.8, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForHighBg = bw.getCalculatedTotalInsulin();
-        bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForBgInRange = bw.getCalculatedTotalInsulin();
-        Assert.assertTrue(bolusForHighBg > bolusForBgInRange);
-    }
-
-    @Test
-    public void shouldCalculateLowerBolusWhenLowBG() throws Exception {
-        Profile profile = setupProfile(4d, 8d, 20d, 12d);
-
-        BolusWizard bw = new BolusWizard(profile, "", null, 20, 0.0, 3.6, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForLowBg = bw.getCalculatedTotalInsulin();
-        bw = new BolusWizard(profile, "", null, 20, 0.0, 5.4, 0d, 100d, true, true, true, true, false, false, false);
-        Double bolusForBgInRange = bw.getCalculatedTotalInsulin();
-        Assert.assertTrue(bolusForLowBg < bolusForBgInRange);
-    }
-
-    private Profile setupProfile(Double targetLow, Double targetHigh, Double insulinSensitivityFactor, Double insulinToCarbRatio) {
-        Profile profile = mock(Profile.class);
-        when(profile.getTargetLowMgdl()).thenReturn(targetLow);
-        when(profile.getTargetHighMgdl()).thenReturn(targetHigh);
-        when(profile.getIsfMgdl()).thenReturn(insulinSensitivityFactor);
-        when(profile.getIc()).thenReturn(insulinToCarbRatio);
-
-        PowerMockito.mockStatic(GlucoseStatus.class);
-        when(GlucoseStatus.getGlucoseStatusData()).thenReturn(null);
-
-        PowerMockito.mockStatic(TreatmentsPlugin.class);
-        TreatmentsPlugin treatment = mock(TreatmentsPlugin.class);
-        IobTotal iobTotalZero = new IobTotal(System.currentTimeMillis());
-        when(treatment.getLastCalculationTreatments()).thenReturn(iobTotalZero);
-        when(treatment.getLastCalculationTempBasals()).thenReturn(iobTotalZero);
-        PowerMockito.mockStatic(MainApp.class);
-        when(TreatmentsPlugin.getPlugin()).thenReturn(treatment);
-
-        AAPSMocker.mockConfigBuilder();
-        PumpInterface pump = MDIPlugin.getPlugin();
-        pump.getPumpDescription().bolusStep = PUMP_BOLUS_STEP;
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-
-        AAPSMocker.mockConstraintsChecker();
-        Mockito.doAnswer(invocation -> {
-            Constraint<Double> constraint = invocation.getArgument(0);
-            return constraint;
-        }).when(AAPSMocker.constraintChecker).applyBolusConstraints(any(Constraint.class));
-
-        AAPSMocker.mockProfileFunctions();
-        return profile;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt
new file mode 100644
index 0000000000..c147c0810c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt
@@ -0,0 +1,76 @@
+package info.nightscout.androidaps.utils
+
+import info.nightscout.androidaps.TestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PowerMockIgnore
+import org.powermock.modules.junit4.PowerMockRunner
+
+@PowerMockIgnore("javax.crypto.*")
+@RunWith(PowerMockRunner::class)
+class CryptoUtilTest: TestBase() {
+
+    @Test
+    fun testFixedSaltCrypto() {
+        val salt = byteArrayOf(
+            -33, -29, 16, -19, 99, -111, -3, 2, 116, 106, 47, 38, -54, 11, -77, 28,
+            111, -15, -65, -110, 4, -32, -29, -70, -95, -88, -53, 19, 87, -103, 123, -15)
+
+        val password = "thisIsFixedPassword"
+        val payload = "FIXED-PAYLOAD"
+        val encrypted = CryptoUtil.encrypt(password, salt, payload)
+
+        Assert.assertNotNull(encrypted)
+        val decrypted = CryptoUtil.decrypt(password, salt, encrypted!!)
+        Assert.assertEquals(decrypted, payload)
+    }
+
+    @Test
+    fun testStandardCrypto() {
+        val salt = CryptoUtil.mineSalt()
+
+        val password = "topSikret"
+        val payload = "{what:payloadYouWantToProtect}"
+        val encrypted = CryptoUtil.encrypt(password, salt, payload)
+
+        Assert.assertNotNull(encrypted)
+        val decrypted = CryptoUtil.decrypt(password, salt, encrypted!!)
+        Assert.assertEquals(decrypted, payload)
+    }
+
+    @Test
+    fun testHashVector() {
+        val payload = "{what:payloadYouWantToProtect}"
+        val hash = CryptoUtil.sha256(payload)
+        Assert.assertEquals(hash, "a1aafe3ed6cc127e6d102ddbc40a205147230e9cfd178daf108c83543bbdcd13")
+    }
+
+    @Test
+    fun testHmac() {
+        val payload = "{what:payloadYouWantToProtect}"
+        val password = "topSikret"
+        val expectedHmac = "ea2213953d0f2e55047cae2d23fb4f0de1b805d55e6271efa70d6b85fb692bea" // generated using other HMAC tool
+        val hash = CryptoUtil.hmac256(payload, password)
+        Assert.assertEquals(hash, expectedHmac)
+    }
+
+    @Test
+    fun testPlainPasswordCheck() {
+        Assert.assertTrue(CryptoUtil.checkPassword("same", "same"))
+        Assert.assertFalse(CryptoUtil.checkPassword("same", "other"))
+    }
+
+    @Test
+    fun testHashedPasswordCheck() {
+        Assert.assertTrue(CryptoUtil.checkPassword("givenSecret", CryptoUtil.hashPassword("givenSecret")))
+        Assert.assertFalse(CryptoUtil.checkPassword("givenSecret", CryptoUtil.hashPassword("otherSecret")))
+
+        Assert.assertTrue(CryptoUtil.checkPassword("givenHashToCheck", "hmac:7fe5f9c7b4b97c5d32d5cfad9d07473543a9938dc07af48a46dbbb49f4f68c12:a0c7cee14312bbe31b51359a67f0d2dfdf46813f319180269796f1f617a64be1"))
+        Assert.assertFalse(CryptoUtil.checkPassword("givenMashToCheck", "hmac:7fe5f9c7b4b97c5d32d5cfad9d07473543a9938dc07af48a46dbbb49f4f68c12:a0c7cee14312bbe31b51359a67f0d2dfdf46813f319180269796f1f617a64be1"))
+        Assert.assertFalse(CryptoUtil.checkPassword("givenHashToCheck", "hmac:0fe5f9c7b4b97c5d32d5cfad9d07473543a9938dc07af48a46dbbb49f4f68c12:a0c7cee14312bbe31b51359a67f0d2dfdf46813f319180269796f1f617a64be1"))
+        Assert.assertFalse(CryptoUtil.checkPassword("givenHashToCheck", "hmac:7fe5f9c7b4b97c5d32d5cfad9d07473543a9938dc07af48a46dbbb49f4f68c12:b0c7cee14312bbe31b51359a67f0d2dfdf46813f319180269796f1f617a64be1"))
+    }
+
+}
+
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
deleted file mode 100644
index 4346023695..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Created by mike on 20.11.2017.
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
-public class DateUtilTest {
-
-    @Test
-    public void fromISODateStringTest() throws Exception {
-        assertEquals(1511124634417L, DateUtil.fromISODateString("2017-11-19T22:50:34.417+0200").getTime());
-        assertEquals(1511124634000L, DateUtil.fromISODateString("2017-11-19T22:50:34+0200").getTime());
-        assertEquals(1512317365000L, DateUtil.fromISODateString("2017-12-03T16:09:25.000Z").getTime());
-        assertEquals(1513902750000L, DateUtil.fromISODateString("2017-12-22T00:32:30Z").getTime());
-    }
-
-    @Test
-    public void toISOStringTest() throws Exception {
-        assertEquals("2017-12-22T00:32:30Z", DateUtil.toISOString(new Date(1513902750000L)));
-        assertEquals("2017-12-22T00:32:30Z", DateUtil.toISOString(1513902750000L));
-    }
-
-    @Test
-    public void toDateTest() {
-        assertTrue(DateUtil.toDate((int) (T.hours(1).secs() + T.mins(1).secs() + 1)).toString().contains("01:01:00"));
-    }
-
-    @Test
-    public void toSecondsTest() {
-        Assert.assertEquals(3600, DateUtil.toSeconds("01:00"));
-        Assert.assertEquals(3600, DateUtil.toSeconds("01:00 a.m."));
-        Assert.assertEquals(3600, DateUtil.toSeconds("01:00 AM"));
-    }
-
-    @Test
-    public void dateStringTest() {
-        assertTrue(DateUtil.dateString(new Date(1513902750000L)).contains("22"));
-        assertTrue(DateUtil.dateString(1513902750000L).contains("22"));
-    }
-
-    @Test
-    public void timeStringTest() {
-        assertTrue(DateUtil.timeString(new Date(1513902750000L)).contains("32"));
-        assertTrue(DateUtil.timeString(1513902750000L).contains("32"));
-    }
-
-    @Test
-    public void dateAndTimeStringTest() {
-        assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("22"));
-        assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("32"));
-        assertTrue(DateUtil.dateAndTimeString(new Date(1513902750000L)).contains("22"));
-        assertTrue(DateUtil.dateAndTimeString(new Date(1513902750000L)).contains("32"));
-    }
-
-   @Test
-    public void dateAndTimeRangeStringTest() {
-        assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"));
-        assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"));
-        assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"));
-        assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"));
-    }
-
-    /*
-    @Test
-    public void timeStringFromSecondsTest() {
-        Assert.assertEquals("1:00 AM", DateUtil.timeStringFromSeconds((int) T.hours(1).secs()));
-    }
-    */
-
-    @Test
-    public void timeFrameStringTest() {
-        Assert.assertEquals("(1h 1')", DateUtil.timeFrameString((T.hours(1).msecs() + T.mins(1).msecs())));
-    }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
new file mode 100644
index 0000000000..0edbe93c11
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
@@ -0,0 +1,77 @@
+package info.nightscout.androidaps.utils
+
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class DateUtilTest : TestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test
+    fun fromISODateStringTest() {
+        Assert.assertEquals(1511124634417L, DateUtil.fromISODateString("2017-11-19T22:50:34.417+0200").time)
+        Assert.assertEquals(1511124634000L, DateUtil.fromISODateString("2017-11-19T22:50:34+0200").time)
+        Assert.assertEquals(1512317365000L, DateUtil.fromISODateString("2017-12-03T16:09:25.000Z").time)
+        Assert.assertEquals(1513902750000L, DateUtil.fromISODateString("2017-12-22T00:32:30Z").time)
+    }
+
+    @Test
+    fun toISOStringTest() {
+        Assert.assertEquals("2017-12-22T00:32:30Z", DateUtil.toISOString(Date(1513902750000L)))
+        Assert.assertEquals("2017-12-22T00:32:30Z", DateUtil.toISOString(1513902750000L))
+    }
+
+    @Test fun toDateTest() {
+        Assert.assertTrue(DateUtil.toDate((T.hours(1).secs() + T.mins(1).secs() + 1).toInt()).toString().contains("01:01:00"))
+    }
+
+    @Test fun toSecondsTest() {
+        Assert.assertEquals(3600, DateUtil.toSeconds("01:00").toLong())
+        Assert.assertEquals(3600, DateUtil.toSeconds("01:00 a.m.").toLong())
+        Assert.assertEquals(3600, DateUtil.toSeconds("01:00 AM").toLong())
+    }
+
+    @Test fun dateStringTest() {
+        Assert.assertTrue(DateUtil.dateString(Date(1513902750000L)).contains("22"))
+        Assert.assertTrue(DateUtil.dateString(1513902750000L).contains("22"))
+    }
+
+    @Test fun timeStringTest() {
+        Assert.assertTrue(DateUtil.timeString(Date(1513902750000L)).contains("32"))
+        Assert.assertTrue(DateUtil.timeString(1513902750000L).contains("32"))
+    }
+
+    @Test fun dateAndTimeStringTest() {
+        Assert.assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil.dateAndTimeString(Date(1513902750000L)).contains("22"))
+        Assert.assertTrue(DateUtil.dateAndTimeString(Date(1513902750000L)).contains("32"))
+    }
+
+    @Test fun dateAndTimeRangeStringTest() {
+        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
+    }
+
+    /*
+    @Test
+    public void timeStringFromSecondsTest() {
+        Assert.assertEquals("1:00 AM", DateUtil.timeStringFromSeconds((int) T.hours(1).secs()));
+    }
+    */
+    @Test fun timeFrameStringTest() {
+        `when`(resourceHelper.gs(R.string.shorthour)).thenReturn("h")
+        Assert.assertEquals("(1h 1')", DateUtil.timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), resourceHelper))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
index ca1bc84e78..e02e5fe28b 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.utils;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class})
 public class DecimalFormatterTest {
 
     @Test
@@ -45,10 +39,4 @@ public class DecimalFormatterTest {
     @Test
     public void pumpSupportedBolusFormat() {
     }
-
-    @Before
-    public void prepareMock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockStrings();
-    }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java b/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java
index 823653c5ab..28a6b1cc31 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/MidnightTimeTest.java
@@ -2,20 +2,12 @@ package info.nightscout.androidaps.utils;
 
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.Calendar;
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Created by mike on 20.11.2017.
@@ -60,6 +52,7 @@ public class MidnightTimeTest {
         MidnightTime.resetCache();
         Assert.assertEquals(0, MidnightTime.times.size());
     }
+
     @Test
     public void log() {
         long now = DateUtil.now();
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
new file mode 100644
index 0000000000..e44b95c950
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
@@ -0,0 +1,125 @@
+package info.nightscout.androidaps.utils.wizard
+
+import android.content.Context
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.mockito.invocation.InvocationOnMock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class)
+class BolusWizardTest : TestBase() {
+
+    private val PUMP_BOLUS_STEP = 0.1
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var context: Context
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var loopPlugin: LoopPlugin
+    @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
+
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is BolusWizard) {
+                it.aapsLogger = aapsLogger
+                it.resourceHelper = resourceHelper
+                it.rxBus = RxBusWrapper()
+                it.profileFunction = profileFunction
+                it.constraintChecker = constraintChecker
+                it.context = context
+                it.activePlugin = activePlugin
+                it.commandQueue = commandQueue
+                it.loopPlugin = loopPlugin
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+            if (it is GlucoseStatus) {
+                it.aapsLogger = aapsLogger
+                it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
+            }
+        }
+    }
+
+    private fun setupProfile(targetLow: Double, targetHigh: Double, insulinSensitivityFactor: Double, insulinToCarbRatio: Double): Profile {
+        val profile = Mockito.mock(Profile::class.java)
+        `when`(profile.targetLowMgdl).thenReturn(targetLow)
+        `when`(profile.targetHighMgdl).thenReturn(targetHigh)
+        `when`(profile.isfMgdl).thenReturn(insulinSensitivityFactor)
+        `when`(profile.ic).thenReturn(insulinToCarbRatio)
+
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+        `when`(iobCobCalculatorPlugin.dataLock).thenReturn(Unit)
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        `when`(treatmentsPlugin.lastCalculationTreatments).thenReturn(IobTotal(System.currentTimeMillis()))
+        `when`(treatmentsPlugin.lastCalculationTempBasals).thenReturn(IobTotal(System.currentTimeMillis()))
+        `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
+        val pumpDescription = PumpDescription()
+        pumpDescription.bolusStep = PUMP_BOLUS_STEP
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
+
+        Mockito.doAnswer { invocation: InvocationOnMock ->
+            invocation.getArgument<Constraint<Double>>(0)
+        }.`when`(constraintChecker).applyBolusConstraints(anyObject())
+        return profile
+    }
+
+    @Test
+        /** Should calculate the same bolus when different blood glucose but both in target range  */
+    fun shouldCalculateTheSameBolusWhenBGsInRange() {
+        val profile = setupProfile(4.0, 8.0, 20.0, 12.0)
+        var bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 4.2, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForBg42 = bw.calculatedTotalInsulin
+        bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 5.4, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForBg54 = bw.calculatedTotalInsulin
+        Assert.assertEquals(bolusForBg42, bolusForBg54, 0.01)
+    }
+
+    @Test
+    fun shouldCalculateHigherBolusWhenHighBG() {
+        val profile = setupProfile(4.0, 8.0, 20.0, 12.0)
+        var bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 9.8, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForHighBg = bw.calculatedTotalInsulin
+        bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 5.4, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForBgInRange = bw.calculatedTotalInsulin
+        Assert.assertTrue(bolusForHighBg > bolusForBgInRange)
+    }
+
+    @Test
+    fun shouldCalculateLowerBolusWhenLowBG() {
+        val profile = setupProfile(4.0, 8.0, 20.0, 12.0)
+        var bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 3.6, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForLowBg = bw.calculatedTotalInsulin
+        bw = BolusWizard(injector).doCalc(profile, "", null, 20, 0.0, 5.4, 0.0, 100.0, true, true, true, true, false, false, false)
+        val bolusForBgInRange = bw.calculatedTotalInsulin
+        Assert.assertTrue(bolusForLowBg < bolusForBgInRange)
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3327014f1f..e2d3d72abf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'io.fabric.tools:gradle:1.31.2'
 
@@ -34,6 +34,13 @@ allprojects {
             }
         }
     }
+    //Support @JvmDefault
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            freeCompilerArgs = ['-Xjvm-default=enable'] //enable or compatibility
+            jvmTarget = "1.8"
+        }
+    }
 }
 
 task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 008330001c..dc6471224f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 21 10:14:00 CEST 2019
+#Sat Feb 29 21:28:06 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/wear/build.gradle b/wear/build.gradle
index 3a2277e2fe..dc73e3c4f0 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -57,6 +57,8 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        firebaseDisable {
+        }
     }
 
     compileOptions {
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 1097be80be..4d197c5bd8 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -465,44 +465,44 @@
         </activity>
         <activity
             android:name=".interaction.AAPSPreferences"
-            android:label="SETTINGS">
+            android:label="@string/menu_settings">
         </activity>
         <activity
             android:name=".interaction.actions.WizardActivity"
-            android:label="Wizard">
+            android:label="@string/menu_wizard">
         </activity>
         <activity
             android:name=".interaction.menus.FillMenuActivity"
-            android:label="Fillmenu">
+            android:label="@string/menu_prime_fill">
         </activity>
         <activity
             android:name=".interaction.menus.StatusMenuActivity"
-            android:label="Status">
+            android:label="@string/menu_status">
         </activity>
         <activity
             android:name=".interaction.actions.BolusActivity"
-            android:label="Bolus">
+            android:label="@string/action_bolus">
         </activity>
         <activity
             android:name=".interaction.actions.CPPActivity"
-            android:label="CPP">
+            android:label="@string/status_cpp">
         </activity>
         <activity
             android:name=".interaction.actions.AcceptActivity"
             android:launchMode="singleInstance"
-            android:label="ACCEPT">
+            android:label="@string/action_confirm">
         </activity>
         <activity
             android:name=".interaction.actions.FillActivity"
-            android:label="Fill">
+            android:label="@string/menu_prime_fill">
         </activity>
         <activity
             android:name=".interaction.actions.ECarbActivity"
-            android:label="Fill">
+            android:label="@string/action_carbs">
         </activity>
         <activity
             android:name=".interaction.actions.TempTargetActivity"
-            android:label="TempTarget">
+            android:label="@string/menu_tempt">
         </activity>
     </application>
 </manifest>
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java
index 885f1cd1ba..3ef2622a0d 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.interaction.actions;
 
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -23,8 +22,6 @@ import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
 
-import static android.preference.PreferenceManager.getDefaultSharedPreferences;
-
 /**
  * Created by adrian on 09/02/17.
  */
diff --git a/wear/src/main/res/values-cs-rCZ/strings.xml b/wear/src/main/res/values-cs-rCZ/strings.xml
index dbc316abad..d231921014 100644
--- a/wear/src/main/res/values-cs-rCZ/strings.xml
+++ b/wear/src/main/res/values-cs-rCZ/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -8,10 +7,101 @@
     <string name="label_xdrip_big_chart">AAPS(VelkýGraf)</string>
     <string name="label_xdrip_no_chart">AAPS(BezGrafu)</string>
     <string name="label_xdrip_circle">APS(Kruh)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS (Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
     <string name="label_warning_sync">Žádná data!</string>
     <string name="label_warning_old">Stará data!</string>
     <string name="label_warning_since">Od %1$s</string>
     <string name="label_warning_sync_aaps">Synchronizovat s AAPS!</string>
     <string name="msg_warning_sync">Od %1$s nebyla obdržena žádná data! Zkontrolujte, zda AAPS na telefonu odesílá data ke sledování</string>
     <string name="msg_warning_old">AAPS data jsou %1$s stará! Zkontrolujte svůj senzor, xDrip +, NS, AAPS konfigurace nebo ostatní!</string>
+    <string name="pref_on">Zap.</string>
+    <string name="pref_off">Vyp.</string>
+    <string name="pref_vibrate_on_bolus">Vibrovat při bolusu</string>
+    <string name="pref_units_for_actions">Jednotky pro akce</string>
+    <string name="pref_show_date">Zobrazit datum</string>
+    <string name="pref_show_iob">Zobrazit IOB</string>
+    <string name="pref_show_cob">Zobrazit COB</string>
+    <string name="pref_show_delta">Zobrazit deltu</string>
+    <string name="pref_show_avgdelta">Zobrazit průměrnou deltu</string>
+    <string name="pref_show_phone_battery">Zobrazit stav baterie telefonu</string>
+    <string name="pref_show_rig_battery">Zobrazovat kruhový graf baterie</string>
+    <string name="pref_show_basal_rate">Zobrazit bazál</string>
+    <string name="pref_show_loop_status">Zobrazovat stav smyčky</string>
+    <string name="pref_show_bg">Zobrazovat glykemii</string>
+    <string name="pref_show_direction_arrow">Zobrazovat trendovou šipku</string>
+    <string name="pref_show_ago">Zobrazit aktualizováno před</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Tmavý</string>
+    <string name="pref_highlight_basals">Zvýraznit bazály</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Odpovídající oddělovač</string>
+    <string name="pref_chart_timeframe">Časové okno grafu</string>
+    <string name="pref_1_hour">1 hodina</string>
+    <string name="pref_2_hours">2 hodiny</string>
+    <string name="pref_3_hours">3 hodiny</string>
+    <string name="pref_4_hours">4 hodiny</string>
+    <string name="pref_5_hours">5 hodin</string>
+    <string name="pref_input_design">Design zadávání</string>
+    <string name="pref_default">Výchozí</string>
+    <string name="pref_quick_righty">Rychle zprava</string>
+    <string name="pref_quick_lefty">Rychle zleva</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Míra podrobnosti delty (Steampunk)</string>
+    <string name="pref_low">Nízká</string>
+    <string name="pref_medium">Střední</string>
+    <string name="pref_high">Vysoká</string>
+    <string name="pref_auto">Auto</string>
+    <string name="pref_big_numbers">Velké číslice</string>
+    <string name="pref_animations">Animace</string>
+    <string name="pref_wizard_in_menu">Kalkulačka v nabídce</string>
+    <string name="pref_prime_in_menu">Plnění v nabídce</string>
+    <string name="pref_single_target">Jeden cíl</string>
+    <string name="pref_wizard_percentage">Procenta z kalkulátoru</string>
+    <string name="pref_complication_tap_action">Akce po klepnutí na komplikaci</string>
+    <string name="pref_unicode_in_complications">Znaky Unicode v komplikacích</string>
+    <string name="pref_version">Verze:</string>
+    <string name="menu_tempt">TempT</string>
+    <string name="menu_wizard">Kalkulačka</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarbs</string>
+    <string name="menu_settings">Nastavení</string>
+    <string name="menu_status">Stav</string>
+    <string name="menu_prime_fill">Plnění/doplňování</string>
+    <string name="menu_none">Nic</string>
+    <string name="menu_default">Výchozí</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">trvání</string>
+    <string name="action_target" comment="In temp target menu, single target value">cíl</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">nízká</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">vysoká</string>
+    <string name="action_carbs">sacharidy</string>
+    <string name="action_percentage">procento</string>
+    <string name="action_start_min">začátek [min]</string>
+    <string name="action_duration_h">trvání [h]</string>
+    <string name="action_insulin">inzulín</string>
+    <string name="action_preset_1">Předvolba 1</string>
+    <string name="action_preset_2">Předvolba 2</string>
+    <string name="action_preset_3">Předvolba 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Libovolné množství</string>
+    <string name="action_confirm">POTVRDIT</string>
+    <string name="action_status_pump">STAV PUMPY</string>
+    <string name="action_status_loop">STAV SMYČKY</string>
+    <string name="action_timeshift">posun času</string>
+    <string name="action_tdd_weighted">TDD vážený</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pumpa</string>
+    <string name="status_loop">Smyčka</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Sacharidy</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">žádný stav</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">t</string>
 </resources>
diff --git a/wear/src/main/res/values-de-rDE/strings.xml b/wear/src/main/res/values-de-rDE/strings.xml
index 79f1d5a568..d60f1f517c 100644
--- a/wear/src/main/res/values-de-rDE/strings.xml
+++ b/wear/src/main/res/values-de-rDE/strings.xml
@@ -56,20 +56,20 @@
     <string name="pref_ring_history">Ring BZ-Historie</string>
     <string name="pref_light_ring_history">Ring BZ-Historie light</string>
     <string name="pref_animations">Animationen</string>
-    <string name="pref_wizard_in_menu">Assistent im Menü</string>
+    <string name="pref_wizard_in_menu">Rechner im Menü</string>
     <string name="pref_prime_in_menu">Befüllung im Menü</string>
     <string name="pref_single_target">Einzelzielwert</string>
-    <string name="pref_wizard_percentage">Assistent mit %</string>
+    <string name="pref_wizard_percentage">Rechner mit %</string>
     <string name="pref_complication_tap_action">Tipp Komplikation</string>
     <string name="pref_unicode_in_complications">Unicode in Komplikationen</string>
     <string name="pref_version">Version:</string>
     <string name="menu_tempt">Temp. Ziel</string>
-    <string name="menu_wizard">Assistent</string>
+    <string name="menu_wizard">Rechner</string>
     <string name="menu_bolus">Bolus</string>
     <string name="menu_ecarb">eCarb</string>
-    <string name="menu_settings">Einstellungen</string>
+    <string name="menu_settings">Einstellung</string>
     <string name="menu_status">Status</string>
-    <string name="menu_prime_fill">Vorfüllen/Füllen</string>
+    <string name="menu_prime_fill">(Vor-)Füllen</string>
     <string name="menu_none">Kein(e)</string>
     <string name="menu_default">Standard</string>
     <string name="menu_menu">Menü</string>
@@ -77,8 +77,8 @@
     <string name="action_target" comment="In temp target menu, single target value">Ziel</string>
     <string name="action_low" comment="In temp target menu, lower value from range">niedrig</string>
     <string name="action_high" comment="In temp target menu, higher value from range">hoch</string>
-    <string name="action_carbs">COB</string>
-    <string name="action_percentage">Prozentsatz</string>
+    <string name="action_carbs">gKH</string>
+    <string name="action_percentage">%-Satz</string>
     <string name="action_start_min">Start [min]</string>
     <string name="action_duration_h">Dauer [h]</string>
     <string name="action_insulin">Insulin</string>
@@ -96,7 +96,7 @@
     <string name="status_loop">Loop</string>
     <string name="status_cpp">CPP</string>
     <string name="status_tdd">TDD</string>
-    <string name="activity_carb">g KH</string>
+    <string name="activity_carb">KH</string>
     <string name="activity_IOB">IOB</string>
     <string name="activity_no_status">Kein Status</string>
     <string name="unit_mg_dl">mg/dl</string>
diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml
index af200da3fb..6e65157335 100644
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -51,6 +50,7 @@
     <string name="pref_low">Bajo</string>
     <string name="pref_medium">Medio</string>
     <string name="pref_high">Alto</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Números grandes</string>
     <string name="pref_ring_history">Historial de Ring</string>
     <string name="pref_light_ring_history">Historial de Ring Light</string>
diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml
index 4fb24f0e5e..27b90d0687 100644
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@@ -35,7 +35,7 @@
     <string name="pref_show_ago">Afficher Min Passées</string>
     <string name="pref_dark" comment="Enables dark visual theme">Sombre</string>
     <string name="pref_highlight_basals">Surbrillance Basale</string>
-    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Séparateur Noir</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Séparateur Invisible</string>
     <string name="pref_chart_timeframe">Echelle Graphique</string>
     <string name="pref_1_hour">1 heure</string>
     <string name="pref_2_hours">2 heures</string>
@@ -51,6 +51,7 @@
     <string name="pref_low">Faible</string>
     <string name="pref_medium">Moyen</string>
     <string name="pref_high">Élevé</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Gros chiffres (Cercle)</string>
     <string name="pref_ring_history">Historique (Cercle)</string>
     <string name="pref_light_ring_history">Historique Léger (Cercle)</string>
diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml
index 5247ee0674..0f7282e210 100644
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -98,7 +97,7 @@
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">CHO</string>
     <string name="activity_IOB">IOB</string>
-    <string name="activity_no_status">no stato</string>
+    <string name="activity_no_status">no status</string>
     <string name="unit_mg_dl">mg/dl</string>
     <string name="unit_mmol_l">mmol/l</string>
     <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml
index 70489fbc5e..cc4e5e62be 100644
--- a/wear/src/main/res/values-ko-rKR/strings.xml
+++ b/wear/src/main/res/values-ko-rKR/strings.xml
@@ -1,3 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(대)</string>
+    <string name="label_xdrip_big_chart">AAPS(큰차트)</string>
+    <string name="label_xdrip_no_chart">AAPS(차트없음)</string>
+    <string name="label_xdrip_circle">AAPS(원형)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(조종석)</string>
+    <string name="label_xdrip_steampunk">AAPS(스팀펑크)</string>
+    <string name="label_warning_sync">데이터없음!</string>
+    <string name="label_warning_old">오래된 데이터!</string>
+    <string name="label_warning_since">%1$s 이후</string>
+    <string name="label_warning_sync_aaps">AAPS와 연결!</string>
+    <string name="msg_warning_sync">%1$s 이후 받은 데이터가 없습니다! 폰에서 AAPS가 워치로 데이터를 보냈는지 확인하세요</string>
+    <string name="msg_warning_old">AAPS 데이터가 %1$s 오래되었습니다! 센서, xDrip+, NS, AAPS 설정 또는 기타사항을 확인하세요!</string>
+    <string name="pref_on">켜기</string>
+    <string name="pref_off">끄기</string>
+    <string name="pref_vibrate_on_bolus">Bolus 주입시 진동</string>
+    <string name="pref_units_for_actions">단위</string>
+    <string name="pref_show_date">날짜 표시</string>
+    <string name="pref_show_iob">IOB 표시</string>
+    <string name="pref_show_cob">COB 표시</string>
+    <string name="pref_show_delta">증분 표시</string>
+    <string name="pref_show_avgdelta">평균증분 표시</string>
+    <string name="pref_show_phone_battery">폰배터리 표시</string>
+    <string name="pref_show_rig_battery">종합 배터리 표시</string>
+    <string name="pref_show_basal_rate">Basal 값 표시</string>
+    <string name="pref_show_loop_status">Loog 상태 표시</string>
+    <string name="pref_show_bg">혈당 표시</string>
+    <string name="pref_show_direction_arrow">화살표 표시</string>
+    <string name="pref_show_ago">\'분전\' 표시</string>
+    <string name="pref_dark" comment="Enables dark visual theme">어두움</string>
+    <string name="pref_highlight_basals">Basal 강조</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">경계선 색상매칭</string>
+    <string name="pref_chart_timeframe">차트 기간</string>
+    <string name="pref_1_hour">1시간</string>
+    <string name="pref_2_hours">2시간</string>
+    <string name="pref_3_hours">3시간</string>
+    <string name="pref_4_hours">4시간</string>
+    <string name="pref_5_hours">5시간</string>
+    <string name="pref_input_design">입력 형태</string>
+    <string name="pref_default">기본</string>
+    <string name="pref_quick_righty">오른손잡이</string>
+    <string name="pref_quick_lefty">왼손잡이</string>
+    <string name="pref_modern_sparse">모던스타일</string>
+    <string name="pref_delta_granularity">증분 밀도(스팀펑크)</string>
+    <string name="pref_low">저</string>
+    <string name="pref_medium">중</string>
+    <string name="pref_high">고</string>
+    <string name="pref_auto">자동</string>
+    <string name="pref_big_numbers">큰 숫자</string>
+    <string name="pref_ring_history">원형 이력</string>
+    <string name="pref_light_ring_history">연한 원형 이력</string>
+    <string name="pref_animations">애니메이션</string>
+    <string name="pref_wizard_in_menu">메뉴에서 마법사</string>
+    <string name="pref_prime_in_menu">메뉴에서 교체</string>
+    <string name="pref_single_target">단일 목표</string>
+    <string name="pref_wizard_percentage">마법사 퍼센트</string>
+    <string name="pref_complication_tap_action">컴플리케이션 탭 동작</string>
+    <string name="pref_unicode_in_complications">컴플리케이션에서 유니코드 사용</string>
+    <string name="pref_version">버전:</string>
+    <string name="menu_tempt">임시목표</string>
+    <string name="menu_wizard">마법사</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">확장탄수화물</string>
+    <string name="menu_settings">설정</string>
+    <string name="menu_status">상태</string>
+    <string name="menu_prime_fill">교체/채움</string>
+    <string name="menu_none">없음</string>
+    <string name="menu_default">기본</string>
+    <string name="menu_menu">메뉴</string>
+    <string name="action_duration">기간</string>
+    <string name="action_target" comment="In temp target menu, single target value">목표</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">하한값</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">상한값</string>
+    <string name="action_carbs">탄수화물</string>
+    <string name="action_percentage">퍼센트</string>
+    <string name="action_start_min">시작 [min]</string>
+    <string name="action_duration_h">기간 [h]</string>
+    <string name="action_insulin">인슐린</string>
+    <string name="action_preset_1">프리셋 1</string>
+    <string name="action_preset_2">프리셋 2</string>
+    <string name="action_preset_3">프리셋 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">양 제한없음</string>
+    <string name="action_confirm">확인</string>
+    <string name="action_status_pump">상태 펌프</string>
+    <string name="action_status_loop">상태 LOOP</string>
+    <string name="action_timeshift">시간이동</string>
+    <string name="action_tdd_weighted">TDD 가중</string>
+    <string name="action_bolus">Bolus</string>
+    <string name="status_pump">펌프</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Carb</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">상태 없음</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">w</string>
+</resources>
diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml
index 4ca8521149..7fb7d68629 100644
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -20,6 +19,7 @@
     <string name="pref_on">Įjungti</string>
     <string name="pref_off">Išjungti</string>
     <string name="pref_vibrate_on_bolus">Vibruoti, kai leidžiamas bolusas</string>
+    <string name="pref_units_for_actions">Veiksmų vienetai</string>
     <string name="pref_show_date">Rodyti datą</string>
     <string name="pref_show_iob">Rodyti AIO</string>
     <string name="pref_show_cob">Rodyti AAO</string>
@@ -50,6 +50,7 @@
     <string name="pref_low">Žemas</string>
     <string name="pref_medium">Vidutinis</string>
     <string name="pref_high">Aukštas</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Dideli Skaičiai</string>
     <string name="pref_ring_history">Glikemijos istorija</string>
     <string name="pref_light_ring_history">Glikemijos istorija - šviesi</string>
@@ -58,6 +59,8 @@
     <string name="pref_prime_in_menu">Užpildyti per meniu</string>
     <string name="pref_single_target">Pavienis tikslas</string>
     <string name="pref_wizard_percentage">Vedlys su %</string>
+    <string name="pref_complication_tap_action">Elementų skirtuko veiksmai</string>
+    <string name="pref_unicode_in_complications">Unikodas elementuose</string>
     <string name="pref_version">Versija:</string>
     <string name="menu_tempt">LaikinasTikslas</string>
     <string name="menu_wizard">Vedlys</string>
@@ -81,6 +84,7 @@
     <string name="action_preset_1">Ruošinys 1</string>
     <string name="action_preset_2">Ruošinys 2</string>
     <string name="action_preset_3">Ruošinys 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Užpildymo kiekis</string>
     <string name="action_confirm">PATVIRTINTI</string>
     <string name="action_status_pump">POMPOS BŪKLĖ</string>
     <string name="action_status_loop">CIKLO STATUSAS</string>
@@ -89,6 +93,7 @@
     <string name="action_bolus">bolusas</string>
     <string name="status_pump">Pompa</string>
     <string name="status_loop">Ciklas</string>
+    <string name="status_cpp">CPP (Procentinis dienos profilis)</string>
     <string name="status_tdd">BPD</string>
     <string name="activity_carb">AV</string>
     <string name="activity_IOB">AIO</string>
@@ -100,4 +105,5 @@
     <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">Vv/val</string>
     <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">val</string>
     <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d.</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
 </resources>
diff --git a/wear/src/main/res/values-nl-rNL/strings.xml b/wear/src/main/res/values-nl-rNL/strings.xml
index e1e7c4c3d6..784fdb2f19 100644
--- a/wear/src/main/res/values-nl-rNL/strings.xml
+++ b/wear/src/main/res/values-nl-rNL/strings.xml
@@ -1,18 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(Groot)</string>
+    <string name="label_xdrip_big_chart">AAPS(GroteGrafiek)</string>
+    <string name="label_xdrip_no_chart">AAPS(GeenGrafiek)</string>
+    <string name="label_xdrip_circle">AAPS(Cirkel)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
+    <string name="label_warning_sync">Geen gegevens!</string>
+    <string name="label_warning_old">Oude gegevens!</string>
+    <string name="label_warning_since">Sinds %1$s</string>
+    <string name="label_warning_sync_aaps">Synchroniseer met AAPS!</string>
+    <string name="msg_warning_sync">Geen gegevens ontvangen sinds %1$s! Controleer of AAPS op de telefoon gegevens verstuurt naar horloge</string>
     <string name="msg_warning_old">AAPS gegevens zijn %1$s oud! Controleer je sensor, xDrip+, NS, AAPS instellingen of andere!</string>
     <string name="pref_on">Aan</string>
     <string name="pref_off">Uit</string>
     <string name="pref_vibrate_on_bolus">Trillen bij bolus</string>
     <string name="pref_units_for_actions">Eenheden voor acties</string>
     <string name="pref_show_date">Toon datum</string>
+    <string name="pref_show_iob">Toon IOB</string>
+    <string name="pref_show_cob">Toon COB</string>
     <string name="pref_show_delta">Toon Delta</string>
     <string name="pref_show_avgdelta">Toon gemiddelde delta</string>
+    <string name="pref_show_phone_battery">Toon telefoonbatterij</string>
+    <string name="pref_show_rig_battery">Toon rig batterij</string>
+    <string name="pref_show_basal_rate">Toon basaal</string>
+    <string name="pref_show_loop_status">Toon loop status</string>
+    <string name="pref_show_bg">Toon BG</string>
+    <string name="pref_show_direction_arrow">Toon richtingspijl</string>
+    <string name="pref_show_ago">Toon tijd geleden</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Donker</string>
+    <string name="pref_highlight_basals">Markeer basaalstanden</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Bijpassende verdeler</string>
+    <string name="pref_chart_timeframe">Tijdsschaal grafiek</string>
     <string name="pref_1_hour">1 uur</string>
     <string name="pref_2_hours">2 uren</string>
     <string name="pref_3_hours">3 uren</string>
     <string name="pref_4_hours">4 uren</string>
     <string name="pref_5_hours">5 uren</string>
+    <string name="pref_input_design">Invoer ontwerp</string>
     <string name="pref_default">Standaard</string>
+    <string name="pref_quick_righty">Snel rechts</string>
+    <string name="pref_quick_lefty">Snel links</string>
+    <string name="pref_modern_sparse">Modern spaarzaam</string>
+    <string name="pref_delta_granularity">Delta schaalverdeling (Steampunk)</string>
+    <string name="pref_low">Laag</string>
+    <string name="pref_medium">Middel</string>
+    <string name="pref_high">Hoog</string>
+    <string name="pref_auto">Automatisch</string>
+    <string name="pref_big_numbers">Grote nummers</string>
+    <string name="pref_ring_history">Ring geschiedenis</string>
+    <string name="pref_light_ring_history">Lichte ring geschiedenis</string>
+    <string name="pref_animations">Animaties</string>
+    <string name="pref_wizard_in_menu">Wizard in menu</string>
+    <string name="pref_prime_in_menu">Ontlucht/vul in menu</string>
+    <string name="pref_single_target">Enkel streefdoel</string>
+    <string name="pref_wizard_percentage">Wizardpercentage</string>
+    <string name="pref_complication_tap_action">Complicatie tik voor actie</string>
+    <string name="pref_unicode_in_complications">Unicode in complicaties</string>
+    <string name="pref_version">Versie:</string>
+    <string name="menu_tempt">TijdStreefd</string>
+    <string name="menu_wizard">Wizard</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Instellingen</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Ontlucht/vul</string>
+    <string name="menu_none">Geen</string>
+    <string name="menu_default">Standaard</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">tijdsduur</string>
+    <string name="action_target" comment="In temp target menu, single target value">doel</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">laag</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">hoog</string>
+    <string name="action_carbs">khd</string>
+    <string name="action_percentage">percentage</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">duur [h]</string>
+    <string name="action_insulin">insuline</string>
+    <string name="action_preset_1">Voorinstelling 1</string>
+    <string name="action_preset_2">Voorinstelling 2</string>
+    <string name="action_preset_3">Voorinstelling 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Vrije hoeveelheid</string>
+    <string name="action_confirm">BEVESTIGEN</string>
+    <string name="action_status_pump">STATUS POMP</string>
+    <string name="action_status_loop">STATUS LOOP</string>
+    <string name="action_timeshift">tijdsverschuiving</string>
+    <string name="action_tdd_weighted">Gewogen TDD</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pomp</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Khd</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">geen status</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">E</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">E/u</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">u</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">w</string>
 </resources>
diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index 29e4e9741b..28339639d6 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -51,6 +50,7 @@
     <string name="pref_low">Baixo</string>
     <string name="pref_medium">Médio</string>
     <string name="pref_high">Alto</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Números Grandes</string>
     <string name="pref_ring_history">Anel Histórico</string>
     <string name="pref_light_ring_history">Anel Suave Histórico</string>
diff --git a/wear/src/main/res/values-sk-rSK/strings.xml b/wear/src/main/res/values-sk-rSK/strings.xml
index e50dc6221a..3ff2d06385 100644
--- a/wear/src/main/res/values-sk-rSK/strings.xml
+++ b/wear/src/main/res/values-sk-rSK/strings.xml
@@ -42,16 +42,26 @@
     <string name="pref_3_hours">3 hodiny</string>
     <string name="pref_4_hours">4 hodiny</string>
     <string name="pref_5_hours">5 hodín</string>
+    <string name="pref_input_design">Vložte dizajn</string>
     <string name="pref_default">Štandardný</string>
+    <string name="pref_quick_righty">Rýchlo vpravo</string>
+    <string name="pref_quick_lefty">Rýchlo vľavo</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Presnosť (Steampunk)</string>
     <string name="pref_low">Nízka</string>
     <string name="pref_medium">Stredná</string>
     <string name="pref_high">Vysoká</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Veľké čísla</string>
+    <string name="pref_ring_history">História glykémií - kruh</string>
+    <string name="pref_light_ring_history">História glykémií - svetlý kruh</string>
     <string name="pref_animations">Animácie</string>
     <string name="pref_wizard_in_menu">Sprievodca v nastaveniach</string>
     <string name="pref_prime_in_menu">Plnenie v nastaveniach</string>
     <string name="pref_single_target">Jeden cieľ</string>
     <string name="pref_wizard_percentage">Sprievodca percentuálne</string>
+    <string name="pref_complication_tap_action">Zadaj komplikáciu</string>
+    <string name="pref_unicode_in_complications">Unicode v komplikáciach</string>
     <string name="pref_version">Verzia:</string>
     <string name="menu_tempt">TempT</string>
     <string name="menu_wizard">Sprievodca</string>
@@ -84,6 +94,7 @@
     <string name="action_bolus">bolus</string>
     <string name="status_pump">Pumpa</string>
     <string name="status_loop">Uzavretý okruh</string>
+    <string name="status_cpp">PROFIL</string>
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">Sacharidy</string>
     <string name="activity_IOB">IOB</string>
diff --git a/wear/src/main/res/values-sl-rSI/strings.xml b/wear/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/wear/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml
index 3c114cb59c..e8e48e3f51 100644
--- a/wear/src/main/res/xml/preferences.xml
+++ b/wear/src/main/res/xml/preferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <CheckBoxPreference
@@ -244,4 +244,4 @@
         android:key="version_number"
         android:summary="Input Design"
         android:title="@string/pref_version" />
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>