fix(messaging): remote message from messaging store on new intent (#4634

)
invertase · Dec 2, 2020 · 00b83af · 00b83af · vercel · Dec 2, 2020
1 parent 11867da
commit 00b83af
Showing 1 changed file with 11 additions and 3 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
@@ -49,6 +49,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
     reactContext.addActivityEventListener(this);
   }
 
+  private RemoteMessage popRemoteMessageFromMessagingStore(String messageId) {
+    ReactNativeFirebaseMessagingStore messagingStore = ReactNativeFirebaseMessagingStoreHelper.getInstance().getMessagingStore();
+    RemoteMessage remoteMessage = messagingStore.getFirebaseMessage(messageId);
+    messagingStore.clearFirebaseMessage(messageId);
+    return remoteMessage;
+  }
+
   @ReactMethod
   public void getInitialNotification(Promise promise) {
     if (initialNotification != null) {
@@ -70,9 +77,7 @@ public void getInitialNotification(Promise promise) {
           if (messageId != null && initialNotificationMap.get(messageId) == null) {
             RemoteMessage remoteMessage = ReactNativeFirebaseMessagingReceiver.notifications.get(messageId);
             if (remoteMessage == null) {
-              ReactNativeFirebaseMessagingStore messagingStore = ReactNativeFirebaseMessagingStoreHelper.getInstance().getMessagingStore();
-              remoteMessage = messagingStore.getFirebaseMessage(messageId);
-              messagingStore.clearFirebaseMessage(messageId);
+              remoteMessage = popRemoteMessageFromMessagingStore(messageId);
             }
             if (remoteMessage != null) {
               promise.resolve(ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap(remoteMessage));
@@ -212,6 +217,9 @@ public void onNewIntent(Intent intent) {
 
       if (messageId != null) {
         RemoteMessage remoteMessage = ReactNativeFirebaseMessagingReceiver.notifications.get(messageId);
+        if (remoteMessage == null) {
+          remoteMessage = popRemoteMessageFromMessagingStore(messageId);
+        }
 
         if (remoteMessage != null) {
           initialNotification = remoteMessage;