From d97a30d195adc7cc86cb32252f79159224eab24e Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 12 Nov 2020 20:13:06 +0100 Subject: [PATCH] Add check --- .../pump/omnipod/OmnipodPumpPlugin.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 f5b9649ce7..515744ed80 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 @@ -245,20 +245,22 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null); } - AlertSet activeAlerts = podStateManager.getActiveAlerts(); - if (aapsOmnipodManager.isAutomaticallyAcknowledgeAlertsEnabled() && activeAlerts.size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) { - String alerts = TextUtils.join(", ", aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager)); - getCommandQueue().customCommand(new CommandAcknowledgeAlerts(), new Callback() { - @Override public void run() { - if (result != null) { - aapsLogger.debug(LTag.PUMP, "Acknowledge alerts result: {} ({})", result.success, result.comment); - if (result.success) { - Notification notification = new Notification(Notification.OMNIPOD_POD_ALERTS, resourceHelper.gq(R.plurals.omnipod_pod_alerts, activeAlerts.size(), alerts), Notification.URGENT); - rxBus.send(new EventNewNotification(notification)); + if (podStateManager.hasPodState()) { + AlertSet activeAlerts = podStateManager.getActiveAlerts(); + if (aapsOmnipodManager.isAutomaticallyAcknowledgeAlertsEnabled() && activeAlerts.size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) { + String alerts = TextUtils.join(", ", aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager)); + getCommandQueue().customCommand(new CommandAcknowledgeAlerts(), new Callback() { + @Override public void run() { + if (result != null) { + aapsLogger.debug(LTag.PUMP, "Acknowledge alerts result: {} ({})", result.success, result.comment); + if (result.success) { + Notification notification = new Notification(Notification.OMNIPOD_POD_ALERTS, resourceHelper.gq(R.plurals.omnipod_pod_alerts, activeAlerts.size(), alerts), Notification.URGENT); + rxBus.send(new EventNewNotification(notification)); + } } } - } - }); + }); + } } doPodCheck();