From 9ca82441bb1cf13202d635b6ca9f4ddcfdd36a17 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Mon, 21 Jun 2021 19:29:22 +0200
Subject: [PATCH 01/32] try different connection timeouts

---
 .../omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt   | 4 ++--
 .../driver/comm/session/ConnectionStateChangeHandler.kt     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
index a01a3b985b..f675065776 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -125,7 +125,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(
             for (i in 1..MAX_NUMBER_OF_CONNECTION_ATTEMPTS) {
                 try {
                     // wait i * CONNECTION_TIMEOUT
-                    conn.connect(i)
+                    conn.connect(4)
                     break
                 } catch (e: Exception) {
                     aapsLogger.warn(LTag.PUMPBTCOMM, "connect error=$e")
@@ -240,7 +240,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(
     }
 
     companion object {
-        const val MAX_NUMBER_OF_CONNECTION_ATTEMPTS = 3
+        const val MAX_NUMBER_OF_CONNECTION_ATTEMPTS = 2
         const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
     }
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt
new file mode 100644
index 0000000000..8396850d70
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+interface ConnectionStateChangeHandler {
+
+    fun onConnectionStateChange(status: Int, newState: Int)
+}

From 92c0aba929a26405479237d15eb56434ba2a8002 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Mon, 21 Jun 2021 19:30:40 +0200
Subject: [PATCH 02/32] cleanup

---
 .../plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 32a5529cdc..ba551ad8db 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -592,7 +592,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun isSuspendDeliveryButtonEnabled(): Boolean {
-        R.string.key_omnipod_common_basal_beeps_enabled
         return sp.getBoolean(R.string.key_omnipod_common_suspend_delivery_button_enabled, false)
     }
 

From 3ebfe1b2683d196ac286eee9a4e8e99f626dbec0 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Mon, 21 Jun 2021 19:31:17 +0200
Subject: [PATCH 03/32] indent. add notifications

---
 .../omnipod/dash/OmnipodDashPumpPlugin.kt     | 67 +++++++++++++++----
 .../dash/ui/DashPodManagementActivity.kt      |  2 +-
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 50935a7f7d..d59e63f074 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash
 
+import android.content.Context
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity.Companion.runAlarm
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
@@ -12,12 +14,14 @@ 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
+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.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.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
@@ -36,7 +40,6 @@ import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.TimeChangeType
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.Completable
 import io.reactivex.Single
@@ -56,11 +59,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
     private val history: DashHistory,
     private val pumpSync: PumpSync,
     private val rxBus: RxBusWrapper,
-    private val aapsSchedulers: AapsSchedulers,
-    private val bleManager: OmnipodDashBleManager,
-
-//    private val disposable: CompositeDisposable = CompositeDisposable(),
-    //   private val aapsSchedulers: AapsSchedulers,
+    private val context: Context,
 
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
@@ -131,6 +130,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     override fun getPumpStatus(reason: String) {
+
         val throwable = getPodStatus().blockingGet()
         if (throwable != null) {
             aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
@@ -415,7 +415,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 continue
             }
             val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
-            updateBolusProgressDialog(resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount), percent.toInt())
+            updateBolusProgressDialog(
+                resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount),
+                percent.toInt()
+            )
         }
 
         for (tryNumber in 1..maxTries) {
@@ -556,7 +559,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
             )
         }
         val historyEntry = history.getById(activeCommand.historyId)
-        aapsLogger.debug(LTag.PUMP, "pumpSyncTempBasal: absoluteRate=$absoluteRate, durationInMinutes=$durationInMinutes")
+        aapsLogger.debug(
+            LTag.PUMP,
+            "pumpSyncTempBasal: absoluteRate=$absoluteRate, durationInMinutes=$durationInMinutes"
+        )
         val ret = pumpSync.syncTemporaryBasalWithPumpId(
             timestamp = historyEntry.createdAt,
             rate = absoluteRate,
@@ -634,10 +640,20 @@ class OmnipodDashPumpPlugin @Inject constructor(
             return PumpEnactResult(injector).success(true).enacted(false)
         }
 
-        return executeProgrammingCommand(
+        val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
             command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements(),
-        ).toPumpEnactResult()
+        ).doOnComplete {
+            if (podStateManager.activeCommand != null) {
+                showNotification(
+                    Notification.OMNIPOD_TBR_ALERTS,
+                    "Cancel temp basal result is uncertain", // TODO: localisation
+                    Notification.URGENT,
+                    R.raw.boluserror, // TODO: add setting for this
+                )
+            }
+        }.toPumpEnactResult()
+        return ret
     }
 
     private fun Completable.toPumpEnactResult(): PumpEnactResult {
@@ -769,7 +785,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
             executeProgrammingCommand(
                 pre = observeDeliverySuspended(),
                 historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
-                command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled()).ignoreElements()
+                command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled())
+                    .ignoreElements()
             ).toPumpEnactResult()
         } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active") // TODO i18n
     }
@@ -907,7 +924,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
             OmnipodCommandType.SUSPEND_DELIVERY -> {
                 if (!confirmation.success) {
-                    pumpSync.invalidateTemporaryBasalWithPumpId(historyEntry.pumpId(), PumpType.OMNIPOD_DASH, serialNumber())
+                    pumpSync.invalidateTemporaryBasalWithPumpId(
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
                 } else {
                     podStateManager.tempBasal = null
                 }
@@ -972,4 +993,24 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 )
         }
     }
+
+    private fun showErrorDialog(message: String, sound: Int) {
+        runAlarm(context, message, resourceHelper.gs(R.string.error), sound)
+    }
+
+    private fun showNotification(id: Int, message: String, urgency: Int, sound: Int?) {
+        val notification = Notification(
+            id,
+            message,
+            urgency
+        )
+        if (sound != null) {
+            notification.soundId = sound
+        }
+        rxBus.send(EventNewNotification(notification))
+    }
+
+    private fun dismissNotification(id: Int) {
+        rxBus.send(EventDismissNotification(id))
+    }
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index a293e04b74..b06587020c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -126,7 +126,7 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
         binding.buttonActivatePod.isEnabled = podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
         binding.buttonDeactivatePod.isEnabled =
             podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) ||
-                podStateManager.podStatus == PodStatus.ALARM
+            podStateManager.podStatus == PodStatus.ALARM
 
         if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)) {
             if (commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class.java)) {

From e51d071181927ea233360a7a61e3ee5b4cb8a3f8 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Tue, 22 Jun 2021 22:27:29 +0200
Subject: [PATCH 04/32] add notifications

---
 .../omnipod/dash/OmnipodDashPumpPlugin.kt     | 143 ++++++++++++++----
 .../action/DashDeactivatePodViewModel.kt      |   5 +
 2 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index d59e63f074..814bbe83a0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -130,7 +130,6 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     override fun getPumpStatus(reason: String) {
-
         val throwable = getPodStatus().blockingGet()
         if (throwable != null) {
             aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
@@ -183,6 +182,12 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     aapsLogger.info(LTag.PUMP, "syncBolusWithPumpId on CANCEL_BOLUS returned: $sync")
                 }
             }
+            showNotification(
+                Notification.OMNIPOD_POD_FAULT,
+                podStateManager.alarmType.toString(),
+                Notification.URGENT,
+                R.raw.boluserror
+            )
         }
         Completable.complete()
     }
@@ -192,20 +197,42 @@ class OmnipodDashPumpPlugin @Inject constructor(
             return PumpEnactResult(injector).success(true).enacted(true)
         }
         val basalProgram = mapProfileToBasalProgram(profile)
+        var deliverySuspended = false
         return executeProgrammingCommand(
-            pre = suspendDeliveryIfActive(),
+            pre = suspendDeliveryIfActive().doOnComplete {
+                if (podStateManager.activeCommand == null) {
+                    // suspend delivery is confirmed
+                    deliverySuspended = true
+                } },
             historyEntry = history.createRecord(commandType = OmnipodCommandType.SET_BASAL_PROFILE),
             activeCommandEntry = { historyId ->
                 podStateManager.createActiveCommand(historyId, basalProgram = basalProgram)
             },
             command = omnipodManager.setBasalProgram(basalProgram, hasBasalBeepEnabled()).ignoreElements(),
-            post = failWhenUnconfirmed(),
+            post = failWhenUnconfirmed(deliverySuspended), // mark as failed even if it worked OK and try again vs. mark ok and
+            // deny later
         ).toPumpEnactResult()
     }
 
