diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java index 0e182e0d6b..280c488b5e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java @@ -261,17 +261,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con @Override public boolean isConnected() { - if (connectionService == null || alertService == null) return false; - return connectionService.getState() == InsightState.CONNECTED; + return connectionService != null && alertService != null && connectionService.getState() == InsightState.CONNECTED; } @Override public boolean isConnecting() { - if (connectionService == null || alertService == null) return false; - InsightState state = connectionService.getState(); - return state == InsightState.CONNECTING - || state == InsightState.APP_CONNECT_MESSAGE - || state == InsightState.RECOVERING; + return connectionService != null && alertService != null && connectionService.hasRequestedConnection(this); } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java index b4ee726a6b..1cd4bbfe68 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java @@ -249,6 +249,10 @@ public class InsightConnectionService extends Service implements ConnectionEstab log.info("Insight state changed: " + state.name()); } + public synchronized boolean hasRequestedConnection(Object lock) { + return connectionRequests.contains(lock); + } + public synchronized void requestConnection(Object lock) { if (connectionRequests.contains(lock)) return; connectionRequests.add(lock); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8785dba800..ed1380c79f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1266,6 +1266,13 @@ Refresh Pump integration for Accu-Chek Insight pumps Not inserted + Last conn: %1$d min ago + TBR: %1$d%% for %2$d / %3$d min + Extended: %1$.2f / %2$.2f U for %3$d min + Extended: %1$.2f / %2$.2f U for %3$d min + TDD: %1$.2f + Reser.: %1$.2fU + Batt.: %1$d%% %1$d day