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

fix(firebase_messaging, android): ensure only messaging permission request is processed #9486

Merged
merged 3 commits into from Sep 8, 2022
Merged

fix(firebase_messaging, android): ensure only messaging permission request is processed #9486

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b6f0e1
fix(messaging): ensure only messaging permission request is processed
russellwheatley Sep 7, 2022
f48b365
fix(messaging): callback is not null check
russellwheatley Sep 7, 2022
e539347
fix(messaging): use `&&` for checking permission result process
russellwheatley Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebasePermissionManager.java
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

class FlutterFirebasePermissionManager implements PluginRegistry.RequestPermissionsResultListener {

private final int permissionCode = 24;
private final int permissionCode = 240;
@Nullable private RequestPermissionsSuccessCallback successCallback;
private boolean requestInProgress = false;

Expand All @@ -24,15 +24,16 @@ interface RequestPermissionsSuccessCallback {
@Override
public boolean onRequestPermissionsResult(
int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
requestInProgress = false;
if (requestCode != permissionCode) {
if (requestInProgress && requestCode == permissionCode || this.successCallback != null) {
russellwheatley marked this conversation as resolved.
Show resolved Hide resolved
requestInProgress = false;
boolean granted =
grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;

this.successCallback.onSuccess(granted ? 1 : 0);
return true;
} else {
return false;
}

int grantResult = grantResults[0];
assert this.successCallback != null;
this.successCallback.onSuccess(grantResult == PackageManager.PERMISSION_GRANTED ? 1 : 0);
return true;
}

@RequiresApi(api = 33)
Expand Down