Skip to content

Fix for Android 10 location permission #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wookie1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for Android 10 location permission #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35cb17d
Update BluetoothLePlugin.java
Wookie1 Apr 22, 2021
e238ab9
Update codenameone_library_appended.properties
Wookie1 Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CN1Bluetooth/codenameone_library_appended.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#is an appended type property.
#
#Wed Jan 09 17:59:31 IST 2013
codename1.arg.android.xpermissions=<uses-permission android:name="android.permission.BLUETOOTH"/><uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/><uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
codename1.arg.android.xpermissions=<uses-permission android:name="android.permission.BLUETOOTH"/><uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/><uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
codename1.arg.ios.pods=,Cordova ~> 6.1
codename1.arg.ios.pods.platform=,11.0
codename1.arg.ios.add_libs=;CoreBluetooth.framework;
Expand Down
7 changes: 4 additions & 3 deletions CN1Bluetooth/native/android/com/codename1/bluetoothle/BluetoothLePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class BluetoothLePlugin extends CordovaPlugin {
private final int REQUEST_BT_ENABLE = 59627; /*Random integer*/

private final int REQUEST_ACCESS_COARSE_LOCATION = 59628;
private final int REQUEST_ACCESS_FINE_LOCATION = 59630;
private final int REQUEST_LOCATION_SOURCE_SETTINGS = 59629;
private BluetoothAdapter bluetoothAdapter;
private boolean isReceiverRegistered = false;
Expand Down Expand Up @@ -855,7 +856,7 @@ private void notifyAction(JSONArray args, CallbackContext callbackContext) {
public void hasPermissionAction(CallbackContext callbackContext) {
JSONObject returnObj = new JSONObject();

addProperty(returnObj, "hasPermission", cordova.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION));
addProperty(returnObj, "hasPermission", cordova.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION));

callbackContext.success(returnObj);
}
Expand All @@ -870,7 +871,7 @@ public void requestPermissionAction(CallbackContext callbackContext) {
}

permissionsCallback = callbackContext;
cordova.requestPermission(this, REQUEST_ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
cordova.requestPermission(this, REQUEST_ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
}

public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) throws JSONException {
Expand All @@ -881,7 +882,7 @@ public void onRequestPermissionResult(int requestCode, String[] permissions, int
//Just call hasPermission again to verify
JSONObject returnObj = new JSONObject();

addProperty(returnObj, "requestPermission", cordova.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION));
addProperty(returnObj, "requestPermission", cordova.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION));

permissionsCallback.success(returnObj);
}
Expand Down