Skip to content

Commit b85e074

Browse files
fix(messaging): revert change to getParcelableExtra() that may result in crash (#11163)
1 parent 3135815 commit b85e074

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingBackgroundExecutor.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,11 @@ public void notImplemented() {
229229

230230
// Handle the message event in Dart.
231231
RemoteMessage remoteMessage;
232-
233-
if (android.os.Build.VERSION.SDK_INT >= 33) {
234-
remoteMessage =
235-
intent.getParcelableExtra(
236-
FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, RemoteMessage.class);
237-
} else {
238-
remoteMessage = intent.getParcelableExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE);
239-
}
232+
// Using android >= 33 API causes sporadic crashes. See: https://github.com/firebase/flutterfire/issues/11142
233+
// remoteMessage =
234+
// intent.getParcelableExtra(
235+
// FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE, RemoteMessage.class);
236+
remoteMessage = intent.getParcelableExtra(FlutterFirebaseMessagingUtils.EXTRA_REMOTE_MESSAGE);
240237

241238
if (remoteMessage != null) {
242239
Map<String, Object> remoteMessageMap =

packages/firebase_messaging/firebase_messaging/example/android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.0.1'
8+
classpath 'com.android.tools.build:gradle:7.4.1'
99
classpath 'com.google.gms:google-services:4.3.15'
1010
}
1111
}
@@ -25,6 +25,6 @@ subprojects {
2525
project.evaluationDependsOn(':app')
2626
}
2727

28-
task clean(type: Delete) {
28+
tasks.register("clean", Delete) {
2929
delete rootProject.buildDir
3030
}

0 commit comments

Comments
 (0)