Commit 02c78e5d by Maurits van Beusekom

Merge branch 'develop'

parents 2bb37573 c5701855
...@@ -529,11 +529,13 @@ public class PermissionHandlerPlugin implements MethodCallHandler { ...@@ -529,11 +529,13 @@ public class PermissionHandlerPlugin implements MethodCallHandler {
@PermissionStatus @PermissionStatus
private int toPermissionStatus(@PermissionGroup int permission, int grantResult) { private int toPermissionStatus(@PermissionGroup int permission, int grantResult) {
if (VERSION.SDK_INT >= VERSION_CODES.M && isNeverAskAgainSelected(permission)) { if (grantResult == PackageManager.PERMISSION_DENIED) {
return PERMISSION_STATUS_NEWER_ASK_AGAIN; return VERSION.SDK_INT >= VERSION_CODES.M && isNeverAskAgainSelected(permission)
? PERMISSION_STATUS_NEWER_ASK_AGAIN
: PERMISSION_STATUS_DENIED;
} }
return grantResult == PackageManager.PERMISSION_GRANTED ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED; return PERMISSION_STATUS_GRANTED;
} }
private void processResult() { private void processResult() {
......
...@@ -14,7 +14,7 @@ public class PermissionUtils { ...@@ -14,7 +14,7 @@ public class PermissionUtils {
static boolean neverAskAgainSelected(final Activity activity, final String permission) { static boolean neverAskAgainSelected(final Activity activity, final String permission) {
final boolean hasRequestedPermissionBefore = getRequestedPermissionBefore(activity, permission); final boolean hasRequestedPermissionBefore = getRequestedPermissionBefore(activity, permission);
final boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(activity, permission); final boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(activity, permission);
return hasRequestedPermissionBefore != shouldShowRequestPermissionRationale; return hasRequestedPermissionBefore && !shouldShowRequestPermissionRationale;
} }
static void setRequestedPermission(final Context context, final String permission) { static void setRequestedPermission(final Context context, final String permission) {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
**/doc/api/ **/doc/api/
.dart_tool/ .dart_tool/
.flutter-plugins .flutter-plugins
.flutter-plugins-dependencies
.packages .packages
.pub-cache/ .pub-cache/
.pub/ .pub/
......
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