Skip to content

fix(messaging, ios): revert "fix(messaging, ios): only call onMessage handler if message is data-only or undelivered" #5641

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
mikehardy merged 2 commits into from
Aug 24, 2021
Merged

fix(messaging, ios): revert "fix(messaging, ios): only call onMessage handler if message is data-only or undelivered" #5641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8944f75
Revert "lint fixes"
helenaford Aug 24, 2021
7a8715e
Revert "fix: onMessage to only trigger for data-only or undelivered m…
helenaford Aug 24, 2021
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
12 changes: 3 additions & 9 deletions packages/messaging/ios/RNFBMessaging/RNFBMessaging+AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,10 @@ - (void)application:(UIApplication *)application
[sharedInstance.conditionBackgroundMessageHandlerSet unlock];
}
} else {
// TODO: send an event to track notification has been delivered (possible needs a new event
// handler for `didReceiveRemoteNotification`) Only sends for data-only messages
DLog(@"didReceiveRemoteNotification while app was in foreground");
if (userInfo[@"aps"][@"alert"] == nil) {
DLog(@"didReceiveRemoteNotification send event for data-only message while app was in "
@"foreground");
[[RNFBRCTEventEmitter shared]
sendEventWithName:@"messaging_message_received"
body:[RNFBMessagingSerializer remoteMessageUserInfoToDict:userInfo]];
}
[[RNFBRCTEventEmitter shared]
sendEventWithName:@"messaging_message_received"
body:[RNFBMessagingSerializer remoteMessageUserInfoToDict:userInfo]];
completionHandler(UIBackgroundFetchResultNoData);
}
}
Expand Down
13 changes: 7 additions & 6 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 @@ -75,13 +75,14 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
if (notification.request.content.userInfo[@"gcm.message_id"]) {
NSDictionary *notificationDict = [RNFBMessagingSerializer notificationToDict:notification];

// Always send an event to know there is an incoming message in the foreground
// Client app will have to display the notification as `UNNotificationPresentationOptionNone` is
// always sent to completion handler (see below)
[[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_received"
body:notificationDict];
// 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];
}

// TODO in a later version allow customizing completion options in JS code
// TODO in a later version allow customising completion options in JS code
completionHandler(UNNotificationPresentationOptionNone);
}

Expand Down