Merge pull request #742 from wzijden/master

Assume hasPermission for BTScan/Connect always true on AndroidSDK < 31
randdusing · Nov 26, 2022 · 83220ae · 83220ae
2 parents 568c07d + 7797e1b
commit 83220ae
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/android/BluetoothLePlugin.java b/src/android/BluetoothLePlugin.java
@@ -788,7 +788,7 @@ private void stopAdvertisingAction(JSONArray args, CallbackContext callbackConte
     }
 
     advertiser.stopAdvertising(advertiseCallback);
-    
+
     if (isAdvertising) isAdvertising = false;
 
     JSONObject returnObj = new JSONObject();
@@ -926,7 +926,7 @@ public void requestPermissionAction(CallbackContext callbackContext) {
   public void hasPermissionBtScanAction(CallbackContext callbackContext) {
     JSONObject returnObj = new JSONObject();
 
-    addProperty(returnObj, "hasPermission", cordova.hasPermission(Manifest.permission.BLUETOOTH_SCAN));
+    addProperty(returnObj, "hasPermission", Build.VERSION.SDK_INT < Build.VERSION_CODES.S || cordova.hasPermission(Manifest.permission.BLUETOOTH_SCAN));
 
     callbackContext.success(returnObj);
   }
@@ -951,7 +951,7 @@ public void requestPermissionBtScanAction(CallbackContext callbackContext) {
    public void hasPermissionBtConnectAction(CallbackContext callbackContext) {
     JSONObject returnObj = new JSONObject();
 
-    addProperty(returnObj, "hasPermission", cordova.hasPermission(Manifest.permission.BLUETOOTH_CONNECT));
+    addProperty(returnObj, "hasPermission", Build.VERSION.SDK_INT < Build.VERSION_CODES.S || cordova.hasPermission(Manifest.permission.BLUETOOTH_CONNECT));
 
     callbackContext.success(returnObj);
   }
@@ -2866,7 +2866,7 @@ private void setPinAction(JSONArray args, CallbackContext callbackContext) {
     if (isNotArgsObject(obj, callbackContext)) {
       return;
     }
-    
+
     String address = getAddress(obj);
     if (isNotAddress(address, callbackContext)) {
       return;
@@ -2876,7 +2876,7 @@ private void setPinAction(JSONArray args, CallbackContext callbackContext) {
     if (pin==null) {
       return;
     }
-    
+
     Log.d("BLE","set pin "  + address  + " " + pin);
     JSONObject returnObj = new JSONObject();
     try {
@@ -2957,7 +2957,7 @@ public void onReceive(Context context, Intent intent) {
 
             // Reset isAdvertising when adapter is off (if STATE_TURNING_OFF doesn't trigger)
             if (isAdvertising) isAdvertising = false;
-            
+
             gattServer = null;
 
             pluginResult = new PluginResult(PluginResult.Status.OK, returnObj);
@@ -3036,7 +3036,7 @@ public void onReceive(Context context, Intent intent) {
       }
     }
   };
-  
+
   private BroadcastReceiver mPairingRequestReceiver;
 
   @Override