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(messaging, ios): foreground notification appears twice on iOS 18 #13572

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fix(messaging, ios): foreground notification appears twice on iOS 18 #13572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a87cf91
fix(messaging, ios): foreground notification appears twice on iOS 18
russellwheatley Oct 30, 2024
4f4b9fa
Merge branch 'main' into messaging-13366
russellwheatley Nov 7, 2024
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: 11 additions & 2 deletions packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ @implementation FLTFirebaseMessagingPlugin {

NSString *_initialNotificationID;
NSString *_notificationOpenedAppID;
NSString *_foregroundUniqueIdentifier;

#ifdef __FF_NOTIFICATIONS_SUPPORTED_PLATFORM
API_AVAILABLE(ios(10), macosx(10.14))
Expand Down Expand Up @@ -314,10 +315,17 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
(void (^)(UNNotificationPresentationOptions options))completionHandler
API_AVAILABLE(macos(10.14), ios(10.0)) {
// We only want to handle FCM notifications.
if (notification.request.content.userInfo[@"gcm.message_id"]) {

// FIX - bug on iOS 18 which results in duplicate foreground notifications posted
// See this Apple issue: https://forums.developer.apple.com/forums/thread/761597
// when it has been resolved, "_foregroundUniqueIdentifier" can be removed (i.e. the commit for
// this fix)
NSString *notificationIdentifier = notification.request.identifier;

if (notification.request.content.userInfo[@"gcm.message_id"] &&
![notificationIdentifier isEqualToString:_foregroundUniqueIdentifier]) {
NSDictionary *notificationDict =
[FLTFirebaseMessagingPlugin NSDictionaryFromUNNotification:notification];

[_channel invokeMethod:@"Messaging#onMessage" arguments:notificationDict];
}

Expand All @@ -344,6 +352,7 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
}
completionHandler(presentationOptions);
}
_foregroundUniqueIdentifier = notificationIdentifier;
}

// Called when a user interacts with a notification.
Expand Down
Loading