From cd90bab877f48e2a7d81cb98fd26f1a74f2dcb23 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 21 Aug 2018 11:39:32 +0200
Subject: [PATCH] fix NPE

---
 .../androidaps/queue/commands/CommandReadStatus.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
index b014b66969..a303375a49 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
@@ -3,10 +3,13 @@ package info.nightscout.androidaps.queue.commands;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.LocalAlertUtils;
+import info.nightscout.utils.T;
 
 /**
  * Created by mike on 09.11.2017.
@@ -29,8 +32,15 @@ public class CommandReadStatus extends Command {
         LocalAlertUtils.notifyPumpStatusRead();
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("CommandReadStatus executed. Reason: " + reason);
+        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpEnactResult result = new PumpEnactResult().success(false);
+        if (pump != null) {
+            long lastConnection = pump.lastDataTime();
+            if (lastConnection > System.currentTimeMillis() - T.mins(1).msecs())
+                result.success(true);
+        }
         if (callback != null)
-            callback.result(null).run();
+            callback.result(result).run();
     }
 
     @Override