Merge remote-tracking branch 'Nightscout/dev' into Autotune/SaveLastRun

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt

app/build.gradle

@@ -104,6 +104,8 @@ tasks.matching { it instanceof Test }.all {
 }
 
 android {
+
+    namespace 'info.nightscout.androidaps'
     ndkVersion "21.1.6352462"
 
     defaultConfig {

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="info.nightscout.androidaps">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BLUETOOTH" />

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt

@@ -80,6 +80,7 @@ class AutotuneFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         sp.putBoolean(R.string.key_autotune_tune_insulin_curve, false)  // put to false tune insulin curve
+        sp.putBoolean(R.string.key_autotune_additional_log, false)      // put to false additional log
         autotunePlugin.loadLastRun()
         if (autotunePlugin.lastNbDays.isEmpty())
             autotunePlugin.lastNbDays = sp.getInt(R.string.key_autotune_default_tune_days, 5).toString()

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt

@@ -163,7 +163,8 @@ class AutotunePlugin @Inject constructor(
                 updateProfile(tunedP)
                 uel.log(
                     UserEntry.Action.STORE_PROFILE,
-                    UserEntry.Sources.Autotune,
+                    UserEntry.Sources.Automation,
+                    rh.gs(R.string.autotune),
                     ValueWithUnit.SimpleString(tunedP.profilename)
                 )
                 updateButtonVisibility = View.GONE
@@ -180,8 +181,8 @@ class AutotunePlugin @Inject constructor(
                         log("Profile Switch succeed ${tunedP.profilename}")
                         uel.log(
                             UserEntry.Action.PROFILE_SWITCH,
-                            UserEntry.Sources.Autotune,
+                            UserEntry.Sources.Automation,
-                            "Autotune AutoSwitch",
+                            rh.gs(R.string.autotune),
                             ValueWithUnit.SimpleString(tunedP.profilename))
                     }
                     rxBus.send(EventLocalProfileChanged())

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

@@ -224,7 +224,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         disposable += activePlugin.activeOverview.overviewBus
             .toObservable(EventUpdateOverviewIobCob::class.java)
             .debounce(1L, TimeUnit.SECONDS)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateIobCob() }, fabricPrivacy::logException)
         disposable += activePlugin.activeOverview.overviewBus
             .toObservable(EventUpdateOverviewSensitivity::class.java)
@@ -256,7 +256,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         disposable += rxBus
             .toObservable(EventNewBG::class.java)
             .debounce(1L, TimeUnit.SECONDS)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateBg() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventRefreshOverview::class.java)
@@ -287,19 +287,19 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                        }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventEffectiveProfileSwitchChanged::class.java)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateProfile() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventTempTargetChange::class.java)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateTemporaryTarget() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventExtendedBolusChange::class.java)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateExtendedBolus() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventTempBasalChange::class.java)
-            .observeOn(aapsSchedulers.main)
+            .observeOn(aapsSchedulers.io)
             .subscribe({ updateTemporaryBasal() }, fabricPrivacy::logException)
 
         refreshLoop = Runnable {
@@ -316,17 +316,19 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     fun refreshAll() {
         runOnUiThread {
             _binding ?: return@runOnUiThread
-            updateBg()
             updateTime()
-            updateProfile()
-            updateTemporaryBasal()
-            updateExtendedBolus()
-            updateTemporaryTarget()
-            updateIobCob()
             updateSensitivity()
             updateGraph()
             updateNotification()
         }
+        updateBg()
+        updateTemporaryBasal()
+        updateExtendedBolus()
+        updateIobCob()
+        processButtonsVisibility()
+        processAps()
+        updateProfile()
+        updateTemporaryTarget()
     }
 
     @Synchronized
@@ -513,13 +515,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         // QuickWizard button
         val quickWizardEntry = quickWizard.getActive()
-        if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended() && !loop.isDisconnected) {
+        runOnUiThread {
-            binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE
+            _binding ?: return@runOnUiThread
-            val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false)
+            if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended() && !loop.isDisconnected) {
-            binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(R.string.format_carbs, quickWizardEntry.carbs()) +
+                binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE
-                " " + rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin)
+                val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false)
-            if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE
+                binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(R.string.format_carbs, quickWizardEntry.carbs()) +
-        } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE
+                    " " + rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin)
+                if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE
+            } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE
+        }
 
         // **** Temp button ****
         val lastRun = loop.lastRun
@@ -530,72 +535,76 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             (lastRun.lastOpenModeAccept == 0L || lastRun.lastOpenModeAccept < lastRun.lastAPSRun) &&// never accepted or before last result
             lastRun.constraintsProcessed?.isChangeRequested == true // change is requested
 
