From f3be91aa1808cabd48af4bcd358196473c65ef4e Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Mon, 21 Dec 2020 21:39:15 +0100 Subject: [PATCH 1/5] Prevent crash in Omnipod driver --- .../androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java index fdbc32a199..ed3aa38a03 100644 --- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java +++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java @@ -554,7 +554,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, if ("SMS".equals(reason)) { aapsLogger.info(LTag.PUMP, "Acknowledged AAPS getPumpStatus request it was requested through an SMS"); getPodStatus(); - } else if (!podStateManager.isBasalCertain() || !podStateManager.isTempBasalCertain()) { + } else if (podStateManager.isPodRunning() && (!podStateManager.isBasalCertain() || !podStateManager.isTempBasalCertain())) { aapsLogger.info(LTag.PUMP, "Acknowledged AAPS getPumpStatus request because basal and/or temp basal is uncertain"); getPodStatus(); } From 029a7e27fb32c27a05e63882a1a819bb9c29c87e Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Mon, 21 Dec 2020 22:26:41 +0100 Subject: [PATCH 2/5] Prevent crash on startup --- .../androidaps/plugins/general/overview/StatusLightHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt index 0c3bb72cb3..dbdfe39bb4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt @@ -52,7 +52,7 @@ class StatusLightHandler @Inject constructor( } if (!config.NSCLIENT) { - if (pump.model() == PumpType.Insulet_Omnipod) { + if (pump.model() == PumpType.Insulet_Omnipod && pump is OmnipodPumpPlugin) { // instanceof check is needed because at startup, pump can still be VirtualPumpPlugin and that will cause a crash because of the class cast below handleOmnipodBatteryLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%", (pump as OmnipodPumpPlugin).isUseRileyLinkBatteryLevel) } else if (pump.model() != PumpType.AccuChekCombo) { handleLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%") From 2f65418c82bfc41f67553dd074fdc365b2d007c4 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Mon, 21 Dec 2020 22:32:22 +0100 Subject: [PATCH 3/5] Improve translation --- omnipod/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml index e290e3ce8b..470b7d964f 100644 --- a/omnipod/src/main/res/values/strings.xml +++ b/omnipod/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ Show Suspend Delivery button in Omnipod tab Show Pulse Log button in Pod Management menu Show RileyLink Stats button in Pod Management menu - Use battery level reported by RileyLink + Use battery level reported by EmaLink/OrangeLink Works with EmaLink and OrangeLink.\nDOES NOT work with the original RileyLink: it will not report the actual battery level. Might also not work with other RileyLink alternatives. DST/Time zone detection enabled Expiration reminder enabled From 645992e97a80ea0c91fab480e4e2aa7f33f0acd1 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Mon, 21 Dec 2020 22:49:42 +0100 Subject: [PATCH 4/5] Improve Omnipod setting description --- omnipod/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml index 470b7d964f..292faf1fcc 100644 --- a/omnipod/src/main/res/values/strings.xml +++ b/omnipod/src/main/res/values/strings.xml @@ -45,7 +45,7 @@ Show Pulse Log button in Pod Management menu Show RileyLink Stats button in Pod Management menu Use battery level reported by EmaLink/OrangeLink - Works with EmaLink and OrangeLink.\nDOES NOT work with the original RileyLink: it will not report the actual battery level. Might also not work with other RileyLink alternatives. + DOES NOT work with the original RileyLink. May not work with other RileyLink alternatives. DST/Time zone detection enabled Expiration reminder enabled Hours before shutdown From a4d2c712d3495272347db84704bf795f08e05cb9 Mon Sep 17 00:00:00 2001 From: Teleriddler Date: Tue, 22 Dec 2020 00:54:04 +0100 Subject: [PATCH 5/5] Fixed capitalizations for short phrases and titles. --- omnipod/src/main/res/values/strings.xml | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml index 292faf1fcc..65cd921044 100644 --- a/omnipod/src/main/res/values/strings.xml +++ b/omnipod/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ Notifications - No active Pod + No Active Pod Setup in progress (waiting for Pod activation) Setup in progress (waiting for cannula insertion) Running @@ -78,8 +78,8 @@ Pod will expire soon Pod will expire soon Shutdown is imminent - Low reservoir - Unknown alert + Low Reservoir + Unknown Alert Pod History @@ -92,7 +92,7 @@ Rate: %1$.2f U, duration: %2$d minutes - No active Pod + No Active Pod LastConn: %1$d min ago LastBolus: %1$s @ %2$s Temp: %1$s @@ -189,21 +189,21 @@ Play Test Beep - Pod management + Pod Management Actions Tools Waiting for RileyLink connection… Activate Pod Deactivate Pod Discard Pod - Pod history - RileyLink stats + Pod History + RileyLink Stats Reset RileyLink Config - Read pulse log - Reading pulse log… + Read Pulse Log + Reading Pulse Log… If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. If you can still communicate with the Pod, please use the Deactivate Pod option.\n\nIf you wish to proceed, please make sure to remove the Pod from your body! - Play test beep - Playing test beep… + Play Test Beep + Playing Test Beep… Cancel @@ -223,9 +223,9 @@ Attach Pod Prepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press Cancel and discard your Pod.\n\nPress Next to insert the cannula and begin basal delivery. When you press OK, the cannula will be inserted. Make sure that you have attached the Pod to the infusion site. - Insert cannula + Insert Cannula Trying to set initial basal schedule and insert the cannula.\n\nWhen the cannula has successfully been inserted, you can press Next. - Pod activated + Pod Activated The new Pod is now active.\n\nYour basal schedule has been programmed and the cannula has been inserted.\n\nPlease verify that the cannula has been inserted correctly and change your Pod if you think it has not. @@ -233,9 +233,9 @@ Press Next to deactivate the Pod.\n\nNote: This will suspend all insulin delivery and deactivate the Pod. Deactivating Pod Deactivating the Pod.\n\nWhen deactivation has completed successfully, you can press Next. - Pod deactivated + Pod Deactivated Your Pod has been deactivated.\n\nPlease remove the Pod from your body and recycle it. - Pod discarded + Pod Discarded The Pod state has been discarded. Insulin delivery has not been suspended because the Pod has not been properly deactivated!\n\nPlease remove the Pod from your body and recycle it. If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. Are you sure you want to discard the Pod? Discard Pod @@ -293,8 +293,8 @@ %1$d days - Pod alert: %1$s - Pod alerts: %1$s + Pod Alert: %1$s + Pod Alerts: %1$s \ No newline at end of file