Commit 992674fe by Maurits van Beusekom Committed by GitHub

Report ignoreBatteryOptimizations permission correctly (#1200)

* Report ignoreBatteryOptimizations permission correctly

* Report restricted status pre-marshmallow devices
parent 7a0244d3
## 12.0.1
* Fixes a bug where the `ignoreBatteryOptimizations` permission didn't report the correct status when the permission is requested and granted.
## 12.0.0
* **BREAKING CHANGES:**
......
......@@ -35,15 +35,12 @@ import io.flutter.plugin.common.PluginRegistry;
final class PermissionManager implements PluginRegistry.ActivityResultListener, PluginRegistry.RequestPermissionsResultListener {
@NonNull
private final Context context;
@Nullable
private RequestPermissionsSuccessCallback successCallback;
@Nullable
private Activity activity;
@NonNull
private final Context context;
/**
* The number of pending permission requests.
* <p>
......@@ -77,14 +74,20 @@ final class PermissionManager implements PluginRegistry.ActivityResultListener,
return false;
}
int status = resultCode == Activity.RESULT_OK
? PermissionConstants.PERMISSION_STATUS_GRANTED
: PermissionConstants.PERMISSION_STATUS_DENIED;
int permission;
int status, permission;
if (requestCode == PermissionConstants.PERMISSION_CODE_IGNORE_BATTERY_OPTIMIZATIONS) {
permission = PermissionConstants.PERMISSION_GROUP_IGNORE_BATTERY_OPTIMIZATIONS;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
String packageName = context.getPackageName();
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
status = (pm != null && pm.isIgnoringBatteryOptimizations(packageName))
? PermissionConstants.PERMISSION_STATUS_GRANTED
: PermissionConstants.PERMISSION_STATUS_DENIED;
} else {
status = PermissionConstants.PERMISSION_STATUS_RESTRICTED;
}
} else if (requestCode == PermissionConstants.PERMISSION_CODE_MANAGE_EXTERNAL_STORAGE) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
status = Environment.isExternalStorageManager()
......@@ -264,21 +267,6 @@ final class PermissionManager implements PluginRegistry.ActivityResultListener,
return true;
}
@FunctionalInterface
interface RequestPermissionsSuccessCallback {
void onSuccess(Map<Integer, Integer> results);
}
@FunctionalInterface
interface CheckPermissionsSuccessCallback {
void onSuccess(@PermissionConstants.PermissionStatus int permissionStatus);
}
@FunctionalInterface
interface ShouldShowRequestPermissionRationaleSuccessCallback {
void onSuccess(boolean shouldShowRequestPermissionRationale);
}
/**
* Determines the permission status of the provided permission.
* <p>
......@@ -666,4 +654,19 @@ final class PermissionManager implements PluginRegistry.ActivityResultListener,
}
return true;
}
@FunctionalInterface
interface RequestPermissionsSuccessCallback {
void onSuccess(Map<Integer, Integer> results);
}
@FunctionalInterface
interface CheckPermissionsSuccessCallback {
void onSuccess(@PermissionConstants.PermissionStatus int permissionStatus);
}
@FunctionalInterface
interface ShouldShowRequestPermissionRationaleSuccessCallback {
void onSuccess(boolean shouldShowRequestPermissionRationale);
}
}
name: permission_handler_android
description: Permission plugin for Flutter. This plugin provides the Android API to request and check permissions.
homepage: https://github.com/baseflow/flutter-permission-handler
version: 12.0.0
version: 12.0.1
environment:
sdk: ">=2.15.0 <4.0.0"
......
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