Merge pull request #499 from Baseflow/issue/472

Correctly handle some permissions on pre Android Q

Merge pull request #499 from Baseflow/issue/472
Correctly handle some permissions on pre Android Q
f4f9924d · Maurits van Beusekom · GitHub · f8b6809c · e22e6f40 · f4f9924d
Commit f4f9924d authored Mar 22, 2021 by Maurits van Beusekom Committed by GitHub Mar 22, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 4 deletions

permission_handler/CHANGELOG.md
+4 -0

permission_handler/android/src/main/java/com/baseflow/permissionhandler/PermissionUtils.java
+16 -3

permission_handler/pubspec.yaml
+1 -1

No files found.
--- a/permission_handler/CHANGELOG.md
+++ b/permission_handler/CHANGELOG.md
+## 6.1.2
+* Correctly handle the ACCESS_MEDIA_LOCATION and ACCESS_ACTIVITY_RECOGNITION permissions on pre Android Q devices (permissions should be implicitly granted on pre Android Q). 
 ## 6.1.1
 * Added unit-tests to guard API against breaking changes.

--- a/permission_handler/android/src/main/java/com/baseflow/permissionhandler/PermissionUtils.java
+++ b/permission_handler/android/src/main/java/com/baseflow/permissionhandler/PermissionUtils.java
@@ -93,11 +93,14 @@ public class PermissionUtils {
                break;
            case PermissionConstants.PERMISSION_GROUP_LOCATION_ALWAYS:
+                // Note that the LOCATION_ALWAYS will deliberately fallthrough to the LOCATION
+                // case on pre Android Q devices. The ACCESS_BACKGROUND_LOCATION permission was only
+                // introduced in Android Q, before it should be treated as the ACCESS_COARSE_LOCATION or
+                // ACCESS_FINE_LOCATION.
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                    if (hasPermissionInManifest(context, permissionNames, Manifest.permission.ACCESS_BACKGROUND_LOCATION))
                        permissionNames.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION);
                }
            case PermissionConstants.PERMISSION_GROUP_LOCATION_WHEN_IN_USE:
            case PermissionConstants.PERMISSION_GROUP_LOCATION:
                if (hasPermissionInManifest(context, permissionNames, Manifest.permission.ACCESS_COARSE_LOCATION))
@@ -184,12 +187,22 @@ public class PermissionUtils {
                break;
            case PermissionConstants.PERMISSION_GROUP_ACCESS_MEDIA_LOCATION:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && hasPermissionInManifest(context, permissionNames, Manifest.permission.ACCESS_MEDIA_LOCATION))
+                // The ACCESS_MEDIA_LOCATION permission is introduced in Android Q, meaning we should
+                // not handle permissions on pre Android Q devices.
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
+                    return null;
+                if(hasPermissionInManifest(context, permissionNames, Manifest.permission.ACCESS_MEDIA_LOCATION))
                    permissionNames.add(Manifest.permission.ACCESS_MEDIA_LOCATION);
                break;
            case PermissionConstants.PERMISSION_GROUP_ACTIVITY_RECOGNITION:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && hasPermissionInManifest(context, permissionNames, Manifest.permission.ACTIVITY_RECOGNITION))
+                // The ACCESS_MEDIA_LOCATION permission is introduced in Android Q, meaning we should
+                // not handle permissions on pre Android Q devices.
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
+                    return null;
+                if (hasPermissionInManifest(context, permissionNames, Manifest.permission.ACTIVITY_RECOGNITION))
                    permissionNames.add(Manifest.permission.ACTIVITY_RECOGNITION);
                break;

--- a/permission_handler/pubspec.yaml
+++ b/permission_handler/pubspec.yaml
 name: permission_handler
 description: Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions.
-version: 6.1.1
+version: 6.1.2
 homepage: https://github.com/baseflowit/flutter-permission-handler
 flutter: