Commit 7fb6cd52 by Maurits van Beusekom Committed by GitHub

Merge pull request #204 from nibo/develop

Request Location-Permission without active GPS
parents 7f9322c6 5e46381c
...@@ -318,11 +318,6 @@ public class PermissionHandlerPlugin implements MethodCallHandler { ...@@ -318,11 +318,6 @@ public class PermissionHandlerPlugin implements MethodCallHandler {
} }
} }
if (permission == PERMISSION_GROUP_LOCATION || permission == PERMISSION_GROUP_LOCATION_ALWAYS || permission == PERMISSION_GROUP_LOCATION_WHEN_IN_USE) {
if (!isLocationServiceEnabled(context)) {
return PERMISSION_STATUS_DISABLED;
}
}
return PERMISSION_STATUS_GRANTED; return PERMISSION_STATUS_GRANTED;
} }
...@@ -474,13 +469,13 @@ public class PermissionHandlerPlugin implements MethodCallHandler { ...@@ -474,13 +469,13 @@ public class PermissionHandlerPlugin implements MethodCallHandler {
mRequestResults.put(PERMISSION_GROUP_SPEECH, toPermissionStatus(permission, result)); mRequestResults.put(PERMISSION_GROUP_SPEECH, toPermissionStatus(permission, result));
} }
} else if (permission == PERMISSION_GROUP_LOCATION_ALWAYS) { } else if (permission == PERMISSION_GROUP_LOCATION_ALWAYS) {
@PermissionStatus int permissionStatus = determineActualLocationStatus(permission, result); @PermissionStatus int permissionStatus = toPermissionStatus(permission, result);
if (!mRequestResults.containsKey(PERMISSION_GROUP_LOCATION_ALWAYS)) { if (!mRequestResults.containsKey(PERMISSION_GROUP_LOCATION_ALWAYS)) {
mRequestResults.put(PERMISSION_GROUP_LOCATION_ALWAYS, permissionStatus); mRequestResults.put(PERMISSION_GROUP_LOCATION_ALWAYS, permissionStatus);
} }
} else if (permission == PERMISSION_GROUP_LOCATION) { } else if (permission == PERMISSION_GROUP_LOCATION) {
@PermissionStatus int permissionStatus = determineActualLocationStatus(permission, result); @PermissionStatus int permissionStatus = toPermissionStatus(permission, result);
if (VERSION.SDK_INT < VERSION_CODES.Q) { if (VERSION.SDK_INT < VERSION_CODES.Q) {
if (!mRequestResults.containsKey(PERMISSION_GROUP_LOCATION_ALWAYS)) { if (!mRequestResults.containsKey(PERMISSION_GROUP_LOCATION_ALWAYS)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment