Skip to content

fix(messaging, ios): prioritize delegate call order in willPresentNotification #8786

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

Open
WontakKim wants to merge 2 commits into
base: main
Choose a base branch
from
+55 −34
Open

fix(messaging, ios): prioritize delegate call order in willPresentNotification #8786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c06218
fix(messaging, ios): prioritize delegate call order in willPresentNot…
wrtn-wontak Dec 1, 2025
4cee1d5
chore: apply clang-formatting
wrtn-wontak Dec 2, 2025
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
89 changes: 55 additions & 34 deletions packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,24 @@ - (void)observe {
__weak RNFBMessagingUNUserNotificationCenter *weakSelf = self;
dispatch_once(&once, ^{
RNFBMessagingUNUserNotificationCenter *strongSelf = weakSelf;
UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
UNUserNotificationCenter *center =
[UNUserNotificationCenter currentNotificationCenter];
if (center.delegate != nil) {
_originalDelegate = center.delegate;
originalDelegateRespondsTo.openSettingsForNotification = (unsigned int)[_originalDelegate
respondsToSelector:@selector(userNotificationCenter:openSettingsForNotification:)];
originalDelegateRespondsTo.willPresentNotification = (unsigned int)[_originalDelegate
respondsToSelector:@selector(userNotificationCenter:
willPresentNotification:withCompletionHandler:)];
originalDelegateRespondsTo.didReceiveNotificationResponse = (unsigned int)[_originalDelegate
respondsToSelector:@selector(userNotificationCenter:
didReceiveNotificationResponse:withCompletionHandler:)];
originalDelegateRespondsTo.openSettingsForNotification =
(unsigned int)[_originalDelegate
respondsToSelector:@selector(userNotificationCenter:
openSettingsForNotification:)];
originalDelegateRespondsTo.willPresentNotification =
(unsigned int)[_originalDelegate
respondsToSelector:@selector
(userNotificationCenter:
willPresentNotification:withCompletionHandler:)];
originalDelegateRespondsTo.didReceiveNotificationResponse =
(unsigned int)[_originalDelegate
respondsToSelector:@selector
(userNotificationCenter:
didReceiveNotificationResponse:withCompletionHandler:)];
}
center.delegate = strongSelf;
});
Expand Down Expand Up @@ -82,12 +89,14 @@ - (NSNumber *)getDidOpenSettingsForNotification {
- (void)userNotificationCenter:(UNUserNotificationCenter *)center
willPresentNotification:(UNNotification *)notification
withCompletionHandler:
(void (^)(UNNotificationPresentationOptions options))completionHandler {
NSArray *presentationOptionsConfig =
[[RNFBJSON shared] getArrayValue:@"messaging_ios_foreground_presentation_options"
defaultValue:@[]];
(void (^)(UNNotificationPresentationOptions options))
completionHandler {
NSArray *presentationOptionsConfig = [[RNFBJSON shared]
getArrayValue:@"messaging_ios_foreground_presentation_options"
defaultValue:@[]];

UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionNone;
UNNotificationPresentationOptions presentationOptions =
UNNotificationPresentationOptionNone;

BOOL badge = [presentationOptionsConfig containsObject:@"badge"];
BOOL sound = [presentationOptionsConfig containsObject:@"sound"];
Expand Down Expand Up @@ -128,39 +137,47 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
}

if (notification.request.content.userInfo[@"gcm.message_id"]) {
NSDictionary *notificationDict = [RNFBMessagingSerializer notificationToDict:notification];
NSDictionary *notificationDict =
[RNFBMessagingSerializer notificationToDict:notification];

// Don't send an event if contentAvailable is true - application:didReceiveRemoteNotification
// will send the event for us, we don't want to duplicate them
// Don't send an event if contentAvailable is true -
// application:didReceiveRemoteNotification will send the event for us, we
// don't want to duplicate them
if (!notificationDict[@"contentAvailable"]) {
[[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_received"
body:notificationDict];
[[RNFBRCTEventEmitter shared]
sendEventWithName:@"messaging_message_received"
body:notificationDict];
}
completionHandler(presentationOptions);
}

if (_originalDelegate != nil && originalDelegateRespondsTo.willPresentNotification) {
if (_originalDelegate != nil &&
originalDelegateRespondsTo.willPresentNotification) {
[_originalDelegate userNotificationCenter:center
willPresentNotification:notification
withCompletionHandler:completionHandler];
} else {
completionHandler(presentationOptions);
}

// Don't consume completionHandler before the _originalDelegate has been
// processed
completionHandler(presentationOptions);
}

- (void)userNotificationCenter:(UNUserNotificationCenter *)center
didReceiveNotificationResponse:(UNNotificationResponse *)response
withCompletionHandler:(void (^)(void))completionHandler {
NSDictionary *remoteNotification = response.notification.request.content.userInfo;
NSDictionary *remoteNotification =
response.notification.request.content.userInfo;
if (remoteNotification[@"gcm.message_id"]) {
NSDictionary *notificationDict =
[RNFBMessagingSerializer remoteMessageUserInfoToDict:remoteNotification];
[[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_notification_opened"
body:notificationDict];
NSDictionary *notificationDict = [RNFBMessagingSerializer
remoteMessageUserInfoToDict:remoteNotification];
[[RNFBRCTEventEmitter shared]
sendEventWithName:@"messaging_notification_opened"
body:notificationDict];
_initialNotification = notificationDict;
}

if (_originalDelegate != nil && originalDelegateRespondsTo.didReceiveNotificationResponse) {
if (_originalDelegate != nil &&
originalDelegateRespondsTo.didReceiveNotificationResponse) {
[_originalDelegate userNotificationCenter:center
didReceiveNotificationResponse:response
withCompletionHandler:completionHandler];
Expand All @@ -171,12 +188,16 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center

- (void)userNotificationCenter:(UNUserNotificationCenter *)center
openSettingsForNotification:(nullable UNNotification *)notification {
if (_originalDelegate != nil && originalDelegateRespondsTo.openSettingsForNotification) {
[_originalDelegate userNotificationCenter:center openSettingsForNotification:notification];
if (_originalDelegate != nil &&
originalDelegateRespondsTo.openSettingsForNotification) {
[_originalDelegate userNotificationCenter:center
openSettingsForNotification:notification];
} else {
NSDictionary *notificationDict = [RNFBMessagingSerializer notificationToDict:notification];
[[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_settings_for_notification_opened"
body:notificationDict];
NSDictionary *notificationDict =
[RNFBMessagingSerializer notificationToDict:notification];
[[RNFBRCTEventEmitter shared]
sendEventWithName:@"messaging_settings_for_notification_opened"
body:notificationDict];

_didOpenSettingsForNotification = YES;
}
Expand Down