UI log category, BolusProgressDialog detailed log

app/src/main/java/info/nightscout/androidaps/logging/L.java

@@ -94,6 +94,7 @@ public class L {
     public static final String APS = "APS";
     public static final String PROFILE = "PROFILE";
     public static final String CONFIGBUILDER = "CONFIGBUILDER";
+    public static final String UI = "UI";
 
     private static void initialize() {
         logElements = new ArrayList<>();
@@ -116,6 +117,7 @@ public class L {
         logElements.add(new LogElement(PUMPBTCOMM, false));
         logElements.add(new LogElement(PUMPCOMM, true));
         logElements.add(new LogElement(PUMPQUEUE, true));
+        logElements.add(new LogElement(UI, true));
     }
 
 }

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

@@ -20,12 +20,13 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 
 public class BolusProgressDialog extends DialogFragment implements View.OnClickListener {
-    private static Logger log = LoggerFactory.getLogger(BolusProgressDialog.class);
+    private static Logger log = LoggerFactory.getLogger(L.UI);
     Button stopButton;
     TextView statusView;
     TextView stopPressedView;
@@ -70,7 +71,9 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     @Override
     public void onResume() {
         super.onResume();
-        if(!ConfigBuilderPlugin.getCommandQueue().bolusInQueue()) {
+        if (L.isEnabled(L.UI))
+            log.debug("onResume");
+        if (!ConfigBuilderPlugin.getCommandQueue().bolusInQueue()) {
             bolusEnded = true;
         }
         if (bolusEnded) {
@@ -80,17 +83,22 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
                 getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             MainApp.subscribe(this);
             running = true;
+            if (L.isEnabled(L.UI))
+                log.debug("onResume running");
         }
     }
 
     @Override
     public void dismiss() {
+        if (L.isEnabled(L.UI))
+            log.debug("dismiss");
         try {
             super.dismiss();
         } catch (IllegalStateException e) {
             // dialog not running yet. onResume will try again. Set bolusEnded to make extra
             // sure onResume will catch this
             bolusEnded = true;
+            log.error("Unhandled exception", e);
         }
         if (helperActivity != null) {
             helperActivity.finish();
@@ -102,13 +110,16 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         super.onPause();
         MainApp.unsubscribe(this);
         running = false;
+        if (L.isEnabled(L.UI))
+            log.debug("onPause");
     }
 
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.overview_bolusprogress_stop:
-                log.debug("Stop bolus delivery button pressed");
+                if (L.isEnabled(L.UI))
+                    log.debug("Stop bolus delivery button pressed");
                 stopPressed = true;
                 stopPressedView.setVisibility(View.VISIBLE);
                 stopButton.setVisibility(View.INVISIBLE);
@@ -122,7 +133,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         Activity activity = getActivity();
         if (activity != null) {
             activity.runOnUiThread(() -> {
-                log.debug("Status: " + ev.status + " Percent: " + ev.percent);
+                if (L.isEnabled(L.UI))
+                    log.debug("Status: " + ev.status + " Percent: " + ev.percent);
                 statusView.setText(ev.status);
                 progressBar.setProgress(ev.percent);
                 if (ev.percent == 100) {
@@ -135,6 +147,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
 
     @Subscribe
     public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
+        if (L.isEnabled(L.UI))
+            log.debug("EventDismissBolusprogressIfRunning");
         if (BolusProgressDialog.running) {
             dismiss();
         }
@@ -142,6 +156,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
 
     @Subscribe
     public void onStatusEvent(final EventPumpStatusChanged c) {
+        if (L.isEnabled(L.UI))
+            log.debug("EventPumpStatusChanged");
         Activity activity = getActivity();
         if (activity != null) {
             activity.runOnUiThread(() -> statusView.setText(c.textStatus()));
@@ -149,18 +165,25 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     }
 
     private void scheduleDismiss() {
+        if (L.isEnabled(L.UI))
+            log.debug("scheduleDismiss");
         Thread t = new Thread(() -> {
             SystemClock.sleep(5000);
             BolusProgressDialog.bolusEnded = true;
             Activity activity = getActivity();
             if (activity != null) {
                 activity.runOnUiThread(() -> {
+                    if (L.isEnabled(L.UI))
+                        log.debug("executing");
                     try {
                         dismiss();
                     } catch (Exception e) {
                         log.error("Unhandled exception", e);
                     }
                 });
+            } else {
+                if (L.isEnabled(L.UI))
+                    log.debug("activity == null");
             }
         });
         t.start();