Merge pull request #647 from p-andreas/master

android: fixed connection failed with status code 133

Author: randdusing

src/android/BluetoothLePlugin.java

@@ -1477,10 +1477,15 @@ private void connectAction(JSONArray args, CallbackContext callbackContext) {
     if (obj != null) {
       autoConnect = obj.optBoolean("autoConnect", false);
     }
-
     connections.put(device.getAddress(), connection);
 
-    BluetoothGatt bluetoothGatt = device.connectGatt(cordova.getActivity().getApplicationContext(), autoConnect, bluetoothGattCallback);
+    BluetoothGatt bluetoothGatt = null;
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+      int transportMode = getTransportMode(obj);
+      bluetoothGatt = device.connectGatt(cordova.getActivity().getApplicationContext(), autoConnect, bluetoothGattCallback, transportMode);
+    } else {
+      bluetoothGatt = device.connectGatt(cordova.getActivity().getApplicationContext(), autoConnect, bluetoothGattCallback);
+    }
 
     connection.put(keyPeripheral, bluetoothGatt);
   }
@@ -3653,6 +3658,23 @@ private UUID[] getServiceUuids(JSONObject obj) {
     return uuids;
   }
 
+
+  private int getTransportMode(JSONObject obj) {
+    int transportMode = 0;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      transportMode = BluetoothDevice.TRANSPORT_AUTO;
+    }
+
+    if (obj != null && !obj.isNull("transport")) {
+      try {
+        transportMode = obj.getInt("transport");
+      } catch (JSONException e) {
+        Log.e("BLE", "An exception occurred while transport connection parameter, fall back to: BluetoothDevice.TRANSPORT_AUTO");
+      }
+    }
+    return transportMode;
+  }
+
   private String getAddress(JSONObject obj) {
     //Get the address string from arguments
     String address = obj.optString(keyAddress, null);

types/index.d.ts

@@ -103,13 +103,13 @@ declare namespace BluetoothlePlugin {
          * Connect to a Bluetooth LE device
          * @param connectSuccess The success callback that is passed with device object
          * @param connectError   The callback that will be triggered when the connect operation fails
-         * @param params         The address/identifier
          *
+         * @param params         connection params
          */
         connect(
             connectSuccess: (status: DeviceInfo) => void,
             connectError: (error: Error) => void,
-            params: { address: string, autoConnect?: boolean }): void;
+            params: ConnectionParams): void;
 
         /**
          * Reconnect to a previously connected Bluetooth device
@@ -619,6 +619,36 @@ declare namespace BluetoothlePlugin {
         isConnectable?: boolean
     }
 
+    interface ConnectionParams{
+        address: string;
+        autoConnect?: boolean;
+        /**
+         * Transport mode. Available from API 23 (Android).
+         * If none is specified the default behavior is TRANSPORT_AUTO
+         *
+         * Note: On Android 10, TRANSPORT_AUTO can lead to connection errors with Status code 133.
+         * In this case TRANSPORT_LE can be used.
+         */
+        transport?:  AndroidGattTransportMode;
+    }
+
+    enum AndroidGattTransportMode{
+        /**
+         * No preference of physical transport for GATT connections to remote dual-mode devices
+         */
+        TRANSPORT_AUTO = 0,
+
+        /**
+         * Prefer BR/EDR transport for GATT connections to remote dual-mode devices
+         */
+        TRANSPORT_BREDR = 1,
+
+        /**
+         * Prefer LE transport for GATT connections to remote dual-mode devices
+         */
+        TRANSPORT_LE = 2,
+    }
+
     interface NotifyParams {
         /** Service's UUID */
         service: string,