react-native-ble-manager 12.3.0 → 12.4.1

package/android/src/main/java/it/innove/BleManager.java

@@ -40,7 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-class BleManager extends NativeBleManagerSpec {
+public class BleManager extends NativeBleManagerSpec {
 
     public static final String LOG_TAG = "RNBleManager";
     private static final int ENABLE_REQUEST = 539;
@@ -282,6 +282,12 @@ class BleManager extends NativeBleManagerSpec {
         Log.d(LOG_TAG, "BleManager initialized");
     }
 
+    @ReactMethod
+    public void isStarted(Callback callback) {
+        Log.d(LOG_TAG, "isStarted");
+        callback.invoke(null, scanManager != null);
+    }
+
     @SuppressLint("MissingPermission")
     @ReactMethod
     public void enableBluetooth(Callback callback) {
@@ -310,7 +316,7 @@ class BleManager extends NativeBleManagerSpec {
     }
 
     @ReactMethod
-    public void scan(ReadableArray serviceUUIDs, double timeoutSeconds, boolean allowDuplicates, ReadableMap scanningOptions,
+    public void scan(ReadableMap scanningOptions,
                      Callback callback) {
         Log.d(LOG_TAG, "scan");
         if (getBluetoothAdapter() == null) {
@@ -333,7 +339,7 @@ class BleManager extends NativeBleManagerSpec {
         }
 
         if (scanManager != null)
-            scanManager.scan(serviceUUIDs, (int) timeoutSeconds, scanningOptions, callback);
+            scanManager.scan(scanningOptions, callback);
     }
 
     @SuppressLint("NewApi") // NOTE: constructor checks the API version.
@@ -448,7 +454,7 @@ class BleManager extends NativeBleManagerSpec {
 
     @ReactMethod
     public void startNotificationWithBuffer(String deviceUUID, String serviceUUID, String characteristicUUID,
-                                           double bufferLength, Callback callback) {
+                                            double bufferLength, Callback callback) {
         Log.d(LOG_TAG, "startNotification");
         if (serviceUUID == null || characteristicUUID == null) {
             callback.invoke("ServiceUUID and characteristicUUID required.");

package/android/src/main/java/it/innove/DefaultPeripheral.java

@@ -1,16 +1,17 @@
 package it.innove;
 
+import static it.innove.BleManager.LOG_TAG;
+
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.ScanRecord;
 import android.bluetooth.le.ScanResult;
 import android.os.Build;
 import android.os.ParcelUuid;
 import android.annotation.SuppressLint;
+import android.util.Log;
 import android.util.SparseArray;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
@@ -25,7 +26,7 @@ public class DefaultPeripheral extends Peripheral {
     private ScanResult scanResult;
 
     public DefaultPeripheral(BleManager bleManager, ScanResult result) {
-        super(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes(), bleManager);
+        super(result.getDevice(), result.getRssi(), Objects.requireNonNull(result.getScanRecord()).getBytes(), bleManager);
         this.advertisingData = result.getScanRecord();
         this.scanResult = result;
     }
@@ -40,9 +41,9 @@ public class DefaultPeripheral extends Peripheral {
         WritableMap advertising = Arguments.createMap();
 
         try {
-            String name = device.getName();
-            if (name == null) {
-                name = Objects.requireNonNull(scanResult.getScanRecord()).getDeviceName();
+            String name = getSafeDeviceName();
+            if (name == null && scanResult != null && scanResult.getScanRecord() != null) {
+                name = scanResult.getScanRecord().getDeviceName();
             }
             map.putString("name", name);
             map.putString("id", device.getAddress()); // mac address
@@ -50,7 +51,7 @@ public class DefaultPeripheral extends Peripheral {
 
             advertising.putMap("rawData", byteArrayToWritableMap(advertisingDataBytes));
 
-            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 // We can check if peripheral is connectable using the scanresult
                 if (this.scanResult != null) {
                     advertising.putBoolean("isConnectable", scanResult.isConnectable());
@@ -66,7 +67,7 @@ public class DefaultPeripheral extends Peripheral {
                     advertising.putString("localName", deviceName.replace("\0", ""));
 
                 WritableArray serviceUuids = Arguments.createArray();
-                if (advertisingData.getServiceUuids() != null && advertisingData.getServiceUuids().size() != 0) {
+                if (advertisingData.getServiceUuids() != null && !advertisingData.getServiceUuids().isEmpty()) {
                     for (ParcelUuid uuid : advertisingData.getServiceUuids()) {
                         serviceUuids.pushString(UUIDHelper.uuidToString(uuid.getUuid()));
                     }
@@ -106,7 +107,7 @@ public class DefaultPeripheral extends Peripheral {
 
             map.putMap("advertising", advertising);
         } catch (Exception e) { // this shouldn't happen
-            e.printStackTrace();
+            Log.e(LOG_TAG, "asWritableMap error", e);
         }
 
         return map;
@@ -115,6 +116,6 @@ public class DefaultPeripheral extends Peripheral {
     public void updateData(ScanResult result) {
         scanResult = result;
         advertisingData = result.getScanRecord();
-        advertisingDataBytes = advertisingData.getBytes();
+        advertisingDataBytes = advertisingData != null ? advertisingData.getBytes() : null;
     }
 }

package/android/src/main/java/it/innove/DefaultScanManager.java

@@ -36,6 +36,7 @@ import com.facebook.react.bridge.WritableMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 @SuppressLint("MissingPermission")
 public class DefaultScanManager extends ScanManager {
@@ -65,7 +66,7 @@ public class DefaultScanManager extends ScanManager {
     }
 
     @Override
-    public void scan(ReadableArray serviceUUIDs, final int scanSeconds, ReadableMap options, Callback callback) {
+    public void scan(ReadableMap options, Callback callback) {
         ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
         List<ScanFilter> filters = new ArrayList<>();
 
@@ -77,16 +78,14 @@ public class DefaultScanManager extends ScanManager {
             scanSettingsBuilder.setScanMode(options.getInt("scanMode"));
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (options.hasKey("numberOfMatches")) {
-                scanSettingsBuilder.setNumOfMatches(options.getInt("numberOfMatches"));
-            }
-            if (options.hasKey("matchMode")) {
-                scanSettingsBuilder.setMatchMode(options.getInt("matchMode"));
-            }
-            if (options.hasKey("callbackType")) {
-                scanSettingsBuilder.setCallbackType(options.getInt("callbackType"));
-            }
+        if (options.hasKey("numberOfMatches")) {
+            scanSettingsBuilder.setNumOfMatches(options.getInt("numberOfMatches"));
+        }
+        if (options.hasKey("matchMode")) {
+            scanSettingsBuilder.setMatchMode(options.getInt("matchMode"));
+        }
+        if (options.hasKey("callbackType")) {
+            scanSettingsBuilder.setCallbackType(options.getInt("callbackType"));
         }
 
         if (options.hasKey("reportDelay")) {
@@ -103,9 +102,10 @@ public class DefaultScanManager extends ScanManager {
             }
         }
 
-        if (serviceUUIDs.size() > 0) {
+        ReadableArray serviceUUIDs = options.getArray("serviceUUIDs");
+        if (serviceUUIDs != null && serviceUUIDs.size() > 0) {
             for (int i = 0; i < serviceUUIDs.size(); i++) {
-                ScanFilter filter = new ScanFilter.Builder().setServiceUuid(new ParcelUuid(UUIDHelper.uuidFromString(serviceUUIDs.getString(i)))).build();
+                ScanFilter filter = new ScanFilter.Builder().setServiceUuid(new ParcelUuid(UUIDHelper.uuidFromString(Objects.requireNonNull(serviceUUIDs.getString(i))))).build();
                 filters.add(filter);
                 Log.d(BleManager.LOG_TAG, "Filter service: " + serviceUUIDs.getString(i));
             }
@@ -221,6 +221,7 @@ public class DefaultScanManager extends ScanManager {
 
         isScanning = true;
 
+        long scanSeconds = (long) options.getDouble("seconds");
         if (scanSeconds > 0) {
             Thread thread = new Thread() {
                 private final int currentScanSession = scanSessionId.incrementAndGet();
@@ -337,7 +338,9 @@ public class DefaultScanManager extends ScanManager {
         if (scanner != null) {
             try {
                 if (scanningWithIntent && scanPendingIntent != null) {
-                    scanner.stopScan(scanPendingIntent);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        scanner.stopScan(scanPendingIntent);
+                    }
                 } else {
                     scanner.stopScan(mScanCallback);
                 }

package/android/src/main/java/it/innove/Peripheral.java

@@ -2,6 +2,7 @@ package it.innove;
 
 import static com.facebook.react.common.ReactConstants.TAG;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.bluetooth.BluetoothDevice;
@@ -12,7 +13,7 @@ import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothStatusCodes;
-
+import android.content.pm.PackageManager;
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
@@ -22,6 +23,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -79,7 +81,7 @@ public class Peripheral extends BluetoothGattCallback {
     private final Handler mainHandler = new Handler(Looper.getMainLooper());
     private boolean commandQueueBusy = false;
 
-    private List<byte[]> writeQueue = new ArrayList<>();
+    private final Queue<byte[]> writeQueue = new LinkedList<>();
 
     public Peripheral(BluetoothDevice device, int advertisingRSSI, byte[] scanRecord, BleManager bleManager) {
         this.device = device;
@@ -160,10 +162,10 @@ public class Peripheral extends BluetoothGattCallback {
     // bt_btif : Register with GATT stack failed.
 
     public void disconnect(final Callback callback, final boolean force) {
+        connected = false;
         mainHandler.post(() -> {
             errorAndClearAllCallbacks("Disconnect called before the command completed");
             resetQueuesAndBuffers();
-            connected = false;
 
             if (gatt != null) {
                 try {
@@ -190,11 +192,11 @@ public class Peripheral extends BluetoothGattCallback {
         WritableMap advertising = Arguments.createMap();
 
         try {
-            map.putString("name", device.getName());
+            String name = getSafeDeviceName();
+            map.putString("name", name);
             map.putString("id", device.getAddress()); // mac address
             map.putInt("rssi", advertisingRSSI);
 
-            String name = device.getName();
             if (name != null)
                 advertising.putString("localName", name);
 
@@ -211,6 +213,23 @@ public class Peripheral extends BluetoothGattCallback {
         return map;
     }
 
+    @Nullable
+    protected String getSafeDeviceName() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            Context context = bleManager != null ? bleManager.getReactContext() : null;
+            if (context == null) {
+                return null;
+            }
+
+            if (ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT)
+                    != PackageManager.PERMISSION_GRANTED) {
+                return null;
+            }
+        }
+
+        return device.getName();
+    }
+
     public WritableMap asWritableMap(BluetoothGatt gatt) {
 
         WritableMap map = asWritableMap();
@@ -219,13 +238,13 @@ public class Peripheral extends BluetoothGattCallback {
         WritableArray characteristicsArray = Arguments.createArray();
 
         if (connected && gatt != null) {
-            for (Iterator<BluetoothGattService> it = gatt.getServices().iterator(); it.hasNext();) {
+            for (Iterator<BluetoothGattService> it = gatt.getServices().iterator(); it.hasNext(); ) {
                 BluetoothGattService service = it.next();
                 WritableMap serviceMap = Arguments.createMap();
                 serviceMap.putString("uuid", UUIDHelper.uuidToString(service.getUuid()));
 
                 for (Iterator<BluetoothGattCharacteristic> itCharacteristic = service.getCharacteristics()
-                        .iterator(); itCharacteristic.hasNext();) {
+                        .iterator(); itCharacteristic.hasNext(); ) {
                     BluetoothGattCharacteristic characteristic = itCharacteristic.next();
                     WritableMap characteristicsMap = Arguments.createMap();
 
@@ -297,15 +316,12 @@ public class Peripheral extends BluetoothGattCallback {
                 for (Callback retrieveServicesCallback : retrieveServicesCallbacks) {
                     retrieveServicesCallback.invoke("Error during service retrieval: gatt is null");
                 }
-            }
-            else if (status == BluetoothGatt.GATT_SUCCESS)
-            {
+            } else if (status == BluetoothGatt.GATT_SUCCESS) {
                 for (Callback retrieveServicesCallback : retrieveServicesCallbacks) {
                     WritableMap map = this.asWritableMap(gatt);
                     retrieveServicesCallback.invoke(null, map);
                 }
-            }
-            else {
+            } else {
                 for (Callback retrieveServicesCallback : retrieveServicesCallbacks) {
                     retrieveServicesCallback.invoke("Error during service retrieval.");
                 }
@@ -370,12 +386,20 @@ public class Peripheral extends BluetoothGattCallback {
         connected = false;
         clearBuffers();
     }
+
     @Override
     public void onConnectionStateChange(BluetoothGatt gatta, int status, final int newState) {
 
         Log.d(BleManager.LOG_TAG, "onConnectionStateChange to " + newState + " on peripheral: " + device.getAddress()
                 + " with status " + status);
 
+        // We immediately update the internal connection status
+        if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
+            connected = true;
+        } else if (newState == BluetoothProfile.STATE_DISCONNECTED || status != BluetoothGatt.GATT_SUCCESS) {
+            connected = false;
+        }
+
         mainHandler.post(() -> {
             gatt = gatta;
 
@@ -385,8 +409,6 @@ public class Peripheral extends BluetoothGattCallback {
 
             connecting = false;
             if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
-                connected = true;
-
                 sendConnectionEvent(device, status);
 
                 Log.d(BleManager.LOG_TAG, "Connected to: " + device.getAddress());
@@ -420,7 +442,7 @@ public class Peripheral extends BluetoothGattCallback {
         advertisingDataBytes = data;
     }
 
-    //////
+    /// ///
 
     @Override
     public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
@@ -456,7 +478,7 @@ public class Peripheral extends BluetoothGattCallback {
                         return;
                     }
                 }
-                
+
                 WritableMap map = Arguments.createMap();
                 map.putString("peripheral", device.getAddress());
                 map.putString("characteristic", charString);
@@ -480,6 +502,7 @@ public class Peripheral extends BluetoothGattCallback {
             onCharacteristicRead(gatt, characteristic, characteristic.getValue(), status);
         }
     }
+
     @Override
     public void onCharacteristicRead(@NonNull final BluetoothGatt gatt,
                                      @NonNull final BluetoothGattCharacteristic characteristic,
@@ -517,27 +540,28 @@ public class Peripheral extends BluetoothGattCallback {
         super.onCharacteristicWrite(gatt, characteristic, status);
 
         mainHandler.post(() -> {
-            if (writeQueue.size() > 0) {
-                byte[] data = writeQueue.get(0);
-                writeQueue.remove(0);
-                doWrite(characteristic, data, null);
-            } else if (status != BluetoothGatt.GATT_SUCCESS) {
-                if (status == GATT_AUTH_FAIL || status == GATT_INSUFFICIENT_AUTHENTICATION) {
-                    Log.d(BleManager.LOG_TAG, "Write needs bonding");
-                    // *not* doing completedCommand()
-                    return;
-                }
-                for (Callback writeCallback : writeCallbacks) {
-                    writeCallback.invoke("Error writing " + characteristic.getUuid() + " status=" + status, null);
-                }
-                writeCallbacks.clear();
-            } else if (!writeCallbacks.isEmpty()) {
-                for (Callback writeCallback : writeCallbacks) {
-                    writeCallback.invoke();
+            if (!writeQueue.isEmpty()) {
+                byte[] data = writeQueue.poll();
+                doWrite(characteristic, data);
+            } else {
+                if (status != BluetoothGatt.GATT_SUCCESS) {
+                    if (status == GATT_AUTH_FAIL || status == GATT_INSUFFICIENT_AUTHENTICATION) {
+                        Log.d(BleManager.LOG_TAG, "Write needs bonding");
+                        // *not* doing completedCommand()
+                        return;
+                    }
+                    for (Callback writeCallback : writeCallbacks) {
+                        writeCallback.invoke("Error writing " + characteristic.getUuid() + " status=" + status, null);
+                    }
+                    writeCallbacks.clear();
+                } else if (!writeCallbacks.isEmpty()) {
+                    for (Callback writeCallback : writeCallbacks) {
+                        writeCallback.invoke();
+                    }
+                    writeCallbacks.clear();
                 }
-                writeCallbacks.clear();
+                completedCommand();
             }
-            completedCommand();
         });
     }
 
@@ -699,7 +723,7 @@ public class Peripheral extends BluetoothGattCallback {
             // Then write to descriptor
             registerNotifyCallbacks.addLast(callback);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                result &=  BluetoothStatusCodes.SUCCESS == gatt.writeDescriptor(descriptor, finalValue);
+                result &= BluetoothStatusCodes.SUCCESS == gatt.writeDescriptor(descriptor, finalValue);
             } else {
                 descriptor.setValue(finalValue);
                 result &= gatt.writeDescriptor(descriptor);
@@ -752,7 +776,7 @@ public class Peripheral extends BluetoothGattCallback {
     // until we find the best match
     // This function prefers Notify over Indicate
     private BluetoothGattCharacteristic findNotifyCharacteristic(BluetoothGattService service,
-            UUID characteristicUUID) {
+                                                                 UUID characteristicUUID) {
 
         try {
             // Check for Notify first
@@ -810,7 +834,7 @@ public class Peripheral extends BluetoothGattCallback {
     }
 
     public void readDescriptor(UUID serviceUUID, UUID characteristicUUID, UUID descriptorUUID,
-            final Callback callback) {
+                               final Callback callback) {
         enqueue(() -> {
             if (!isConnected() || gatt == null) {
                 callback.invoke("Device is not connected", null);
@@ -893,9 +917,8 @@ public class Peripheral extends BluetoothGattCallback {
                     writeCallback.invoke("writeDescriptor failed for descriptor: " + descriptor.getUuid(), null);
                 }
                 writeDescriptorCallbacks.clear();
+                completedCommand();
             }
-
-            completedCommand();
         });
     }
 
@@ -939,14 +962,6 @@ public class Peripheral extends BluetoothGattCallback {
                 return;
             }
 
-            // Check if we still have a valid gatt object
-            if (gatt == null) {
-                Log.d(BleManager.LOG_TAG, "Error, gatt is null. Fill all callbacks with an error");
-                errorAndClearAllCallbacks("Gatt is null");
-                resetQueuesAndBuffers();
-                return;
-            }
-
             // Execute the next command in the queue
             commandQueueBusy = true;
             mainHandler.post(new Runnable() {
@@ -1019,7 +1034,12 @@ public class Peripheral extends BluetoothGattCallback {
                 return;
             } else {
                 this.retrieveServicesCallbacks.addLast(callback);
-                gatt.discoverServices();
+                boolean started = gatt.discoverServices();
+                if (!started) {
+                    this.retrieveServicesCallbacks.removeLastOccurrence(callback);
+                    callback.invoke("Failed to start service discovery", null);
+                    completedCommand();
+                }
             }
         });
     }
@@ -1029,7 +1049,7 @@ public class Peripheral extends BluetoothGattCallback {
     // and UUID of all characteristics instead of using
     // service.getCharacteristic(characteristicUUID)
     private BluetoothGattCharacteristic findReadableCharacteristic(BluetoothGattService service,
-            UUID characteristicUUID) {
+                                                                   UUID characteristicUUID) {
 
         if (service != null) {
             int read = BluetoothGattCharacteristic.PROPERTY_READ;
@@ -1051,7 +1071,7 @@ public class Peripheral extends BluetoothGattCallback {
     }
 
     private BluetoothGattCharacteristic findCharacteristic(BluetoothGattService service,
-                                                                   UUID characteristicUUID) {
+                                                           UUID characteristicUUID) {
 
         if (service != null) {
             return service.getCharacteristic(characteristicUUID);
@@ -1060,30 +1080,39 @@ public class Peripheral extends BluetoothGattCallback {
         return null;
     }
 
-    public boolean doWrite(final BluetoothGattCharacteristic characteristic, byte[] data, final Callback callback) {
+    private void doWrite(final BluetoothGattCharacteristic characteristic, final byte[] data) {
+        characteristic.setValue(data);
+        if (!gatt.writeCharacteristic(characteristic)) {
+            // write without response, caller will handle the callback
+            for (Callback writeCallback : writeCallbacks) {
+                writeCallback.invoke("Write failed", null);
+            }
+            writeCallbacks.clear();
+            completedCommand();
+        }
+    }
+
+    private boolean enqueueWrite(final BluetoothGattCharacteristic characteristic, byte[] data, final Callback callback) {
         final byte[] copyOfData = copyOf(data);
-        return enqueue(new Runnable() {
-            @Override
-            public void run() {
-                characteristic.setValue(copyOfData);
-                if (characteristic.getWriteType() == BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT
-                        && callback != null) {
-                    writeCallbacks.addLast(callback);
-                }
-                if (!gatt.writeCharacteristic(characteristic)) {
-                    // write without response, caller will handle the callback
-                    for (Callback writeCallback : writeCallbacks) {
-                        writeCallback.invoke("Write failed", null);
-                    }
-                    writeCallbacks.clear();
-                    completedCommand();
+        final boolean withResponse = characteristic.getWriteType() == BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
+        if (withResponse && callback != null) {
+            writeCallbacks.addLast(callback);
+        }
+        return enqueue(() -> {
+            if (!isConnected() || gatt == null) {
+                if (withResponse && callback != null) {
+                    writeCallbacks.removeLastOccurrence(callback);
+                    callback.invoke("Device is not connected", null);
                 }
+                completedCommand();
+                return;
             }
+            doWrite(characteristic, copyOfData);
         });
     }
 
     public void write(UUID serviceUUID, UUID characteristicUUID, byte[] data, Integer maxByteSize,
-            Integer queueSleepTime, Callback callback, int writeType) {
+                      Integer queueSleepTime, Callback callback, int writeType) {
         enqueue(() -> {
             if (!isConnected() || gatt == null) {
                 callback.invoke("Device is not connected", null);
@@ -1104,12 +1133,15 @@ public class Peripheral extends BluetoothGattCallback {
             characteristic.setWriteType(writeType);
 
             if (data.length <= maxByteSize) {
-                if (!doWrite(characteristic, data, callback)) {
-                    callback.invoke("Write failed");
-                } else {
-                    if (BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE == writeType) {
-                        callback.invoke();
+                if (!enqueueWrite(characteristic, data, callback)) {
+                    if (BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT == writeType) {
+                        writeCallbacks.removeLastOccurrence(callback);
                     }
+                    callback.invoke("Write failed");
+                    completedCommand();
+                    return;
+                } else if (BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE == writeType) {
+                    callback.invoke();
                 }
             } else {
                 int dataLength = data.length;
@@ -1134,21 +1166,24 @@ public class Peripheral extends BluetoothGattCallback {
 
                 if (BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT == writeType) {
                     writeQueue.addAll(splittedMessage);
-                    if (!doWrite(characteristic, firstMessage, callback)) {
+                    if (!enqueueWrite(characteristic, firstMessage, callback)) {
                         writeQueue.clear();
+                        writeCallbacks.remove(callback);
                         callback.invoke("Write failed");
+                        completedCommand();
+                        return;
                     }
                 } else {
                     try {
                         boolean writeError = false;
-                        if (!doWrite(characteristic, firstMessage, callback)) {
+                        if (!enqueueWrite(characteristic, firstMessage, callback)) {
                             writeError = true;
                             callback.invoke("Write failed");
                         }
                         if (!writeError) {
                             Thread.sleep(queueSleepTime);
                             for (byte[] message : splittedMessage) {
-                                if (!doWrite(characteristic, message, callback)) {
+                                if (!enqueueWrite(characteristic, message, callback)) {
                                     writeError = true;
                                     callback.invoke("Write failed");
                                     break;
@@ -1159,8 +1194,14 @@ public class Peripheral extends BluetoothGattCallback {
                                 callback.invoke();
                             }
                         }
+                        if (writeError) {
+                            completedCommand();
+                            return;
+                        }
                     } catch (InterruptedException e) {
                         callback.invoke("Error during writing");
+                        completedCommand();
+                        return;
                     }
                 }
             }
@@ -1234,7 +1275,7 @@ public class Peripheral extends BluetoothGattCallback {
     // and UUID of all characteristics instead of using
     // service.getCharacteristic(characteristicUUID)
     private BluetoothGattCharacteristic findWritableCharacteristic(BluetoothGattService service,
-            UUID characteristicUUID, int writeType) {
+                                                                   UUID characteristicUUID, int writeType) {
         try {
             // get write property
             int writeProperty = BluetoothGattCharacteristic.PROPERTY_WRITE;
@@ -1242,9 +1283,9 @@ public class Peripheral extends BluetoothGattCallback {
                 writeProperty = BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE;
             }
 
-           if (service == null) {
-               throw new Exception("Service is null.");
-           }
+            if (service == null) {
+                throw new Exception("Service is null.");
+            }
             List<BluetoothGattCharacteristic> characteristics = service.getCharacteristics();
             for (BluetoothGattCharacteristic characteristic : characteristics) {
                 if ((characteristic.getProperties() & writeProperty) != 0

package/android/src/main/java/it/innove/ScanManager.java

@@ -36,7 +36,7 @@ public abstract class ScanManager {
 
     public abstract void stopScan(Callback callback);
 
-    public abstract void scan(ReadableArray serviceUUIDs, final int scanSeconds, ReadableMap options, Callback callback);
+    public abstract void scan(ReadableMap options, Callback callback);
 
     public abstract boolean isScanning();