discover Bluetooth services only for debug Bluetooth driver

android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java

@@ -17,7 +17,6 @@
 package com.health.openscale.core.bluetooth;
 
 import android.Manifest;
-import android.bluetooth.BluetoothGattService;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.LocationManager;
@@ -35,8 +34,6 @@ import com.polidea.rxandroidble2.scan.ScanSettings;
 
 import java.io.IOException;
 import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -85,7 +82,6 @@ public abstract class BluetoothCommunication {
     private PublishSubject<Boolean> disconnectTriggerSubject = PublishSubject.create();
 
     private Handler callbackBtHandler;
-    private RxBleDeviceServices rxBleDeviceServices;
 
     private int cmdStepNr;
     private int initStepNr;
@@ -99,7 +95,6 @@ public abstract class BluetoothCommunication {
     {
         this.context = context;
         this.bleClient = OpenScale.getInstance().getBleClient();
-        this.rxBleDeviceServices = null;
         this.scanSubscription = null;
         this.disconnectHandler = new Handler();
 
@@ -275,6 +270,13 @@ public abstract class BluetoothCommunication {
      */
     protected void onBluetoothNotify(UUID characteristic, byte[] value) {}
 
+    /**
+     * Method is triggered if a Bluetooth services from a device is discovered.
+     *
+     * @param rxBleDeviceServices
+     */
+    protected void onBluetoothDiscovery(RxBleDeviceServices rxBleDeviceServices) { }
+
     /**
      * Set the Bluetooth machine state to a specific state.
      *
@@ -294,7 +296,6 @@ public abstract class BluetoothCommunication {
      * @param bytes the bytes that should be write
      */
     protected void writeBytes(UUID characteristic, byte[] bytes) {
-        if (isConnected()) {
         final Disposable disposable = connectionObservable
                 .delay(BT_DELAY, TimeUnit.MILLISECONDS)
                 .flatMapSingle(rxBleConnection -> rxBleConnection.writeCharacteristic(characteristic, bytes))
@@ -312,7 +313,6 @@ public abstract class BluetoothCommunication {
 
         compositeDisposable.add(disposable);
     }
-    }
 
     /**
      * Read bytes from a Bluetooth device.
@@ -321,7 +321,6 @@ public abstract class BluetoothCommunication {
      *@param characteristic the Bluetooth UUID characteristic
      */
     protected void readBytes(UUID characteristic) {
-        if (isConnected()) {
         final Disposable disposable = connectionObservable
                 .delay(BT_DELAY, TimeUnit.MILLISECONDS)
                 .firstOrError()
@@ -337,7 +336,6 @@ public abstract class BluetoothCommunication {
 
         compositeDisposable.add(disposable);
     }
-    }
 
     /**
      * Set indication flag on for the Bluetooth device.
@@ -345,7 +343,6 @@ public abstract class BluetoothCommunication {
      * @param characteristic the Bluetooth UUID characteristic
      */
     protected void setIndicationOn(UUID characteristic) {
-        if (isConnected()) {
         final Disposable disposable = connectionObservable
                 .delay(BT_DELAY, TimeUnit.MILLISECONDS)
                 .flatMap(rxBleConnection -> rxBleConnection.setupIndication(characteristic))
@@ -370,7 +367,6 @@ public abstract class BluetoothCommunication {
 
         compositeDisposable.add(disposable);
     }
-    }
 
     /**
      * Set notification flag on for the Bluetooth device.
@@ -378,7 +374,6 @@ public abstract class BluetoothCommunication {
      * @param characteristic the Bluetooth UUID characteristic
      */
     protected void setNotificationOn(UUID characteristic) {
-        if (isConnected()) {
         final Disposable disposable = connectionObservable
                 .delay(BT_DELAY, TimeUnit.MILLISECONDS)
                 .flatMap(rxBleConnection -> rxBleConnection.setupNotification(characteristic))
@@ -403,6 +398,23 @@ public abstract class BluetoothCommunication {
 
         compositeDisposable.add(disposable);
     }
+
+    public void doBluetoothDiscoverServices() {
+        final Disposable connectionDisposable = connectionObservable
+                .delay(BT_DELAY, TimeUnit.MILLISECONDS)
+                .flatMapSingle(RxBleConnection::discoverServices)
+                .observeOn(AndroidSchedulers.mainThread())
+                .retry(BT_RETRY_TIMES_ON_ERROR)
+                .subscribe(
+                        deviceServices -> {
+                            Timber.d("Successful Bluetooth services discovered");
+                            onBluetoothDiscovery(deviceServices);
+                            nextMachineStateStep();
+                        },
+                        throwable -> onError(throwable)
+                );
+
+        compositeDisposable.add(connectionDisposable);
     }
 
     /**
@@ -447,14 +459,6 @@ public abstract class BluetoothCommunication {
         return checksum;
     }
 
-    protected List<BluetoothGattService> getBluetoothGattServices() {
-        if (rxBleDeviceServices == null) {
-            return new ArrayList<>();
-        }
-
-        return rxBleDeviceServices.getBluetoothGattServices();
-    }
-
     /**
      * Test in a byte if a bit is set (1) or not (0)
      *
@@ -507,13 +511,16 @@ public abstract class BluetoothCommunication {
     }
 
     private void connectToDevice(String macAddress) {
-        Timber.d("Try to connect to BLE device " + macAddress);
 
         // stop LE scan before connecting to device
         if (scanSubscription != null) {
+            Timber.d("Stop Le san");
             scanSubscription.dispose();
+            scanSubscription = null;
         }
 
+        Timber.d("Try to connect to BLE device " + macAddress);
+
         connectionObservable = bleDevice
                 .establishConnection(false)
                 .delay(BT_DELAY, TimeUnit.MILLISECONDS)
@@ -525,30 +532,12 @@ public abstract class BluetoothCommunication {
         if (isConnected()) {
             disconnect();
         } else {
-            final Disposable connectionDisposable = connectionObservable
-                    .delay(BT_DELAY, TimeUnit.MILLISECONDS)
-                    .flatMapSingle(RxBleConnection::discoverServices)
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .retry(BT_RETRY_TIMES_ON_ERROR)
-                    .subscribe(
-                            deviceServices -> {
-                                rxBleDeviceServices = deviceServices;
-                                //setBtMonitoringOn();
-
             initStepNr = -1;
             cmdStepNr = -1;
             cleanupStepNr = -1;
 
-                                setBtStatus(BT_STATUS_CODE.BT_CONNECTION_ESTABLISHED);
+            setBtMonitoringOn();
             setBtMachineState(BT_MACHINE_STATE.BT_INIT_STATE);
-                            },
-                            throwable -> {
-                                setBtStatus(BT_STATUS_CODE.BT_NO_DEVICE_FOUND);
-                                disconnect();
-                            }
-                    );
-
-            compositeDisposable.add(connectionDisposable);
         }
     }
 
@@ -567,7 +556,7 @@ public abstract class BluetoothCommunication {
                                     // empty
                                     break;
                                 case DISCONNECTED:
-                                    setBtStatus(BT_STATUS_CODE.BT_CONNECTION_LOST);
+                                    // setBtStatus(BT_STATUS_CODE.BT_CONNECTION_LOST);
                                     break;
                             }
                         },
@@ -604,14 +593,15 @@ public abstract class BluetoothCommunication {
      * Disconnect from a Bluetooth device
      */
     public void disconnect() {
+        Timber.d("Bluetooth disconnect");
         setBtStatus(BT_STATUS_CODE.BT_CONNECTION_DISCONNECT);
+        if (scanSubscription != null) {
+            scanSubscription.dispose();
+        }
         callbackBtHandler = null;
         disconnectHandler.removeCallbacksAndMessages(null);
         disconnectTriggerSubject.onNext(true);
         compositeDisposable.clear();
-        if (scanSubscription != null) {
-            scanSubscription.dispose();
-        }
     }
 
     /**

android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDebug.java

@@ -21,14 +21,15 @@ import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
 
-import com.polidea.rxandroidble2.RxBleClient;
+import com.polidea.rxandroidble2.RxBleDeviceServices;
 
 import java.util.HashMap;
 
 import timber.log.Timber;
 
 public class BluetoothDebug extends BluetoothCommunication {
-    HashMap<Integer, String> propertyString;
+    private HashMap<Integer, String> propertyString;
+    private RxBleDeviceServices rxBleDeviceServices;
 
     BluetoothDebug(Context context) {
         super(context);
@@ -157,24 +158,41 @@ public class BluetoothDebug extends BluetoothCommunication {
         return offset;
     }
 
+    @Override
+    public void onBluetoothDiscovery(RxBleDeviceServices rxBleDeviceServices) {
+        this.rxBleDeviceServices = rxBleDeviceServices;
+    }
+
     @Override
     protected boolean nextInitCmd(int stateNr) {
+        switch (stateNr)
+        {
+            case 0:
+                doBluetoothDiscoverServices();
+                break;
+            case 1:
                 int offset = stateNr;
 
-        for (BluetoothGattService service : getBluetoothGattServices()) {
+                for (BluetoothGattService service : rxBleDeviceServices.getBluetoothGattServices()) {
                     offset = readServiceCharacteristics(service, offset);
                 }
 
-        for (BluetoothGattService service : getBluetoothGattServices()) {
+                for (BluetoothGattService service : rxBleDeviceServices.getBluetoothGattServices()) {
                     logService(service, false);
                 }
 
                 setBtStatus(BT_STATUS_CODE.BT_CONNECTION_LOST);
+                break;
+            case 2:
                 disconnect();
-
+                break;
+            default:
                 return false;
         }
 
+        return true;
+    }
+
     @Override
     protected boolean nextBluetoothCmd(int stateNr) {
         return false;