Merge pull request #62 from inovait/ble_transport

add ability to force bluetooth device's transport type
inovait · Sep 26, 2023 · 5a2c6de · 5a2c6de
2 parents f9745da + 2832eab
commit 5a2c6de
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 This changelog is for older versions. See [Github Releases](https://github.com/inovait/neatle/releases) for newer versions.
 
+## Version 0.10.0
+ - New: Added setTransport() to Connection
+ - New: Added setTransport() to ConnectionMonitor
+
 ## Version 0.9.3
  - Fixed: #21 - BluetoothGattCharacteristic needed to extract value on subscription
 

diff --git a/neatle/src/main/java/si/inova/neatle/Device.java b/neatle/src/main/java/si/inova/neatle/Device.java
@@ -71,6 +71,8 @@ public class Device implements Connection {
     private boolean serviceDiscovered;
     private BluetoothGatt gatt;
 
+    private int transport = 0;
+
     private final CopyOnWriteArrayList<ConnectionHandler> connectionHandlers = new CopyOnWriteArrayList<>();
     private final HashMap<UUID, CopyOnWriteArrayList<CharacteristicsChangedListener>> changeListeners = new HashMap<>();
     private final CopyOnWriteArrayList<ConnectionStateListener> connectionStateListeners = new CopyOnWriteArrayList<>();
@@ -431,7 +433,13 @@ void connectWithGatt() {
         }
 
         NeatleLogger.d("Connecting with " + device.getName() + "[" + device.getAddress() + "]");
-        BluetoothGatt gatt = device.connectGatt(context, false, callback);
+        BluetoothGatt gatt;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            gatt = device.connectGatt(context, false, callback, transport);
+        } else {
+            gatt = device.connectGatt(context, false, callback);
+        }
 
         synchronized (lock) {
             if (state == BluetoothGatt.STATE_DISCONNECTED) {
@@ -545,7 +553,12 @@ public boolean isConnected() {
         }
     }
 
-    /*public void yield(BluetoothGattCallback from, BluetoothGattCallback to) {
+    @Override
+    public void setTransport(int transport) {
+        this.transport = transport;
+    }
+
+/*public void yield(BluetoothGattCallback from, BluetoothGattCallback to) {
         synchronized (lock) {
             if (currentCallback == from) {
                 queue.add(0, currentCallback);

diff --git a/neatle/src/main/java/si/inova/neatle/monitor/Connection.java b/neatle/src/main/java/si/inova/neatle/monitor/Connection.java
@@ -159,4 +159,16 @@ public interface Connection {
     void addServicesDiscoveredListener(ServicesDiscoveredListener listener);
 
     void removeServicesDiscoveredListener(ServicesDiscoveredListener listener);
+
+    /**
+     * Set which transport will be used to connect to this device.
+     * Defaults to {@link BluetoothDevice#TRANSPORT_AUTO}.
+     *
+     * Only works on API Level 23 and higher.
+     *
+     * @param transport Either {@link BluetoothDevice#TRANSPORT_AUTO},
+     * {@link BluetoothDevice#TRANSPORT_BREDR} or
+     * {@link BluetoothDevice#TRANSPORT_LE}
+     */
+    public void setTransport(int transport);
 }
diff --git a/neatle/src/main/java/si/inova/neatle/monitor/ConnectionMonitor.java b/neatle/src/main/java/si/inova/neatle/monitor/ConnectionMonitor.java
@@ -61,6 +61,18 @@ public interface ConnectionMonitor {
      */
     void setOnServiceDiscoveredListener(ServicesDiscoveredListener serviceDiscoveredListener);
 
+    /**
+     * Set which transport will be used to connect to the device under this monitor.
+     * Defaults to {@link BluetoothDevice#TRANSPORT_AUTO}.
+     *
+     * Only works on API Level 23 and higher.
+     *
+     * @param transport Either {@link BluetoothDevice#TRANSPORT_AUTO},
+     * {@link BluetoothDevice#TRANSPORT_BREDR} or
+     * {@link BluetoothDevice#TRANSPORT_LE}
+     */
+    public void setTransport(int transport);
+
     /**
      * Starts this connection monitor, if it's not already running. If keepAlive is set this will
      * also initiate a connection request.

diff --git a/neatle/src/main/java/si/inova/neatle/monitor/ConnectionMonitorImpl.java b/neatle/src/main/java/si/inova/neatle/monitor/ConnectionMonitorImpl.java
@@ -58,6 +58,8 @@ public class ConnectionMonitorImpl implements ConnectionMonitor {
     private final ConnHandler connectionHandler = new ConnHandler();
     private final ReconnectRunnable reconnectRunnable = new ReconnectRunnable();
 
+    private int transport = 0;
+
     private final IntentFilter btFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
     private final BroadcastReceiver btReceiver = new BroadcastReceiver() {
         @Override
@@ -105,6 +107,7 @@ public void start() {
         connection.addConnectionHandler(connectionHandler);
         connection.addConnectionStateListener(connectionHandler);
         connection.addServicesDiscoveredListener(connectionHandler);
+        connection.setTransport(transport);
 
         if (keepAlive) {
             connection.connect();
@@ -137,6 +140,15 @@ public Connection getConnection() {
         return connection;
     }
 
+    @Override
+    public void setTransport(int transport) {
+        this.transport = transport;
+
+        if (this.connection != null) {
+            this.connection.setTransport(transport);
+        }
+    }
+
     private void onBluetoothTurnedOn() {
         if (keepAlive && connection != null) {
             connection.connect();