-        if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && (loop as PluginBase).isEnabled()) {
+        runOnUiThread {
-            binding.buttonsLayout.acceptTempButton.visibility = View.VISIBLE
+            _binding ?: return@runOnUiThread
-            binding.buttonsLayout.acceptTempButton.text = "${rh.gs(R.string.setbasalquestion)}\n${lastRun!!.constraintsProcessed}"
+            if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && (loop as PluginBase).isEnabled()) {
-        } else {
+                binding.buttonsLayout.acceptTempButton.visibility = View.VISIBLE
-            binding.buttonsLayout.acceptTempButton.visibility = View.GONE
+                binding.buttonsLayout.acceptTempButton.text = "${rh.gs(R.string.setbasalquestion)}\n${lastRun!!.constraintsProcessed}"
-        }
+            } else {
-
+                binding.buttonsLayout.acceptTempButton.visibility = View.GONE
-        // **** Various treatment buttons ****
-        binding.buttonsLayout.carbsButton.visibility =
-            ((!activePlugin.activePump.pumpDescription.storesCarbInfo || pump.isInitialized() && !pump.isSuspended()) && profile != null
-                && sp.getBoolean(R.string.key_show_carbs_button, true)).toVisibility()
-        binding.buttonsLayout.treatmentButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
-            && sp.getBoolean(R.string.key_show_treatment_button, false)).toVisibility()
-        binding.buttonsLayout.wizardButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
-            && sp.getBoolean(R.string.key_show_wizard_button, true)).toVisibility()
-        binding.buttonsLayout.insulinButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
-            && sp.getBoolean(R.string.key_show_insulin_button, true)).toVisibility()
-
-        // **** Calibration & CGM buttons ****
-        val xDripIsBgSource = xdripPlugin.isEnabled()
-        val dexcomIsSource = dexcomPlugin.isEnabled()
-        binding.buttonsLayout.calibrationButton.visibility = (xDripIsBgSource && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility()
-        if (dexcomIsSource) {
-            binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null)
-            for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) {
-                drawable?.mutate()
-                drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN)
             }
-            binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmDexColor))
+
-        } else if (xDripIsBgSource) {
+            // **** Various treatment buttons ****
-            binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null)
+            binding.buttonsLayout.carbsButton.visibility =
-            for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) {
+                ((!activePlugin.activePump.pumpDescription.storesCarbInfo || pump.isInitialized() && !pump.isSuspended()) && profile != null
-                drawable?.mutate()
+                    && sp.getBoolean(R.string.key_show_carbs_button, true)).toVisibility()
-                drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN)
+            binding.buttonsLayout.treatmentButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
+                && sp.getBoolean(R.string.key_show_treatment_button, false)).toVisibility()
+            binding.buttonsLayout.wizardButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
+                && sp.getBoolean(R.string.key_show_wizard_button, true)).toVisibility()
+            binding.buttonsLayout.insulinButton.visibility = (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null
+                && sp.getBoolean(R.string.key_show_insulin_button, true)).toVisibility()
+
+            // **** Calibration & CGM buttons ****
+            val xDripIsBgSource = xdripPlugin.isEnabled()
+            val dexcomIsSource = dexcomPlugin.isEnabled()
+            binding.buttonsLayout.calibrationButton.visibility = (xDripIsBgSource && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility()
+            if (dexcomIsSource) {
+                binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null)
+                for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) {
+                    drawable?.mutate()
+                    drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN)
+                }
+                binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmDexColor))
+            } else if (xDripIsBgSource) {
+                binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null)
+                for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) {
+                    drawable?.mutate()
+                    drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN)
+                }
+                binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmXdripColor))
             }
-            binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmXdripColor))
+            binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility()
-        }
-        binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility()
 
-        // Automation buttons
+            // Automation buttons
-        binding.buttonsLayout.userButtonsLayout.removeAllViews()
+            binding.buttonsLayout.userButtonsLayout.removeAllViews()
-        val events = automationPlugin.userEvents()
+            val events = automationPlugin.userEvents()
-        if (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null)
+            if (!loop.isDisconnected && pump.isInitialized() && !pump.isSuspended() && profile != null)
-            for (event in events)
+                for (event in events)
-                if (event.isEnabled && event.trigger.shouldRun())
+                    if (event.isEnabled && event.trigger.shouldRun())
-                    context?.let { context ->
+                        context?.let { context ->
-                        SingleClickButton(context).also {
+                            SingleClickButton(context).also {
-                            it.setTextColor(rh.gac(context, R.attr.treatmentButton))
+                                it.setTextColor(rh.gac(context, R.attr.treatmentButton))
-                            it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
+                                it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
-                            it.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 0.5f).also { l ->
+                                it.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 0.5f).also { l ->
-                                l.setMargins(0, 0, rh.dpToPx(-4), 0)
+                                    l.setMargins(0, 0, rh.dpToPx(-4), 0)
-                            }
+                                }
-                            it.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_danar_useropt), null, null)
+                                it.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_danar_useropt), null, null)
-                            it.text = event.title
+                                it.text = event.title
 
-                            it.setOnClickListener {
+                                it.setOnClickListener {
-                                OKDialog.showConfirmation(context, rh.gs(R.string.run_question, event.title), { handler.post { automationPlugin.processEvent(event) } })
+                                    OKDialog.showConfirmation(context, rh.gs(R.string.run_question, event.title), { handler.post { automationPlugin.processEvent(event) } })
+                                }
+                                binding.buttonsLayout.userButtonsLayout.addView(it)
                             }
-                            binding.buttonsLayout.userButtonsLayout.addView(it)
                         }
