Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2

* adrian/localalerts-settings:
  remove already commented out code
  upper case literals
  use correct setting
  Don't alarm while disconnected
  disconnect state
  remove deprecated wear notification settings
  no-urgent notification title
  presnooze missed readings/pump on startup
  system notifications for non-urgent
  Notification bugfixes
  use ID as request code
  guard double clicks
  refactor notifications: subpackage
  initialized only when maxBasal >0
  Dismiss notification service
  local alert thresholds as settings
  Extract local alerts for unreachable pump, missed BG readings.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
#	app/src/main/res/values/strings.xml

app/src/main/AndroidManifest.xml

@@ -146,6 +146,10 @@
             android:name=".Services.AlarmSoundService"
             android:enabled="true"
             android:exported="true" />
+        <service
+            android:name=".plugins.Overview.notifications.DismissNotificationService"
+            android:exported="false" >
+        </service>
 
         <meta-data
             android:name="io.fabric.ApiKey"

app/src/main/java/info/nightscout/androidaps/Services/DataService.java

@@ -24,7 +24,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSMbg;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;

app/src/main/java/info/nightscout/androidaps/data/Profile.java

@@ -12,17 +12,15 @@ import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.TimeZone;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
 
 public class Profile {

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java

@@ -30,7 +30,7 @@ import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NumberPicker;

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java

@@ -25,7 +25,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java

@@ -47,7 +47,7 @@ import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressHelperActivity;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 /**

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -63,6 +63,8 @@ public class LoopPlugin implements PluginBase {
 
     private long loopSuspendedTill = 0L; // end of manual loop suspend
     private boolean isSuperBolus = false;
+    private boolean isDisconnected = false;
+
 
     public class LastRun {
         public APSResult request = null;
@@ -85,6 +87,7 @@ public class LoopPlugin implements PluginBase {
         MainApp.bus().register(this);
         loopSuspendedTill = SP.getLong("loopSuspendedTill", 0L);
         isSuperBolus = SP.getBoolean("isSuperBolus", false);
+        isDisconnected = SP.getBoolean("isDisconnected", false);
     }
 
     @Override
@@ -170,13 +173,28 @@ public class LoopPlugin implements PluginBase {
     public void suspendTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = false;
+        isDisconnected = false;
         SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
     }
 
     public void superBolusTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = true;
+        isDisconnected = false;
         SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
+    }
+
+    public void disconnectTo(long endTime) {
+        loopSuspendedTill = endTime;
+        isSuperBolus = false;
+        isDisconnected = true;
+        SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
     }
 
     public int minutesToEndOfSuspend() {
@@ -222,6 +240,20 @@ public class LoopPlugin implements PluginBase {
         return isSuperBolus;
     }
 
+    public boolean isDisconnected() {
+        if (loopSuspendedTill == 0)
+            return false;
+
+        long now = System.currentTimeMillis();
+
+        if (loopSuspendedTill <= now) { // time exceeded
+            suspendTo(0L);
+            return false;
+        }
+
+        return isDisconnected;
+    }
+
     public void invoke(String initiator, boolean allowNotification) {
         try {
             if (Config.logFunctionCalls)

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java

@@ -58,7 +58,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSTreatment;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.DateUtil;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java

@@ -34,7 +34,7 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
@@ -51,6 +51,10 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
 
     private Handler mHandler;
 
+    //one shot guards
+    private boolean accepted;
+    private boolean okClicked;
+
     public NewTreatmentDialog() {
         HandlerThread mHandlerThread = new HandlerThread(NewTreatmentDialog.class.getSimpleName());
         mHandlerThread.start();
@@ -109,10 +113,15 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
     }
 
     @Override
-    public void onClick(View view) {
+    public synchronized void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
-
+                if (okClicked){
+                    log.debug("guarding: ok already clicked");
+                    dismiss();
+                    return;
+                }
+                okClicked = true;
                 try {
                     Double insulin = SafeParse.stringToDouble(editInsulin.getText());
                     final Integer carbs = SafeParse.stringToInt(editCarbs.getText());
@@ -132,43 +141,50 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     final int finalCarbsAfterConstraints = carbsAfterConstraints;
 
                     final Context context = getContext();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
 
                     builder.setTitle(this.getContext().getString(R.string.confirmation));
                     builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                            synchronized (builder) {
-                                final PumpInterface pump = MainApp.getConfigBuilder();
+                                if (accepted) {
-                                mHandler.post(new Runnable() {
+                                    log.debug("guarding: already accepted");
-                                    @Override
+                                    return;
-                                    public void run() {
+                                }
-                                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+                                accepted = true;
-                                        if (finalInsulinAfterConstraints == 0)
+                                if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                            detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
+                                    final PumpInterface pump = MainApp.getConfigBuilder();
-                                        if (finalCarbsAfterConstraints == 0)
+                                    mHandler.post(new Runnable() {
-                                            detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
+                                        @Override
-                                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                                        public void run() {
-                                        detailedBolusInfo.carbs = finalCarbsAfterConstraints;
+                                            DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                        detailedBolusInfo.context = context;
+                                            if (finalInsulinAfterConstraints == 0)
-                                        detailedBolusInfo.source = Source.USER;
+                                                detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
-                                        PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
+                                            if (finalCarbsAfterConstraints == 0)
-                                        if (!result.success) {
+                                                detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
-                                            try {
+                                            detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                            detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                            detailedBolusInfo.context = context;
-                                                builder.setMessage(result.comment);
+                                            detailedBolusInfo.source = Source.USER;
-                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                            PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
-                                                builder.show();
+                                            if (!result.success) {
-                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
+                                                try {
-                                                // window has been destroyed
+                                                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                    builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                MainApp.bus().post(new EventNewNotification(notification));
+                                                    builder.setMessage(result.comment);
+                                                    builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                    builder.show();
+                                                } catch (WindowManager.BadTokenException | NullPointerException e) {
+                                                    // window has been destroyed
+                                                    Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                    MainApp.bus().post(new EventNewNotification(notification));
+                                                }
                                             }
                                         }
-                                    }
+                                    });
-                                });
+                                    Answers.getInstance().logCustom(new CustomEvent("Bolus"));
-                                Answers.getInstance().logCustom(new CustomEvent("Bolus"));
+                                }
                             }
                         }
                     });

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -32,7 +32,6 @@ import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.mozilla.javascript.tools.debugger.Main;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +58,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
@@ -114,6 +113,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     Context context;
 
+    //one shot guards
+    private boolean accepted;
+    private boolean okClicked;
+
+
     public WizardDialog() {
         super();
         mHandlerThread = new HandlerThread(WizardDialog.class.getSimpleName());
@@ -297,9 +301,15 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     }
 
     @Override
-    public void onClick(View view) {
+    public synchronized void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
+                if (okClicked){
+                    log.debug("guarding: ok already clicked");
+                    dismiss();
+                    return;
+                }
+                okClicked = true;
                 if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
                     DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
 
@@ -327,56 +337,63 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                     final int carbTime = SafeParse.stringToInt(editCarbTime.getText());
                     final boolean useSuperBolus = superbolusCheckbox.isChecked();
 
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
                     builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
                     builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                            synchronized (builder) {
-                                final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
+                                if (accepted) {
-                                mHandler.post(new Runnable() {
+                                    log.debug("guarding: already accepted");
-                                    @Override
+                                    return;
-                                    public void run() {
+                                }
-                                        PumpEnactResult result;
+                                accepted = true;
-                                        if (useSuperBolus) {
+                                if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                            final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
+                                    final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
-                                            if (activeloop != null) {
+                                    mHandler.post(new Runnable() {
-                                                activeloop.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+                                        @Override
-                                                MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
+                                        public void run() {
+                                            PumpEnactResult result;
+                                            if (useSuperBolus) {
+                                                final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
+                                                if (activeloop != null) {
+                                                    activeloop.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+                                                    MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
+                                                }
+                                                pump.cancelTempBasal(true);
+                                                result = pump.setTempBasalAbsolute(0d, 120, true);
+                                                if (!result.success) {
+                                                    OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror), result.comment, null);
+                                                }
                                             }
-                                            pump.cancelTempBasal(true);
+                                            DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                            result = pump.setTempBasalAbsolute(0d, 120, true);
+                                            detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
+                                            detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                                            detailedBolusInfo.carbs = finalCarbsAfterConstraints;
+                                            detailedBolusInfo.context = context;
+                                            detailedBolusInfo.glucose = bg;
+                                            detailedBolusInfo.glucoseType = "Manual";
+                                            detailedBolusInfo.carbTime = carbTime;
+                                            detailedBolusInfo.boluscalc = boluscalcJSON;
+                                            detailedBolusInfo.source = Source.USER;
+                                            result = pump.deliverTreatment(detailedBolusInfo);
                                             if (!result.success) {
-                                                OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror), result.comment, null);
+                                                try {
+                                                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                                    builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    builder.setMessage(result.comment);
+                                                    builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                    builder.show();
+                                                } catch (WindowManager.BadTokenException | NullPointerException e) {
+                                                    // window has been destroyed
+                                                    Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                    MainApp.bus().post(new EventNewNotification(notification));
+                                                }
                                             }
                                         }
-                                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+                                    });
-                                        detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
+                                    Answers.getInstance().logCustom(new CustomEvent("Wizard"));
-                                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                                }
-                                        detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                        detailedBolusInfo.context = context;
-                                        detailedBolusInfo.glucose = bg;
-                                        detailedBolusInfo.glucoseType = "Manual";
-                                        detailedBolusInfo.carbTime = carbTime;
-                                        detailedBolusInfo.boluscalc = boluscalcJSON;
-                                        detailedBolusInfo.source = Source.USER;
-                                        result = pump.deliverTreatment(detailedBolusInfo);
-                                        if (!result.success) {
-                                            try {
-                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                builder.setMessage(result.comment);
-                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
-                                                builder.show();
-                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                                // window has been destroyed
-                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                                MainApp.bus().post(new EventNewNotification(notification));
-                                            }
-                                        }
-                                    }
-                                });
-                                Answers.getInstance().logCustom(new CustomEvent("Wizard"));
                             }
                         }
                     });

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -6,7 +6,6 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
-import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
@@ -37,11 +36,6 @@ import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.ValueDependentColor;
-import com.jjoe64.graphview.series.BarGraphSeries;
-import com.jjoe64.graphview.series.DataPoint;
-import com.jjoe64.graphview.series.LineGraphSeries;
-import com.jjoe64.graphview.series.Series;
 import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
@@ -50,7 +44,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -59,6 +52,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
@@ -109,8 +103,8 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.FixedLineGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.TimeAsXAxisLabelFormatter;
+import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileViewerDialog;
 import info.nightscout.utils.BolusWizard;
@@ -497,7 +491,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             NSUpload.uploadOpenAPSOffline(600);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor30m))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 30L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 30L * 60 * 1000);
             updateGUI("suspendmenu");
             sHandler.post(new Runnable() {
                 @Override
@@ -511,7 +505,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             NSUpload.uploadOpenAPSOffline(30);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor1h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 1 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 1 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
             sHandler.post(new Runnable() {
                 @Override
@@ -525,7 +519,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             NSUpload.uploadOpenAPSOffline(60);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor2h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
             sHandler.post(new Runnable() {
                 @Override
@@ -539,7 +533,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             NSUpload.uploadOpenAPSOffline(120);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor3h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
             sHandler.post(new Runnable() {
                 @Override
@@ -696,40 +690,48 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 final Double finalInsulinAfterConstraints = insulinAfterConstraints;
                 final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
                 final Context context = getContext();
-                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                final AtomicBoolean accepted = new AtomicBoolean(false);
                 builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
                 builder.setMessage(confirmMessage);
                 builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                        synchronized (accepted) {
-                            final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
+                            if(accepted.get()) {
-                            sHandler.post(new Runnable() {
+                                log.debug("Guarding: already accepted!");
-                                @Override
+                                return;
-                                public void run() {
+                            }
-                                    DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+                            accepted.set(true);
-                                    detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
+                            if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                    detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                                final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
-                                    detailedBolusInfo.carbs = finalCarbsAfterConstraints;
+                                sHandler.post(new Runnable() {
-                                    detailedBolusInfo.context = context;
+                                    @Override
-                                    detailedBolusInfo.boluscalc = boluscalcJSON;
+                                    public void run() {
-                                    detailedBolusInfo.source = Source.USER;
+                                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                    PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
+                                        detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
-                                    if (!result.success) {
+                                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                                        try {
+                                        detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                                        detailedBolusInfo.context = context;
-                                            builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                        detailedBolusInfo.boluscalc = boluscalcJSON;
-                                            builder.setMessage(result.comment);
+                                        detailedBolusInfo.source = Source.USER;
-                                            builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                        PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
-                                            builder.show();
+                                        if (!result.success) {
-                                        } catch (WindowManager.BadTokenException | NullPointerException e) {
+                                            try {
-                                            // window has been destroyed
+                                                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                                            Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                            MainApp.bus().post(new EventNewNotification(notification));
+                                                builder.setMessage(result.comment);
+                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                builder.show();
+                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
+                                                // window has been destroyed
+                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
+                                                MainApp.bus().post(new EventNewNotification(notification));
+                                            }
                                         }
                                     }
-                                }
+                                });
-                            });
+                                Answers.getInstance().logCustom(new CustomEvent("QuickWizard"));
-                            Answers.getInstance().logCustom(new CustomEvent("QuickWizard"));
+                            }
                         }
                     }
                 });

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java

@@ -13,6 +13,7 @@ import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
 import info.nightscout.utils.SP;
 
 /**

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventNewNotification.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
 import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 
 /**
  * Created by mike on 03.12.2016.

app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java

@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.Overview.notifications;
+
+import android.app.IntentService;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.support.annotation.Nullable;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
+
+public class DismissNotificationService extends IntentService {
+
+    /**
+     * Creates an IntentService.  Invoked by your subclass's constructor.
+     *
+     * @param name Used to name the worker thread, important only for debugging.
+     */
+    public DismissNotificationService(String name) {
+        super(name);
+    }
+
+    public DismissNotificationService(){
+        super("DismissNotificationService");
+    };
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+        MainApp.bus().post(new EventDismissNotification(intent.getIntExtra("alertID", -1)));
+    }
+
+    public static PendingIntent deleteIntent(int id){
+        Intent intent = new Intent(MainApp.instance(), DismissNotificationService.class);
+        intent.putExtra("alertID", id);
+        return PendingIntent.getService(MainApp.instance(), id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java

@@ -1,5 +1,5 @@
 
-package info.nightscout.androidaps.plugins.Overview;
+package info.nightscout.androidaps.plugins.Overview.notifications;
 
 import java.util.Date;
 

app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.Overview;
+package info.nightscout.androidaps.plugins.Overview.notifications;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -21,8 +21,6 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.Services.AlarmSoundService;
-import info.nightscout.androidaps.plugins.Wear.WearPlugin;
-//Added by Rumen for snooze time
 import info.nightscout.utils.SP;
 
 /**
@@ -57,20 +55,16 @@ public class NotificationStore {
             }
         }
 
-        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_raise_urgent_alarms_as_android_notification), false)
-                && n.level == Notification.URGENT) {
-            raiseSystemNotification(n);
-        } else if (n.soundId != null) {
-            Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
-            alarm.putExtra("soundid", n.soundId);
-            MainApp.instance().startService(alarm);
-        }
-
         store.add(n);
 
-        WearPlugin wearPlugin = MainApp.getSpecificPlugin(WearPlugin.class);
+        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_raise_notifications_as_android_notifications), false)) {
-        if(wearPlugin!= null && wearPlugin.isEnabled()) {
+            raiseSystemNotification(n);
-            wearPlugin.overviewNotification(n.id, "OverviewNotification:\n" + n.text);
+        } else {
+            if (n.soundId != null) {
+                Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
+                alarm.putExtra("soundid", n.soundId);
+                MainApp.instance().startService(alarm);
+            }
         }
 
         Collections.sort(store, new NotificationComparator());
@@ -85,14 +79,22 @@ public class NotificationStore {
                 new NotificationCompat.Builder(context)
                         .setSmallIcon(R.drawable.ic_notification)
                         .setLargeIcon(largeIcon)
-                        .setContentTitle("Urgent alarm")
                         .setContentText(n.text)
-                        .setPriority(NotificationCompat.PRIORITY_HIGH)
+                        .setPriority(NotificationCompat.PRIORITY_MAX)
-                        .setVibrate(new long[] { 1000, 1000, 1000, 1000})
+                        .setDeleteIntent(DismissNotificationService.deleteIntent(n.id));
-                        .setSound(sound, AudioAttributes.USAGE_ALARM);
+        if (n.level == Notification.URGENT) {
+            notificationBuilder.setVibrate(new long[]{1000, 1000, 1000, 1000})
+                    .setContentTitle(MainApp.sResources.getString(R.string.urgent_alarm))
+                    .setSound(sound, AudioAttributes.USAGE_ALARM);
+        } else {
+            notificationBuilder.setVibrate(new long[]{0, 100, 50, 100, 50})
+                    .setContentTitle(MainApp.sResources.getString(R.string.info))
+            ;
+        }
         mgr.notify(n.id, notificationBuilder.build());
     }
 
+
     public boolean remove(int id) {
         for (int i = 0; i < store.size(); i++) {
             if (get(i).id == id) {
@@ -131,3 +133,4 @@ public class NotificationStore {
         }
     }
 }
+

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java

@@ -38,7 +38,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
@@ -229,7 +229,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0 && pump.isExtendedBolusEnabled;
+        return pump.lastConnection.getTime() > 0 && pump.isExtendedBolusEnabled && pump.maxBasal > 0;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolus.java

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfile.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 public class MsgSetBasalProfile extends MessageBase {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfile.java

@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.comm;
 
-import com.j256.ormlite.stmt.query.Not;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 public class MsgSetSingleBasalProfile extends MessageBase {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java

@@ -79,7 +79,7 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -38,7 +38,7 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBasic_k.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBolus_k.java

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java

@@ -70,7 +70,7 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.SerialIOThread;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingBasal_k;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -36,7 +36,7 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java

@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java

@@ -8,7 +8,7 @@ import com.cozmo.danar.util.BleCommandUtil;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java

@@ -6,11 +6,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 
 public class DanaRS_Packet_General_Get_Pump_Check extends DanaRS_Packet {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java

@@ -24,7 +24,7 @@ import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -38,7 +38,7 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java

@@ -34,7 +34,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java

@@ -35,7 +35,7 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java

@@ -9,9 +9,7 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.PowerManager;
-import android.preference.PreferenceManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,39 +18,84 @@ import java.util.Date;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.utils.SP;
 
 public class KeepAliveReceiver extends BroadcastReceiver {
+    public static final long STATUS_UPDATE_FREQUENCY = 15 * 60 * 1000L;
     private static Logger log = LoggerFactory.getLogger(KeepAliveReceiver.class);
 
+    // TODO consider moving this into an Alarms plugin that works offline and can be configured
+    // (e.g. override silent mode at night only)
+
+    private static int missedReadingsThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_missed_bg_readings_threshold), 30) * 60 * 1000;
+    }
+
+    private static int pumpUnreachableThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_pump_unreachable_threshold), 30) * 60 * 1000;
+    }
+
     @Override
     public void onReceive(Context context, Intent rIntent) {
         PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "");
         wl.acquire();
 
+        shortenSnoozeInterval();
+        checkBg();
+        checkPump();
 
+        log.debug("KeepAlive received");
+        wl.release();
+    }
+
+    private void checkBg() {
+        BgReading bgReading = DatabaseHelper.lastBg();
+        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
+        && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
+                && SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
+            Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
+            n.soundId = R.raw.alarm;
+            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold());
+            MainApp.bus().post(new EventNewNotification(n));
+        }
+    }
+
+    private void checkPump() {
         final PumpInterface pump = MainApp.getConfigBuilder();
         final Profile profile = MainApp.getConfigBuilder().getProfile();
         if (pump != null && profile != null && profile.getBasal() != null) {
-            boolean isBasalOutdated = false;
-            boolean isStatusOutdated = false;
-
             Date lastConnection = pump.lastDataTime();
-            if (lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis())
-                isStatusOutdated = true;
-            if (Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep)
-                isBasalOutdated = true;
 
-            SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
+            boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis();
+            boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
+
+            boolean alarmTimeoutExpired = lastConnection.getTime() + pumpUnreachableThreshold() < System.currentTimeMillis();
+            boolean nextAlarmOccurrenceReached = SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis();
+
+            if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_pump_unreachable_alert), true)
+                    && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && ! ConfigBuilderPlugin.getActiveLoop().isDisconnected()) {
+                Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
+                n.soundId = R.raw.alarm;
+                SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold());
+                MainApp.bus().post(new EventNewNotification(n));
+            }
+
             if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
                 Thread t = new Thread(new Runnable() {
                     @Override
                     public void run() {
                         pump.setNewBasalProfile(profile);
                     }
-                });
+                }, "pump-update-basal-profile");
                 t.start();
             } else if (isStatusOutdated && !pump.isBusy()) {
                 Thread t = new Thread(new Runnable() {
@@ -60,7 +103,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                     public void run() {
                         pump.refreshDataFromPump("KeepAlive. Status outdated.");
                     }
-                });
+                }, "pump-refresh");
                 t.start();
             } else if (isBasalOutdated && !pump.isBusy()) {
                 Thread t = new Thread(new Runnable() {
@@ -68,16 +111,18 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                     public void run() {
                         pump.refreshDataFromPump("KeepAlive. Basal outdated.");
                     }
-                });
+                }, "pump-refresh");
                 t.start();
             }
         }
-
-        log.debug("KeepAlive received");
-        wl.release();
     }
 
+    //called by MainAPP at first app start
     public void setAlarm(Context context) {
+
+        shortenSnoozeInterval();
+        presnoozeAlarms();
+
         AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         Intent i = new Intent(context, KeepAliveReceiver.class);
         PendingIntent pi = PendingIntent.getBroadcast(context, 0, i, 0);
@@ -89,10 +134,34 @@ public class KeepAliveReceiver extends BroadcastReceiver {
         am.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), Constants.keepAliveMsecs, pi);
     }
 
+    /*Presnoozes the alarms with 5 minutes if no snooze exists.
+     * Call only at startup!
+     */
+    public void presnoozeAlarms() {
+        if(SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()){
+            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5*60*1000);
+        }
+        if(SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis()){
+            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + 5*60*1000);
+        }
+    }
+
     public void cancelAlarm(Context context) {
         Intent intent = new Intent(context, KeepAliveReceiver.class);
         PendingIntent sender = PendingIntent.getBroadcast(context, 0, intent, 0);
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         alarmManager.cancel(sender);
     }
