From 618e00d71d3f1f828e4b79f7f5691e4af32e4ae7 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 13 Dec 2017 15:10:30 +0100
Subject: [PATCH] Update bolus progress dialog when recovery kicks in.

---
 .../androidaps/plugins/PumpCombo/ComboPlugin.java  | 14 +++++++++++---
 .../de/jotomo/ruffy/spi/BolusProgressReporter.java |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index 01daaddb58..c88d954dee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -404,6 +404,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
             case STOPPED:
                 event.status = MainApp.sResources.getString(R.string.bolusstopped);
                 break;
+            case RECOVERING:
+                event.status = "Connection was interrupted. Please wait while recovery takes place.";
             case FINISHED:
                 // no state, just percent below to close bolus progress dialog
                 break;
@@ -466,11 +468,15 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
                 return new PumpEnactResult().success(true).enacted(false);
             }
 
+            BolusProgressReporter progressReporter = detailedBolusInfo.isSMB ? nullBolusProgressReporter : ComboPlugin.bolusProgressReporter;
+
             // start bolus delivery
             bolusInProgress = true;
             CommandResult bolusCmdResult = runCommand(null, 0,
-                    () -> ruffyScripter.deliverBolus(detailedBolusInfo.insulin,
-                            detailedBolusInfo.isSMB ? nullBolusProgressReporter : bolusProgressReporter));
+                    () -> {
+                        return ruffyScripter.deliverBolus(detailedBolusInfo.insulin,
+                                progressReporter);
+                    });
             bolusInProgress = false;
 
             if (bolusCmdResult.success) {
@@ -485,6 +491,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
                         .bolusDelivered(bolusCmdResult.delivered)
                         .carbsDelivered(detailedBolusInfo.carbs);
             } else {
+                progressReporter.report(BolusProgressReporter.State.RECOVERING, 0, 0);
                 return recoverFromErrorDuringBolusDelivery(detailedBolusInfo, pumpTimeWhenBolusWasRequested);
             }
         } finally {
@@ -509,7 +516,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
      */
     private PumpEnactResult recoverFromErrorDuringBolusDelivery(DetailedBolusInfo detailedBolusInfo, long pumpTimeWhenBolusWasRequested) {
         log.debug("Trying to determine from pump history what was actually delivered");
-        CommandResult readLastBolusResult = runCommand(MainApp.sResources.getString(R.string.combo_activity_verifying_delivered_bolus), 3,
+        CommandResult readLastBolusResult = runCommand(null , 3,
                 () -> ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(PumpHistoryRequest.LAST)));
         if (!readLastBolusResult.success || readLastBolusResult.history == null) {
             // this happens when the cartridge runs empty during delivery, the pump will be in an error
@@ -520,6 +527,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
 
         List<Bolus> bolusHistory = readLastBolusResult.history.bolusHistory;
         Bolus lastBolus = !bolusHistory.isEmpty() ? bolusHistory.get(0) : null;
+        log.debug("Last bolus read from history: " + lastBolus + ", request time: " + pumpTimeWhenBolusWasRequested);
 
         if (lastBolus == null // no bolus ever given
                 || lastBolus.timestamp < pumpTimeWhenBolusWasRequested // this is not the bolus you're looking for
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
index 7539513120..645d126c75 100644
--- a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
+++ b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
@@ -7,6 +7,7 @@ public interface BolusProgressReporter {
         DELIVERED,
         STOPPING,
         STOPPED,
+        RECOVERING,
         FINISHED
     }