Add "DescriptorWriteNotAllowed" error to Android implementation.

naluri-hidup · Sep 4, 2019 · 3778307 · 3778307
1 parent 8120be1
commit 3778307
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/android/src/main/java/com/polidea/reactnativeble/BleModule.java b/android/src/main/java/com/polidea/reactnativeble/BleModule.java
@@ -1553,6 +1553,13 @@ private void safeWriteDescriptorForDevice(final Descriptor descriptor,
                                               final String valueBase64,
                                               final String transactionId,
                                               final SafePromise promise) {
+        BluetoothGattDescriptor nativeDescriptor = descriptor.getNativeDescriptor();
+
+        if (nativeDescriptor.getUuid().equals(Characteristic.CLIENT_CHARACTERISTIC_CONFIG_UUID)) {
+            BleErrorUtils.descriptorWriteNotAllowed(UUIDConverter.fromUUID(nativeDescriptor.getUuid())).reject(promise);
+            return;
+        }
+
         final RxBleConnection connection = getConnectionOrReject(descriptor.getCharacteristic().getService().getDevice(), promise);
         if (connection == null) {
             return;
@@ -1562,13 +1569,13 @@ private void safeWriteDescriptorForDevice(final Descriptor descriptor,
         try {
             value = Base64Converter.decode(valueBase64);
         } catch (Throwable e) {
-            String uuid = UUIDConverter.fromUUID(descriptor.getNativeDescriptor().getUuid());
+            String uuid = UUIDConverter.fromUUID(nativeDescriptor.getUuid());
             BleErrorUtils.invalidWriteDataForDescriptor(valueBase64, uuid).reject(promise);
             return;
         }
 
         final Subscription subscription = connection
-                .writeDescriptor(descriptor.getNativeDescriptor(), value)
+                .writeDescriptor(nativeDescriptor, value)
                 .doOnUnsubscribe(new Action0() {
                     @Override
                     public void call() {

diff --git a/android/src/main/java/com/polidea/reactnativeble/errors/BleErrorCode.java b/android/src/main/java/com/polidea/reactnativeble/errors/BleErrorCode.java
@@ -44,6 +44,7 @@ public enum BleErrorCode {
     DescriptorNotFound(503),
     DescriptorsNotDiscovered(504),
     DescriptorInvalidDataFormat(505),
+    DescriptorWriteNotAllowed(506),
 
     ScanStartFailed(600),
     LocationServicesDisabled(601);

diff --git a/android/src/main/java/com/polidea/reactnativeble/errors/BleErrorUtils.java b/android/src/main/java/com/polidea/reactnativeble/errors/BleErrorUtils.java
@@ -70,6 +70,12 @@ static public BleError invalidWriteDataForDescriptor(String data, String uuid) {
         return bleError;
     }
 
+    static public BleError descriptorWriteNotAllowed(String uuid) {
+        BleError bleError = new BleError(BleErrorCode.DescriptorWriteNotAllowed, null, null);
+        bleError.descriptorUUID = uuid;
+        return bleError;
+    }
+
     static public BleError serviceNotFound(String uuid) {
         BleError bleError = new BleError(BleErrorCode.ServiceNotFound, null, null);
         bleError.serviceUUID = uuid;

diff --git a/android/src/main/java/com/polidea/reactnativeble/errors/ErrorConverter.java b/android/src/main/java/com/polidea/reactnativeble/errors/ErrorConverter.java
@@ -184,6 +184,7 @@ private BleError toError(int code, String message, BleGattOperationType operatio
             bleError.serviceUUID = serviceUUID;
             bleError.characteristicUUID = characteristicUUID;
             bleError.descriptorUUID = descriptorUUID;
+            return bleError;
         } else if (BleGattOperationType.READ_RSSI == operationType) {
             BleError bleError = new BleError(BleErrorCode.DeviceRSSIReadFailed, message, code);
             bleError.deviceID = deviceID;

diff --git a/src/BleError.js b/src/BleError.js
@@ -335,7 +335,8 @@ export const BleErrorCodeMessage: BleErrorCodeMessageMapping = {
     'Descriptors not discovered for device {deviceID}, service {serviceUUID} and characteristic {characteristicUUID}',
   [BleErrorCode.DescriptorInvalidDataFormat]:
     'Cannot write to descriptor {descriptorUUID} with invalid data format: {internalMessage}',
-  [BleErrorCode.DescriptorWriteNotAllowed]: "Cannot write to descriptor {descriptorUUID}. It's not allowed by iOS.",
+  [BleErrorCode.DescriptorWriteNotAllowed]:
+    "Cannot write to descriptor {descriptorUUID}. It's not allowed by iOS and therefore forbidden on Android as well.",
 
   // Scanning
   [BleErrorCode.ScanStartFailed]: 'Cannot start scanning operation',