From 8452840cfd155043d3d113d114c222d68c1cb280 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Mon, 17 Aug 2020 22:39:44 +0200
Subject: [PATCH] Fix missing string resources in Omnipod module

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19d8c7966b..a6c4e65831 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1284,7 +1284,6 @@
     <string name="objectives_button_unfinish">Clear finished</string>
     <string name="objectives_button_unstart">Clear started</string>
     <string name="doyouwantresetstart">Do you want reset objective start? You may lose your progress.</string>
-    <string name="time_or_timezone_change">Time and/or Timezone change on pump</string>
     <string name="nopumpselected">No pump selected</string>
     <string name="setupwizard_units_prompt">Select units you want to display values in</string>
     <string name="ns_ploadlocalprofile">Upload local profile changes to NS</string>
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 466c9c62f4..5f29613719 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -470,7 +470,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                         Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", 0);
                         i.putExtra("status", "Pulse Log (copied to clipboard):\n" + result.toString());
-                        i.putExtra("title", resourceHelper.gs(R.string.combo_warning));
+                        i.putExtra("title", resourceHelper.gs(R.string.omnipod_warning));
                         i.putExtra("clipboardContent", result.toString());
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         context.startActivity(i);
@@ -496,7 +496,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
                 Notification notification = new Notification(
                         Notification.TIME_OR_TIMEZONE_CHANGE,
-                        resourceHelper.gs(R.string.time_or_timezone_change),
+                        resourceHelper.gs(R.string.omnipod_time_or_timezone_change),
                         Notification.INFO, 60);
                 rxBus.send(new EventNewNotification(notification));
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 61c6bb9299..153af29008 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -618,7 +618,7 @@ public class AapsOmnipodManager implements IOmnipodManager {
         Intent intent = new Intent(context, ErrorHelperActivity.class);
         intent.putExtra("soundid", sound);
         intent.putExtra("status", message);
-        intent.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror));
+        intent.putExtra("title", resourceHelper.gs(R.string.error));
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 1a74c2b64d..39fa580849 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -143,5 +143,6 @@
     <string name="omnipod_errors">Errors</string>
     <string name="omnipod_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
     <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink Config</string>
+    <string name="omnipod_time_or_timezone_change">Time and/or Timezone change on pump</string>
 
 </resources>
\ No newline at end of file