Merge pull request #753 from jcconneqtech/master

Fix advertise permissions for android 12
randdusing · Apr 7, 2023 · 169be8c · 169be8c
2 parents b4e35d5 + 1c1d5ad
commit 169be8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -26,6 +26,7 @@
       <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
       <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
       <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+      <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
       <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
       <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     </config-file>

diff --git a/src/android/BluetoothLePlugin.java b/src/android/BluetoothLePlugin.java
@@ -976,8 +976,8 @@ public void requestPermissionBtConnectAction(CallbackContext callbackContext) {
    public void hasPermissionBtAdvertiseAction(CallbackContext callbackContext) {
     JSONObject returnObj = new JSONObject();
 
-    addProperty(returnObj, "hasPermission", cordova.hasPermission(Manifest.permission.BLUETOOTH_ADVERTISE));
-
+    addProperty(returnObj, "hasPermission", Build.VERSION.SDK_INT < Build.VERSION_CODES.S || cordova.hasPermission(Manifest.permission.BLUETOOTH_ADVERTISE));
+    
     callbackContext.success(returnObj);
   }