Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java

@@ -200,15 +200,28 @@ public class OmnipodManager {
         }
     }
 
+    // CAUTION: cancels temp basal and then sets new temp basal. An OmnipodException[certainFailure=false] indicates that the pod might have cancelled the previous temp basal, but did not set a new temp basal
     public synchronized void setTemporaryBasal(TempBasalPair tempBasalPair, boolean acknowledgementBeep, boolean completionBeep) {
         assertReadyForDelivery();
 
         logStartingCommandExecution("setTemporaryBasal [tempBasalPair=" + tempBasalPair + ", acknowledgementBeep=" + acknowledgementBeep + ", completionBeep=" + completionBeep + "]");
 
+        try {
+            cancelDelivery(EnumSet.of(DeliveryType.TEMP_BASAL), acknowledgementBeep);
+        } catch (Exception ex) {
+            logCommandExecutionFinished("setTemporaryBasal");
+            throw ex;
+        }
+
         try {
             executeAndVerify(() -> communicationService.executeAction(new SetTempBasalAction(
                     podState, tempBasalPair.getInsulinRate(), Duration.standardMinutes(tempBasalPair.getDurationMinutes()),
                     acknowledgementBeep, completionBeep)));
+        } catch (OmnipodException ex) {
+            // Treat all exceptions as uncertain failures, because all delivery has been suspended here.
+            // Setting this to an uncertain failure will enable for the user to get an appropriate warning
+            ex.setCertainFailure(false);
+            throw ex;
         } finally {
             logCommandExecutionFinished("setTemporaryBasal");
         }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java

@@ -217,7 +217,6 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         long time = System.currentTimeMillis();
         try {
             delegate.deactivatePod();
-            addSuccessToHistory(time, PodHistoryEntryType.DeactivatePod, null);
         } catch (Exception ex) {
             String comment = handleAndTranslateException(ex);
             podInitReceiver.returnInitTaskStatus(PodInitActionType.DeactivatePodWizardStep, false, comment);
@@ -225,6 +224,10 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
             return new PumpEnactResult().success(false).enacted(false).comment(comment);
         }
 
+        addSuccessToHistory(time, PodHistoryEntryType.DeactivatePod, null);
+
+        reportImplicitlyCanceledTbr();
+
         podInitReceiver.returnInitTaskStatus(PodInitActionType.DeactivatePodWizardStep, true, null);
 
         OmnipodUtil.setPodSessionState(null);
@@ -264,6 +267,8 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
     public PumpEnactResult resetPodStatus() {
         delegate.resetPodState();
 
+        reportImplicitlyCanceledTbr();
+
         OmnipodUtil.setPodSessionState(null);
 
         addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.ResetPodState, null);
@@ -348,6 +353,10 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
             delegate.setTemporaryBasal(tempBasalPair, beepsEnabled, beepsEnabled);
             time = System.currentTimeMillis();
         } catch (Exception ex) {
+            if ((ex instanceof OmnipodException) && !((OmnipodException) ex).isCertainFailure()) {
+                addToHistory(time, PodHistoryEntryType.SetTemporaryBasal, "Uncertain failure", false);
+                return new PumpEnactResult().success(false).enacted(false).comment(getStringResource(R.string.omnipod_error_set_temp_basal_failed_uncertain));
+            }
             String comment = handleAndTranslateException(ex);
             addFailureToHistory(time, PodHistoryEntryType.SetTemporaryBasal, comment);
             return new PumpEnactResult().success(false).enacted(false).comment(comment);

app/src/main/res/values/strings.xml

@@ -1762,10 +1762,10 @@
     <string name="omnipod_alert_low_reservoir">Low reservoir</string>
     <string name="omnipod_alert_unknown_alert">Unknown alert</string>
     <string name="omnipod_error_set_basal_failed_uncertain">Setting basal profile might have failed. Delivery might be suspended! Please refresh Pod status.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Setting temp basal might have failed. If there was a temp basal already running, that may have been cancelled! Please refresh pod status.</string>
     <string name="omnipod_error_set_time_failed_uncertain">Setting time might have failed. Delivery might be suspended! Please refresh Pod status.</string>
     <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please verify that your Pod is bolusing or cancel the bolus.</string>
     <string name="omnipod_rl_stats">RL Stats</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
 
-
 </resources>