Merge branch 'dev' into 2.7.0-rc4

.idea/codeStyles/Project.xml

@@ -2,6 +2,22 @@
   <code_scheme name="Project" version="173">
     <option name="AUTODETECT_INDENTS" value="false" />
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <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" />

app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt

@@ -8,13 +8,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
+import androidx.fragment.app.FragmentManager
 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.sharedPreferences.SP
 import info.nightscout.androidaps.utils.extensions.toVisibility
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import kotlinx.android.synthetic.main.datetime.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
@@ -22,6 +23,7 @@ import java.util.*
 import javax.inject.Inject
 
 abstract class DialogFragmentWithDate : DaggerDialogFragment() {
+
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
     @Inject lateinit var dateUtil: DateUtil
@@ -33,6 +35,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
     private var okClicked: Boolean = false
 
     companion object {
+
         private var seconds: Int = (Math.random() * 59.0).toInt()
     }
 
@@ -124,5 +127,16 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
         cancel.setOnClickListener { dismiss() }
     }
 
+    override fun show(manager: FragmentManager, tag: String?) {
+        try {
+            manager.beginTransaction().let {
+                it.add(this, tag)
+                it.commitAllowingStateLoss()
+            }
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(e.localizedMessage)
+        }
+    }
+
     abstract fun submit(): Boolean
 }

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -12,6 +12,7 @@ import android.widget.AdapterView
 import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import android.widget.CompoundButton
+import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
@@ -20,11 +21,11 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.ProfileFunction
 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.interfaces.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
@@ -32,9 +33,9 @@ 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.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -358,4 +359,15 @@ class WizardDialog : DaggerDialogFragment() {
         }
 
     }
+
+    override fun show(manager: FragmentManager, tag: String?) {
+        try {
+            manager.beginTransaction().let {
+                it.add(this, tag)
+                it.commitAllowingStateLoss()
+            }
+        } catch (e: IllegalStateException) {
+            aapsLogger.debug(e.localizedMessage)
+        }
+    }
 }

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

@@ -111,6 +111,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickListener {
+
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
@@ -315,62 +316,58 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         // 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 (childFragmentManager.isStateSaved) return
-        try {
+        activity?.let { activity ->
-            activity?.let { activity ->
+            when (v.id) {
-                when (v.id) {
+                R.id.overview_treatmentbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { TreatmentDialog().show(childFragmentManager, "Overview") }))
-                    R.id.overview_treatmentbutton   -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { TreatmentDialog().show(childFragmentManager, "Overview") }))
+                R.id.overview_wizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { WizardDialog().show(childFragmentManager, "Overview") }))
-                    R.id.overview_wizardbutton      -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { WizardDialog().show(childFragmentManager, "Overview") }))
+                R.id.overview_insulinbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { InsulinDialog().show(childFragmentManager, "Overview") }))
-                    R.id.overview_insulinbutton     -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { InsulinDialog().show(childFragmentManager, "Overview") }))
+                R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { onClickQuickWizard() }))
-                    R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { onClickQuickWizard() }))
+                R.id.overview_carbsbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { CarbsDialog().show(childFragmentManager, "Overview") }))
-                    R.id.overview_carbsbutton       -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { CarbsDialog().show(childFragmentManager, "Overview") }))
 
-                    R.id.overview_cgmbutton         -> {
+                R.id.overview_cgmbutton -> {
-                        if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
+                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
-                            openCgmApp("com.eveningoutpost.dexdrip")
+                        openCgmApp("com.eveningoutpost.dexdrip")
-                        else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                    else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                        dexcomPlugin.findDexcomPackageName()?.let {
+                            openCgmApp(it)
+                        }
+                            ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                    }
+                }
+
+                R.id.overview_calibrationbutton -> {
+                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE)) {
+                        CalibrationDialog().show(childFragmentManager, "CalibrationDialog")
+                    } else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                        try {
                             dexcomPlugin.findDexcomPackageName()?.let {
-                                openCgmApp(it)
+                                startActivity(Intent("com.dexcom.cgm.activities.MeterEntryActivity").setPackage(it))
                             }
                                 ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                        } catch (e: ActivityNotFoundException) {
+                            ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.g5appnotdetected))
                         }
                     }
+                }
 
-                    R.id.overview_calibrationbutton -> {
+                R.id.overview_accepttempbutton -> {
-                        if (xdripPlugin.isEnabled(PluginType.BGSOURCE)) {
+                    profileFunction.getProfile() ?: return
-                            CalibrationDialog().show(childFragmentManager, "CalibrationDialog")
+                    if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                        } else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                        val lastRun = loopPlugin.lastRun
-                            try {
+                        loopPlugin.invoke("Accept temp button", false)
-                                dexcomPlugin.findDexcomPackageName()?.let {
+                        if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
-                                    startActivity(Intent("com.dexcom.cgm.activities.MeterEntryActivity").setPackage(it))
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
-                                }
+                                ?: "".toSpanned(), Runnable {
-                                    ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                                aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
-                            } catch (e: ActivityNotFoundException) {
+                                overview_accepttempbutton?.visibility = View.GONE
-                                ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.g5appnotdetected))
+                                (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
-                            }
+                                actionStringHandler.handleInitiate("cancelChangeRequest")
-                        }
+                                loopPlugin.acceptChangeRequest()
-                    }
+                            })
-
-                    R.id.overview_accepttempbutton  -> {
-                        profileFunction.getProfile() ?: return
-                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                            val lastRun = loopPlugin.lastRun
-                            loopPlugin.invoke("Accept temp button", false)
-                            if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
-                                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
-                                    ?: "".toSpanned(), Runnable {
-                                    aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
-                                    overview_accepttempbutton?.visibility = View.GONE
-                                    (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
-                                    actionStringHandler.handleInitiate("cancelChangeRequest")
-                                    loopPlugin.acceptChangeRequest()
-                                })
-                            }
                         }
                     }
                 }
             }
-        } catch (ignored: IllegalStateException) {
-            // ignore Can not perform this action after onSaveInstanceState
         }
     }
 
@@ -521,6 +518,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     private fun scheduleUpdateGUI(from: String) {
         class UpdateRunnable : Runnable {
+
             override fun run() {
                 activity?.runOnUiThread {
                     updateGUI(from)