-                    }
+            binding.buttonsLayout.userButtonsLayout.visibility = events.isNotEmpty().toVisibility()
-        binding.buttonsLayout.userButtonsLayout.visibility = events.isNotEmpty().toVisibility()
+        }
     }
 
     private fun processAps() {
         val pump = activePlugin.activePump
+        val profile = profileFunction.getProfile()
 
         // aps mode
         val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
@@ -608,103 +617,106 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
         }
 
-        if (config.APS && pump.pumpDescription.isTempBasalCapable) {
+        runOnUiThread {
-            binding.infoLayout.apsMode.visibility = View.VISIBLE
+            _binding ?: return@runOnUiThread
-            binding.infoLayout.timeLayout.visibility = View.GONE
+            if (config.APS && pump.pumpDescription.isTempBasalCapable) {
-            when {
+                binding.infoLayout.apsMode.visibility = View.VISIBLE
-                (loop as PluginBase).isEnabled() && loop.isSuperBolus                       -> {
+                binding.infoLayout.timeLayout.visibility = View.GONE
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_superbolus)
+                when {
-                    apsModeSetA11yLabel(R.string.superbolus)
+                    (loop as PluginBase).isEnabled() && loop.isSuperBolus                       -> {
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_superbolus)
-                    binding.infoLayout.apsModeText.visibility = View.VISIBLE
+                        apsModeSetA11yLabel(R.string.superbolus)
-                }
+                        binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
+                        binding.infoLayout.apsModeText.visibility = View.VISIBLE
+                    }
 
-                loop.isDisconnected                                                         -> {
+                    loop.isDisconnected                                                         -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_disconnected)
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_disconnected)
-                    apsModeSetA11yLabel(R.string.disconnected)
+                        apsModeSetA11yLabel(R.string.disconnected)
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
+                        binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
-                    binding.infoLayout.apsModeText.visibility = View.VISIBLE
+                        binding.infoLayout.apsModeText.visibility = View.VISIBLE
-                }
+                    }
 
-                (loop as PluginBase).isEnabled() && loop.isSuspended                        -> {
+                    (loop as PluginBase).isEnabled() && loop.isSuspended                        -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_paused)
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_paused)
-                    apsModeSetA11yLabel(R.string.suspendloop_label)
+                        apsModeSetA11yLabel(R.string.suspendloop_label)
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
+                        binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh)
-                    binding.infoLayout.apsModeText.visibility = View.VISIBLE
+                        binding.infoLayout.apsModeText.visibility = View.VISIBLE
-                }
+                    }
 
-                pump.isSuspended()                                                          -> {
+                    pump.isSuspended()                                                          -> {
-                    binding.infoLayout.apsMode.setImageResource(
+                        binding.infoLayout.apsMode.setImageResource(
-                        if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) {
+                            if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) {
-                            // For Omnipod, indicate the pump as disconnected when it's suspended.
+                                // For Omnipod, indicate the pump as disconnected when it's suspended.
-                            // The only way to 'reconnect' it, is through the Omnipod tab
+                                // The only way to 'reconnect' it, is through the Omnipod tab
-                            apsModeSetA11yLabel(R.string.disconnected)
+                                apsModeSetA11yLabel(R.string.disconnected)
-                            R.drawable.ic_loop_disconnected
+                                R.drawable.ic_loop_disconnected
-                        } else {
+                            } else {
-                            apsModeSetA11yLabel(R.string.pump_paused)
+                                apsModeSetA11yLabel(R.string.pump_paused)
-                            R.drawable.ic_loop_paused
+                                R.drawable.ic_loop_paused
-                        }
+                            }
-                    )
-                    binding.infoLayout.apsModeText.visibility = View.GONE
-                }
-
-                (loop as PluginBase).isEnabled() && closedLoopEnabled.value() && loop.isLGS -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_lgs)
-                    apsModeSetA11yLabel(R.string.uel_lgs_loop_mode)
-                    binding.infoLayout.apsModeText.visibility = View.GONE
-                }
-
-                (loop as PluginBase).isEnabled() && closedLoopEnabled.value()               -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_closed)
-                    apsModeSetA11yLabel(R.string.closedloop)
-                    binding.infoLayout.apsModeText.visibility = View.GONE
-                }
-
-                (loop as PluginBase).isEnabled() && !closedLoopEnabled.value()              -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_open)
-                    apsModeSetA11yLabel(R.string.openloop)
-                    binding.infoLayout.apsModeText.visibility = View.GONE
-                }
-
-                else                                                                        -> {
-                    binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_disabled)
-                    apsModeSetA11yLabel(R.string.disabledloop)
-                    binding.infoLayout.apsModeText.visibility = View.GONE
-                }
-            }
-            // Show variable sensitivity
-            val request = loop.lastRun?.request
-            if (request is DetermineBasalResultSMB) {
-                val isfMgdl = profileFunction.getProfile()?.getIsfMgdl()
-                val variableSens = request.variableSens
-                if (variableSens != isfMgdl && variableSens != null && isfMgdl != null) {
-                    binding.infoLayout.variableSensitivity.text =
-                        String.format(
-                            Locale.getDefault(), "%1$.1f→%2$.1f",
-                            Profile.toUnits(isfMgdl, isfMgdl * Constants.MGDL_TO_MMOLL, profileFunction.getUnits()),
-                            Profile.toUnits(variableSens, variableSens * Constants.MGDL_TO_MMOLL, profileFunction.getUnits())
                         )
-                    binding.infoLayout.variableSensitivity.visibility = View.VISIBLE
+                        binding.infoLayout.apsModeText.visibility = View.GONE
+                    }
+
+                    (loop as PluginBase).isEnabled() && closedLoopEnabled.value() && loop.isLGS -> {
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_lgs)
+                        apsModeSetA11yLabel(R.string.uel_lgs_loop_mode)
+                        binding.infoLayout.apsModeText.visibility = View.GONE
+                    }
+
+                    (loop as PluginBase).isEnabled() && closedLoopEnabled.value()               -> {
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_closed)
+                        apsModeSetA11yLabel(R.string.closedloop)
+                        binding.infoLayout.apsModeText.visibility = View.GONE
+                    }
+
+                    (loop as PluginBase).isEnabled() && !closedLoopEnabled.value()              -> {
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_open)
+                        apsModeSetA11yLabel(R.string.openloop)
+                        binding.infoLayout.apsModeText.visibility = View.GONE
+                    }
+
+                    else                                                                        -> {
+                        binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_disabled)
+                        apsModeSetA11yLabel(R.string.disabledloop)
+                        binding.infoLayout.apsModeText.visibility = View.GONE
+                    }
+                }
+                // Show variable sensitivity
+                val request = loop.lastRun?.request
+                if (request is DetermineBasalResultSMB) {
+                    val isfMgdl = profile?.getIsfMgdl()
+                    val variableSens = request.variableSens
+                    if (variableSens != isfMgdl && variableSens != null && isfMgdl != null) {
+                        binding.infoLayout.variableSensitivity.text =
+                            String.format(
+                                Locale.getDefault(), "%1$.1f→%2$.1f",
+                                Profile.toUnits(isfMgdl, isfMgdl * Constants.MGDL_TO_MMOLL, profileFunction.getUnits()),
+                                Profile.toUnits(variableSens, variableSens * Constants.MGDL_TO_MMOLL, profileFunction.getUnits())
+                            )
+                        binding.infoLayout.variableSensitivity.visibility = View.VISIBLE
+                    } else binding.infoLayout.variableSensitivity.visibility = View.GONE
                 } else binding.infoLayout.variableSensitivity.visibility = View.GONE
