Refactor BluetoothCentral and include method to get bond state

Author: weliem

app/src/main/java/com/welie/blessedexample/BluetoothHandler.java

@@ -17,6 +17,8 @@
 import com.welie.blessed.GattStatus;
 import com.welie.blessed.HciStatus;
 
+import com.welie.blessed.PhyOptions;
+import com.welie.blessed.PhyType;
 import com.welie.blessed.ScanFailure;
 import com.welie.blessed.WriteType;
 
@@ -117,10 +119,14 @@ public void onServicesDiscovered(@NotNull BluetoothPeripheral peripheral) {
             // Request a new connection priority
             peripheral.requestConnectionPriority(ConnectionPriority.HIGH);
 
+            peripheral.setPreferredPhy(PhyType.LE_2M, PhyType.LE_2M, PhyOptions.S2);
+
             // Read manufacturer and model number from the Device Information Service
             peripheral.readCharacteristic(DIS_SERVICE_UUID, MANUFACTURER_NAME_CHARACTERISTIC_UUID);
             peripheral.readCharacteristic(DIS_SERVICE_UUID, MODEL_NUMBER_CHARACTERISTIC_UUID);
 
+            peripheral.readPhy();
+
             // Turn on notifications for Current Time Service and write it if possible
             BluetoothGattCharacteristic currentTimeCharacteristic = peripheral.getCharacteristic(CTS_SERVICE_UUID, CURRENT_TIME_CHARACTERISTIC_UUID);
             if (currentTimeCharacteristic != null) {
@@ -376,7 +382,7 @@ private void startScan() {
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                central.scanForPeripheralsWithServices(new UUID[]{BLP_SERVICE_UUID, HTS_SERVICE_UUID, HRS_SERVICE_UUID, PLX_SERVICE_UUID, WSS_SERVICE_UUID, GLUCOSE_SERVICE_UUID});
+                central.scanForPeripheralsWithServices(new UUID[]{BLP_SERVICE_UUID, HTS_SERVICE_UUID, PLX_SERVICE_UUID, WSS_SERVICE_UUID, GLUCOSE_SERVICE_UUID});
             }
         },1000);
     }

blessed/src/main/java/com/welie/blessed/BluetoothCentral.java

@@ -23,35 +23,37 @@
 
 package com.welie.blessed;
 
+import android.annotation.SuppressLint;
+import android.bluetooth.BluetoothDevice;
+
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
 /**
  * This class represent a remote Central
  */
+@SuppressLint("MissingPermission")
 public class BluetoothCentral {
 
-    @NotNull
-    private final String address;
-
-    @Nullable
-    private final String name;
+    @NotNull private final BluetoothDevice device;
 
     private int currentMtu = 23;
 
-    BluetoothCentral(@NotNull String address, @Nullable String name) {
-        this.address = Objects.requireNonNull(address, "address is null");
-        this.name = name;
+    BluetoothCentral(@NotNull BluetoothDevice device) {
+        this.device = device;
     }
 
     public @NotNull String getAddress() {
-        return address;
+        return device.getAddress();
     }
 
     public @NotNull String getName() {
-        return name == null ? "" : name;
+        return device.getName() == null ? "" : device.getName();
+    }
+
+    public BondState getBondState() {
+        return BondState.fromValue(device.getBondState());
     }
 
     protected void setCurrentMtu(final int currentMtu) {

blessed/src/main/java/com/welie/blessed/BluetoothPeripheralManager.java

@@ -103,7 +103,6 @@ public class BluetoothPeripheralManager {
     protected final BluetoothGattServerCallback bluetoothGattServerCallback = new BluetoothGattServerCallback() {
         @Override
         public void onConnectionStateChange(final BluetoothDevice device, final int status, final int newState) {
-
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 if (newState == BluetoothProfile.STATE_CONNECTED) {
                     // Call connect() even though we are already connected
@@ -132,7 +131,7 @@ public void onConnectionStateChange(final BluetoothDevice device, final int stat
 
         private void handleDeviceConnected(@NotNull final BluetoothDevice device) {
             Logger.i(TAG,"Central '%s' (%s) connected", device.getName(), device.getAddress());
-            final BluetoothCentral bluetoothCentral = new BluetoothCentral(device.getAddress(), device.getName());
+            final BluetoothCentral bluetoothCentral = new BluetoothCentral(device);
             connectedCentralsMap.put(bluetoothCentral.getAddress(), bluetoothCentral);
             mainHandler.post(new Runnable() {
                 @Override
@@ -757,7 +756,7 @@ private BluetoothCentral getCentral(@NotNull final BluetoothDevice device) {
 
         BluetoothCentral result = connectedCentralsMap.get(device.getAddress());
         if (result == null) {
-            result = new BluetoothCentral(device.getAddress(), device.getName());
+            result = new BluetoothCentral(device);
         }
         return result;
     }