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, android): repair crash handling remote notifications #5236

Merged
merged 1 commit into from
Apr 29, 2021
Merged

fix(messaging, android): repair crash handling remote notifications #5236

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
9 changes: 5 additions & 4 deletions ...oid/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void getInitialNotification(Promise promise) {
} else {
remoteMessageMap = ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap(remoteMessage);
}
if (remoteMessageMap != null){
if (remoteMessageMap != null) {
promise.resolve(remoteMessageMap);
initialNotificationMap.put(messageId, true);
return;
Expand Down Expand Up @@ -228,9 +228,10 @@ public void onNewIntent(Intent intent) {
} else {
remoteMessageMap = ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap(remoteMessage);
}

if (remoteMessageMap != null){
initialNotification = remoteMessageMap;

if (remoteMessageMap != null) {
// WritableNativeMap not be consumed twice. But it is resolved in future and in event below. Make a copy - issue #5231
initialNotification = remoteMessageMap.copy();
ReactNativeFirebaseMessagingReceiver.notifications.remove(messageId);

ReactNativeFirebaseEventEmitter emitter = ReactNativeFirebaseEventEmitter.getSharedInstance();
Expand Down