-            } else binding.infoLayout.variableSensitivity.visibility = View.GONE
+            } else {
-        } else {
+                //nsclient
-            //nsclient
+                binding.infoLayout.apsMode.visibility = View.GONE
-            binding.infoLayout.apsMode.visibility = View.GONE
+                binding.infoLayout.apsModeText.visibility = View.GONE
-            binding.infoLayout.apsModeText.visibility = View.GONE
+                binding.infoLayout.timeLayout.visibility = View.VISIBLE
-            binding.infoLayout.timeLayout.visibility = View.VISIBLE
+            }
+
+            // pump status from ns
+            binding.pump.text = nsDeviceStatus.pumpStatus
+            binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
+
+            // OpenAPS status from ns
+            binding.openaps.text = nsDeviceStatus.openApsStatus
+            binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.openaps), nsDeviceStatus.extendedOpenApsStatus) } }
+
+            // Uploader status from ns
+            binding.uploader.text = nsDeviceStatus.uploaderStatusSpanned
+            binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
         }
-
-        // pump status from ns
-        binding.pump.text = nsDeviceStatus.pumpStatus
-        binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
-
-        // OpenAPS status from ns
-        binding.openaps.text = nsDeviceStatus.openApsStatus
-        binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.openaps), nsDeviceStatus.extendedOpenApsStatus) } }
-
-        // Uploader status from ns
-        binding.uploader.text = nsDeviceStatus.uploaderStatusSpanned
-        binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
     }
 
     private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
