From ef6ee43c326c96ab97cc800a9128e7e530eb86bd Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 2 Jun 2018 18:06:04 +0200
Subject: [PATCH] One-short guards for Fill/Prime dialog.

---
 .../plugins/Actions/dialogs/FillDialog.java   | 69 ++++++++++++-------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
index 7b9b8570d6..558a7c381c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
@@ -61,6 +61,10 @@ public class FillDialog extends DialogFragment implements OnClickListener {
 
     private EditText notesEdit;
 
+    //one shot guards
+    private boolean accepted;
+    private boolean okClicked;
+
     final private TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void afterTextChanged(Editable s) {
@@ -163,7 +167,14 @@ public class FillDialog extends DialogFragment implements OnClickListener {
 
     }
 
-    private void confirmAndDeliver() {
+    private synchronized void confirmAndDeliver() {
+        if (okClicked) {
+            log.debug("guarding: ok already clicked");
+            dismiss();
+            return;
+        }
+        okClicked = true;
+
         try {
             Double insulin = SafeParse.stringToDouble(editInsulin.getText());
 
@@ -198,32 +209,40 @@ public class FillDialog extends DialogFragment implements OnClickListener {
             if (insulinAfterConstraints > 0 || pumpSiteChangeCheckbox.isChecked() || insulinCartridgeChangeCheckbox.isChecked()) {
                 builder.setMessage(Html.fromHtml(Joiner.on("<br/>").join(confirmMessage)));
                 builder.setPositiveButton(MainApp.gs(R.string.primefill), (dialog, id) -> {
-                    if (finalInsulinAfterConstraints > 0) {
-                        DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                        detailedBolusInfo.insulin = finalInsulinAfterConstraints;
-                        detailedBolusInfo.context = context;
-                        detailedBolusInfo.source = Source.USER;
-                        detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
-                        detailedBolusInfo.notes = notes;
-                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                            @Override
-                            public void run() {
-                                if (!result.success) {
-                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                    i.putExtra("soundid", R.raw.boluserror);
-                                    i.putExtra("status", result.comment);
-                                    i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
-                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    MainApp.instance().startActivity(i);
+                    synchronized (builder) {
+                        if (accepted) {
+                            log.debug("guarding: already accepted");
+                            return;
+                        }
+                        accepted = true;
+
+                        if (finalInsulinAfterConstraints > 0) {
+                            DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+                            detailedBolusInfo.insulin = finalInsulinAfterConstraints;
+                            detailedBolusInfo.context = context;
+                            detailedBolusInfo.source = Source.USER;
+                            detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
+                            detailedBolusInfo.notes = notes;
+                            ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                @Override
+                                public void run() {
+                                    if (!result.success) {
+                                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                        i.putExtra("soundid", R.raw.boluserror);
+                                        i.putExtra("status", result.comment);
+                                        i.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
+                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                        MainApp.instance().startActivity(i);
+                                    }
                                 }
-                            }
-                        });
-                        FabricPrivacy.getInstance().logCustom(new CustomEvent("Fill"));
+                            });
+                            FabricPrivacy.getInstance().logCustom(new CustomEvent("Fill"));
+                        }
+                        if (pumpSiteChangeCheckbox.isChecked())
+                            NSUpload.uploadEvent(CareportalEvent.SITECHANGE, now(), notes);
+                        if (insulinCartridgeChangeCheckbox.isChecked())
+                            NSUpload.uploadEvent(CareportalEvent.INSULINCHANGE, now() + 1000, notes);
                     }
-                    if (pumpSiteChangeCheckbox.isChecked())
-                        NSUpload.uploadEvent(CareportalEvent.SITECHANGE, now(), notes);
-                    if (insulinCartridgeChangeCheckbox.isChecked())
-                        NSUpload.uploadEvent(CareportalEvent.INSULINCHANGE, now() + 1000, notes);
                 });
             } else {
                 builder.setMessage(MainApp.gs(R.string.no_action_selected));