Skip to content

fix(messaging): revert change to getParcelableExtra() that may result in crash #11163

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

Merged
merged 3 commits into from
Jun 22, 2023
Merged

fix(messaging): revert change to getParcelableExtra() that may result in crash #11163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
913e8ac
fix: revert change to `getParcelableExtra()` that may result in crash
russellwheatley Jun 20, 2023
e512303
chore: lower gradle SDK so we can use Java 11 for example app
russellwheatley Jun 20, 2023
8f846b1
chore: format
russellwheatley Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...ava/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingBackgroundExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,11 @@ public void notImplemented() {

// Handle the message event in Dart.
RemoteMessage remoteMessage;

if (android.os.Build.VERSION.SDK_INT >= 33) {
remoteMessage =
intent.getParcelableExtra(
FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, RemoteMessage.class);
} else {
remoteMessage = intent.getParcelableExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE);
}
// Using android >= 33 API causes sporadic crashes. See: https://github.com/firebase/flutterfire/issues/11142
// remoteMessage =
// intent.getParcelableExtra(
// FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, RemoteMessage.class);
remoteMessage = intent.getParcelableExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE);

if (remoteMessage != null) {
Map<String, Object> remoteMessageMap =
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_messaging/firebase_messaging/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:7.4.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can keep gradle 8.0.1, it shouldn't cause issues

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid it does cause issues, it requires Java 17

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this is the gradle file of the example app, should not impact the release

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, it won't impact the release, but anyone trying to build the example app won't be able to without java 17. It's an easy win.

classpath 'com.google.gms:google-services:4.3.15'
}
}
Expand All @@ -25,6 +25,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}