@@ -760,59 +772,67 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     @SuppressLint("SetTextI18n")
     fun updateBg() {
-        _binding ?: return
         val units = profileFunction.getUnits()
-        binding.infoLayout.bg.text = overviewData.lastBg?.valueToUnitsString(units)
+        val lastBg = overviewData.lastBg
-            ?: rh.gs(R.string.notavailable)
+        val lastBgColor = overviewData.lastBgColor(context)
-        binding.infoLayout.bg.setTextColor(overviewData.lastBgColor(context))
+        val isActualBg = overviewData.isActualBg
-        binding.infoLayout.arrow.setImageResource(trendCalculator.getTrendArrow(overviewData.lastBg).directionToIcon())
-        binding.infoLayout.arrow.setColorFilter(overviewData.lastBgColor(context))
-        binding.infoLayout.arrow.contentDescription = overviewData.lastBgDescription + " " + rh.gs(R.string.and) + " " + trendCalculator.getTrendDescription(overviewData.lastBg)
-
         val glucoseStatus = glucoseStatusProvider.glucoseStatusData
-        if (glucoseStatus != null) {
+        val trendDescription = trendCalculator.getTrendDescription(lastBg)
-            binding.infoLayout.deltaLarge.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+        val trendArrow = trendCalculator.getTrendArrow(lastBg)
-            binding.infoLayout.deltaLarge.setTextColor(overviewData.lastBgColor(context))
+        val lastBgDescription = overviewData.lastBgDescription
-            binding.infoLayout.delta.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+        runOnUiThread {
-            binding.infoLayout.avgDelta.text = Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units)
+            _binding ?: return@runOnUiThread
-            binding.infoLayout.longAvgDelta.text = Profile.toSignedUnitsString(glucoseStatus.longAvgDelta, glucoseStatus.longAvgDelta * Constants.MGDL_TO_MMOLL, units)
+            binding.infoLayout.bg.text = lastBg?.valueToUnitsString(units)
-        } else {
+                ?: rh.gs(R.string.notavailable)
-            binding.infoLayout.deltaLarge.text = ""
+            binding.infoLayout.bg.setTextColor(lastBgColor)
-            binding.infoLayout.delta.text = "Δ " + rh.gs(R.string.notavailable)
+            binding.infoLayout.arrow.setImageResource(trendArrow.directionToIcon())
-            binding.infoLayout.avgDelta.text = ""
+            binding.infoLayout.arrow.setColorFilter(lastBgColor)
-            binding.infoLayout.longAvgDelta.text = ""
+            binding.infoLayout.arrow.contentDescription = lastBgDescription + " " + rh.gs(R.string.and) + " " + trendDescription
-        }
 
-        // strike through if BG is old
+            if (glucoseStatus != null) {
-        binding.infoLayout.bg.paintFlags =
+                binding.infoLayout.deltaLarge.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-            if (!overviewData.isActualBg) binding.infoLayout.bg.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+                binding.infoLayout.deltaLarge.setTextColor(lastBgColor)
-            else binding.infoLayout.bg.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+                binding.infoLayout.delta.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-
+                binding.infoLayout.avgDelta.text = Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units)
-        val outDate = (if (!overviewData.isActualBg) rh.gs(R.string.a11y_bg_outdated) else "")
+                binding.infoLayout.longAvgDelta.text = Profile.toSignedUnitsString(glucoseStatus.longAvgDelta, glucoseStatus.longAvgDelta * Constants.MGDL_TO_MMOLL, units)
-        binding.infoLayout.bg.contentDescription =
+            } else {
-            rh.gs(R.string.a11y_blood_glucose) + " " + binding.infoLayout.bg.text.toString() + " " + overviewData.lastBgDescription + " " + outDate
+                binding.infoLayout.deltaLarge.text = ""
-
+                binding.infoLayout.delta.text = "Δ " + rh.gs(R.string.notavailable)
-        binding.infoLayout.timeAgo.text = dateUtil.minAgo(rh, overviewData.lastBg?.timestamp)
+                binding.infoLayout.avgDelta.text = ""
-        binding.infoLayout.timeAgo.contentDescription = dateUtil.minAgoLong(rh, overviewData.lastBg?.timestamp)
+                binding.infoLayout.longAvgDelta.text = ""
-        binding.infoLayout.timeAgoShort.text = "(" + dateUtil.minAgoShort(overviewData.lastBg?.timestamp) + ")"
+            }
-
+
-        val qualityIcon = bgQualityCheckPlugin.icon()
+            // strike through if BG is old
-        if (qualityIcon != 0) {
+            binding.infoLayout.bg.paintFlags =
-            binding.infoLayout.bgQuality.visibility = View.VISIBLE
+                if (!isActualBg) binding.infoLayout.bg.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-            binding.infoLayout.bgQuality.setImageResource(qualityIcon)
+                else binding.infoLayout.bg.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
-            binding.infoLayout.bgQuality.contentDescription = rh.gs(R.string.a11y_bg_quality) + " " + bgQualityCheckPlugin.stateDescription()
+
-            binding.infoLayout.bgQuality.setOnClickListener {
+            val outDate = (if (!isActualBg) rh.gs(R.string.a11y_bg_outdated) else "")
-                context?.let { context -> OKDialog.show(context, rh.gs(R.string.data_status), bgQualityCheckPlugin.message) }
+            binding.infoLayout.bg.contentDescription = rh.gs(R.string.a11y_blood_glucose) + " " + binding.infoLayout.bg.text.toString() + " " + lastBgDescription + " " + outDate
+
+            binding.infoLayout.timeAgo.text = dateUtil.minAgo(rh, lastBg?.timestamp)
+            binding.infoLayout.timeAgo.contentDescription = dateUtil.minAgoLong(rh, lastBg?.timestamp)
+            binding.infoLayout.timeAgoShort.text = "(" + dateUtil.minAgoShort(lastBg?.timestamp) + ")"
+
+            val qualityIcon = bgQualityCheckPlugin.icon()
+            if (qualityIcon != 0) {
+                binding.infoLayout.bgQuality.visibility = View.VISIBLE
+                binding.infoLayout.bgQuality.setImageResource(qualityIcon)
+                binding.infoLayout.bgQuality.contentDescription = rh.gs(R.string.a11y_bg_quality) + " " + bgQualityCheckPlugin.stateDescription()
+                binding.infoLayout.bgQuality.setOnClickListener {
+                    context?.let { context -> OKDialog.show(context, rh.gs(R.string.data_status), bgQualityCheckPlugin.message) }
+                }
+            } else {
+                binding.infoLayout.bgQuality.visibility = View.GONE
             }
-        } else {
-            binding.infoLayout.bgQuality.visibility = View.GONE
         }
     }
 
     fun updateProfile() {
-        _binding ?: return
+        val profile = profileFunction.getProfile()
-        val profileBackgroundColor =
+        runOnUiThread {
-            profileFunction.getProfile()?.let {
+            _binding ?: return@runOnUiThread
+            val profileBackgroundColor = profile?.let {
                 if (it is ProfileSealed.EPS) {
                     if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L)
                         R.attr.ribbonWarningColor
@@ -824,8 +844,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 }
             } ?: R.attr.ribbonCriticalColor
 
-        val profileTextColor =
+            val profileTextColor = profile?.let {
-            profileFunction.getProfile()?.let {
                 if (it is ProfileSealed.EPS) {
                     if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L)
                         R.attr.ribbonTextWarningColor
@@ -836,27 +855,35 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     R.attr.ribbonTextDefaultColor
                 }
             } ?: R.attr.ribbonTextDefaultColor
-        setRibbon(binding.activeProfile, profileTextColor, profileBackgroundColor, profileFunction.getProfileNameWithRemainingTime())
+            setRibbon(binding.activeProfile, profileTextColor, profileBackgroundColor, profileFunction.getProfileNameWithRemainingTime())
+        }
     }
 
     private fun updateTemporaryBasal() {
-        _binding ?: return
+        val temporaryBasalText = overviewData.temporaryBasalText(iobCobCalculator)
-        binding.infoLayout.baseBasal.text = overviewData.temporaryBasalText(iobCobCalculator)
+        val temporaryBasalColor = overviewData.temporaryBasalColor(context, iobCobCalculator)
-        binding.infoLayout.baseBasal.setTextColor(overviewData.temporaryBasalColor(context, iobCobCalculator))
+        val temporaryBasalIcon = overviewData.temporaryBasalIcon(iobCobCalculator)
-        binding.infoLayout.baseBasalIcon.setImageResource(overviewData.temporaryBasalIcon(iobCobCalculator))
+        val temporaryBasalDialogText = overviewData.temporaryBasalDialogText(iobCobCalculator)
-        binding.infoLayout.basalLayout.setOnClickListener {
+        runOnUiThread {
-            activity?.let { OKDialog.show(it, rh.gs(R.string.basal), overviewData.temporaryBasalDialogText(iobCobCalculator)) }
+            _binding ?: return@runOnUiThread
+            binding.infoLayout.baseBasal.text = temporaryBasalText
+            binding.infoLayout.baseBasal.setTextColor(temporaryBasalColor)
+            binding.infoLayout.baseBasalIcon.setImageResource(temporaryBasalIcon)
+            binding.infoLayout.basalLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.basal), temporaryBasalDialogText) } }
         }
     }
 
     private fun updateExtendedBolus() {
-        _binding ?: return
         val pump = activePlugin.activePump
-        binding.infoLayout.extendedBolus.text = overviewData.extendedBolusText(iobCobCalculator)
+        val extendedBolus = iobCobCalculator.getExtendedBolus(dateUtil.now())
-        binding.infoLayout.extendedLayout.setOnClickListener {
+        val extendedBolusText = overviewData.extendedBolusText(iobCobCalculator)
-            activity?.let { OKDialog.show(it, rh.gs(R.string.extended_bolus), overviewData.extendedBolusDialogText(iobCobCalculator)) }
+        val extendedBolusDialogText = overviewData.extendedBolusDialogText(iobCobCalculator)
+        runOnUiThread {
+            _binding ?: return@runOnUiThread
+            binding.infoLayout.extendedBolus.text = extendedBolusText
+            binding.infoLayout.extendedLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.extended_bolus), extendedBolusDialogText) } }
+            binding.infoLayout.extendedLayout.visibility = (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses).toVisibility()
         }