-    private fun failWhenUnconfirmed(): Completable = Completable.defer {
+    private fun failWhenUnconfirmed(deliverySuspended: Boolean): Completable = Completable.defer {
         rxBus.send(EventTempBasalChange())
         if (podStateManager.activeCommand != null) {
+            if (deliverySuspended) {
+                showNotification(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Failed to set the new basal profile. Delivery suspended",
+                    Notification.URGENT,
+                    R.raw.boluserror
+                )
+            } else {
+                showNotification(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Setting basal profile might have failed. Delivery might be suspended!" +
+                        " Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
+                    Notification.URGENT,
+                    R.raw.boluserror
+                )
+            }
             Completable.error(java.lang.IllegalStateException("Command not confirmed"))
         } else {
             Completable.complete()
@@ -229,7 +256,14 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         rxBus.send(EventTempBasalChange())
                     }
                     .ignoreElements()
-            )
+            ).doFinally {
+                notifyOnUnconfirmed(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Suspend delivery is unconfirmed! " +
+                        "Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
+                    R.raw.boluserror,
+                )
+            }
     }
 
     /* override fun onStop() {
@@ -351,7 +385,23 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         aapsLogger.info(LTag.PUMP, "deliverTreatment: deliveredBolusAmount=$deliveredBolusAmount")
                     }
                     .ignoreElement()
-            ).toSingleDefault(
+            ).doFinally {
+                if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) {
+                    notifyOnUnconfirmed(
+                        Notification.OMNIPOD_UNCERTAIN_SMB,
+                        "Unable to verify whether SMB bolus (${requestedBolusAmount} U) succeeded. " +
+                            "<b>Refresh pod status to confirm or deny this command.",
+                        R.raw.boluserror
+                    )
+                } else {
+                    if (podStateManager.activeCommand != null) {
+                        showErrorDialog(
+                            "Bolus delivery status uncertain. Refresh pod status to confirm or deny.",
+                            R.raw.boluserror
+                        )
+                    }
+                }
+            }.toSingleDefault(
                 PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(deliveredBolusAmount)
             )
                 .onErrorReturnItem(
@@ -510,8 +560,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val tempBasalBeeps = hasTempBasalBeepEnabled()
         aapsLogger.info(
             LTag.PUMP,
-            "setTempBasalAbsolute: duration=$durationInMinutes min, rate=$absoluteRate U/h :: " +
-                "enforce=$enforceNew, tbrType=$tbrType"
+            "setTempBasalAbsolute: " +
+                "duration=$durationInMinutes min :: " +
+                "rate=$absoluteRate U/h :: " +
+                "enforce=$enforceNew ::" +
+                "tbrType=$tbrType"
         )
 
         val ret = executeProgrammingCommand(
@@ -538,7 +591,15 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 .filter { podEvent -> podEvent.isCommandSent() }
                 .map { pumpSyncTempBasal(absoluteRate, durationInMinutes.toLong(), tbrType) }
                 .ignoreElements(),
-        ).toPumpEnactResult()
+        ).doOnComplete {
+            notifyOnUnconfirmed(
+                Notification.OMNIPOD_TBR_ALERTS,
+                "Setting temp basal might have basal failed. If a temp basal was previously running, " +
+                    "it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.",
+                R.raw.boluserror,
+            )
+        }.toPumpEnactResult()
+
         if (ret.success && ret.enacted) {
             ret.isPercent(false).absolute(absoluteRate).duration(durationInMinutes)
         }
@@ -600,7 +661,14 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     executeProgrammingCommand(
                         historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
                         command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements()
-                    )
+                    ).doFinally {
+                        notifyOnUnconfirmed(
+                            Notification.OMNIPOD_TBR_ALERTS,
+                            "Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. " +
+                                "Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n
+                            R.raw.boluserror,
+                        )
+                    }
                 }
             }
         }
@@ -640,20 +708,22 @@ class OmnipodDashPumpPlugin @Inject constructor(
             return PumpEnactResult(injector).success(true).enacted(false)
         }
 
-        val ret = executeProgrammingCommand(
+        return executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
             command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements(),
-        ).doOnComplete {
-            if (podStateManager.activeCommand != null) {
-                showNotification(
-                    Notification.OMNIPOD_TBR_ALERTS,
-                    "Cancel temp basal result is uncertain", // TODO: localisation
-                    Notification.URGENT,
-                    R.raw.boluserror, // TODO: add setting for this
-                )
-            }
+        ).doOnComplete{
+            notifyOnUnconfirmed(
+                Notification.OMNIPOD_TBR_ALERTS,
+                "Cancel temp basal result is uncertain", // TODO: i8n,
+                R.raw.boluserror, // TODO: add setting for this
+            )
         }.toPumpEnactResult()
-        return ret
+    }
+
+    private fun notifyOnUnconfirmed(notificationId: Int, msg: String, sound: Int?) {
+        if (podStateManager.activeCommand != null) {
+            showNotification(notificationId, msg, Notification.URGENT, sound)
+        }
     }
 
     private fun Completable.toPumpEnactResult(): PumpEnactResult {
@@ -770,7 +840,13 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 }
                 .ignoreElements(),
             pre = observeDeliveryActive(),
-        ).toPumpEnactResult()
+        ).doFinally {
+            notifyOnUnconfirmed(
+                Notification.PUMP_ERROR,
+                "Unconfirmed suspendDelivery command. Please refresh pod status",
+                R.raw.boluserror
+            )
+        }.toPumpEnactResult()
     }
 
     private fun observeDeliveryActive(): Completable = Completable.defer {
@@ -787,7 +863,13 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
                 command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled())
                     .ignoreElements()
-            ).toPumpEnactResult()
+            ).doFinally{
+                notifyOnUnconfirmed(
+                    Notification.PUMP_ERROR,
+                    "Unconfirmed resumeDelivery command. Please refresh pod status",
+                    R.raw.boluserror
+                )
+            }.toPumpEnactResult()
         } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active") // TODO i18n
     }
 
@@ -795,7 +877,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
             command = omnipodManager.deactivatePod().ignoreElements()
-        ).toPumpEnactResult()
+        ).doOnComplete{
+            rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
+        }.toPumpEnactResult()
+
         if (podStateManager.activeCommand != null) {
             ret.success(false)
         }
@@ -876,7 +961,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         aapsLogger.debug(LTag.PUMPCOMM, "handling command confirmation: $confirmation")
         when (historyEntry.commandType) {
             OmnipodCommandType.CANCEL_TEMPORARY_BASAL,
-            OmnipodCommandType.RESUME_DELIVERY ->
+            OmnipodCommandType.RESUME_DELIVERY -> {
                 // We can't invalidate this command,
                 // and this is why it is pumpSync-ed at this point
                 if (confirmation.success) {
@@ -888,6 +973,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     )
                     podStateManager.tempBasal = null
                 }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+            }
 
             OmnipodCommandType.SET_BASAL_PROFILE -> {
                 if (confirmation.success) {
@@ -906,6 +993,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         serialNumber()
                     )
                 }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
             }
 
             OmnipodCommandType.SET_TEMPORARY_BASAL -> {
@@ -920,6 +1008,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 } else {
                     podStateManager.tempBasal = command.tempBasal
                 }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
             }
 
             OmnipodCommandType.SUSPEND_DELIVERY -> {
@@ -964,17 +1053,17 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         type = null // TODO: set the correct bolus type here!!!
                     )
                 }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_UNCERTAIN_SMB))
             }
 
             OmnipodCommandType.CANCEL_BOLUS -> {
                 if (confirmation.success) {
-
                     podStateManager.lastBolus?.run {
                         val deliveredUnits = markComplete()
                         val bolusHistoryEntry = history.getById(historyId)
                         val sync = pumpSync.syncBolusWithPumpId(
                             timestamp = bolusHistoryEntry.createdAt,
-                            amount = deliveredUnits, // we just marked this bolus as complete
+                            amount = deliveredUnits,
                             pumpId = bolusHistoryEntry.pumpId(),
                             pumpType = PumpType.OMNIPOD_DASH,
                             pumpSerial = serialNumber(),
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
index e7508214b6..c3507e5f1d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
@@ -5,6 +5,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 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.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
@@ -16,6 +19,7 @@ import javax.inject.Inject
 class DashDeactivatePodViewModel @Inject constructor(
     private val podStateManager: OmnipodDashPodStateManager,
     private val commandQueueProvider: CommandQueueProvider,
+    private val rxBus: RxBusWrapper,
     injector: HasAndroidInjector,
     logger: AAPSLogger
 ) : DeactivatePodViewModel(injector, logger) {
@@ -33,6 +37,7 @@ class DashDeactivatePodViewModel @Inject constructor(
 
     override fun discardPod() {
         podStateManager.reset()
+        rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
     }
 
     @StringRes

From 6ee4ec1ae3a189774928638d7cb74b4e6b35000f Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Tue, 22 Jun 2021 22:36:35 +0200
Subject: [PATCH 05/32] format

---
 .../pump/omnipod/dash/OmnipodDashPumpPlugin.kt        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 814bbe83a0..d110e13ec4 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -203,7 +203,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 if (podStateManager.activeCommand == null) {
                     // suspend delivery is confirmed
                     deliverySuspended = true
-                } },
+                }
+            },
             historyEntry = history.createRecord(commandType = OmnipodCommandType.SET_BASAL_PROFILE),
             activeCommandEntry = { historyId ->
                 podStateManager.createActiveCommand(historyId, basalProgram = basalProgram)
@@ -389,7 +390,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) {
                     notifyOnUnconfirmed(
                         Notification.OMNIPOD_UNCERTAIN_SMB,
-                        "Unable to verify whether SMB bolus (${requestedBolusAmount} U) succeeded. " +
+                        "Unable to verify whether SMB bolus ($requestedBolusAmount U) succeeded. " +
                             "<b>Refresh pod status to confirm or deny this command.",
                         R.raw.boluserror
                     )
@@ -711,7 +712,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         return executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
             command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements(),
-        ).doOnComplete{
+        ).doOnComplete {
             notifyOnUnconfirmed(
                 Notification.OMNIPOD_TBR_ALERTS,
                 "Cancel temp basal result is uncertain", // TODO: i8n,
@@ -863,7 +864,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
                 command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled())
                     .ignoreElements()
-            ).doFinally{
+            ).doFinally {
                 notifyOnUnconfirmed(
                     Notification.PUMP_ERROR,
                     "Unconfirmed resumeDelivery command. Please refresh pod status",
@@ -877,7 +878,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
             command = omnipodManager.deactivatePod().ignoreElements()
-        ).doOnComplete{
+        ).doOnComplete {
             rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
         }.toPumpEnactResult()
 

From 44c7747405342cd2ca139f72a99d3a2beec5bccd Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Tue, 22 Jun 2021 22:43:14 +0200
Subject: [PATCH 06/32] remove test 'active command'

---
 .../pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index ab0cf6fe61..803e17d179 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -308,15 +308,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             })
              */
 