+
+    static void shortenSnoozeInterval() {
+        //shortens alarm times in case of setting changes or future data
+        long nextMissedReadingsAlarm = SP.getLong("nextMissedReadingsAlarm", 0L);
+        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm);
+        SP.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm);
+
+        long nextPumpDisconnectedAlarm = SP.getLong("nextPumpDisconnectedAlarm", 0L);
+        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm);
+        SP.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm);
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/receivers/NSAlarmReceiver.java

@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.Services.Intents;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSAlarm;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 

app/src/main/java/info/nightscout/utils/ToastUtils.java

@@ -7,7 +7,7 @@ import android.os.Looper;
 import android.widget.Toast;
 
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 

app/src/main/res/values/strings.xml

@@ -801,5 +801,19 @@
     <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
     <string name="combo_pump_battery_low_warrning">Pump battery is low</string>
     <string name="combo_is_in_error_state">Pump is in an error state, please check the pump</string>
+    <string name="pump_unreachable">Pump unreachable</string>
+    <string name="missed_bg_readings">Missed BG readings</string>
+    <string name="key_raise_notifications_as_android_notifications" translatable="false">raise_urgent_alarms_as_android_notification</string>
+    <string name="raise_notifications_as_android_notifications">Use system notifications for alerts and notifications</string>
+    <string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
+    <string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
+    <string name="localalertsettings_title">Local alerts</string>
+    <string name="enable_missed_bg_readings_alert">Alert if no BG data is received</string>
+    <string name="enable_pump_unreachable_alert">Alert if pump is unreachable</string>
+    <string name="pump_unreachable_threshold">Pump unreachable threshold [min]</string>
+    <string name="key_pump_unreachable_threshold" translatable="false">pump_unreachable_threshold</string>
+    <string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
+    <string name="urgent_alarm">Urgent Alarm</string>
+    <string name="info">INFO</string>
 </resources>
 