-        binding.infoLayout.extendedLayout.visibility = (iobCobCalculator.getExtendedBolus(dateUtil.now()) != null && !pump.isFakingTempsByExtendedBoluses).toVisibility()
     }
 
     fun updateTime() {
@@ -887,69 +914,73 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             binding.statusLightsLayout.pbAge,
             binding.statusLightsLayout.batteryLevel
         )
-        processButtonsVisibility()
-        processAps()
     }
 
     fun updateIobCob() {
-        _binding ?: return
+        val iobText = overviewData.iobText(iobCobCalculator)
-        binding.infoLayout.iob.text = overviewData.iobText(iobCobCalculator)
+        val iobDialogText = overviewData.iobDialogText(iobCobCalculator)
-        binding.infoLayout.iobLayout.setOnClickListener {
+        val displayText = overviewData.cobInfo(iobCobCalculator).displayText(rh, dateUtil, buildHelper.isEngineeringMode())
-            activity?.let { OKDialog.show(it, rh.gs(R.string.iob), overviewData.iobDialogText(iobCobCalculator)) }
+        val lastCarbsTime = overviewData.lastCarbsTime
-        }
+        runOnUiThread {
-        // cob
+            _binding ?: return@runOnUiThread
-        var cobText = overviewData.cobInfo(iobCobCalculator).displayText(rh, dateUtil, buildHelper.isEngineeringMode()) ?: rh.gs(R.string.value_unavailable_short)
+            binding.infoLayout.iob.text = iobText
+            binding.infoLayout.iobLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.iob), iobDialogText) } }
+            // cob
+            var cobText = displayText ?: rh.gs(R.string.value_unavailable_short)
 
