@iotize/device-com-ble.cordova 3.6.2-alpha.2 → 3.6.3

package/src/android/src/ble/characteristics/CharacteristicAdapter.java

@@ -1,221 +1,221 @@
-package com.iotize.plugin.cordova.ble.characteristics;
-
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattDescriptor;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-
-import com.iotize.android.communication.protocol.ble.BLECommandRunnable;
-import com.iotize.android.communication.protocol.ble.exception.CannotSetCharacteristicNotification;
-import com.iotize.android.communication.protocol.ble.exception.CannotWriteCharacteristicException;
-import com.iotize.android.communication.protocol.ble.exception.CharacteristicNotificationNotSupported;
-import com.iotize.android.communication.protocol.ble.exception.DescriptorNotAvailableException;
-import com.iotize.android.communication.protocol.ble.exception.WritePacketIsTooBigException;
-import com.iotize.android.core.util.Helper;
-import com.iotize.plugin.cordova.ble.BLEProtocol;
-import com.iotize.plugin.cordova.ble.commands.BLECommand;
-import com.iotize.plugin.cordova.ble.commands.CharacteristicOperationCompletedNotifier;
-import com.iotize.plugin.cordova.ble.commands.DescriptorOperationCompletedNotifier;
-
-import java.util.UUID;
-
-@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-public class CharacteristicAdapter implements CharacteristicAdapterCallbacks {
-
-    static final UUID NOTIFICATION_DESCRIPTOR_UUID =
-            UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
-
-    private static final String TAG = "AbstractCharacteristicA";
-    @NonNull
-    public final BluetoothGattCharacteristic characteristic;
-
-    @NonNull
-    protected final BLEProtocol protocol;
-
-    @Nullable
-    private OnCharacteristicValueChangedCallback onCharacteristicValueChangedCallback;
-
-    @Nullable
-    protected CharacteristicAdapterCallbacks callbacks;
-
-    @Nullable
-    private OnCharacteristicOperationResult cmdCallback;
-
-    public CharacteristicAdapter(
-            @NonNull BLEProtocol protocol,
-            @NonNull BluetoothGattCharacteristic characteristic,
-            @Nullable CharacteristicAdapterCallbacks callbacks) {
-        this.protocol = protocol;
-        this.characteristic = characteristic;
-        this.callbacks = callbacks;
-    }
-
-    public void setCallbacks(CharacteristicAdapterCallbacks callbacks) {
-        this.callbacks = callbacks;
-    }
-
-    public boolean isWritable() {
-        int properties = this.characteristic.getProperties();
-        return (properties & (BluetoothGattCharacteristic.PROPERTY_WRITE | BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) != 0;
-    }
-
-    public void startNotification(BluetoothGatt gatt, OnCharacteristicOperationResult callback) {
-        this.startOrStopValueChangedSubscription(gatt, true, callback);
-    }
-
-    public void stopNotification(BluetoothGatt gatt, OnCharacteristicOperationResult callback) {
-        this.startOrStopValueChangedSubscription(gatt, false, callback);
-    }
-
-    private void startOrStopValueChangedSubscription(BluetoothGatt gatt, boolean start, OnCharacteristicOperationResult callback) {
-        queueCommand(callback, () -> {
-            if (gatt.setCharacteristicNotification(characteristic, start)) {
-
-                BluetoothGattDescriptor descriptor = characteristic.getDescriptor(NOTIFICATION_DESCRIPTOR_UUID);
-
-                if (descriptor == null) {
-                    throw new DescriptorNotAvailableException(characteristic, NOTIFICATION_DESCRIPTOR_UUID);
-                }
-
-                if (start) {
-                    int properties = characteristic.getProperties();
-                    if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) {
-                        descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
-                    } else if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) != 0) {
-                        descriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE);
-                    } else {
-                        throw new CharacteristicNotificationNotSupported(this.characteristic);
-                    }
-                } else {
-                    descriptor.setValue(BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
-                }
-
-                if (!gatt.writeDescriptor(descriptor)) {
-                    throw new CannotSetCharacteristicNotification(this.characteristic);
-                }
-            } else {
-                throw new CannotSetCharacteristicNotification(this.characteristic);
-            }
-        });
-    }
-
-    void queueCommand(@Nullable OnCharacteristicOperationResult cb, @NonNull BLECommandRunnable runnable) {
-        this.protocol.queueCommand(new BLECommand(
-                runnable,
-                new CharacteristicOperationCompletedNotifier(cb, this.characteristic)
-        ));
-    }
-
-    void queueCommand(@Nullable OnDescriptorOperationResult cb, @NonNull BLECommandRunnable runnable, BluetoothGattDescriptor descriptor) {
-        this.protocol.queueCommand(new BLECommand(
-                        runnable,
-                        new DescriptorOperationCompletedNotifier(cb, descriptor)
-                )
-        );
-    }
-
-    public byte[] getValue() {
-        return this.characteristic.getValue();
-    }
-
-    public void read(@Nullable OnCharacteristicOperationResult callback) {
-        queueCommand(callback, () -> {
-            this.protocol.getGatt().readCharacteristic(this.characteristic);
-        });
-    }
-
-    public void readDescriptor(@NonNull UUID descriptorUUID, @Nullable OnDescriptorOperationResult callback) {
-        BluetoothGattDescriptor descriptor = this.characteristic.getDescriptor(descriptorUUID);
-        if (descriptor == null && callback != null) {
-            callback.onError(null, new DescriptorNotAvailableException(this.characteristic, descriptorUUID));
-            return;
-        }
-        queueCommand(callback, () -> {
-            this.protocol.getGatt().readDescriptor(descriptor);
-        }, descriptor);
-    }
-
-    public void onValueChanged(OnCharacteristicValueChangedCallback onCharacteristicValueChangedCallback) {
-        this.onCharacteristicValueChangedCallback = onCharacteristicValueChangedCallback;
-    }
-
-    public void write(BluetoothGatt gatt, byte[] packet, int writeType, @Nullable OnCharacteristicOperationResult callback) throws CannotWriteCharacteristicException, WritePacketIsTooBigException {
-        queueCommand(callback, () -> {
-            if (packet.length > protocol.getMTU()) {
-            //    throw new WritePacketIsTooBigException(packet);
-                Log.w(TAG, "current mtu is " + protocol.getMTU() + " bytes but writing " + packet.length + " bytes");
-            }
-            Log.d(TAG, "_writeData ... packet = 0x" + Helper.ByteArrayToHexString(packet) + " (size = " + packet.length + ")");
-            this.characteristic.setValue(packet);
-            this.characteristic.setWriteType(writeType);
-            boolean writeSuccess = gatt.writeCharacteristic(this.characteristic);
-            if (!writeSuccess) {
-                Log.w(TAG, "Cannot write on characteristic on first try. WRITE ENABLED: " + this.isWritable() + "/ Write type: " + this.characteristic.getWriteType());
-                throw new CannotWriteCharacteristicException(gatt, this.characteristic);
-            }
-            Log.d(TAG, "_writeData OK ! packet = 0x" + Helper.ByteArrayToHexString(packet) + " (size = " + packet.length + ")");
-        });
-    }
-
-    @Override
-    public void onCharacteristicValueChanged(BluetoothGatt gatt) {
-        if (this.onCharacteristicValueChangedCallback != null) {
-            this.onCharacteristicValueChangedCallback.onCharacteristicValueChanged(this.characteristic.getValue());
-        }
-        if (this.callbacks != null) {
-            this.callbacks.onCharacteristicValueChanged(gatt);
-        }
-    }
-
-    @Override
-    public void onCharacteristicWrite(BluetoothGatt gatt, int status) throws WritePacketIsTooBigException, CannotWriteCharacteristicException {
-        if (this.callbacks != null) {
-            this.callbacks.onCharacteristicWrite(gatt, status);
-        }
-    }
-
-    @Override
-    public void onCharacteristicRead(BluetoothGatt gatt, int status) {
-        if (this.callbacks != null) {
-            this.callbacks.onCharacteristicRead(gatt, status);
-        }
-    }
-
-    @Override
-    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
-        if (descriptor.getUuid().equals(NOTIFICATION_DESCRIPTOR_UUID)) {
-            if (this.cmdCallback != null) {
-                this.cmdCallback.onResult(this.characteristic, status);
-                this.cmdCallback = null;
-            }
-        }
-        if (this.callbacks != null) {
-            this.callbacks.onDescriptorWrite(gatt, descriptor, status);
-        }
-    }
-
-    public interface OnCharacteristicOperationResult {
-
-        void onResult(@NonNull BluetoothGattCharacteristic characteristic, int statusCode);
-
-        void onError(@NonNull BluetoothGattCharacteristic characteristic, @NonNull Exception ex);
-    }
-
-    public interface OnDescriptorOperationResult {
-
-        void onResult(@NonNull BluetoothGattDescriptor descriptor, int statusCode);
-
-        void onError(@Nullable BluetoothGattDescriptor descriptor, @NonNull Exception ex);
-    }
-
-    public interface OnCharacteristicValueChangedCallback {
-
-        void onCharacteristicValueChanged(byte[] value);
-
-    }
-}
+package com.iotize.plugin.cordova.ble.characteristics;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.iotize.android.communication.protocol.ble.BLECommandRunnable;
+import com.iotize.android.communication.protocol.ble.exception.CannotSetCharacteristicNotification;
+import com.iotize.android.communication.protocol.ble.exception.CannotWriteCharacteristicException;
+import com.iotize.android.communication.protocol.ble.exception.CharacteristicNotificationNotSupported;
+import com.iotize.android.communication.protocol.ble.exception.DescriptorNotAvailableException;
+import com.iotize.android.communication.protocol.ble.exception.WritePacketIsTooBigException;
+import com.iotize.android.core.util.Helper;
+import com.iotize.plugin.cordova.ble.BLEProtocol;
+import com.iotize.plugin.cordova.ble.commands.BLECommand;
+import com.iotize.plugin.cordova.ble.commands.CharacteristicOperationCompletedNotifier;
+import com.iotize.plugin.cordova.ble.commands.DescriptorOperationCompletedNotifier;
+
+import java.util.UUID;
+
+@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+public class CharacteristicAdapter implements CharacteristicAdapterCallbacks {
+
+    static final UUID NOTIFICATION_DESCRIPTOR_UUID =
+            UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+
+    private static final String TAG = "AbstractCharacteristicA";
+    @NonNull
+    public final BluetoothGattCharacteristic characteristic;
+
+    @NonNull
+    protected final BLEProtocol protocol;
+
+    @Nullable
+    private OnCharacteristicValueChangedCallback onCharacteristicValueChangedCallback;
+
+    @Nullable
+    protected CharacteristicAdapterCallbacks callbacks;
+
+    @Nullable
+    private OnCharacteristicOperationResult cmdCallback;
+
+    public CharacteristicAdapter(
+            @NonNull BLEProtocol protocol,
+            @NonNull BluetoothGattCharacteristic characteristic,
+            @Nullable CharacteristicAdapterCallbacks callbacks) {
+        this.protocol = protocol;
+        this.characteristic = characteristic;
+        this.callbacks = callbacks;
+    }
+
+    public void setCallbacks(CharacteristicAdapterCallbacks callbacks) {
+        this.callbacks = callbacks;
+    }
+
+    public boolean isWritable() {
+        int properties = this.characteristic.getProperties();
+        return (properties & (BluetoothGattCharacteristic.PROPERTY_WRITE | BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) != 0;
+    }
+
+    public void startNotification(BluetoothGatt gatt, OnCharacteristicOperationResult callback) {
+        this.startOrStopValueChangedSubscription(gatt, true, callback);
+    }
+
+    public void stopNotification(BluetoothGatt gatt, OnCharacteristicOperationResult callback) {
+        this.startOrStopValueChangedSubscription(gatt, false, callback);
+    }
+
+    private void startOrStopValueChangedSubscription(BluetoothGatt gatt, boolean start, OnCharacteristicOperationResult callback) {
+        queueCommand(callback, () -> {
+            if (gatt.setCharacteristicNotification(characteristic, start)) {
+
+                BluetoothGattDescriptor descriptor = characteristic.getDescriptor(NOTIFICATION_DESCRIPTOR_UUID);
+
+                if (descriptor == null) {
+                    throw new DescriptorNotAvailableException(characteristic, NOTIFICATION_DESCRIPTOR_UUID);
+                }
+
+                if (start) {
+                    int properties = characteristic.getProperties();
+                    if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) {
+                        descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+                    } else if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) != 0) {
+                        descriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE);
+                    } else {
+                        throw new CharacteristicNotificationNotSupported(this.characteristic);
+                    }
+                } else {
+                    descriptor.setValue(BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
+                }
+
+                if (!gatt.writeDescriptor(descriptor)) {
+                    throw new CannotSetCharacteristicNotification(this.characteristic);
+                }
+            } else {
+                throw new CannotSetCharacteristicNotification(this.characteristic);
+            }
+        });
+    }
+
+    void queueCommand(@Nullable OnCharacteristicOperationResult cb, @NonNull BLECommandRunnable runnable) {
+        this.protocol.queueCommand(new BLECommand(
+                runnable,
+                new CharacteristicOperationCompletedNotifier(cb, this.characteristic)
+        ));
+    }
+
+    void queueCommand(@Nullable OnDescriptorOperationResult cb, @NonNull BLECommandRunnable runnable, BluetoothGattDescriptor descriptor) {
+        this.protocol.queueCommand(new BLECommand(
+                        runnable,
+                        new DescriptorOperationCompletedNotifier(cb, descriptor)
+                )
+        );
+    }
+
+    public byte[] getValue() {
+        return this.characteristic.getValue();
+    }
+
+    public void read(@Nullable OnCharacteristicOperationResult callback) {
+        queueCommand(callback, () -> {
+            this.protocol.getGatt().readCharacteristic(this.characteristic);
+        });
+    }
+
+    public void readDescriptor(@NonNull UUID descriptorUUID, @Nullable OnDescriptorOperationResult callback) {
+        BluetoothGattDescriptor descriptor = this.characteristic.getDescriptor(descriptorUUID);
+        if (descriptor == null && callback != null) {
+            callback.onError(null, new DescriptorNotAvailableException(this.characteristic, descriptorUUID));
+            return;
+        }
+        queueCommand(callback, () -> {
+            this.protocol.getGatt().readDescriptor(descriptor);
+        }, descriptor);
+    }
+
+    public void onValueChanged(OnCharacteristicValueChangedCallback onCharacteristicValueChangedCallback) {
+        this.onCharacteristicValueChangedCallback = onCharacteristicValueChangedCallback;
+    }
+
+    public void write(BluetoothGatt gatt, byte[] packet, int writeType, @Nullable OnCharacteristicOperationResult callback) throws CannotWriteCharacteristicException, WritePacketIsTooBigException {
+        queueCommand(callback, () -> {
+            if (packet.length > protocol.getMTU()) {
+            //    throw new WritePacketIsTooBigException(packet);
+                Log.w(TAG, "current mtu is " + protocol.getMTU() + " bytes but writing " + packet.length + " bytes");
+            }
+            Log.d(TAG, "_writeData ... packet = 0x" + Helper.ByteArrayToHexString(packet) + " (size = " + packet.length + ")");
+            this.characteristic.setValue(packet);
+            this.characteristic.setWriteType(writeType);
+            boolean writeSuccess = gatt.writeCharacteristic(this.characteristic);
+            if (!writeSuccess) {
+                Log.w(TAG, "Cannot write on characteristic on first try. WRITE ENABLED: " + this.isWritable() + "/ Write type: " + this.characteristic.getWriteType());
+                throw new CannotWriteCharacteristicException(gatt, this.characteristic);
+            }
+            Log.d(TAG, "_writeData OK ! packet = 0x" + Helper.ByteArrayToHexString(packet) + " (size = " + packet.length + ")");
+        });
+    }
+
+    @Override
+    public void onCharacteristicValueChanged(BluetoothGatt gatt) {
+        if (this.onCharacteristicValueChangedCallback != null) {
+            this.onCharacteristicValueChangedCallback.onCharacteristicValueChanged(this.characteristic.getValue());
+        }
+        if (this.callbacks != null) {
+            this.callbacks.onCharacteristicValueChanged(gatt);
+        }
+    }
+
+    @Override
+    public void onCharacteristicWrite(BluetoothGatt gatt, int status) throws WritePacketIsTooBigException, CannotWriteCharacteristicException {
+        if (this.callbacks != null) {
+            this.callbacks.onCharacteristicWrite(gatt, status);
+        }
+    }
+
+    @Override
+    public void onCharacteristicRead(BluetoothGatt gatt, int status) {
+        if (this.callbacks != null) {
+            this.callbacks.onCharacteristicRead(gatt, status);
+        }
+    }
+
+    @Override
+    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        if (descriptor.getUuid().equals(NOTIFICATION_DESCRIPTOR_UUID)) {
+            if (this.cmdCallback != null) {
+                this.cmdCallback.onResult(this.characteristic, status);
+                this.cmdCallback = null;
+            }
+        }
+        if (this.callbacks != null) {
+            this.callbacks.onDescriptorWrite(gatt, descriptor, status);
+        }
+    }
+
+    public interface OnCharacteristicOperationResult {
+
+        void onResult(@NonNull BluetoothGattCharacteristic characteristic, int statusCode);
+
+        void onError(@NonNull BluetoothGattCharacteristic characteristic, @NonNull Exception ex);
+    }
+
+    public interface OnDescriptorOperationResult {
+
+        void onResult(@NonNull BluetoothGattDescriptor descriptor, int statusCode);
+
+        void onError(@Nullable BluetoothGattDescriptor descriptor, @NonNull Exception ex);
+    }
+
+    public interface OnCharacteristicValueChangedCallback {
+
+        void onCharacteristicValueChanged(byte[] value);
+
+    }
+}

