From b3f0951d1f70adff98031735c80931983bb3e2f2 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 23 Nov 2017 02:19:29 +0100 Subject: [PATCH] isThisProfileSet - same behaviour on uninitialized pump as DanaR --- .../androidaps/plugins/PumpCombo/ComboPlugin.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index c2a7faa79a..280a8bee48 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -224,6 +224,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf CommandResult setResult = runCommand(MainApp.sResources.getString(R.string.combo_activity_setting_basal_profile), 0, () -> ruffyScripter.setBasalProfile(requestedBasalProfile)); if (!setResult.success) { + Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT); + MainApp.bus().post(new EventNewNotification(notification)); return PumpInterface.FAILED; } @@ -238,6 +240,10 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf @Override public boolean isThisProfileSet(Profile profile) { + if (!isInitialized()) + return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS + if (pump.basalProfile == null) + return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS return pump.basalProfile.equals(convertProfileToComboProfile(profile)); }