-        val constraintsProcessed = loop.lastRun?.constraintsProcessed
+            val constraintsProcessed = loop.lastRun?.constraintsProcessed
-        val lastRun = loop.lastRun
+            val lastRun = loop.lastRun
-        if (config.APS && constraintsProcessed != null && lastRun != null) {
+            if (config.APS && constraintsProcessed != null && lastRun != null) {
-            if (constraintsProcessed.carbsReq > 0) {
+                if (constraintsProcessed.carbsReq > 0) {
-                //only display carbsreq when carbs have not been entered recently
+                    //only display carbsreq when carbs have not been entered recently
-                if (overviewData.lastCarbsTime < lastRun.lastAPSRun) {
+                    if (lastCarbsTime < lastRun.lastAPSRun) {
-                    cobText += " | " + constraintsProcessed.carbsReq + " " + rh.gs(R.string.required)
+                        cobText += " | " + constraintsProcessed.carbsReq + " " + rh.gs(R.string.required)
+                    }
+                    if (carbAnimation?.isRunning == false)
+                        carbAnimation?.start()
+                } else {
+                    carbAnimation?.stop()
+                    carbAnimation?.selectDrawable(0)
                 }
-                if (carbAnimation?.isRunning == false)
-                    carbAnimation?.start()
-            } else {
-                carbAnimation?.stop()
-                carbAnimation?.selectDrawable(0)
             }
+            binding.infoLayout.cob.text = cobText
         }
-        binding.infoLayout.cob.text = cobText
     }
 
     @SuppressLint("SetTextI18n")
     fun updateTemporaryTarget() {
-        _binding ?: return
         val units = profileFunction.getUnits()
         val tempTarget = overviewData.temporaryTarget
-        if (tempTarget != null) {
+        runOnUiThread {
-            setRibbon(
+            _binding ?: return@runOnUiThread
-                binding.tempTarget,
+            if (tempTarget != null) {
-                R.attr.ribbonTextWarningColor,
+                setRibbon(
-                R.attr.ribbonWarningColor,
+                    binding.tempTarget,
-                Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, rh)
+                    R.attr.ribbonTextWarningColor,
-            )
+                    R.attr.ribbonWarningColor,
-        } else {
+                    Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, rh)
-            // If the target is not the same as set in the profile then oref has overridden it
+                )
-            profileFunction.getProfile()?.let { profile ->
+            } else {
-                val targetUsed = loop.lastRun?.constraintsProcessed?.targetBG ?: 0.0
+                // If the target is not the same as set in the profile then oref has overridden it
+                profileFunction.getProfile()?.let { profile ->
+                    val targetUsed = loop.lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
-                if (targetUsed != 0.0 && abs(profile.getTargetMgdl() - targetUsed) > 0.01) {
+                    if (targetUsed != 0.0 && abs(profile.getTargetMgdl() - targetUsed) > 0.01) {
-                    aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed")
+                        aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed")
-                    setRibbon(
+                        setRibbon(
-                        binding.tempTarget,
+                            binding.tempTarget,
-                        R.attr.ribbonTextWarningColor,
+                            R.attr.ribbonTextWarningColor,
-                        R.attr.tempTargetBackgroundColor,
+                            R.attr.tempTargetBackgroundColor,
-                        Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
+                            Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
-                    )
+                        )
-                } else {
+                    } else {
-                    setRibbon(
+                        setRibbon(
-                        binding.tempTarget,
+                            binding.tempTarget,
-                        R.attr.ribbonTextDefaultColor,
+                            R.attr.ribbonTextDefaultColor,
-                        R.attr.ribbonDefaultColor,
+                            R.attr.ribbonDefaultColor,
-                        Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
+                            Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
-                    )
+                        )
+                    }
                 }
             }
         }

app/src/main/res/xml/pref_autotune.xml

@@ -36,11 +36,12 @@
             android:key="@string/key_autotune_circadian_ic_isf"
             android:summary="@string/autotune_circadian_ic_isf_summary"
             android:title="@string/autotune_circadian_ic_isf_title" />
-
+        <!--  Hide autotune_additional_log option
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_autotune_additional_log"
             android:summary="@string/autotune_additional_log_summary"
             android:title="@string/autotune_additional_log_title" />
+        -->
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>

automation/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.automation'
+}
 
 
 dependencies {

automation/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.automation">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.BLUETOOTH" />

automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionRunAutotune.kt

@@ -28,7 +28,6 @@ class ActionRunAutotune(injector: HasAndroidInjector) : Action(injector) {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var sp: SP
-    @Inject lateinit var uel: UserEntryLogger
 
     var defaultValue = 0
     private var inputProfileName = InputProfileName(rh, activePlugin, "", true)

combo/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.combo'
+}
 
 dependencies {
     implementation project(':core')

combo/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.combo">
 
     <application
         android:supportsRtl="true">

core/build.gradle

@@ -15,3 +15,7 @@ dependencies {
     implementation project(':shared')
     implementation project(':database')
 }
+
+android {
+    namespace 'info.nightscout.androidaps.core'
+}

core/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.core">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

dana/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.dana'
     defaultConfig {
         kapt {
             arguments {

dana/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.dana">
 
     <application
         android:supportsRtl="true">

danar/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.danar'
+}
 
 dependencies {
     implementation project(':core')

danar/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.danar" >
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
 

danars/build.gradle

@@ -11,6 +11,7 @@ apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
     ndkVersion "21.1.6352462"
+    namespace 'info.nightscout.androidaps.danars'
 
     defaultConfig {
 

danars/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.danars">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

database/build.gradle

@@ -7,6 +7,8 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.database'
     defaultConfig {
         kapt {
             arguments {

database/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
-    package="info.nightscout.androidaps.database" />

diaconn/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.diaconn'
     defaultConfig {
         kapt {
             arguments {

diaconn/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.diaconn">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

gradle.properties

@@ -21,3 +21,4 @@ org.gradle.jvmargs=-Xmx2g
 
 android.enableJetifier=true
 android.useAndroidX=true
+org.gradle.unsafe.configuration-cache=true

insight/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.insight'
     defaultConfig {
         kapt {
             arguments {

insight/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.insight">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

medtronic/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.medtronic'
+}
 
 dependencies {
     implementation project(':core')

medtronic/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.medtronic">
 
     <application
         android:supportsRtl="true">

omnipod-common/build.gradle

@@ -9,6 +9,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.common'
+}
 
 dependencies {
     implementation project(':core')

omnipod-common/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:supportsRtl="true">

omnipod-dash/build.gradle

@@ -17,6 +17,8 @@ detekt { // TODO move to `subprojects` section in global build.gradle
 }
 
 android {
+
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.dash'
     defaultConfig {
         kapt {
             arguments {

omnipod-dash/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.omnipod.dash">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

omnipod-eros/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.eros'
     defaultConfig {
         kapt {
             arguments {

omnipod-eros/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.omnipod.eros">
 
     <application
         android:supportsRtl="true">

openhumans/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugin.general.openhumans'
+}
 
 
 dependencies {

openhumans/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugin.general.openhumans">
 
     <application>
         <activity

pump-common/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.common'
+}
 
 dependencies {
     implementation project(':core')

pump-common/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="info.nightscout.androidaps.plugins.pump.common">
+<manifest>
 
     <application>
 

rileylink/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.common.hw.rileylink'
+}
 
 dependencies {
     implementation project(':core')

rileylink/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.common.hw.rileylink">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

shared/build.gradle

@@ -11,6 +11,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.shared'
     defaultConfig {
         minSdkVersion 23  // for wear
     }

shared/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.shared">
 
 </manifest>

wear/build.gradle

@@ -76,6 +76,7 @@ android {
             versionName version + "-nsclient"
         }
     }
+    namespace 'info.nightscout.androidaps'
 }
 
 allprojects {

wear/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="info.nightscout.androidaps">
 
     <uses-feature android:name="android.hardware.type.watch" />
 

wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.kt

@@ -23,8 +23,8 @@ class FillMenuActivity : MenuListActivity() {
             add(MenuItem(R.drawable.ic_canula, getString(R.string.action_free_amount)))
         }
 
-    override fun doAction(action: String) {
+    override fun doAction(position: String) {
-        when (action) {
+        when (position) {
             getString(R.string.action_preset_1)    -> rxBus.send(EventWearToMobile(EventData.ActionFillPresetPreCheck(1)))
             getString(R.string.action_preset_2)    -> rxBus.send(EventWearToMobile(EventData.ActionFillPresetPreCheck(2)))
             getString(R.string.action_preset_3)    -> rxBus.send(EventWearToMobile(EventData.ActionFillPresetPreCheck(3)))

wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.kt

@@ -40,8 +40,8 @@ class MainMenuActivity : MenuListActivity() {
             }
         }
 
-    override fun doAction(action: String) {
+    override fun doAction(position: String) {
-        when (action) {
+        when (position) {
             getString(R.string.menu_settings)         -> startActivity(Intent(this, WatchfaceConfigurationActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
             getString(R.string.menu_resync)           -> rxBus.send(EventWearToMobile(ActionResendData("Re-Sync")))
             getString(R.string.status_profile_switch) -> rxBus.send(EventWearToMobile(EventData.ActionProfileSwitchSendInitialData(System.currentTimeMillis())))

wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.kt

@@ -22,8 +22,8 @@ class StatusMenuActivity : MenuListActivity() {
             add(MenuItem(R.drawable.ic_tdd, getString(R.string.status_tdd)))
         }
 
-    override fun doAction(action: String) {
+    override fun doAction(position: String) {
-        when (action) {
+        when (position) {
             getString(R.string.status_pump) -> rxBus.send(EventWearToMobile(ActionPumpStatus(System.currentTimeMillis())))
             getString(R.string.status_loop) -> rxBus.send(EventWearToMobile(ActionLoopStatus(System.currentTimeMillis())))
             getString(R.string.status_tdd)  -> rxBus.send(EventWearToMobile(ActionTddStatus(System.currentTimeMillis())))