react-native-ble-manager 8.8.0 → 9.0.0

package/android/gradlew

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

package/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Dec 14 11:36:49 CET 2022
+sdk.dir=/Volumes/Dati/android

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

@@ -1,5 +1,9 @@
 package it.innove;
 
+import static android.app.Activity.RESULT_OK;
+import static android.bluetooth.BluetoothProfile.GATT;
+import static android.os.Build.VERSION_CODES.LOLLIPOP;
+
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -11,14 +15,13 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
-import android.util.Log;
-
 import com.facebook.react.bridge.ActivityEventListener;
-import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -36,10 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static android.app.Activity.RESULT_OK;
-import static android.bluetooth.BluetoothProfile.GATT;
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
-
 class BleManager extends ReactContextBaseJavaModule {
 
     public static final String LOG_TAG = "ReactNativeBleManager";
@@ -218,7 +217,7 @@ class BleManager extends ReactContextBaseJavaModule {
         if (scanManager != null) {
             scanManager.stopScan(callback);
             WritableMap map = Arguments.createMap();
-						map.putInt("status", 0);
+            map.putInt("status", 0);
             sendEvent("BleManagerStopScan", map);
         }
     }
@@ -458,7 +457,7 @@ class BleManager extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void checkState() {
+    public void checkState(Callback callback) {
         Log.d(LOG_TAG, "checkState");
 
         BluetoothAdapter adapter = getBluetoothAdapter();
@@ -490,6 +489,7 @@ class BleManager extends ReactContextBaseJavaModule {
         map.putString("state", state);
         Log.d(LOG_TAG, "state:" + state);
         sendEvent("BleManagerDidUpdateState", map);
+        callback.invoke(state);
     }
 
     @ReactMethod
@@ -538,7 +538,7 @@ class BleManager extends ReactContextBaseJavaModule {
                 final int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);
                 final int prevState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE,
                         BluetoothDevice.ERROR);
-                BluetoothDevice device = (BluetoothDevice) intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
 
                 String bondStateStr = "UNKNOWN";
                 switch (bondState) {
@@ -604,7 +604,7 @@ class BleManager extends ReactContextBaseJavaModule {
             synchronized (peripherals) {
                 for (Peripheral peripheral : peripherals.values()) {
                     if (peripheral.isConnected()) {
-                        peripheral.disconnect(null,true);
+                        peripheral.disconnect(null, true);
                     }
                 }
             }
@@ -743,14 +743,14 @@ class BleManager extends ReactContextBaseJavaModule {
         return peripheral;
     }
 
-   @ReactMethod
+    @ReactMethod
     public void addListener(String eventName) {
-      // Keep: Required for RN built in Event Emitter Calls.
+        // Keep: Required for RN built in Event Emitter Calls.
     }
 
     @ReactMethod
-     public void removeListeners(Integer count) {
-      // Keep: Required for RN built in Event Emitter Calls.
+    public void removeListeners(Integer count) {
+        // Keep: Required for RN built in Event Emitter Calls.
     }
 
     @Override
@@ -759,13 +759,14 @@ class BleManager extends ReactContextBaseJavaModule {
             // Disconnect all known peripherals, otherwise android system will think we are still connected
             // while we have lost the gatt instance
             disconnectPeripherals();
-        }catch(Exception e) {
+        } catch (Exception e) {
             Log.d(LOG_TAG, "Could not disconnect peripherals", e);
         }
 
         if (scanManager != null) {
             // Stop scan in case one was started to stop events from being emitted after destroy
-            scanManager.stopScan(args -> {});
+            scanManager.stopScan(args -> {
+            });
         }
     }
 }

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

@@ -1,12 +1,17 @@
 package it.innove;
 
+import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.util.Log;
 
-import com.facebook.react.bridge.*;
-
-import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 
 public class LegacyScanManager extends ScanManager {
 
@@ -24,38 +29,38 @@ public class LegacyScanManager extends ScanManager {
     }
 
     private BluetoothAdapter.LeScanCallback mLeScanCallback =
-        new BluetoothAdapter.LeScanCallback() {
-
-            @Override
-            public void onLeScan(final BluetoothDevice device, final int rssi,
-                                 final byte[] scanRecord) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Log.i(bleManager.LOG_TAG, "DiscoverPeripheral: " + device.getName());
-
-                        Peripheral peripheral = bleManager.getPeripheral(device);
-                        if (peripheral == null) {
-                            peripheral = new Peripheral(device, rssi, scanRecord, bleManager.getReactContext());
-                        } else {
-                            peripheral.updateData(scanRecord);
-                            peripheral.updateRssi(rssi);
-                        }
-                        bleManager.savePeripheral(peripheral);
+            new BluetoothAdapter.LeScanCallback() {
 
-                        WritableMap map = peripheral.asWritableMap();
-                        bleManager.sendEvent("BleManagerDiscoverPeripheral", map);
-                    }
-                });
-            }
+                @Override
+                public void onLeScan(final BluetoothDevice device, final int rssi,
+                                     final byte[] scanRecord) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Log.i(BleManager.LOG_TAG, "DiscoverPeripheral: " + device.getName());
+
+                            Peripheral peripheral = bleManager.getPeripheral(device);
+                            if (peripheral == null) {
+                                peripheral = new Peripheral(device, rssi, scanRecord, bleManager.getReactContext());
+                            } else {
+                                peripheral.updateData(scanRecord);
+                                peripheral.updateRssi(rssi);
+                            }
+                            bleManager.savePeripheral(peripheral);
+
+                            WritableMap map = peripheral.asWritableMap();
+                            bleManager.sendEvent("BleManagerDiscoverPeripheral", map);
+                        }
+                    });
+                }
 
 
-        };
+            };
 
     @Override
     public void scan(ReadableArray serviceUUIDs, final int scanSeconds, ReadableMap options, Callback callback) {
         if (serviceUUIDs.size() > 0) {
-            Log.d(bleManager.LOG_TAG, "Filter is not working in pre-lollipop devices");
+            Log.d(BleManager.LOG_TAG, "Filter is not working in pre-lollipop devices");
         }
         getBluetoothAdapter().startLeScan(mLeScanCallback);
 

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

@@ -5,6 +5,7 @@ import android.bluetooth.le.ScanRecord;
 import android.bluetooth.le.ScanResult;
 import android.os.Build;
 import android.os.ParcelUuid;
+
 import androidx.annotation.RequiresApi;
 
 import com.facebook.react.bridge.Arguments;
@@ -18,76 +19,76 @@ import java.util.Map;
 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 public class LollipopPeripheral extends Peripheral {
 
-	private ScanRecord advertisingData;
-	private ScanResult scanResult;
-
-	public LollipopPeripheral(ReactContext reactContext, ScanResult result) {
-		super(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes(), reactContext);
-		this.advertisingData = result.getScanRecord();
-		this.scanResult = result;
-	}
-
-	public LollipopPeripheral(BluetoothDevice device, ReactApplicationContext reactContext) {
-		super(device, reactContext);
-	}
-
-	@Override
-	public WritableMap asWritableMap() {
-		WritableMap map = super.asWritableMap();
-		WritableMap advertising = Arguments.createMap();
-
-		try {
-			advertising.putMap("manufacturerData", byteArrayToWritableMap(advertisingDataBytes));
-
-			if (android.os.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());
-				}
-			} else{
-				// We can't check if peripheral is connectable
-				advertising.putBoolean("isConnectable", true);
-			}
-
-
-			if (advertisingData != null) {
-				String deviceName = advertisingData.getDeviceName();
-				if (deviceName != null)
-					advertising.putString("localName", deviceName.replace("\0", ""));
-
-				WritableArray serviceUuids = Arguments.createArray();
-				if (advertisingData.getServiceUuids() != null && advertisingData.getServiceUuids().size() != 0) {
-					for (ParcelUuid uuid : advertisingData.getServiceUuids()) {
-						serviceUuids.pushString(UUIDHelper.uuidToString(uuid.getUuid()));
-					}
-				}
-				advertising.putArray("serviceUUIDs", serviceUuids);
-
-				WritableMap serviceData = Arguments.createMap();
-				if (advertisingData.getServiceData() != null) {
-					for (Map.Entry<ParcelUuid, byte[]> entry : advertisingData.getServiceData().entrySet()) {
-						if (entry.getValue() != null) {
-							serviceData.putMap(UUIDHelper.uuidToString((entry.getKey()).getUuid()), byteArrayToWritableMap(entry.getValue()));
-						}
-					}
-				}
+    private ScanRecord advertisingData;
+    private ScanResult scanResult;
+
+    public LollipopPeripheral(ReactContext reactContext, ScanResult result) {
+        super(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes(), reactContext);
+        this.advertisingData = result.getScanRecord();
+        this.scanResult = result;
+    }
+
+    public LollipopPeripheral(BluetoothDevice device, ReactApplicationContext reactContext) {
+        super(device, reactContext);
+    }
+
+    @Override
+    public WritableMap asWritableMap() {
+        WritableMap map = super.asWritableMap();
+        WritableMap advertising = Arguments.createMap();
+
+        try {
+            advertising.putMap("manufacturerData", byteArrayToWritableMap(advertisingDataBytes));
+
+            if (android.os.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());
+                }
+            } else {
+                // We can't check if peripheral is connectable
+                advertising.putBoolean("isConnectable", true);
+            }
+
+
+            if (advertisingData != null) {
+                String deviceName = advertisingData.getDeviceName();
+                if (deviceName != null)
+                    advertising.putString("localName", deviceName.replace("\0", ""));
+
+                WritableArray serviceUuids = Arguments.createArray();
+                if (advertisingData.getServiceUuids() != null && advertisingData.getServiceUuids().size() != 0) {
+                    for (ParcelUuid uuid : advertisingData.getServiceUuids()) {
+                        serviceUuids.pushString(UUIDHelper.uuidToString(uuid.getUuid()));
+                    }
+                }
+                advertising.putArray("serviceUUIDs", serviceUuids);
+
+                WritableMap serviceData = Arguments.createMap();
+                if (advertisingData.getServiceData() != null) {
+                    for (Map.Entry<ParcelUuid, byte[]> entry : advertisingData.getServiceData().entrySet()) {
+                        if (entry.getValue() != null) {
+                            serviceData.putMap(UUIDHelper.uuidToString((entry.getKey()).getUuid()), byteArrayToWritableMap(entry.getValue()));
+                        }
+                    }
+                }
 
                 advertising.putMap("serviceData", serviceData);
-				advertising.putInt("txPowerLevel", advertisingData.getTxPowerLevel());
-			}
+                advertising.putInt("txPowerLevel", advertisingData.getTxPowerLevel());
+            }
 
-			map.putMap("advertising", advertising);
-		} catch (Exception e) { // this shouldn't happen
-			e.printStackTrace();
-		}
+            map.putMap("advertising", advertising);
+        } catch (Exception e) { // this shouldn't happen
+            e.printStackTrace();
+        }
 
-		return map;
-	}
+        return map;
+    }
 
-	public void updateData(ScanResult result) {
-		advertisingData = result.getScanRecord();
-		advertisingDataBytes = advertisingData.getBytes();
-	}
+    public void updateData(ScanResult result) {
+        advertisingData = result.getScanRecord();
+        advertisingDataBytes = advertisingData.getBytes();
+    }
 
 
 }