app/src/main/res/xml/pref_others.xml

@@ -72,4 +72,33 @@
             android:key="short_tabtitles"
             android:title="@string/short_tabtitles"/>
     </PreferenceCategory>
+    <PreferenceScreen
+        android:title="@string/localalertsettings_title">
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enable_missed_bg_readings_alert"
+            android:title="@string/enable_missed_bg_readings_alert"/>
+        <EditTextPreference
+            android:title="@string/nsalarm_staledatavalue_label"
+            android:key="@string/key_missed_bg_readings_threshold"
+            android:dependency="@string/key_enable_missed_bg_readings_alert"
+            android:defaultValue="30"
+            android:inputType="number">
+        </EditTextPreference>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_enable_pump_unreachable_alert"
+            android:title="@string/enable_pump_unreachable_alert"/>
+        <EditTextPreference
+            android:title="@string/pump_unreachable_threshold"
+            android:key="@string/key_pump_unreachable_threshold"
+            android:dependency="@string/key_enable_pump_unreachable_alert"
+            android:defaultValue="30"
+            android:inputType="number">
+        </EditTextPreference>
+    </PreferenceScreen>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/key_raise_notifications_as_android_notifications"
+        android:title="@string/raise_notifications_as_android_notifications"/>
 </PreferenceScreen>

app/src/main/res/xml/pref_wear.xml

@@ -22,12 +22,6 @@
             android:title="@string/wear_showbgi_title"
             android:summary="@string/wear_showbgi_summary"/>
 
-        <SwitchPreference
+            </PreferenceCategory>
-            android:defaultValue="false"
-            android:key="wear_overview_notification"
-            android:title="@string/wear_overviewnotifications"
-            android:summary="@string/wear_overviewnotifications_summary"/>
-
-    </PreferenceCategory>
 
 </PreferenceScreen>