From 3ceb5f46d83ded1aa4ae7a640ce3c74223aeeebc Mon Sep 17 00:00:00 2001
From: Andy Rozman <aleksander.rozman@bearingpoint.com>
Date: Wed, 25 Dec 2019 21:49:35 +0100
Subject: [PATCH] - added Notification when Time/TZ change is made - changed
 code to display dialog

---
 .../general/overview/notifications/Notification.java       | 1 +
 .../androidaps/plugins/pump/omnipod/OmnipodFragment.kt     | 2 +-
 .../androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java | 7 +++++++
 app/src/main/res/values/strings.xml                        | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
index 3a1dd12522..dd82ae8c0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
@@ -79,6 +79,7 @@ public class Notification {
     public static final int OVER_24H_TIME_CHANGE_REQUESTED = 54;
     public static final int INVALID_VERSION = 55;
     public static final int OMNIPOD_PUMP_ALARM = 56;
+    public static final int TIME_OR_TIMEZONE_CHANGE = 57;
 
 
     public int id;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index b1437612ea..6687101830 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -118,7 +118,7 @@ class OmnipodFragment : Fragment() {
             } else {
                 val readPulseLog = AapsOmnipodManager.getInstance().readPulseLog()
 
-                OKDialog.showConfirmation(null,
+                OKDialog.show(MainApp.instance().applicationContext, MainApp.gs(R.string.action),
                         "Pulse Log:\n" + readPulseLog.toString(), null)
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 7dc4563cf8..349596eece 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -387,6 +387,13 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
             if (omnipodUITask.wasCommandSuccessful()) {
                 this.hasTimeDateOrTimeZoneChanged = false;
                 timeChangeRetries = 0;
+
+                Notification notification = new Notification(
+                        Notification.TIME_OR_TIMEZONE_CHANGE,
+                        MainApp.gs(R.string.time_or_timezone_change),
+                        Notification.INFO, 60);
+                RxBus.INSTANCE.send(new EventNewNotification(notification));
+
             } else {
                 timeChangeRetries++;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4bca04829b..92fc9785dc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1636,7 +1636,7 @@
     <string name="objectives_button_unstart">Clear started</string>
     <string name="timedetection">Time detection</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>
 
     <!-- Omnipod -->