Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt

@@ -310,8 +310,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
     )
 
     private fun checkPodKaput(): Completable = Completable.defer {
-        val tbr = pumpSync.expectedPumpState().temporaryBasal
         if (podStateManager.isPodKaput) {
+            val tbr = pumpSync.expectedPumpState().temporaryBasal
             if (tbr == null || tbr.rate != 0.0) {
                 pumpSync.syncTemporaryBasalWithPumpId(
                     timestamp = System.currentTimeMillis(),
@@ -340,20 +340,23 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     aapsLogger.info(LTag.PUMP, "syncBolusWithPumpId on CANCEL_BOLUS returned: $sync")
                 }
             }
-            showNotification(
+
-                Notification.OMNIPOD_POD_FAULT,
+            podStateManager.alarmType?.let {
-                podStateManager.alarmType.toString(),
+                showNotification(
-                Notification.URGENT,
+                    Notification.OMNIPOD_POD_FAULT,
-                R.raw.boluserror
+                    it.toString(),
-            )
+                    Notification.URGENT,
-            if (!podStateManager.alarmSynced) {
+                    R.raw.boluserror
-                pumpSync.insertAnnouncement(
-                    error = podStateManager.alarmType?.toString() ?: "Unknown pod failure",
-                    pumpId = Random.Default.nextLong(),
-                    pumpType = PumpType.OMNIPOD_DASH,
-                    pumpSerial = serialNumber()
                 )
-                podStateManager.alarmSynced = true
+                if (!podStateManager.alarmSynced) {
+                    pumpSync.insertAnnouncement(
+                        error = it.toString(),
+                        pumpId = Random.Default.nextLong(),
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = serialNumber()
+                    )
+                    podStateManager.alarmSynced = true
+                }
             }
         }
         Completable.complete()
@@ -1165,14 +1168,14 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
             command = omnipodManager.deactivatePod().ignoreElements(),
-            checkNoActiveCommand = false,
+            checkNoActiveCommand = false
-            post = createFakeTBRWhenNoActivePod(),
         ).doOnComplete {
             if (podStateManager.activeCommand != null) {
                 success = false
+            } else {
+                podStateManager.reset()
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
             }
-            podStateManager.reset()
-            rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
         }.toPumpEnactResult()
         if (!success) {
             ret.success(false)

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt

@@ -56,47 +56,48 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
 
     private fun groupForCommandType(type: OmnipodCommandType): PumpHistoryEntryGroup {
         return when (type) {
-            OmnipodCommandType.INITIALIZE_POD ->
+            OmnipodCommandType.INITIALIZE_POD         ->
                 PumpHistoryEntryGroup.Prime
-            OmnipodCommandType.INSERT_CANNULA ->
+            OmnipodCommandType.INSERT_CANNULA         ->
                 PumpHistoryEntryGroup.Prime
-            OmnipodCommandType.DEACTIVATE_POD ->
+            OmnipodCommandType.DEACTIVATE_POD         ->
                 PumpHistoryEntryGroup.Prime
-            OmnipodCommandType.DISCARD_POD ->
+            OmnipodCommandType.DISCARD_POD            ->
                 PumpHistoryEntryGroup.Prime
 
             OmnipodCommandType.CANCEL_TEMPORARY_BASAL ->
                 PumpHistoryEntryGroup.Basal
-            OmnipodCommandType.SET_BASAL_PROFILE ->
+            OmnipodCommandType.SET_BASAL_PROFILE      ->
                 PumpHistoryEntryGroup.Basal
-            OmnipodCommandType.SET_TEMPORARY_BASAL ->
+            OmnipodCommandType.SET_TEMPORARY_BASAL    ->
                 PumpHistoryEntryGroup.Basal
-            OmnipodCommandType.RESUME_DELIVERY ->
+            OmnipodCommandType.RESUME_DELIVERY        ->
                 PumpHistoryEntryGroup.Basal
-            OmnipodCommandType.SUSPEND_DELIVERY ->
+            OmnipodCommandType.SUSPEND_DELIVERY       ->
                 PumpHistoryEntryGroup.Basal
 
-            OmnipodCommandType.SET_BOLUS ->
+            OmnipodCommandType.SET_BOLUS              ->
                 PumpHistoryEntryGroup.Bolus
-            OmnipodCommandType.CANCEL_BOLUS ->
+            OmnipodCommandType.CANCEL_BOLUS           ->
                 PumpHistoryEntryGroup.Bolus
 
-            OmnipodCommandType.ACKNOWLEDGE_ALERTS ->
+            OmnipodCommandType.ACKNOWLEDGE_ALERTS     ->
                 PumpHistoryEntryGroup.Alarm
-            OmnipodCommandType.CONFIGURE_ALERTS ->
+            OmnipodCommandType.CONFIGURE_ALERTS       ->
                 PumpHistoryEntryGroup.Alarm
-            OmnipodCommandType.PLAY_TEST_BEEP ->
+            OmnipodCommandType.PLAY_TEST_BEEP         ->
                 PumpHistoryEntryGroup.Alarm
 
-            OmnipodCommandType.GET_POD_STATUS ->
+            OmnipodCommandType.GET_POD_STATUS         ->
                 PumpHistoryEntryGroup.Configuration
-            OmnipodCommandType.SET_TIME ->
+            OmnipodCommandType.SET_TIME               ->
                 PumpHistoryEntryGroup.Configuration
 
-            OmnipodCommandType.READ_POD_PULSE_LOG ->
+            OmnipodCommandType.READ_POD_PULSE_LOG     ->
                 PumpHistoryEntryGroup.Unknown
         }
     }
+
     private fun filterHistory(group: PumpHistoryEntryGroup) {
         filteredHistoryList.clear()
         aapsLogger.debug(LTag.PUMP, "Items on full list: {}", fullHistoryList.size)
@@ -208,8 +209,48 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
             }
         }
 
+        private fun setTextViewColor(check_result: Boolean, textview: TextView, record: HistoryRecord) {
+            if (check_result && !record.isSuccess()) {
+                // Record says not success
+                textview.setTextColor(android.graphics.Color.YELLOW)
+                return
+            }
+            // On success set color
+            val textColor = when (record.commandType) {
+                // Operational
+                OmnipodCommandType.INITIALIZE_POD,
+                OmnipodCommandType.CONFIGURE_ALERTS,
+                OmnipodCommandType.INSERT_CANNULA,
+                OmnipodCommandType.DEACTIVATE_POD,
+                OmnipodCommandType.DISCARD_POD,
+                OmnipodCommandType.SUSPEND_DELIVERY,
+                OmnipodCommandType.RESUME_DELIVERY,
+                OmnipodCommandType.SET_BASAL_PROFILE   -> {
+                    android.graphics.Color.CYAN
+                }
+                // User action
+                OmnipodCommandType.PLAY_TEST_BEEP,
+                OmnipodCommandType.ACKNOWLEDGE_ALERTS,
+                OmnipodCommandType.CANCEL_BOLUS        -> {
+                    android.graphics.Color.GREEN
+                }
+                // Insulin treatment
+                OmnipodCommandType.SET_BOLUS,
+                OmnipodCommandType.SET_TEMPORARY_BASAL -> {
+                    android.graphics.Color.WHITE
+                }
+
+                else                                   ->
+                    // Other
+                    android.graphics.Color.LTGRAY
+            }
+            textview.setTextColor(textColor)
+        }
+
         private fun setType(record: HistoryRecord, typeView: TextView) {
             typeView.text = resourceHelper.gs(record.commandType.resourceId)
+            // Set some color, include result
+            setTextViewColor(check_result = true, typeView, record)
         }
 
         private fun setValue(historyEntry: HistoryRecord, valueView: TextView) {
@@ -226,22 +267,27 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
                         resourceHelper.gs(R.string.omnipod_common_history_tbr_value, it.rate, it.duration)
                     }
                 }
-                OmnipodCommandType.SET_BOLUS -> {
+
+                OmnipodCommandType.SET_BOLUS           -> {
                     val bolus = historyEntry.record as BolusRecord
                     bolus.let {
                         resourceHelper.gs(R.string.omnipod_common_history_bolus_value, it.amout)
                     }
                 }
+
                 OmnipodCommandType.SET_BASAL_PROFILE,
                 OmnipodCommandType.SET_TIME,
                 OmnipodCommandType.INSERT_CANNULA,
-                OmnipodCommandType.RESUME_DELIVERY -> {
+                OmnipodCommandType.RESUME_DELIVERY     -> {
                     val basal = historyEntry.record as BasalValuesRecord
                     ProfileUtil.getBasalProfilesDisplayable(basal.segments.toTypedArray(), PumpType.OMNIPOD_DASH)
                 }
-                else ->
+
+                else                                   ->
                     ""
             }
+            // Set some color
+            setTextViewColor(check_result = false, valueView, historyEntry)
         }
 
         override fun getItemCount(): Int {
@@ -249,6 +295,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
         }
 
         inner class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
             val timeView: TextView = itemView.findViewById(R.id.omnipod_history_time)
             val typeView: TextView = itemView.findViewById(R.id.omnipod_history_source)
             val valueView: TextView = itemView.findViewById(R.id.omnipod_history_description)
@@ -259,17 +306,18 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
         return when {
             historyEntry.initialResult == InitialResult.FAILURE_SENDING ->
                 R.string.omnipod_dash_failed_to_send
-            historyEntry.initialResult == InitialResult.NOT_SENT ->
+            historyEntry.initialResult == InitialResult.NOT_SENT        ->
                 R.string.omnipod_dash_command_not_sent
             historyEntry.initialResult == InitialResult.SENT &&
-                historyEntry.resolvedResult == ResolvedResult.FAILURE ->
+                historyEntry.resolvedResult == ResolvedResult.FAILURE   ->
                 R.string.omnipod_dash_command_not_received_by_the_pod
-            else ->
+            else                                                        ->
                 R.string.omnipod_dash_unknown
         }
     }
 
     companion object {
+
         private var selectedGroup: PumpHistoryEntryGroup = PumpHistoryEntryGroup.All
         const val DAYS_TO_DISPLAY = 5
     }