-            // TODO: Active command
-            if (podStateManager.activeCommand != null) {
-                podInfoBinding.podExpiryDate.setTextColor(Color.RED)
-                podInfoBinding.podExpiryDate.text = "Active command"
-            } else {
-                podInfoBinding.podExpiryDate.text = PLACEHOLDER
-                podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
-            }
-
             // Update Pod expiry time
             val expiresAt = getExpiryAt()
             if (expiresAt is Nothing) {

From 2aeff0e92d7e2d588d3aac5c3b4ebf4ecb7b88d6 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Tue, 22 Jun 2021 22:49:26 +0200
Subject: [PATCH 07/32] disable notifications sound

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 2e2e98fcb4..b2cffc2d99 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1095,9 +1095,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
             message,
             urgency
         )
+        // TODO add back sound when we have options to disable it
+        /*
         if (sound != null) {
             notification.soundId = sound
-        }
+        }*/
         rxBus.send(EventNewNotification(notification))
     }
 

From e1337f0fb875866d4447dbcacae1fc39de657dca Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Wed, 23 Jun 2021 21:50:58 +0200
Subject: [PATCH 08/32] update overview

---
 .../pod/state/OmnipodDashPodStateManager.kt   |  6 +++
 .../state/OmnipodDashPodStateManagerImpl.kt   | 28 +++++++++++
 .../dash/ui/OmnipodDashOverviewFragment.kt    | 49 +++++++++----------
 3 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index 420a57c017..b649aaf7ff 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -12,6 +12,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import org.joda.time.Duration
 import java.io.Serializable
 import java.util.*
 
@@ -32,8 +35,11 @@ interface OmnipodDashPodStateManager {
     val isPodKaput: Boolean
     var bluetoothConnectionState: BluetoothConnectionState
 
+    var timeZone: DateTimeZone
     val lastUpdatedSystem: Long // System.currentTimeMillis()
     val lastStatusResponseReceived: Long
+    val time: DateTime?
+    val timeBehind: Duration?
 
     val messageSequenceNumber: Short
     val sequenceNumberOfLastProgrammingCommand: Short?
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 376d5ee12c..2028e236b1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -21,6 +21,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import org.joda.time.Duration
 import java.io.Serializable
 import java.util.*
 import javax.inject.Inject
@@ -96,6 +99,13 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             }
         }
 
+    override var timeZone: DateTimeZone
+        get() = podState.timeZone
+        set(tz) {
+            podState.timeZone = tz
+            store()
+        }
+
     override val bluetoothVersion: SoftwareVersion?
         get() = podState.bleVersion
 
@@ -172,6 +182,23 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
     override val lastStatusResponseReceived: Long
         get() = podState.lastStatusResponseReceived
 
+    override val time: DateTime?
+        get() {
+            val minutesSinceActivation = podState.minutesSinceActivation
+            val activationTime = podState.activationTime
+            if ((activationTime != null) && (minutesSinceActivation != null)) {
+                return DateTime(activationTime)
+                    .plusMinutes(minutesSinceActivation.toInt())
+                    .plus(Duration(podState.lastStatusResponseReceived, System.currentTimeMillis()))
+            }
+            return null
+        }
+
+    override val timeBehind: Duration?
+        get() {
+            return Duration(DateTime.now(), time)
+        }
+
     override var bluetoothConnectionState: OmnipodDashPodStateManager.BluetoothConnectionState
         get() = podState.bluetoothConnectionState
         set(bluetoothConnectionState) {
@@ -513,6 +540,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         var ltk: ByteArray? = null
         var eapAkaSequenceNumber: Long = 1
         var bolusPulsesRemaining: Short = 0
+        var timeZone = DateTimeZone.getDefault()
 
         var bleVersion: SoftwareVersion? = null
         var firmwareVersion: SoftwareVersion? = null
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 803e17d179..67296c4967 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -69,6 +69,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         private const val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
         private const val PLACEHOLDER = "-"
+        private const val MAX_TIME_DEVIATION_MINUTES = 15
     }
 
     private var disposables: CompositeDisposable = CompositeDisposable()
@@ -236,13 +237,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
     }
 
