Merge branch 'omnipod_eros_dev_automatically_ack_pod_alerts' into omnipod_eros_dev

This commit is contained in:
Bart Sopers 2020-11-12 20:13:38 +01:00
commit e9944e3b9c

View file

@ -245,6 +245,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null); getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null);
} }
if (podStateManager.hasPodState()) {
AlertSet activeAlerts = podStateManager.getActiveAlerts(); AlertSet activeAlerts = podStateManager.getActiveAlerts();
if (aapsOmnipodManager.isAutomaticallyAcknowledgeAlertsEnabled() && activeAlerts.size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) { if (aapsOmnipodManager.isAutomaticallyAcknowledgeAlertsEnabled() && activeAlerts.size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) {
String alerts = TextUtils.join(", ", aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager)); String alerts = TextUtils.join(", ", aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager));
@ -260,6 +261,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
} }
}); });
} }
}
doPodCheck(); doPodCheck();