From ecb02e4cfa564399ac700b7cd70e53d717900dbd Mon Sep 17 00:00:00 2001 From: inlacou Date: Mon, 11 Jan 2021 18:08:01 +0100 Subject: [PATCH 1/3] Update BluetoothSerial.java --- .../com/megster/cordova/BluetoothSerial.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/android/com/megster/cordova/BluetoothSerial.java b/src/android/com/megster/cordova/BluetoothSerial.java index 8be5575..d698c5a 100644 --- a/src/android/com/megster/cordova/BluetoothSerial.java +++ b/src/android/com/megster/cordova/BluetoothSerial.java @@ -86,6 +86,7 @@ public class BluetoothSerial extends CordovaPlugin { // Android 23 requires user to explicitly grant permission for location to discover unpaired private static final String ACCESS_COARSE_LOCATION = Manifest.permission.ACCESS_COARSE_LOCATION; + private static final String ACCESS_FINE_LOCATION = Manifest.permission.ACCESS_FINE_LOCATION; private static final int CHECK_PERMISSIONS_REQ_CODE = 2; private CallbackContext permissionCallback; @@ -213,11 +214,20 @@ public boolean execute(String action, CordovaArgs args, CallbackContext callback } else if (action.equals(DISCOVER_UNPAIRED)) { - if (cordova.hasPermission(ACCESS_COARSE_LOCATION)) { - discoverUnpairedDevices(callbackContext); - } else { - permissionCallback = callbackContext; - cordova.requestPermission(this, CHECK_PERMISSIONS_REQ_CODE, ACCESS_COARSE_LOCATION); + if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + if (cordova.hasPermission(ACCESS_FINE_LOCATION)) { + discoverUnpairedDevices(callbackContext); + } else { + permissionCallback = callbackContext; + cordova.requestPermission(this, CHECK_PERMISSIONS_REQ_CODE, ACCESS_FINE_LOCATION); + } + }else{ + if (cordova.hasPermission(ACCESS_COARSE_LOCATION)) { + discoverUnpairedDevices(callbackContext); + } else { + permissionCallback = callbackContext; + cordova.requestPermission(this, CHECK_PERMISSIONS_REQ_CODE, ACCESS_COARSE_LOCATION); + } } } else if (action.equals(SET_DEVICE_DISCOVERED_LISTENER)) { From 6f0749c5cb214808814641a7043db33c2dd1baa5 Mon Sep 17 00:00:00 2001 From: inlacou Date: Mon, 11 Jan 2021 18:15:13 +0100 Subject: [PATCH 2/3] Update plugin.xml --- plugin.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.xml b/plugin.xml index f3f71d4..036f576 100644 --- a/plugin.xml +++ b/plugin.xml @@ -33,6 +33,7 @@ + From ee43f4263b12cc623f9354628d735b953fcc1de2 Mon Sep 17 00:00:00 2001 From: Wojtek Siudzinski Date: Tue, 12 Oct 2021 17:24:29 +0200 Subject: [PATCH 3/3] Fix the styling --- src/android/com/megster/cordova/BluetoothSerial.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/com/megster/cordova/BluetoothSerial.java b/src/android/com/megster/cordova/BluetoothSerial.java index d698c5a..df08eab 100644 --- a/src/android/com/megster/cordova/BluetoothSerial.java +++ b/src/android/com/megster/cordova/BluetoothSerial.java @@ -214,14 +214,14 @@ public boolean execute(String action, CordovaArgs args, CallbackContext callback } else if (action.equals(DISCOVER_UNPAIRED)) { - if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { if (cordova.hasPermission(ACCESS_FINE_LOCATION)) { discoverUnpairedDevices(callbackContext); } else { permissionCallback = callbackContext; cordova.requestPermission(this, CHECK_PERMISSIONS_REQ_CODE, ACCESS_FINE_LOCATION); } - }else{ + } else { if (cordova.hasPermission(ACCESS_COARSE_LOCATION)) { discoverUnpairedDevices(callbackContext); } else {