From c336ceba333eeac2c8ce31a9e60143026c9317a4 Mon Sep 17 00:00:00 2001
From: Andy Rozman <aleksander.rozman@bearingpoint.com>
Date: Sun, 12 Jan 2020 12:42:10 +0100
Subject: [PATCH] - trying to fix problem with exception

---
 .../androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java   | 5 ++++-
 .../pump/omnipod/service/RileyLinkOmnipodService.java        | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

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 51c851085c..00d112ac61 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
@@ -105,6 +105,8 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
     private Profile currentProfile;
 
+    boolean omnipodServiceRunning = false;
+
     private long nextPodCheck = 0L;
     private static long UNREACHABLE_ALERT_THRESHOLD_MILLIS = T.mins(30).msecs();
 
@@ -152,6 +154,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                                 if (omnipodCommunicationManager == null) {
                                     omnipodCommunicationManager = AapsOmnipodManager.getInstance();
                                     omnipodCommunicationManager.setPumpStatus(pumpStatusLocal);
+                                    omnipodServiceRunning = true;
                                 } else {
                                     omnipodCommunicationManager.setPumpStatus(pumpStatusLocal);
                                 }
@@ -278,7 +281,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
     private void doPodCheck() {
 
         if (System.currentTimeMillis() > this.nextPodCheck) {
-            if (!getPodPumpStatusObject().podAvailable && getPodPumpStatusObject().podAvailibityChecked) {
+            if (!getPodPumpStatusObject().podAvailable && omnipodServiceRunning) {
                 Notification notification = new Notification(Notification.OMNIPOD_POD_NOT_ATTACHED, MainApp.gs(R.string.omnipod_error_pod_not_attached), Notification.NORMAL);
                 RxBus.INSTANCE.send(new EventNewNotification(notification));
             } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
index a3ddaff461..9f9143af46 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
@@ -128,7 +128,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
             }
             OmnipodCommunicationService omnipodCommunicationService = new OmnipodCommunicationService(rfspy);
             omnipodCommunicationService.setPumpStatus(pumpStatus);
-            pumpStatus.podAvailibityChecked = true;
 
             omnipodCommunicationManager = new AapsOmnipodManager(omnipodCommunicationService, podState, pumpStatus);
         } else {