Merge pull request pauldemarco#97 from pauldemarco/advertisement_fix

Advertisement data fix

Author: Paul DeMarco

android/src/main/java/com/pauldemarco/flutterblue/AdvertisementParser.java

@@ -84,7 +84,7 @@ static AdvertisementData parse(byte[] rawData) {
           break;
         }
         case 0x0A: { // Power level.
-          ret.setTxPowerLevel(data.get());
+          ret.setTxPowerLevel(Protos.Int32Value.newBuilder().setValue(data.get()));
           break;
         }
         case 0x16: // Service Data with 16 bit UUID.
@@ -114,9 +114,15 @@ static AdvertisementData parse(byte[] rawData) {
           break;
         }
         case 0xFF: {// Manufacturer specific data.
-          byte[] msd = new byte[length];
-          data.get(msd);
-          ret.setManufacturerData(ByteString.copyFrom(msd));
+          if(length < 2) {
+            throw new ArrayIndexOutOfBoundsException("Not enough data for Manufacturer specific data.");
+          }
+          int manufacturerId = data.getShort();
+          if((length - 2) > 0) {
+            byte[] msd = new byte[length - 2];
+            data.get(msd);
+            ret.putManufacturerData(manufacturerId, ByteString.copyFrom(msd));
+          }
           break;
         }
         default: {

android/src/main/java/com/pauldemarco/flutterblue/FlutterBluePlugin.java

@@ -622,7 +622,7 @@ private ScanCallback getScanCallback21() {
                 public void onScanResult(int callbackType, ScanResult result) {
                     super.onScanResult(callbackType, result);
                     if(scanResultsSink != null) {
-                        Protos.ScanResult scanResult = ProtoMaker.from(result.getDevice(), result.getScanRecord().getBytes(), result.getRssi());
+                        Protos.ScanResult scanResult = ProtoMaker.from(result.getDevice(), result);
                         scanResultsSink.success(scanResult.toByteArray());
                     }
                 }

android/src/main/java/com/pauldemarco/flutterblue/ProtoMaker.java

@@ -4,15 +4,26 @@
 
 package com.pauldemarco.flutterblue;
 
+import android.annotation.TargetApi;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.ScanRecord;
+import android.bluetooth.le.ScanResult;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.ParcelUuid;
+import android.util.Log;
+import android.util.SparseArray;
 
 import com.google.protobuf.ByteString;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -32,6 +43,56 @@ static Protos.ScanResult from(BluetoothDevice device, byte[] advertisementData,
         return p.build();
     }
 
+    @TargetApi(21)
+    static Protos.ScanResult from(BluetoothDevice device, ScanResult scanResult) {
+        Protos.ScanResult.Builder p = Protos.ScanResult.newBuilder();
+        p.setDevice(from(device));
+        Protos.AdvertisementData.Builder a = Protos.AdvertisementData.newBuilder();
+        ScanRecord scanRecord = scanResult.getScanRecord();
+        if(Build.VERSION.SDK_INT >= 26) {
+            a.setConnectable(scanResult.isConnectable());
+        } else {
+            if(scanRecord != null) {
+                int flags = scanRecord.getAdvertiseFlags();
+                a.setConnectable((flags & 0x2) > 0);
+            }
+        }
+        if(scanRecord != null) {
+            String deviceName = scanRecord.getDeviceName();
+            if(deviceName != null) {
+                a.setLocalName(deviceName);
+            }
+            int txPower = scanRecord.getTxPowerLevel();
+            if(txPower != Integer.MIN_VALUE) {
+                a.setTxPowerLevel(Protos.Int32Value.newBuilder().setValue(txPower));
+            }
+            // Manufacturer Specific Data
+            SparseArray<byte[]> msd = scanRecord.getManufacturerSpecificData();
+            for (int i = 0; i < msd.size(); i++) {
+                int key = msd.keyAt(i);
+                byte[] value = msd.valueAt(i);
+                a.putManufacturerData(key, ByteString.copyFrom(value));
+            }
+            // Service Data
+            Map<ParcelUuid, byte[]> serviceData = scanRecord.getServiceData();
+            for (Map.Entry<ParcelUuid, byte[]> entry : serviceData.entrySet()) {
+                ParcelUuid key = entry.getKey();
+                byte[] value = entry.getValue();
+                a.putServiceData(key.getUuid().toString(), ByteString.copyFrom(value));
+            }
+            // Service UUIDs
+            List<ParcelUuid> serviceUuids = scanRecord.getServiceUuids();
+            if(serviceUuids != null) {
+                for (ParcelUuid s : serviceUuids) {
+                    a.addServiceUuids(s.getUuid().toString());
+                }
+            }
+        }
+        p.setRssi(scanResult.getRssi());
+        p.setAdvertisementData(a.build());
+        return p.build();
+    }
+
     static Protos.BluetoothDevice from(BluetoothDevice device) {
         Protos.BluetoothDevice.Builder p = Protos.BluetoothDevice.newBuilder();
         p.setRemoteId(device.getAddress());

example/ios/.gitignore

@@ -34,6 +34,7 @@ Icon?
 /Flutter/app.flx
 /Flutter/app.zip
 /Flutter/App.framework
+/Flutter/flutter_assets/
 /Flutter/Flutter.framework
 /Flutter/Generated.xcconfig
 /ServiceDefinitions.json