-    // Get time on pos from activation time and minutes since activation
+    // Get time on pod from activation time and minutes since activation
     private fun getTimeOnPod(): DateTime? {
         var timeOnPod: DateTime? = null
         val minutesSinceActivation = podStateManager.minutesSinceActivation
         val activationTime = podStateManager.activationTime
-        if ((activationTime != null) and (minutesSinceActivation != null)) {
-            timeOnPod = DateTime(activationTime!!).plusMinutes(minutesSinceActivation!!.toInt())
+        if ((activationTime != null) && (minutesSinceActivation != null)) {
+            timeOnPod = DateTime(activationTime)
+                .plusMinutes(minutesSinceActivation.toInt())
+                .plus(Duration(podStateManager.lastStatusResponseReceived, System.currentTimeMillis()))
         }
         return timeOnPod
     }
@@ -252,8 +255,8 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         var expiresAt: DateTime? = null
         val podLifeInHours = podStateManager.podLifeInHours
         val minutesSinceActivation = podStateManager.minutesSinceActivation
-        if ((podLifeInHours != null) and (minutesSinceActivation != null)) {
-            val expiresInMinutes = (podLifeInHours!! * 60) - minutesSinceActivation!!
+        if (podLifeInHours != null && minutesSinceActivation != null) {
+            val expiresInMinutes = podLifeInHours * 60 - minutesSinceActivation
             expiresAt = DateTime().plusMinutes(expiresInMinutes)
         }
         return expiresAt
@@ -293,28 +296,28 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             // Update time on Pod
             // TODO: For now: derive from podStateManager.minutesSinceActivation
             val timeOnPod = getTimeOnPod()
-            if (timeOnPod == null) {
-                podInfoBinding.timeOnPod.text = "???"
-            } else {
-                podInfoBinding.timeOnPod.text = readableZonedTime(timeOnPod)
-            }
+            podInfoBinding.timeOnPod.text = podStateManager.time?.let{
+                readableZonedTime(it)
+            } ?: PLACEHOLDER
+
+            podInfoBinding.timeOnPod.setTextColor(
+                podStateManager.timeBehind?.let {
+                    if (it.abs().toStandardMinutes() > MAX_TIME_DEVIATION_MINUTES) {
+                        Color.RED
+                    }else {
+                        Color.WHITE
+                    }
+                } ?: Color.WHITE
+            )
 
-            // TODO
-            /*
-            podInfoBinding.timeOnPod.setTextColor(if (podStateManager.timeDeviatesMoreThan(OmnipodConstants.TIME_DEVIATION_THRESHOLD)) {
-                Color.RED
-            } else {
-                Color.WHITE
-            })
-             */
 
             // Update Pod expiry time
             val expiresAt = getExpiryAt()
-            if (expiresAt is Nothing) {
+            if (expiresAt == null) {
                 podInfoBinding.podExpiryDate.text = PLACEHOLDER
                 podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
             } else {
-                podInfoBinding.podExpiryDate.text = readableZonedTime(expiresAt!!)
+                podInfoBinding.podExpiryDate.text = readableZonedTime(expiresAt)
                 podInfoBinding.podExpiryDate.setTextColor(if (DateTime.now().isAfter(expiresAt)) {
                     Color.RED
                 } else {
@@ -322,12 +325,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 })
             }
 
-            /* TODO
-            if (podStateManager.isPodFaulted) {
-                val faultEventCode = podStateManager.faultEventCode
-                errors.add(resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault_description, faultEventCode.value, faultEventCode.name))
-            }
-             */
             podStateManager.alarmType?.let {
                 errors.add(
                     resourceHelper.gs(

From e916290687586a42578e0bac8b7d7ccfd2d63280 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Wed, 23 Jun 2021 21:52:57 +0200
Subject: [PATCH 09/32] compile

---
 .../pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 67296c4967..57c649bfa9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -69,7 +69,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         private const val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
         private const val PLACEHOLDER = "-"
-        private const val MAX_TIME_DEVIATION_MINUTES = 15
+        private const val MAX_TIME_DEVIATION_MINUTES = 15.toInt()
     }
 
     private var disposables: CompositeDisposable = CompositeDisposable()
@@ -302,7 +302,8 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             podInfoBinding.timeOnPod.setTextColor(
                 podStateManager.timeBehind?.let {
-                    if (it.abs().toStandardMinutes() > MAX_TIME_DEVIATION_MINUTES) {
+                    if (it.abs().toStandardMinutes().isGreaterThan(Duration.standardMinutes
+                        (MAX_TIME_DEVIATION_MINUTES))) {
                         Color.RED
                     }else {
                         Color.WHITE

From a9f49704d94ee122d4cd3bf2dcb2a55f5113a830 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Wed, 23 Jun 2021 21:53:50 +0200
Subject: [PATCH 10/32] compile

---
 .../pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 57c649bfa9..b9d0103e8c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -69,7 +69,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         private const val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
         private const val PLACEHOLDER = "-"
-        private const val MAX_TIME_DEVIATION_MINUTES = 15.toInt()
+        private const val MAX_TIME_DEVIATION_MINUTES = 15L
     }
 
     private var disposables: CompositeDisposable = CompositeDisposable()
@@ -302,8 +302,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             podInfoBinding.timeOnPod.setTextColor(
                 podStateManager.timeBehind?.let {
-                    if (it.abs().toStandardMinutes().isGreaterThan(Duration.standardMinutes
-                        (MAX_TIME_DEVIATION_MINUTES))) {
+                    if (it.abs().isLongerThan(Duration.standardMinutes(MAX_TIME_DEVIATION_MINUTES))) {
                         Color.RED
                     }else {
                         Color.WHITE

From 3c222f0500b8cf2acfd24284d12470b6bb4f81c8 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Thu, 24 Jun 2021 21:57:34 +0200
Subject: [PATCH 11/32] recover active commands on start. Display deaction
 button after SET_UNIQUE_ID

---
 .../omnipod/dash/OmnipodDashPumpPlugin.kt     |  5 ++++
 .../pod/state/OmnipodDashPodStateManager.kt   |  1 +
 .../state/OmnipodDashPodStateManagerImpl.kt   | 25 +++++++++++++++++++
 .../dash/ui/DashPodManagementActivity.kt      |  2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index b2cffc2d99..cfd2b28061 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -274,6 +274,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
      */
 
+    override fun onStart() {
+        super.onStart()
+        podStateManager.onStart()
+    }
+
     private fun observeDeliverySuspended(): Completable = Completable.defer {
         if (podStateManager.deliveryStatus == DeliveryStatus.SUSPENDED)
             Completable.complete()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index b649aaf7ff..15fcd4f84e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -95,6 +95,7 @@ interface OmnipodDashPodStateManager {
 
     fun createLastBolus(requestedUnits: Double, historyId: String, bolusType: DetailedBolusInfo.BolusType)
     fun markLastBolusComplete(): LastBolus?
+    fun onStart()
 
     data class ActiveCommand(
         val sequence: Short,
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 2028e236b1..2da1889ba9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -391,6 +391,31 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         store()
     }
 
+    override fun onStart() {
+        when (getCommandConfirmationFromState()) {
+            CommandConfirmationSuccess, CommandConfirmationDenied -> {
+                val now = System.currentTimeMillis()
+                val newCommand = podState.activeCommand?.copy(
+                    createdRealtime = now,
+                    sentRealtime = now + 1
+                )
+                podState.lastStatusResponseReceived = now + 2
+                podState.activeCommand = newCommand
+            }
+            CommandSendingNotConfirmed -> {
+                val now = System.currentTimeMillis()
+                val newCommand = podState.activeCommand?.copy(
+                    createdRealtime = now,
+                    sentRealtime = now + 1
+                )
+                podState.lastStatusResponseReceived = 0
+            }
+            CommandSendingFailure, NoActiveCommand ->
+                podState.activeCommand = null
+        }
+
+    }
+
     override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) {
         logger.debug(LTag.PUMPCOMM, "Default status response :$response")
         podState.deliveryStatus = response.deliveryStatus
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index b06587020c..e3f6f97138 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -125,7 +125,7 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
 
         binding.buttonActivatePod.isEnabled = podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
         binding.buttonDeactivatePod.isEnabled =
-            podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) ||
+            podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID) ||
             podStateManager.podStatus == PodStatus.ALARM
 
         if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)) {

From c50757a2d1b16d2d0b712b98a807efe9f417e2fb Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Thu, 24 Jun 2021 22:06:08 +0200
Subject: [PATCH 12/32] getPumpStatus only if requested by user while the pod
 is not activated

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index cfd2b28061..38fb460368 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -130,6 +130,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     override fun getPumpStatus(reason: String) {
+        if (reason != "REQUESTED BY USER" &&  !podStateManager.isActivationCompleted) {
+            // prevent races on BLE whent the pod is not activated
+            return
+        }
+
         val throwable = getPodStatus().blockingGet()
         if (throwable != null) {
             aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)

From a3cacc75fed73a2a5d4a7b775a9dd70cb378ac20 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Thu, 24 Jun 2021 22:06:56 +0200
Subject: [PATCH 13/32] typo

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 38fb460368..6851f3a7ff 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -131,7 +131,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     override fun getPumpStatus(reason: String) {
         if (reason != "REQUESTED BY USER" &&  !podStateManager.isActivationCompleted) {
-            // prevent races on BLE whent the pod is not activated
+            // prevent races on BLE when the pod is not activated
             return
         }
 

From 22d78f356b490a7f24ce0d8ead21a6d1b9fd43f0 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Thu, 24 Jun 2021 22:37:29 +0200
Subject: [PATCH 14/32] recover pod activation status when lost during
 activation

---
 .../omnipod/dash/OmnipodDashPumpPlugin.kt     |  9 ++++++-
 .../pod/state/OmnipodDashPodStateManager.kt   |  6 +++++
 .../state/OmnipodDashPodStateManagerImpl.kt   | 26 ++++++++++++++++++-
 .../dash/ui/OmnipodDashOverviewFragment.kt    | 17 ++++++------
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 6851f3a7ff..5898ce8688 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -130,7 +130,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     override fun getPumpStatus(reason: String) {
-        if (reason != "REQUESTED BY USER" &&  !podStateManager.isActivationCompleted) {
+        if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) {
             // prevent races on BLE when the pod is not activated
             return
         }
@@ -140,6 +140,13 @@ class OmnipodDashPumpPlugin @Inject constructor(
             aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
         } else {
             aapsLogger.info(LTag.PUMP, "getPumpStatus executed with success")
+            if (!podStateManager.isActivationCompleted) {
+                val msg = podStateManager.recoverActivationFromPodStatus()
+                msg?.let {
+                    // TODO: show dialog with "try again, the pod is busy now"
+                    aapsLogger.info(LTag.PUMP, "recoverActivationFromPodStatus msg=$msg")
+                }
+            }
         }
     }
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index 15fcd4f84e..9a7b094846 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -96,6 +96,12 @@ interface OmnipodDashPodStateManager {
     fun createLastBolus(requestedUnits: Double, historyId: String, bolusType: DetailedBolusInfo.BolusType)
     fun markLastBolusComplete(): LastBolus?
     fun onStart()
+    /*
+    This is called only:. It overwrites activationStatus
+       - when activation was interrupted(application crash, killed, etc)
+       - after getPodStatus was successful(we have an up-to-date podStatus)
+     */
+    fun recoverActivationFromPodStatus(): String?
 
     data class ActiveCommand(
         val sequence: Short,
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 2da1889ba9..96aa31a78c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -312,6 +312,29 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         }
     }
 
+    override fun recoverActivationFromPodStatus(): String? {
+        val newActivationProgress = when (podState.podStatus) {
+            PodStatus.FILLED ->
+                ActivationProgress.NOT_STARTED
+            PodStatus.UID_SET ->
+                ActivationProgress.SET_UNIQUE_ID
+            PodStatus.ENGAGING_CLUTCH_DRIVE, PodStatus.PRIMING ->
+                return "Busy"
+            PodStatus.CLUTCH_DRIVE_ENGAGED ->
+                ActivationProgress.PRIME_COMPLETED
+            PodStatus.BASAL_PROGRAM_SET ->
+                ActivationProgress.PROGRAMMED_BASAL
+            PodStatus.RUNNING_ABOVE_MIN_VOLUME, PodStatus.RUNNING_BELOW_MIN_VOLUME ->
+                ActivationProgress.CANNULA_INSERTED
+            else ->
+                null
+        }
+        newActivationProgress?.let {
+            podState.activationProgress = it
+        }
+        return null
+    }
+
     @Synchronized
     override fun updateActiveCommand() = Maybe.create<CommandConfirmed> { source ->
         val activeCommand = podState.activeCommand
@@ -402,6 +425,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
                 podState.lastStatusResponseReceived = now + 2
                 podState.activeCommand = newCommand
             }
+
             CommandSendingNotConfirmed -> {
                 val now = System.currentTimeMillis()
                 val newCommand = podState.activeCommand?.copy(
@@ -410,10 +434,10 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
                 )
                 podState.lastStatusResponseReceived = 0
             }
+
             CommandSendingFailure, NoActiveCommand ->
                 podState.activeCommand = null
         }
-
     }
 
     override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index b9d0103e8c..64b2a22b70 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -296,7 +296,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             // Update time on Pod
             // TODO: For now: derive from podStateManager.minutesSinceActivation
             val timeOnPod = getTimeOnPod()
-            podInfoBinding.timeOnPod.text = podStateManager.time?.let{
+            podInfoBinding.timeOnPod.text = podStateManager.time?.let {
                 readableZonedTime(it)
             } ?: PLACEHOLDER
 
@@ -304,13 +304,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 podStateManager.timeBehind?.let {
                     if (it.abs().isLongerThan(Duration.standardMinutes(MAX_TIME_DEVIATION_MINUTES))) {
                         Color.RED
-                    }else {
+                    } else {
                         Color.WHITE
                     }
                 } ?: Color.WHITE
             )
 
-
             // Update Pod expiry time
             val expiresAt = getExpiryAt()
             if (expiresAt == null) {
@@ -318,11 +317,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
             } else {
                 podInfoBinding.podExpiryDate.text = readableZonedTime(expiresAt)
-                podInfoBinding.podExpiryDate.setTextColor(if (DateTime.now().isAfter(expiresAt)) {
-                    Color.RED
-                } else {
-                    Color.WHITE
-                })
+                podInfoBinding.podExpiryDate.setTextColor(
+                    if (DateTime.now().isAfter(expiresAt)) {
+                        Color.RED
+                    } else {
+                        Color.WHITE
+                    }
+                )
             }
 
             podStateManager.alarmType?.let {

From 19ff58ac95d119b80ae3ac109eb812d52aab431b Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Thu, 24 Jun 2021 23:08:32 +0200
Subject: [PATCH 15/32] fix timeOnPod

---
 .../dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 96aa31a78c..a8fcd7844f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -189,7 +189,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             if ((activationTime != null) && (minutesSinceActivation != null)) {
                 return DateTime(activationTime)
                     .plusMinutes(minutesSinceActivation.toInt())
-                    .plus(Duration(podState.lastStatusResponseReceived, System.currentTimeMillis()))
+                    .plus(Duration(podState.lastUpdatedSystem, System.currentTimeMillis()))
             }
             return null
         }

From 3ed9cd0f78d854b9c63e6784308ff95a71f3f572 Mon Sep 17 00:00:00 2001
From: Theo van Elsberg <van.elsberg@outlook.com>
Date: Fri, 25 Jun 2021 13:40:32 +0200
Subject: [PATCH 16/32] - Fixed loading PodState (failed to serialize) - Moved
 Pod expiry time calculation to Pod Manager/PodState - Show local date/time in
 overview (TODO: handle TZ)

---
 .../pod/state/OmnipodDashPodStateManager.kt   |  3 +-
 .../state/OmnipodDashPodStateManagerImpl.kt   | 16 +++-
 .../dash/ui/OmnipodDashOverviewFragment.kt    | 73 ++++++++-----------
 3 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index 9a7b094846..fd6d1f5aff 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -35,11 +35,12 @@ interface OmnipodDashPodStateManager {
     val isPodKaput: Boolean
     var bluetoothConnectionState: BluetoothConnectionState
 
-    var timeZone: DateTimeZone
+    var timeZone: String
     val lastUpdatedSystem: Long // System.currentTimeMillis()
     val lastStatusResponseReceived: Long
     val time: DateTime?
     val timeBehind: Duration?
+    val expiry: DateTime?
 
     val messageSequenceNumber: Short
     val sequenceNumberOfLastProgrammingCommand: Short?
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index a8fcd7844f..5414606941 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -99,7 +99,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             }
         }
 
-    override var timeZone: DateTimeZone
+    override var timeZone: String
         get() = podState.timeZone
         set(tz) {
             podState.timeZone = tz
@@ -199,6 +199,18 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             return Duration(DateTime.now(), time)
         }
 
+    override val expiry: DateTime?
+        // TODO: Consider storing expiry datetime in pod state saving continuesly recalculating to the same value
+        get() {
+            val podLifeInHours = podLifeInHours
+            val minutesSinceActivation = minutesSinceActivation
+            if (podLifeInHours != null && minutesSinceActivation != null) {
+                val expiresInMinutes = podLifeInHours * 60 - minutesSinceActivation
+                return DateTime().plusMinutes(expiresInMinutes)
+            }
+            return null
+        }
+
     override var bluetoothConnectionState: OmnipodDashPodStateManager.BluetoothConnectionState
         get() = podState.bluetoothConnectionState
         set(bluetoothConnectionState) {
@@ -589,7 +601,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         var ltk: ByteArray? = null
         var eapAkaSequenceNumber: Long = 1
         var bolusPulsesRemaining: Short = 0
-        var timeZone = DateTimeZone.getDefault()
+        var timeZone: String = "" // DateTimeZone.getDefault()
 
         var bleVersion: SoftwareVersion? = null
         var firmwareVersion: SoftwareVersion? = null
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 64b2a22b70..972bdaa418 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -237,31 +237,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
     }
 
-    // Get time on pod from activation time and minutes since activation
-    private fun getTimeOnPod(): DateTime? {
-        var timeOnPod: DateTime? = null
-        val minutesSinceActivation = podStateManager.minutesSinceActivation
-        val activationTime = podStateManager.activationTime
-        if ((activationTime != null) && (minutesSinceActivation != null)) {
-            timeOnPod = DateTime(activationTime)
-                .plusMinutes(minutesSinceActivation.toInt())
-                .plus(Duration(podStateManager.lastStatusResponseReceived, System.currentTimeMillis()))
-        }
-        return timeOnPod
-    }
-
-    // TODO: Consider storing expiry datetime in pod state saving continuesly recalculating to the same value
-    private fun getExpiryAt(): DateTime? {
-        var expiresAt: DateTime? = null
-        val podLifeInHours = podStateManager.podLifeInHours
-        val minutesSinceActivation = podStateManager.minutesSinceActivation
-        if (podLifeInHours != null && minutesSinceActivation != null) {
-            val expiresInMinutes = podLifeInHours * 60 - minutesSinceActivation
-            expiresAt = DateTime().plusMinutes(expiresInMinutes)
-        }
-        return expiresAt
-    }
-
     private fun updateOmnipodStatus() {
         updateLastConnection()
         updateLastBolus()
@@ -294,8 +269,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             )
 
             // Update time on Pod
-            // TODO: For now: derive from podStateManager.minutesSinceActivation
-            val timeOnPod = getTimeOnPod()
             podInfoBinding.timeOnPod.text = podStateManager.time?.let {
                 readableZonedTime(it)
             } ?: PLACEHOLDER
@@ -311,7 +284,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             )
 
             // Update Pod expiry time
-            val expiresAt = getExpiryAt()
+            val expiresAt = podStateManager.expiry
             if (expiresAt == null) {
                 podInfoBinding.podExpiryDate.text = PLACEHOLDER
                 podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
@@ -631,25 +604,41 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         }
     }
 
-    private fun getTimeZone(): DateTimeZone {
-        // TODO: Get timezone as configured/podState
-        // return getSafe(() -> podState.getTimeZone());
-        return DateTimeZone.getDefault()
+    // private fun getTimeZone(): DateTimeZone {
+    //     // return getSafe(() -> podState.getTimeZone());
+    //     return podStateManager.timeZone
+    // }
+    private fun getTimeZone(): String {
+        // Return timezone ID (e.g "Europe/Amsterdam")
+        return podStateManager.timeZone
     }
 
     private fun readableZonedTime(time: DateTime): String {
         val timeAsJavaData = time.toLocalDateTime().toDate()
+        return dateUtil.dateAndTimeString(timeAsJavaData.time)
 
-        val timeZone = getTimeZone().toTimeZone()
-        if (timeZone == TimeZone.getDefault()) {
-            return dateUtil.dateAndTimeString(timeAsJavaData.time)
-        }
-
-        // Get full timezoned time
-        val isDaylightTime = timeZone.inDaylightTime(timeAsJavaData)
-        val locale = resources.configuration.locales.get(0)
-        val timeZoneDisplayName = timeZone.getDisplayName(isDaylightTime, TimeZone.SHORT, locale) + " " + timeZone.getDisplayName(isDaylightTime, TimeZone.LONG, locale)
-        return resourceHelper.gs(R.string.omnipod_common_time_with_timezone, dateUtil.dateAndTimeString(timeAsJavaData.time), timeZoneDisplayName)
+        // // TODO: Handle timeZone ID
+        // val timeZone = getTimeZone()
+        // if (timeZone == "") {
+        //     // No timezone defined, use local time (default)
+        //     return dateUtil.dateAndTimeString(timeAsJavaData.time)
+        // }
+        // else {
+        //     // Get full timezoned time
+        //     val isDaylightTime = timeZone.inDaylightTime(timeAsJavaData)
+        //     val locale = resources.configuration.locales.get(0)
+        //     val timeZoneDisplayName =
+        //         timeZone.getDisplayName(isDaylightTime, TimeZone.SHORT, locale) + " " + timeZone.getDisplayName(
+        //             isDaylightTime,
+        //             TimeZone.LONG,
+        //             locale
+        //         )
+        //     return resourceHelper.gs(
+        //         R.string.omnipod_common_time_with_timezone,
+        //         dateUtil.dateAndTimeString(timeAsJavaData.time),
+        //         timeZoneDisplayName
+        //     )
+        // }
     }
 
     private fun readableDuration(duration: Duration): String {

From b82d9cf457ec9fdd741931308ba36e9cddb60559 Mon Sep 17 00:00:00 2001
From: Theo van Elsberg <van.elsberg@outlook.com>
Date: Fri, 25 Jun 2021 14:37:54 +0200
Subject: [PATCH 17/32] - Redo Pod expiry datetime based on activation time

---
 .../driver/pod/state/OmnipodDashPodStateManagerImpl.kt   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 5414606941..b57c8a3eb0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -203,10 +203,9 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         // TODO: Consider storing expiry datetime in pod state saving continuesly recalculating to the same value
         get() {
             val podLifeInHours = podLifeInHours
-            val minutesSinceActivation = minutesSinceActivation
-            if (podLifeInHours != null && minutesSinceActivation != null) {
-                val expiresInMinutes = podLifeInHours * 60 - minutesSinceActivation
-                return DateTime().plusMinutes(expiresInMinutes)
+            val activationTime = podState.activationTime
+            if (podLifeInHours != null && activationTime != null) {
+                return DateTime(podState.activationTime).plusHours(podLifeInHours.toInt())
             }
             return null
         }
@@ -601,7 +600,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         var ltk: ByteArray? = null
         var eapAkaSequenceNumber: Long = 1
         var bolusPulsesRemaining: Short = 0
-        var timeZone: String = "" // DateTimeZone.getDefault()
+        var timeZone: String = "" // TimeZone ID (e.g. "Europe/Amsterdam")
 
         var bleVersion: SoftwareVersion? = null
         var firmwareVersion: SoftwareVersion? = null

From d882428cc0d83c7c87467e790487f1d7a7869129 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 19:45:38 +0200
Subject: [PATCH 18/32] set timezone

---
 .../pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt      | 3 +++
 .../dash/driver/pod/state/OmnipodDashPodStateManager.kt     | 2 +-
 .../dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt | 6 +++---
 .../pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
index 78b778def9..63cfb403ae 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
@@ -425,6 +425,9 @@ class OmnipodDashManagerImpl @Inject constructor(
             observeConnectToPod,
             observeSendProgramBasalCommand(basalProgram, hasBasalBeepEnabled)
         )
+            .doOnComplete {
+                podStateManager.timeZone = TimeZone.getDefault()
+            }
             // TODO these would be common for any observable returned in a public function in this class
             .doOnNext(PodEventInterceptor())
             .doOnError(ErrorInterceptor())
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index fd6d1f5aff..fce985edc2 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -35,7 +35,7 @@ interface OmnipodDashPodStateManager {
     val isPodKaput: Boolean
     var bluetoothConnectionState: BluetoothConnectionState
 
-    var timeZone: String
+    var timeZone: TimeZone
     val lastUpdatedSystem: Long // System.currentTimeMillis()
     val lastStatusResponseReceived: Long
     val time: DateTime?
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index b57c8a3eb0..03bf7468e5 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -99,10 +99,10 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             }
         }
 
-    override var timeZone: String
-        get() = podState.timeZone
+    override var timeZone: TimeZone
+        get() = TimeZone.getTimeZone(podState.timeZone)
         set(tz) {
-            podState.timeZone = tz
+            podState.timeZone = tz.getDisplayName(true, TimeZone.SHORT)
             store()
         }
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 972bdaa418..e524444513 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -608,7 +608,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     //     // return getSafe(() -> podState.getTimeZone());
     //     return podStateManager.timeZone
     // }
-    private fun getTimeZone(): String {
+    private fun getTimeZone(): TimeZone {
         // Return timezone ID (e.g "Europe/Amsterdam")
         return podStateManager.timeZone
     }

From efd3acbb2a8beb3fd65a67baa23876ea4ee7792b Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 20:52:32 +0200
Subject: [PATCH 19/32] save tx after setting basal. save basal in pod state
 when the basal command is confirmed

---
 .../omnipod/dash/driver/OmnipodDashManagerImpl.kt   |  9 ++++-----
 .../driver/pod/state/OmnipodDashPodStateManager.kt  |  2 +-
 .../pod/state/OmnipodDashPodStateManagerImpl.kt     | 13 +++++--------
 .../omnipod/dash/ui/DashPodManagementActivity.kt    |  2 +-
 .../omnipod/dash/ui/OmnipodDashOverviewFragment.kt  |  6 ++----
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
index 63cfb403ae..487ecf2c6c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
@@ -173,8 +173,7 @@ class OmnipodDashManagerImpl @Inject constructor(
                 DefaultStatusResponse::class
             )
         }.doOnComplete {
-            // TODO: remove podStateManager.basalProgram?
-            podStateManager.basalProgram = basalProgram
+            podStateManager.timeZone = TimeZone.getDefault()
         }
     }
 
@@ -246,6 +245,7 @@ class OmnipodDashManagerImpl @Inject constructor(
                 observeVerifyPrime.doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIME_COMPLETED))
             )
         }
+
         if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIMING)) {
             observables.add(observeConnectToPod) // connection can time out while waiting
             observables.add(
@@ -270,6 +270,7 @@ class OmnipodDashManagerImpl @Inject constructor(
                 }.doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIMING))
             )
         }
+
         if (podStateManager.activationProgress.isBefore(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT)) {
             observables.add(
                 observeSendProgramAlertsCommand(
@@ -304,6 +305,7 @@ class OmnipodDashManagerImpl @Inject constructor(
                 ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS))
             )
         }
+
         if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) {
             observables.add(
                 observeSendSetUniqueIdCommand.doOnComplete(ActivationProgressUpdater(ActivationProgress.SET_UNIQUE_ID))
@@ -425,9 +427,6 @@ class OmnipodDashManagerImpl @Inject constructor(
             observeConnectToPod,
             observeSendProgramBasalCommand(basalProgram, hasBasalBeepEnabled)
         )
-            .doOnComplete {
-                podStateManager.timeZone = TimeZone.getDefault()
-            }
             // TODO these would be common for any observable returned in a public function in this class
             .doOnNext(PodEventInterceptor())
             .doOnError(ErrorInterceptor())
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index fce985edc2..3eeab834ad 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -39,7 +39,7 @@ interface OmnipodDashPodStateManager {
     val lastUpdatedSystem: Long // System.currentTimeMillis()
     val lastStatusResponseReceived: Long
     val time: DateTime?
-    val timeBehind: Duration?
+    val timeDrift: Duration?
     val expiry: DateTime?
 
     val messageSequenceNumber: Short
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 03bf7468e5..95df4367a7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -194,13 +194,13 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             return null
         }
 
-    override val timeBehind: Duration?
+    override val timeDrift: Duration?
         get() {
             return Duration(DateTime.now(), time)
         }
 
     override val expiry: DateTime?
-        // TODO: Consider storing expiry datetime in pod state saving continuesly recalculating to the same value
+        // TODO: Consider storing expiry datetime in pod state saving continuously recalculating to the same value
         get() {
             val podLifeInHours = podLifeInHours
             val activationTime = podState.activationTime
@@ -466,6 +466,9 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         podState.lastUpdatedSystem = System.currentTimeMillis()
         podState.lastStatusResponseReceived = SystemClock.elapsedRealtime()
         updateLastBolusFromResponse(response.bolusPulsesRemaining)
+        if (podState.activationTime == null) {
+            podState.activationTime = System.currentTimeMillis() - (response.minutesSinceActivation * 60000)
+        }
 
         store()
         rxBus.send(EventOmnipodDashPumpValuesChanged())
@@ -514,12 +517,6 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         podState.uniqueId = response.uniqueIdReceivedInCommand
 
         podState.lastUpdatedSystem = System.currentTimeMillis()
-        // TODO: what is considered to be the pod activation time?
-        //  LTK negotiation ?
-        //  setUniqueId?
-        //  compute it from the number of "minutesOnPod"?
-        podState.activationTime = System.currentTimeMillis()
-
         store()
         rxBus.send(EventOmnipodDashPumpValuesChanged())
     }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index e3f6f97138..3d89be5da8 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -125,7 +125,7 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
 
         binding.buttonActivatePod.isEnabled = podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
         binding.buttonDeactivatePod.isEnabled =
-            podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID) ||
+            podStateManager.ltk != null ||
             podStateManager.podStatus == PodStatus.ALARM
 
         if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)) {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index e524444513..80b14e98b3 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -45,7 +45,6 @@ import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.apache.commons.lang3.StringUtils
 import org.joda.time.DateTime
-import org.joda.time.DateTimeZone
 import org.joda.time.Duration
 import java.util.*
 import javax.inject.Inject
@@ -69,7 +68,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         private const val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
         private const val PLACEHOLDER = "-"
-        private const val MAX_TIME_DEVIATION_MINUTES = 15L
+        private const val MAX_TIME_DEVIATION_MINUTES = 10L
     }
 
     private var disposables: CompositeDisposable = CompositeDisposable()
