Skip to content

fix(messaging,android): skip onMessageOpenedApp for terminated notification taps #18663

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
SelaseKay merged 1 commit into from
Sep 8, 2026
Merged

fix(messaging,android): skip onMessageOpenedApp for terminated notification taps #18663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions ...d/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ public void onAttachedToActivity(ActivityPluginBinding binding) {
// The notification tap created this Activity, so the Messaging SDK has already logged
// `notification_open` from FcmLifecycleCallbacks#onActivityCreated. Handle the intent
// without logging it a second time.
handleNotificationIntent(mainActivity.getIntent());
// Terminated launch: getInitialMessage() owns this tap. Do not also fire
// onMessageOpenedApp (firebase/flutterfire#18661).
handleNotificationIntent(mainActivity.getIntent(), /* shouldNotifyStream= */ false);
}
}
}
Expand Down Expand Up @@ -630,7 +632,8 @@ public boolean onNewIntent(@NonNull Intent intent) {
// FcmLifecycleCallbacks#onActivityCreated for this intent and `notification_open` was not
// logged. Log it here before handling the intent.
logNotificationOpen(intent);
return handleNotificationIntent(intent);
// Background resume: onMessageOpenedApp owns this tap.
return handleNotificationIntent(intent, /* shouldNotifyStream= */ true);
}

/**
Expand Down Expand Up @@ -700,7 +703,17 @@ private static String getMessageId(@NonNull Bundle extras) {
return messageId;
}

private boolean handleNotificationIntent(@NonNull Intent intent) {
/**
* Handles a notification-tap intent.
*
* <p>{@code shouldNotifyStream} is {@code false} when the tap created this Activity (terminated
* launch). In that case the message is stored for {@code getInitialMessage()} only, matching iOS
* and the Dart API docs. It is {@code true} when the Activity already existed ({@link
* #onNewIntent}), which is a resume from background and should fire {@code onMessageOpenedApp}.
*
* @see <a href="https://github.com/firebase/flutterfire/issues/18661">#18661</a>
*/
private boolean handleNotificationIntent(@NonNull Intent intent, boolean shouldNotifyStream) {
if (intent.getExtras() == null) {
return false;
}
Expand Down Expand Up @@ -740,7 +753,10 @@ private boolean handleNotificationIntent(@NonNull Intent intent) {
message.put("notification", initialMessageNotification);
}

channel.invokeMethod("Messaging#onMessageOpenedApp", message);
// On a terminated launch, getInitialMessage() owns this message.
if (shouldNotifyStream) {
channel.invokeMethod("Messaging#onMessageOpenedApp", message);
}
mainActivity.setIntent(intent);
return true;
}
Expand Down
Loading