From 4637332bbdb857de650a604a138e2d5dd07be75f Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Thu, 6 May 2021 13:07:38 -0500
Subject: [PATCH] fix(messaging, android): avoid using rn61+ symbol

this should be the inline equivalent of the rn61 symbol I added
in #5236 - accidentally breaking react-native 0.60 compatibility
---
 .../messaging/ReactNativeFirebaseMessagingModule.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/messaging/android/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java b/packages/messaging/android/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java
index 71565b08ca..9286f95fbb 100644
--- a/packages/messaging/android/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java
+++ b/packages/messaging/android/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingModule.java
@@ -29,6 +29,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.FirebaseMessaging;
@@ -231,7 +232,9 @@ public void onNewIntent(Intent intent) {
 
         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();
+          WritableNativeMap newInitialNotification = new WritableNativeMap();
+          newInitialNotification.merge(remoteMessageMap);
+          initialNotification = newInitialNotification;
           ReactNativeFirebaseMessagingReceiver.notifications.remove(messageId);
 
           ReactNativeFirebaseEventEmitter emitter = ReactNativeFirebaseEventEmitter.getSharedInstance();