@@ -274,7 +273,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             } ?: PLACEHOLDER
 
             podInfoBinding.timeOnPod.setTextColor(
-                podStateManager.timeBehind?.let {
+                podStateManager.timeDrift?.let {
                     if (it.abs().isLongerThan(Duration.standardMinutes(MAX_TIME_DEVIATION_MINUTES))) {
                         Color.RED
                     } else {
@@ -526,7 +525,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     private fun updateRefreshStatusButton() {
         buttonBinding.buttonRefreshStatus.isEnabled =
             podStateManager.isUniqueIdSet &&
-            podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) &&
             isQueueEmpty()
     }
 

From 989a20d02305800148634f082f6b608d277581a7 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 21:38:01 +0200
Subject: [PATCH 20/32] less notifications on unconfirmed commands when
 switching profile

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 5898ce8688..49364229ea 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -269,7 +269,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         rxBus.send(EventTempBasalChange())
                     }
                     .ignoreElements()
-            ).doFinally {
+            ).doOnComplete() {
                 notifyOnUnconfirmed(
                     Notification.FAILED_UPDATE_PROFILE,
                     "Suspend delivery is unconfirmed! " +

From a62b5f7f7018747ddcfec44bc69511da76e66309 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 21:50:25 +0200
Subject: [PATCH 21/32] dismiss notifications

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 49364229ea..2a2c38ee30 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -884,7 +884,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     .ignoreElements()
             ).doFinally {
                 notifyOnUnconfirmed(
-                    Notification.PUMP_ERROR,
+                    Notification.FAILED_UPDATE_PROFILE,
                     "Unconfirmed resumeDelivery command. Please refresh pod status",
                     R.raw.boluserror
                 )
@@ -1013,6 +1013,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     )
                 }
                 rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+                rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
             }
 
             OmnipodCommandType.SET_TEMPORARY_BASAL -> {

From 8f5ecfd0d6e39d6bf9e69f7f5ac32c6cb885f987 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 22:14:05 +0200
Subject: [PATCH 22/32] restart service discovery

---
 .../pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt        | 1 +
 .../omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
index 284b6d975d..664db805e0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
@@ -21,6 +21,7 @@ class ServiceDiscoverer(
      */
     fun discoverServices(): Map<CharacteristicType, BluetoothGattCharacteristic> {
         logger.debug(LTag.PUMPBTCOMM, "Discovering services")
+        bleCallbacks.startServiceDiscovery()
         val discover = gatt.discoverServices()
         if (!discover) {
             throw ConnectException("Could not start discovering services`")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
index de2fceafe9..3d4d3d1339 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
@@ -61,6 +61,10 @@ class BleCommCallbacks(
         }
     }
 
+    fun startServiceDiscovery() {
+        serviceDiscoveryComplete = CountDownLatch(1)
+    }
+
     fun waitForServiceDiscovery(timeoutMs: Int) {
         try {
             serviceDiscoveryComplete.await(timeoutMs.toLong(), TimeUnit.MILLISECONDS)

From 4e4cc4cdfa2f16693fe25ce2f7bc710f10c89213 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 22:39:05 +0200
Subject: [PATCH 23/32] pumpSync on new pod

---
 .../viewmodel/action/DashInsertCannulaViewModel.kt  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index c7bc85a539..fcff9a9e3d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -2,13 +2,17 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activatio
 
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
 import io.reactivex.Single
 import io.reactivex.rxkotlin.subscribeBy
@@ -17,6 +21,8 @@ import javax.inject.Inject
 class DashInsertCannulaViewModel @Inject constructor(
     private val omnipodManager: OmnipodDashManager,
     private val profileFunction: ProfileFunction,
+    private val pumpSync: PumpSync,
+    private val podStateManager: OmnipodDashPodStateManager,
     injector: HasAndroidInjector,
     logger: AAPSLogger
 ) : InsertCannulaViewModel(injector, logger) {
@@ -52,6 +58,13 @@ class DashInsertCannulaViewModel @Inject constructor(
                 },
                 onComplete = {
                     logger.debug("Pod activation part 2 completed")
+                    pumpSync.connectNewPump()
+                    pumpSync.insertTherapyEventIfNewWithTimestamp(
+                        timestamp = System.currentTimeMillis(),
+                        type = DetailedBolusInfo.EventType.CANNULA_CHANGE,
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
+                    )
                     source.onSuccess(PumpEnactResult(injector).success(true))
                 }
             )

From 80c24a23dcf0b32c0a2f1b19c379f32cc0d0ef39 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 23:26:38 +0200
Subject: [PATCH 24/32] do not display last connection if the pod is not
 activated

---
 .../pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 80b14e98b3..59e90ef7dc 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -386,9 +386,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             podInfoBinding.lastConnection.setTextColor(lastConnectionColor)
         } else {
             podInfoBinding.lastConnection.setTextColor(Color.WHITE)
-            podInfoBinding.lastConnection.text = readableDuration(
-                Duration(podStateManager.lastUpdatedSystem, System.currentTimeMillis())
-            )
+            podInfoBinding.lastConnection.text = PLACEHOLDER
         }
     }
 

From c803f6504bd36eac84cd869e53769d61255aaa3d Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Fri, 25 Jun 2021 23:34:38 +0200
Subject: [PATCH 25/32] add both INSULIN and CANULA change

---
 .../viewmodel/action/DashInsertCannulaViewModel.kt          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index fcff9a9e3d..143fb8fb91 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -65,6 +65,12 @@ class DashInsertCannulaViewModel @Inject constructor(
                         pumpType = PumpType.OMNIPOD_DASH,
                         pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
                     )
+                    pumpSync.insertTherapyEventIfNewWithTimestamp(
+                        timestamp = System.currentTimeMillis(),
+                        type = DetailedBolusInfo.EventType.INSULIN_CHANGE,
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
+                    )
                     source.onSuccess(PumpEnactResult(injector).success(true))
                 }
             )

From 2a35c60e81eb71f995763052cabc3aff64e010e4 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sat, 26 Jun 2021 11:10:19 +0200
Subject: [PATCH 26/32] notification on pod suspend. try to getpodstatus on
 activecommands

---
 .../omnipod/dash/OmnipodDashPumpPlugin.kt     | 86 +++++++++++++++++--
 1 file changed, 77 insertions(+), 9 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 2a2c38ee30..197921ae76 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.ErrorHelperActivity.Companion.runAlarm
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -19,6 +21,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 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.common.utils.DateTimeUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
@@ -67,10 +70,14 @@ class OmnipodDashPumpPlugin @Inject constructor(
     commandQueue: CommandQueueProvider
 ) : PumpPluginBase(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue), Pump {
     @Volatile var bolusCanceled = false
+    private val handler: Handler = Handler(Looper.getMainLooper())
+    lateinit private var statusChecker: Runnable
+    var nextPodWarningCheck : Long = 0
 
     companion object {
         private const val BOLUS_RETRY_INTERVAL_MS = 2000.toLong()
-        private const val BOLUS_RETRIES = 5 // numer of retries for cancel/get bolus status
+        private const val BOLUS_RETRIES = 5 // number of retries for cancel/get bolus status
+        private const val STATUS_CHECK_INTERVAL_MS = (60L * 1000)
 
         private val pluginDescription = PluginDescription()
             .mainType(PluginType.PUMP)
@@ -84,6 +91,52 @@ class OmnipodDashPumpPlugin @Inject constructor(
         private val pumpDescription = PumpDescription(PumpType.OMNIPOD_DASH)
     }
 
+    init {
+        statusChecker = Runnable {
+            refreshStatusOnUnacknowledgedCommands()
+            updatePodWarnings()
+            handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS)
+        }
+    }
+
+    private fun updatePodWarnings() {
+        if (System.currentTimeMillis() > nextPodWarningCheck) {
+            if (!podStateManager.isPodRunning) {
+                val notification =
+                    Notification(
+                        Notification.OMNIPOD_POD_NOT_ATTACHED,
+                        "Pod not activated",
+                        Notification.NORMAL
+                    )
+                rxBus.send(EventNewNotification(notification))
+            } else {
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
+                if (podStateManager.isSuspended) {
+                    val notification =
+                        Notification(
+                            Notification.OMNIPOD_POD_SUSPENDED,
+                            "Insulin delivery suspended",
+                            Notification.NORMAL
+                        )
+                    rxBus.send(EventNewNotification(notification))
+                } else {
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
+                    // TODO: time out of sync notification?
+                }
+            }
+            nextPodWarningCheck = DateTimeUtil.getTimeInFutureFromMinutes(15)
+        }
+    }
+
+    private fun refreshStatusOnUnacknowledgedCommands() {
+        if (podStateManager.isPodRunning &&
+            podStateManager.activeCommand != null &&
+            commandQueue.size() == 0 &&
+            commandQueue.performing() == null) {
+            commandQueue.readStatus("Unconfirmed command", null)
+        }
+    }
+
     override fun isInitialized(): Boolean {
         // TODO
         return true
@@ -129,6 +182,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
         // TODO
     }
 
+
+
     override fun getPumpStatus(reason: String) {
         if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) {
             // prevent races on BLE when the pod is not activated
@@ -279,16 +334,15 @@ class OmnipodDashPumpPlugin @Inject constructor(
             }
     }
 
-    /* override fun onStop() {
-         super.onStop()
-         disposable.clear()
-     }
-
-     */
-
     override fun onStart() {
         super.onStart()
         podStateManager.onStart()
+        handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        handler.removeCallbacks(statusChecker)
     }
 
     private fun observeDeliverySuspended(): Completable = Completable.defer {
@@ -979,7 +1033,19 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val historyEntry = history.getById(command.historyId)
         aapsLogger.debug(LTag.PUMPCOMM, "handling command confirmation: $confirmation")
         when (historyEntry.commandType) {
-            OmnipodCommandType.CANCEL_TEMPORARY_BASAL,
+            OmnipodCommandType.CANCEL_TEMPORARY_BASAL -> {
+                if (confirmation.success) {
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                    podStateManager.tempBasal = null
+                }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+
+            }
             OmnipodCommandType.RESUME_DELIVERY -> {
                 // We can't invalidate this command,
                 // and this is why it is pumpSync-ed at this point
@@ -991,6 +1057,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         serialNumber()
                     )
                     podStateManager.tempBasal = null
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
                 }
                 rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
             }
@@ -1011,6 +1078,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         PumpType.OMNIPOD_DASH,
                         serialNumber()
                     )
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
                 }
                 rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
                 rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))