package/src/android/src/ble/characteristics/CharacteristicAdapterCallbacks.java

@@ -1,21 +1,21 @@
-package com.iotize.plugin.cordova.ble.characteristics;
-
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattDescriptor;
-
-import com.iotize.android.communication.protocol.ble.exception.CannotWriteCharacteristicException;
-import com.iotize.android.communication.protocol.ble.exception.WritePacketIsTooBigException;
-
-import java.util.UUID;
-
-public interface CharacteristicAdapterCallbacks {
-
-    void onCharacteristicValueChanged(BluetoothGatt gatt);
-
-    void onCharacteristicWrite(BluetoothGatt gatt, int status) throws WritePacketIsTooBigException, CannotWriteCharacteristicException;
-
-    void onCharacteristicRead(BluetoothGatt gatt, int status);
-
-    void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status);
-
-}
+package com.iotize.plugin.cordova.ble.characteristics;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattDescriptor;
+
+import com.iotize.android.communication.protocol.ble.exception.CannotWriteCharacteristicException;
+import com.iotize.android.communication.protocol.ble.exception.WritePacketIsTooBigException;
+
+import java.util.UUID;
+
+public interface CharacteristicAdapterCallbacks {
+
+    void onCharacteristicValueChanged(BluetoothGatt gatt);
+
+    void onCharacteristicWrite(BluetoothGatt gatt, int status) throws WritePacketIsTooBigException, CannotWriteCharacteristicException;
+
+    void onCharacteristicRead(BluetoothGatt gatt, int status);
+
+    void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status);
+
+}