From 1c8c49e61e1e57d8a765a0779c07e6dea2f8b202 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Thu, 26 Dec 2019 13:47:24 -0500
Subject: [PATCH] Ignore Pod fault when cancelling delivery before deactivating
 pod

---
 .../pump/omnipod/comm/action/DeactivatePodAction.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
index 24dc6cbcb0..e88fafdb6c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.Sta
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.DeliveryType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
 import info.nightscout.androidaps.plugins.pump.omnipod.exception.ActionInitializationException;
+import info.nightscout.androidaps.plugins.pump.omnipod.exception.PodFaultException;
 
 public class DeactivatePodAction implements OmnipodAction<StatusResponse> {
     private final PodSessionState podState;
@@ -24,8 +25,12 @@ public class DeactivatePodAction implements OmnipodAction<StatusResponse> {
     @Override
     public StatusResponse execute(OmnipodCommunicationService communicationService) {
         if (!podState.isSuspended() && !podState.hasFaultEvent()) {
-            communicationService.executeAction(new CancelDeliveryAction(podState,
-                    EnumSet.allOf(DeliveryType.class), acknowledgementBeep));
+            try {
+                communicationService.executeAction(new CancelDeliveryAction(podState,
+                        EnumSet.allOf(DeliveryType.class), acknowledgementBeep));
+            } catch(PodFaultException ex) {
+                // Ignore
+            }
         }
 
         return communicationService.sendCommand(StatusResponse.class, podState, new DeactivatePodCommand(podState.getCurrentNonce()));