From b9acc21633b2d6cb82d61ebef09865d3bfad6434 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sat, 26 Jun 2021 11:40:01 +0200
Subject: [PATCH 27/32] update notifications

---
 .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 197921ae76..bd69f261fb 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1079,9 +1079,9 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         serialNumber()
                     )
                     rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
+                    rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
                 }
-                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
-                rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
             }
 
             OmnipodCommandType.SET_TEMPORARY_BASAL -> {

From cb45e51b990f41d043fb6a8e163787a253ec9890 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sat, 26 Jun 2021 15:06:57 +0200
Subject: [PATCH 28/32] add logging. try to prevent race condition

---
 .../pump/omnipod/dash/OmnipodDashPumpPlugin.kt        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index bd69f261fb..df8f87a507 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -185,6 +185,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
 
     override fun getPumpStatus(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "getPumpStatus reason=$reason")
         if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) {
             // prevent races on BLE when the pod is not activated
             return
@@ -263,6 +264,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         if (!podStateManager.isActivationCompleted) {
             return PumpEnactResult(injector).success(true).enacted(true)
         }
+        aapsLogger.debug(LTag.PUMP, "setNewBasalProfile profile=$profile")
         val basalProgram = mapProfileToBasalProgram(profile)
         var deliverySuspended = false
         return executeProgrammingCommand(
@@ -324,7 +326,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         rxBus.send(EventTempBasalChange())
                     }
                     .ignoreElements()
-            ).doOnComplete() {
+            ).doOnComplete {
                 notifyOnUnconfirmed(
                     Notification.FAILED_UPDATE_PROFILE,
                     "Suspend delivery is unconfirmed! " +
@@ -734,10 +736,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     executeProgrammingCommand(
                         historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
                         command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements()
-                    ).doFinally {
+                    ).doOnComplete {
                         notifyOnUnconfirmed(
                             Notification.OMNIPOD_TBR_ALERTS,
-                            "Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. " +
+                            "Cancelling temp basal might have failed." +
+                                "If a temp basal was previously running, it might have been cancelled." +
                                 "Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n
                             R.raw.boluserror,
                         )
@@ -795,6 +798,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     private fun notifyOnUnconfirmed(notificationId: Int, msg: String, sound: Int?) {
         if (podStateManager.activeCommand != null) {
+            aapsLogger.debug(LTag.PUMP, "Notification for active command: ${podStateManager.activeCommand}")
             showNotification(notificationId, msg, Notification.URGENT, sound)
         }
     }
@@ -1044,7 +1048,6 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     podStateManager.tempBasal = null
                 }
                 rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
-
             }
             OmnipodCommandType.RESUME_DELIVERY -> {
                 // We can't invalidate this command,

From e467e9f7b6e91d7f0a25fd0047cad917b70e8d6f Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sun, 4 Jul 2021 18:21:08 +0200
Subject: [PATCH 29/32] simplify observeNoActiveCommand

---
 .../pump/omnipod/dash/OmnipodDashPumpPlugin.kt        |  5 ++++-
 .../driver/pod/state/OmnipodDashPodStateManager.kt    |  3 ++-
 .../pod/state/OmnipodDashPodStateManagerImpl.kt       | 11 ++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index df8f87a507..2e54cd7f3d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1014,7 +1014,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
         return Completable.concat(
             listOf(
                 pre,
-                podStateManager.observeNoActiveCommand(checkNoActiveCommand).ignoreElements(),
+                if (checkNoActiveCommand)
+                    podStateManager.observeNoActiveCommand()
+                else
+                    Completable.complete(),
                 historyEntry
                     .flatMap { activeCommandEntry(it) }
                     .ignoreElement(),
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index 3eeab834ad..ebf81c8de9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
+import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -91,7 +92,7 @@ interface OmnipodDashPodStateManager {
         requestedBolus: Double? = null
     ): Single<ActiveCommand>
     fun updateActiveCommand(): Maybe<CommandConfirmed>
-    fun observeNoActiveCommand(b: Boolean): Observable<PodEvent>
+    fun observeNoActiveCommand(): Completable
     fun getCommandConfirmationFromState(): CommandConfirmationFromState
 
     fun createLastBolus(requestedUnits: Double, historyId: String, bolusType: DetailedBolusInfo.BolusType)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index 95df4367a7..f5de686b76 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -18,6 +18,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -307,13 +308,13 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         }
 
     @Synchronized
-    override fun observeNoActiveCommand(check: Boolean): Observable<PodEvent> {
-        return Observable.defer {
-            if (activeCommand == null || !check) {
-                Observable.empty()
+    override fun observeNoActiveCommand(): Completable {
+        return Completable.defer {
+            if (activeCommand == null) {
+                Completable.complete()
             } else {
                 logger.warn(LTag.PUMP, "Active command already existing: $activeCommand")
-                Observable.error(
+                Completable.error(
                     java.lang.IllegalStateException(
                         "Trying to send a command " +
                             "and the last command was not confirmed"

From 3a4001a1a6d4171f56df16f1083c731aab963883 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sun, 4 Jul 2021 18:28:19 +0200
Subject: [PATCH 30/32] make it compile

---
 wear/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wear/build.gradle b/wear/build.gradle
index b18138cb08..237d585dfc 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -150,7 +150,7 @@ dependencies {
     }
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
-    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.core:core-ktx:$coreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

From 87a297c36dbda105cac4ccabd54c4560c9ef6fa3 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sun, 11 Jul 2021 11:55:20 +0200
Subject: [PATCH 31/32] constant

---
 .../pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
index f675065776..24885e70e2 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -125,7 +125,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(
             for (i in 1..MAX_NUMBER_OF_CONNECTION_ATTEMPTS) {
                 try {
                     // wait i * CONNECTION_TIMEOUT
-                    conn.connect(4)
+                    conn.connect(CONNECT_TIMEOUT_MULTIPLIER)
                     break
                 } catch (e: Exception) {
                     aapsLogger.warn(LTag.PUMPBTCOMM, "connect error=$e")
@@ -242,5 +242,6 @@ class OmnipodDashBleManagerImpl @Inject constructor(
     companion object {
         const val MAX_NUMBER_OF_CONNECTION_ATTEMPTS = 2
         const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
+        private const val CONNECT_TIMEOUT_MULTIPLIER = 4
     }
 }

From 5ffc924e63f18e5032b9cf66de3ee553ba275fa1 Mon Sep 17 00:00:00 2001
From: Andrei Vereha <avereha@gmail.com>
Date: Sun, 11 Jul 2021 12:02:03 +0200
Subject: [PATCH 32/32] 60_000

---
 .../dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index f5de686b76..ed2e9d88d4 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -468,7 +468,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         podState.lastStatusResponseReceived = SystemClock.elapsedRealtime()
         updateLastBolusFromResponse(response.bolusPulsesRemaining)
         if (podState.activationTime == null) {
-            podState.activationTime = System.currentTimeMillis() - (response.minutesSinceActivation * 60000)
+            podState.activationTime = System.currentTimeMillis() - (response.minutesSinceActivation * 60_000)
         }
 
         store()