From e50c6fc8ed51a8db40b52e2a7541e03f54a5165b Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Mon, 25 Dec 2017 20:39:14 +0100
Subject: [PATCH] RS BLE modifications

---
 .../plugins/PumpDanaRS/services/BLEComm.java  |  2 ++
 .../androidaps/queue/QueueThread.java         | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
index f8d18a4d22..15b57231ea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
@@ -164,6 +164,8 @@ public class BLEComm {
         scheduledDisconnection = null;
 
         if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
+            log.debug("disconnect not possible: (mBluetoothAdapter == null) " + (mBluetoothAdapter == null));
+            log.debug("disconnect not possible: (mBluetoothGatt == null) " + (mBluetoothGatt == null));
             return;
         }
         setCharacteristicNotification(getUARTReadBTGattChar(), false);
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index dd02c5e973..c0915d96e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -16,6 +16,8 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.utils.SP;
 
@@ -52,12 +54,6 @@ public class QueueThread extends Thread {
             while (true) {
                 PumpInterface pump = ConfigBuilderPlugin.getActivePump();
                 long secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000;
-                if (pump.isConnecting()) {
-                    log.debug("QUEUE: connecting " + secondsElapsed);
-                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));
-                    SystemClock.sleep(1000);
-                    continue;
-                }
 
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
                     MainApp.bus().post(new EventDismissBolusprogressIfRunning(new PumpEnactResult()));
@@ -74,19 +70,37 @@ public class QueueThread extends Thread {
                         //write time
                         SP.putLong(R.string.key_btwatchdog_lastbark, System.currentTimeMillis());
                         //toggle BT
+                        pump.stopConnecting();
+                        pump.disconnect("watchdog");
+                        SystemClock.sleep(1000);
                         BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
                         mBluetoothAdapter.disable();
                         SystemClock.sleep(1000);
                         mBluetoothAdapter.enable();
                         SystemClock.sleep(1000);
                         //start over again once after watchdog barked
+                        //Notification notification = new Notification(Notification.OLD_NSCLIENT, "Watchdog", Notification.URGENT);
+                        //MainApp.bus().post(new EventNewNotification(notification));
                         connectionStartTime = lastCommandTime = System.currentTimeMillis();
+                        pump.connect("watchdog");
                     } else {
                         queue.clear();
+                        log.debug("QUEUE: no connection possible");
+                        MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
+                        pump.disconnect("Queue empty");
+                        MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
                         return;
                     }
                 }
 
+                if (pump.isConnecting()) {
+                    log.debug("QUEUE: connecting " + secondsElapsed);
+                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));
+                    SystemClock.sleep(1000);
+                    continue;
+                }
+
+
                 if (!pump.isConnected()) {
                     log.debug("QUEUE: connect");
                     MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));