react-native-ble-manager 10.1.2 → 10.1.4

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

@@ -175,7 +175,15 @@ class BleManager extends ReactContextBaseJavaModule {
             if (getCurrentActivity() == null)
                 callback.invoke("Current activity not available");
             else
-                getCurrentActivity().startActivityForResult(intentEnable, ENABLE_REQUEST);
+                {
+                    try{
+                        getCurrentActivity().startActivityForResult(intentEnable, ENABLE_REQUEST);
+                    }catch(Exception e){
+                        callback.invoke("Current activity not available");
+                    }
+                    
+                }
+                
         } else
             callback.invoke();
     }

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

@@ -5,6 +5,7 @@ import android.bluetooth.le.ScanRecord;
 import android.bluetooth.le.ScanResult;
 import android.os.Build;
 import android.os.ParcelUuid;
+import android.annotation.SuppressLint;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,6 +16,7 @@ import com.facebook.react.bridge.WritableMap;
 import java.util.Map;
 
 
+@SuppressLint("MissingPermission")
 public class DefaultPeripheral extends Peripheral {
 
     private ScanRecord advertisingData;
@@ -36,6 +38,10 @@ public class DefaultPeripheral extends Peripheral {
         WritableMap advertising = Arguments.createMap();
 
         try {
+            map.putString("name", device.getName());
+            map.putString("id", device.getAddress()); // mac address
+            map.putInt("rssi", advertisingRSSI);
+
             advertising.putMap("manufacturerData", byteArrayToWritableMap(advertisingDataBytes));
 
             if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

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

@@ -12,18 +12,21 @@ public class NotifyBufferContainer {
         this.items.clear();
     }
     public byte[] put(byte[] value){
-        int restLength = value.length - this.items.remaining();
         byte[] toInsert = null;
         byte[] rest = null;
-        if (restLength < 0) {
+        
+        if (value.length > this.items.remaining()) {
+            int restLength = value.length - this.items.remaining();
             rest = new byte[restLength];
-            toInsert = new byte[value.length - restLength];
+            toInsert = new byte[this.items.remaining()];
             System.arraycopy(value, 0, toInsert, 0, toInsert.length);
-            System.arraycopy(value, toInsert.length, rest, restLength, rest.length);
+            System.arraycopy(value, toInsert.length, rest, 0, rest.length);
         } else {
             toInsert = value;
         }
+        
         this.items.put(toInsert);
+
         return rest;
     }
     public boolean isBufferFull(){

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

@@ -52,7 +52,7 @@ public class Peripheral extends BluetoothGattCallback {
     public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5;
     public static final int GATT_AUTH_FAIL = 137;
 
-    private final BluetoothDevice device;
+    protected final BluetoothDevice device;
     private final Map<String, NotifyBufferContainer> bufferedCharacteristics;
     protected volatile byte[] advertisingDataBytes = new byte[0];
     protected volatile int advertisingRSSI;
@@ -435,11 +435,7 @@ public class Peripheral extends BluetoothGattCallback {
                 byte[] rest = null;
                 if (buffer != null) {
                     rest = buffer.put(dataValue);
-                    Log.d(BleManager.LOG_TAG, "onCharacteristicChanged-buffering: " +
-                            buffer.size() + " from peripheral: " + device.getAddress());
-
                     if (buffer.isBufferFull()) {
-                        Log.d(BleManager.LOG_TAG, "onCharacteristicChanged sending buffered data " + buffer.size());
 
                         // fetch and reset
                         dataValue = buffer.items.array();
@@ -448,8 +444,7 @@ public class Peripheral extends BluetoothGattCallback {
                         return;
                     }
                 }
-                Log.d(BleManager.LOG_TAG, "onCharacteristicChanged: " + BleManager.bytesToHex(dataValue)
-                        + " from peripheral: " + device.getAddress());
+                
                 WritableMap map = Arguments.createMap();
                 map.putString("peripheral", device.getAddress());
                 map.putString("characteristic", charString);

package/dist/cjs/types.d.ts

@@ -37,7 +37,7 @@ export interface AdvertisingData {
     isConnectable?: boolean;
     localName?: string;
     manufacturerData?: CustomAdvertisingData;
-    serviceData?: CustomAdvertisingData;
+    serviceData?: Record<string, CustomAdvertisingData>;
     serviceUUIDs?: string[];
     txPowerLevel?: number;
 }

package/dist/esm/types.d.ts

@@ -37,7 +37,7 @@ export interface AdvertisingData {
     isConnectable?: boolean;
     localName?: string;
     manufacturerData?: CustomAdvertisingData;
-    serviceData?: CustomAdvertisingData;
+    serviceData?: Record<string, CustomAdvertisingData>;
     serviceUUIDs?: string[];
     txPowerLevel?: number;
 }

package/ios/BleManager.m

@@ -112,11 +112,19 @@ static bool hasListeners = NO;
         [self invokeAndClearDictionary:readDescriptorCallbacks withKey:key usingParameters:@[error, [NSNull null]]];
         return;
     }
-    NSLog(@"Read value [descriptor: %@, characteristic: %@]: (%lu) %@",
+
+    if ([descriptor.value isKindOfClass:[NSData class]]) {
+        NSLog(@"Read value [descriptor: %@, characteristic: %@]: (%lu) %@",
+            descriptor.UUID,
+            descriptor.characteristic.UUID,
+            [(NSData *)descriptor.value length],
+            descriptor.value);
+    } else {
+        NSLog(@"Read value [descriptor: %@, characteristic: %@]: %@",
             descriptor.UUID,
             descriptor.characteristic.UUID,
-            [descriptor.value length],
             descriptor.value);
+    }
 
     NSMutableArray* peripheralReadDescriptorCallbacks = [readDescriptorCallbacks objectForKey:key];
     if (peripheralReadDescriptorCallbacks != NULL) {
@@ -185,7 +193,7 @@ static bool hasListeners = NO;
 
 
 
-- (NSString *) centralManagerStateToString: (int)state
+- (NSString *) centralManagerStateToString: (CBManagerState)state
 {
     switch (state) {
         case CBManagerStateUnknown:
@@ -406,9 +414,11 @@ RCT_EXPORT_METHOD(scan:(NSArray *)serviceUUIDStrings timeoutSeconds:(nonnull NSN
     }
     [manager scanForPeripheralsWithServices:serviceUUIDs options:options];
     
-    dispatch_async(dispatch_get_main_queue(), ^{
-        self.scanTimer = [NSTimer scheduledTimerWithTimeInterval:[timeoutSeconds floatValue] target:self selector:@selector(stopScanTimer:) userInfo: nil repeats:NO];
-    });
+    if ([timeoutSeconds floatValue] > 0) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.scanTimer = [NSTimer scheduledTimerWithTimeInterval:[timeoutSeconds floatValue] target:self selector:@selector(stopScanTimer:) userInfo: nil repeats:NO];
+        });
+    }
     callback(@[]);
 }
 
@@ -972,7 +982,6 @@ RCT_EXPORT_METHOD(requestMTU:(NSString *)deviceUUID mtu:(NSInteger)mtu callback:
     }
     NSLog(@"Characteristics For Service Discover");
     
-    NSString *peripheralUUIDString = [peripheral uuidAsString];
     NSMutableSet *characteristicsForService = [NSMutableSet new];
     [characteristicsForService addObjectsFromArray:service.characteristics];
     [retrieveServicesLatches setObject:characteristicsForService forKey:service.UUID.UUIDString];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-manager",
-  "version": "10.1.2",
+  "version": "10.1.4",
   "description": "A BLE module for react native.",
   "repository": {
     "type": "git",

package/src/types.ts

@@ -39,7 +39,7 @@ export interface AdvertisingData {
   isConnectable?: boolean;
   localName?: string;
   manufacturerData?: CustomAdvertisingData;
-  serviceData?: CustomAdvertisingData;
+  serviceData?: Record<string, CustomAdvertisingData>;
   serviceUUIDs?: string[];
   txPowerLevel?: number;
 }
@@ -76,7 +76,7 @@ export interface StartOptions {
   forceLegacy?: boolean;
 }
 
-export interface ConnectOptions {  
+export interface ConnectOptions {
   /**
    * [android only]
    */