fix exception

boikonur · Oct 17, 2019 · 3b1f629 · 3b1f629
1 parent dd00230
commit 3b1f629
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/...java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java b/...java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java
@@ -23,7 +23,7 @@
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -101,10 +101,10 @@ public void onResume() {
                 .subscribe(event -> statusView.setText(event.getStatus()), FabricPrivacy::logException)
         );
         disposable.add(RxBus.INSTANCE
-                .toObservable(EventDismissBolusprogressIfRunning.class)
+                .toObservable(EventDismissBolusProgressIfRunning.class)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(event -> {
-                    if (L.isEnabled(L.UI)) log.debug("EventDismissBolusprogressIfRunning");
+                    if (L.isEnabled(L.UI)) log.debug("EventDismissBolusProgressIfRunning");
                     if (BolusProgressDialog.running) dismiss();
                 }, FabricPrivacy::logException)
         );

diff --git a/...nts/EventDismissBolusprogressIfRunning.kt → ...nts/EventDismissBolusProgressIfRunning.kt b/...nts/EventDismissBolusprogressIfRunning.kt → ...nts/EventDismissBolusProgressIfRunning.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.general.overview.events
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.events.Event
 
-class EventDismissBolusprogressIfRunning(val result: PumpEnactResult) : Event()
+class EventDismissBolusProgressIfRunning(val result: PumpEnactResult?) : Event()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.java
@@ -18,7 +18,7 @@
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
@@ -139,7 +139,7 @@ protected void onStart() {
                         }, FabricPrivacy::logException
                 ));
         disposable.add(RxBus.INSTANCE
-                .toObservable(EventDismissBolusprogressIfRunning.class)
+                .toObservable(EventDismissBolusProgressIfRunning.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                             if (event.getResult() == null) return;

diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
@@ -27,7 +27,7 @@
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.BolusProgressHelperActivity;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -275,7 +275,7 @@ public void setTBROverNotification(Callback callback, boolean enable) {
 
     public synchronized void cancelAllBoluses() {
         if (!isRunning(Command.CommandType.BOLUS)) {
-            RxBus.INSTANCE.send(new EventDismissBolusprogressIfRunning(new PumpEnactResult().success(true).enacted(false)));
+            RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(new PumpEnactResult().success(true).enacted(false)));
         }
         removeAll(Command.CommandType.BOLUS);
         removeAll(Command.CommandType.SMB_BOLUS);

diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -16,7 +16,7 @@
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
@@ -68,7 +68,7 @@ public final void run() {
                 long secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000;
 
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
-                    RxBus.INSTANCE.send(new EventDismissBolusprogressIfRunning(null));
+                    RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(null));
                     RxBus.INSTANCE.send(new EventPumpStatusChanged(MainApp.gs(R.string.connectiontimedout)));
                     if (L.isEnabled(L.PUMPQUEUE))
                         log.debug("timed out");

diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
@@ -3,14 +3,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 
@@ -34,7 +33,7 @@ public void execute() {
         PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().deliverTreatment(detailedBolusInfo);
 
         BolusProgressDialog.bolusEnded = true;
-        RxBus.INSTANCE.send(new EventDismissBolusprogressIfRunning(r));
+        RxBus.INSTANCE.send(new EventDismissBolusProgressIfRunning(r));
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result success: " + r.success + " enacted: " + r.enacted);