From 60beb0f5b6418203e03aeb9a0e24f856e415dd85 Mon Sep 17 00:00:00 2001 From: Andrei Vereha Date: Sun, 10 Oct 2021 17:32:11 +0200 Subject: [PATCH 1/3] fixes: updateLowReservoirAlertSettings, call updateExpirationAlertSettings --- .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt | 2 +- .../viewmodel/action/DashInsertCannulaViewModel.kt | 9 ++++++++- 2 files changed, 9 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 31070b8773..3814743d10 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 @@ -1229,7 +1229,7 @@ class OmnipodDashPumpPlugin @Inject constructor( expirationReminderEnabled, expirationHours ).andThen( - podStateManager.updateExpirationAlertSettings( + podStateManager.updateLowReservoirAlertSettings( lowReservoirAlertEnabled, lowReservoirAlertUnits ) 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 29a574549a..a4e413e7ae 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 @@ -103,7 +103,14 @@ class DashInsertCannulaViewModel @Inject constructor( pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a" ) - podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours) + val err = podStateManager.updateExpirationAlertSettings( + expirationReminderEnabled, + expirationHours + ) + .blockingGet() + err?.let { + logger.warn(LTag.PUMP, "Error updating local alert settings: $err") + } rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED)) source.onSuccess(PumpEnactResult(injector).success(true)) } From 883c2322d25d612a1e7bf146d57294a4e16e0c93 Mon Sep 17 00:00:00 2001 From: Andrei Vereha Date: Thu, 14 Oct 2021 22:09:13 +0200 Subject: [PATCH 2/3] nicer --- .../action/DashInsertCannulaViewModel.kt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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 a4e413e7ae..e372e1528b 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,13 +65,9 @@ class DashInsertCannulaViewModel @Inject constructor( null super.disposable += omnipodManager.activatePodPart2(basalProgram, expirationHoursBeforeShutdown) + .ignoreElements() + .andThen(podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours)) .subscribeBy( - onNext = { podEvent -> - logger.debug( - LTag.PUMP, - "Received PodEvent in Pod activation part 2: $podEvent" - ) - }, onError = { throwable -> logger.error(LTag.PUMP, "Error in Pod activation part 2", throwable) source.onSuccess(PumpEnactResult(injector).success(false).comment(I8n.textFromException(throwable, resourceHelper))) @@ -103,14 +99,6 @@ class DashInsertCannulaViewModel @Inject constructor( pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a" ) - val err = podStateManager.updateExpirationAlertSettings( - expirationReminderEnabled, - expirationHours - ) - .blockingGet() - err?.let { - logger.warn(LTag.PUMP, "Error updating local alert settings: $err") - } rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED)) source.onSuccess(PumpEnactResult(injector).success(true)) } From f48956fd0df243a25e4681aacae7107452f26c03 Mon Sep 17 00:00:00 2001 From: Andrei Vereha Date: Thu, 14 Oct 2021 22:10:50 +0200 Subject: [PATCH 3/3] fix warning --- .../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 3814743d10..86e21d449e 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 @@ -1031,7 +1031,7 @@ class OmnipodDashPumpPlugin @Inject constructor( DateFormat.format("HH:mm", Date(this.startTime)) ) + "\n" } - val (temporaryBasal, extendedBolus, _, profile) = pumpSync.expectedPumpState() + val temporaryBasal = pumpSync.expectedPumpState().temporaryBasal temporaryBasal?.run { ret += resourceHelper.gs( R.string.omnipod_common_short_status_temp_basal,