alarm for failed bolus

app/src/main/AndroidManifest.xml

@@ -42,6 +42,9 @@
         <activity
             android:name=".plugins.Overview.Dialogs.BolusProgressHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
+       <activity
+            android:name=".plugins.Overview.Dialogs.ErrorHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
         <activity android:name=".AgreementActivity" />
         <activity android:name=".plugins.PumpDanaR.activities.DanaRHistoryActivity" />
         <activity android:name=".plugins.PumpDanaR.activities.DanaRStatsActivity" />

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

@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.Overview.Dialogs;
+
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.Services.AlarmSoundService;
+
+public class ErrorDialog extends DialogFragment implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(ErrorDialog.class);
+    Button okButton;
+    TextView statusView;
+    ErrorHelperActivity helperActivity;
+
+    static String status;
+    static String title;
+    static int soundId;
+
+    public ErrorDialog() {
+        super();
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setSound(int soundId) {
+        this.soundId = soundId;
+    }
+
+    public void setHelperActivity(ErrorHelperActivity activity) {
+        this.helperActivity = activity;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        getDialog().setTitle(title);
+        View view = inflater.inflate(R.layout.overview_error_dialog, container, false);
+        okButton = (Button) view.findViewById(R.id.overview_error_ok);
+        statusView = (TextView) view.findViewById(R.id.overview_error_status);
+        okButton.setOnClickListener(this);
+        setCancelable(false);
+
+        Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
+        alarm.putExtra("soundid", soundId);
+        MainApp.instance().startService(alarm);
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getDialog() != null)
+            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        statusView.setText(status);
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if (helperActivity != null) {
+            helperActivity.finish();
+        }
+        Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
+        MainApp.instance().stopService(alarm);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.overview_error_ok:
+                log.debug("Error dialog ok button pressed");
+                dismiss();
+                break;
+        }
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.Overview.Dialogs;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class ErrorHelperActivity extends AppCompatActivity {
+    public ErrorHelperActivity() {
+        super();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ErrorDialog errorDialog = new ErrorDialog();
+        errorDialog.setHelperActivity(this);
+        errorDialog.setStatus(getIntent().getStringExtra("status"));
+        errorDialog.setSound(getIntent().getIntExtra("soundid", 0));
+        errorDialog.setTitle(getIntent().getStringExtra("title"));
+        errorDialog.show(this.getSupportFragmentManager(), "Error");
+    }
+}

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

@@ -2,9 +2,8 @@ package info.nightscout.androidaps.plugins.Overview.Dialogs;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -30,12 +29,11 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-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.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
@@ -49,12 +47,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
     private Integer maxCarbs;
     private Double maxInsulin;
 
-    private Handler mHandler;
-
     public NewTreatmentDialog() {
-        HandlerThread mHandlerThread = new HandlerThread(NewTreatmentDialog.class.getSimpleName());
-        mHandlerThread.start();
-        this.mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     final private TextWatcher textWatcher = new TextWatcher() {
@@ -139,32 +132,25 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                final PumpInterface pump = MainApp.getConfigBuilder();
+                                DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                mHandler.post(new Runnable() {
+                                if (finalInsulinAfterConstraints == 0)
+                                    detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
+                                if (finalCarbsAfterConstraints == 0)
+                                    detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
+                                detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                                detailedBolusInfo.carbs = finalCarbsAfterConstraints;
+                                detailedBolusInfo.context = context;
+                                detailedBolusInfo.source = Source.USER;
+                                ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                     @Override
                                     public void run() {
-                                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                                        if (finalInsulinAfterConstraints == 0)
-                                            detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
-                                        if (finalCarbsAfterConstraints == 0)
-                                            detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
-                                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                                        detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                        detailedBolusInfo.context = context;
-                                        detailedBolusInfo.source = Source.USER;
-                                        PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
                                         if (!result.success) {
-                                            try {
+                                            Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                            i.putExtra("soundid", R.raw.boluserror);
-                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                            i.putExtra("status", result.comment);
-                                                builder.setMessage(result.comment);
+                                            i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                builder.show();
+                                            MainApp.instance().startActivity(i);
-                                            } 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));
-                                            }
                                         }
                                     }
                                 });

app/src/main/res/layout/overview_error_dialog.xml

@@ -0,0 +1,24 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorDialog"
+    android:paddingTop="15dp"
+    android:paddingBottom="15dp">
+
+    <TextView
+        android:id="@+id/overview_error_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal" />
+
+    <Button
+        android:id="@+id/overview_error_ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="30dp"
+        android:text="@string/ok" />
+
+</LinearLayout>