From ceca00ca502718f8db52ca0c3210f87fc7784a39 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Mon, 6 Jan 2020 22:35:24 +0100
Subject: [PATCH] Fix cancel TBR type in Pod history

---
 .../pump/omnipod/driver/comm/AapsOmnipodManager.java        | 6 +++---
 app/src/main/res/values/strings.xml                         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 269988abfe..baaaa8d4e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -397,10 +397,10 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         long time = System.currentTimeMillis();
         try {
             delegate.cancelTemporaryBasal(isTempBasalBeepsEnabled());
-            addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, null);
+            addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, null);
         } catch (Exception ex) {
             String comment = handleAndTranslateException(ex);
-            addFailureToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, comment);
+            addFailureToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, comment);
             return new PumpEnactResult().success(false).enacted(false).comment(comment);
         }
 
@@ -521,7 +521,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
 
             long time = System.currentTimeMillis();
 
-            addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, null);
+            addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, null);
 
             TemporaryBasal temporaryBasal = new TemporaryBasal() //
                     .date(time) //
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fdda226de0..8a9d21cdc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1703,8 +1703,8 @@
     <string name="omnipod_cmd_set_bolus">Set Bolus</string>
     <string name="omnipod_cmd_cancel_bolus">Cancel Bolus</string>
     <string name="omnipod_cmd_set_tbr">Set Temporary Basal</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced)</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal (Internally by driver)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced by user)</string>
     <string name="omnipod_cmd_set_basal_schedule">Set Basal Schedule</string>
     <string name="omnipod_cmd_get_pod_status">Get Pod Status</string>
     <string name="omnipod_cmd_get_pod_info">Get Pod Info</string>