Merge branch 'avereha/alarms' into avereha/bolus

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

@@ -339,10 +339,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
     override fun stopBolusDelivering() {
         // TODO update Treatments (?)
         aapsLogger.info(LTag.PUMP, "stopBolusDelivering called")
-        executeProgrammingCommand(
+        val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.CANCEL_BOLUS),
             command = omnipodManager.stopBolus().ignoreElements()
         ).toPumpEnactResult()
+        aapsLogger.info(LTag.PUMP, "stopBolusDelivering finished with result: $ret")
     }
 
     override fun setTempBasalAbsolute(
@@ -487,6 +488,9 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     fun Completable.toPumpEnactResult(): PumpEnactResult {
         return this.toSingleDefault(PumpEnactResult(injector).success(true).enacted(true))
+            .doOnError { throwable ->
+                aapsLogger.error(LTag.PUMP, "toPumpEnactResult, error executing command: $throwable")
+            }
             .onErrorReturnItem(PumpEnactResult(injector).success(false).enacted(false))
             .blockingGet()
     }
@@ -575,33 +579,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
     private fun silenceAlerts(): PumpEnactResult {
         // TODO filter alert types
         return podStateManager.activeAlerts?.let {
-            Single.create<PumpEnactResult> { source ->
+            executeProgrammingCommand(
-                Observable.concat(
+                historyEntry = history.createRecord(commandType = OmnipodCommandType.ACKNOWLEDGE_ALERTS),
-                    // TODO: is this a programming command? if yes, save to history
+                command = omnipodManager.silenceAlerts(it).ignoreElements(),
-                    omnipodManager.silenceAlerts(it),
+            ).toPumpEnactResult()
-                    history.updateFromState(podStateManager).toObservable(),
-                    podStateManager.updateActiveCommand().toObservable(),
-                ).subscribeBy(
-                    onNext = { podEvent ->
-                        aapsLogger.debug(
-                            LTag.PUMP,
-                            "Received PodEvent in silenceAlerts: $podEvent"
-                        )
-                    },
-                    onError = { throwable ->
-                        aapsLogger.error(LTag.PUMP, "Error in silenceAlerts", throwable)
-                        source.onSuccess(
-                            PumpEnactResult(injector).success(false).comment(
-                                throwable.toString()
-                            )
-                        )
-                    },
-                    onComplete = {
-                        aapsLogger.debug("silenceAlerts completed")
-                        source.onSuccess(PumpEnactResult(injector).success(true))
-                    }
-                )
-            }.blockingGet()
         } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No active alerts") // TODO i18n
     }
 

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt

@@ -8,9 +8,10 @@ object AlertUtil {
     fun decodeAlertSet(encoded: Byte): EnumSet<AlertType> {
         val encodedInt = encoded.toInt() and 0xff
 
-        val alertList = AlertType.values().filter {
+        val alertList = AlertType.values()
-            (it.value.toInt() and 0xff) and encodedInt != 0
+            .filter { it != AlertType.UNKNOWN } // 0xff && <something> will always be true
-        }.toList()
+            .filter { (it.value.toInt() and 0xff) and encodedInt != 0 }
+            .toList()
 
         return if (alertList.isEmpty()) {
             EnumSet.noneOf(AlertType::class.java)