Skip to content
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

Jump to bottom

feat(android): check location service before permission #280

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

feat(android): check location service before permission #280

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfd1d16
feat: unify permission check/request
kumo01GitHub Oct 4, 2024
ef97953
refactor: typo
kumo01GitHub Oct 5, 2024
77dff7d
perf: check provider before permission
kumo01GitHub Oct 5, 2024
3082041
refactor: change target provider to check
kumo01GitHub Oct 12, 2024
95c616d
fix: revert hasPermission()
kumo01GitHub Oct 12, 2024
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
79 changes: 30 additions & 49 deletions src/android/Geolocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Licensed to the Apache Software Foundation (ASF) under one
specific language governing permissions and limitations
under the License.
*/


package org.apache.cordova.geolocation;

import android.content.Context;
import android.content.pm.PackageManager;
import android.Manifest;
import android.location.LocationManager;
import android.os.Build;

import org.apache.cordova.CallbackContext;
Expand All @@ -30,73 +30,68 @@ Licensed to the Apache Software Foundation (ASF) under one
import org.json.JSONArray;
import org.json.JSONException;


public class Geolocation extends CordovaPlugin {

String TAG = "GeolocationPlugin";
CallbackContext context;


String [] highAccuracyPermissions = { Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION };
String [] lowAccuracyPermissions = { Manifest.permission.ACCESS_COARSE_LOCATION };
String [] permissionsToRequest;
String[] highAccuracyPermissions = {Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
String[] lowAccuracyPermissions = {Manifest.permission.ACCESS_COARSE_LOCATION};
String[] permissionsToRequest;
String[] permissionsToCheck;

LocationManager manager;

public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
LOG.d(TAG, "We are entering execute");
context = callbackContext;
if(action.equals("getPermission"))
{
if (action.equals("getPermission")) {
if (!isLocationProviderAvailable()) {
LOG.d(TAG, "Location Provider Unavailable!");
PluginResult result = new PluginResult(PluginResult.Status.ILLEGAL_ACCESS_EXCEPTION);
context.sendPluginResult(result);
return true;
}

boolean highAccuracy = args.getBoolean(0);
permissionsToCheck = highAccuracy ? highAccuracyPermissions : lowAccuracyPermissions;

// Always request both FINE & COARSE permissions on API <= 31 due to bug in WebView that manifests on these versions
// See https://bugs.chromium.org/p/chromium/issues/detail?id=1269362
permissionsToRequest = Build.VERSION.SDK_INT <= 31 ? highAccuracyPermissions : permissionsToCheck;

if(hasPermisssion(permissionsToCheck))
{
if (hasPermission(permissionsToCheck)) {
PluginResult r = new PluginResult(PluginResult.Status.OK, Build.VERSION.SDK_INT);
context.sendPluginResult(r);
return true;
}
else {
} else {
PermissionHelper.requestPermissions(this, 0, permissionsToRequest);
}
return true;
}
return false;
}


public void onRequestPermissionResult(int requestCode, String[] permissions,
int[] grantResults) throws JSONException
{
public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
PluginResult result;
//This is important if we're using Cordova without using Cordova, but we have the geolocation plugin installed
if(context != null) {
for (int i=0; i<grantResults.length; i++) {
int r = grantResults[i];
String p = permissions[i];
if (r == PackageManager.PERMISSION_DENIED && arrayContains(permissionsToCheck, p)) {
LOG.d(TAG, "Permission Denied!");
result = new PluginResult(PluginResult.Status.ILLEGAL_ACCESS_EXCEPTION);
if (context != null) {
for (int r : grantResults) {
if (r == PackageManager.PERMISSION_GRANTED) {
result = new PluginResult(PluginResult.Status.OK);
context.sendPluginResult(result);
return;
}

}
result = new PluginResult(PluginResult.Status.OK);
LOG.d(TAG, "Permission Denied!");
result = new PluginResult(PluginResult.Status.ILLEGAL_ACCESS_EXCEPTION);
context.sendPluginResult(result);
}
}

public boolean hasPermisssion(String[] permissions) {
for(String p : permissions)
{
if(!PermissionHelper.hasPermission(this, p))
{
public boolean hasPermission(String[] permissions) {
for (String p : permissions) {
if (!PermissionHelper.hasPermission(this, p)) {
return false;
}
}
Expand All @@ -107,26 +102,12 @@ public boolean hasPermisssion(String[] permissions) {
* We override this so that we can access the permissions variable, which no longer exists in
* the parent class, since we can't initialize it reliably in the constructor!
*/

public void requestPermissions(int requestCode)
{
public void requestPermissions(int requestCode) {
PermissionHelper.requestPermissions(this, requestCode, permissionsToRequest);
}

//https://stackoverflow.com/a/12635769/777265
private <T> boolean arrayContains(final T[] array, final T v) {
if (v == null) {
for (final T e : array)
if (e == null)
return true;
}
else {
for (final T e : array)
if (e == v || v.equals(e))
return true;
}

return false;
private boolean isLocationProviderAvailable() {
manager = (LocationManager) this.cordova.getActivity().getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
return manager.isProviderEnabled(LocationManager.GPS_PROVIDER) || manager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
}

}
Loading