Merge efe63f3 into b972cb6

invertase · Apr 29, 2021 · 652b47a · 652b47a
2 parents b972cb6 + efe63f3
commit 652b47a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...oid/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java b/...oid/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java
@@ -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;
@@ -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();