caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

Browse source
This commit is contained in:
Bart Sopers 2020-11-11 21:36:03 +01:00
parent 5e8cb2e1ed a425d710a3
commit 15fed588ca
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
View file

@ -366,7 +366,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
rxBus.send(new EventNewNotification(notification)); rxBus.send(new EventNewNotification(notification));
} else { } else {
if (podStateManager.isSuspended()) { if (podStateManager.isSuspended()) {
Notification notification = new Notification(Notification.OMNIPOD_POD_SUSPENDED, resourceHelper.gs(R.string.omnipod_confirmation_pod_suspended), Notification.NORMAL); Notification notification = new Notification(Notification.OMNIPOD_POD_SUSPENDED, resourceHelper.gs(R.string.omnipod_error_pod_suspended), Notification.NORMAL);
rxBus.send(new EventNewNotification(notification)); rxBus.send(new EventNewNotification(notification));
} }
} }

2
omnipod/src/main/res/values/strings.xml
View file

@ -132,6 +132,7 @@
<string name="omnipod_error_failed_to_insert_cannula">Failed to insert cannula</string> <string name="omnipod_error_failed_to_insert_cannula">Failed to insert cannula</string>
<string name="omnipod_error_pod_fault_activation_time_exceeded">The Pod\'s activation time has been exceeded. This Pod can no longer be activated.</string> <string name="omnipod_error_pod_fault_activation_time_exceeded">The Pod\'s activation time has been exceeded. This Pod can no longer be activated.</string>
<string name="omnipod_error_failed_to_verify_activation_progress">Failed to verify activation progress. Please retry.</string> <string name="omnipod_error_failed_to_verify_activation_progress">Failed to verify activation progress. Please retry.</string>
<string name="omnipod_error_pod_suspended">Pod suspended</string>
<!-- Omnipod - Confirmation --> <!-- Omnipod - Confirmation -->
<string name="omnipod_confirmation">Confirmation</string> <string name="omnipod_confirmation">Confirmation</string>
@ -141,7 +142,6 @@
<string name="omnipod_confirmation_suspended_delivery">All insulin delivery has been suspended.</string> <string name="omnipod_confirmation_suspended_delivery">All insulin delivery has been suspended.</string>
<string name="omnipod_confirmation_acknowledged_alerts">Active alerts have been acknowledged.</string> <string name="omnipod_confirmation_acknowledged_alerts">Active alerts have been acknowledged.</string>
<string name="omnipod_confirmation_delivery_resumed">Insulin delivery has been resumed.</string> <string name="omnipod_confirmation_delivery_resumed">Insulin delivery has been resumed.</string>
<string name="omnipod_confirmation_pod_suspended">Pod suspended</string>
<!-- Omnipod - Commands --> <!-- Omnipod - Commands -->
<string name="omnipod_cmd_deactivate_pod">Deactivate Pod</string> <string name="omnipod_cmd_deactivate_pod">Deactivate Pod</string>