fix notification bug during incoming data call (#1)

relatel · Feb 27, 2024 · aacf9af · aacf9af
1 parent bffb31f
commit aacf9af
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...pp/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/...pp/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
@@ -63,11 +63,13 @@ protected PushNotification(Context context, Bundle bundle, AppLifecycleFacade ap
     }
 
     @Override
-    public void onReceived() throws InvalidNotificationException {
-        if (!mAppLifecycleFacade.isAppVisible()) {
+    public void onReceived() {
+        ReactContext reactContext = mAppLifecycleFacade.getRunningReactContext();
+        boolean hasActiveCatalystInstance = reactContext != null && reactContext.hasActiveCatalystInstance();
+        if (!mAppLifecycleFacade.isAppVisible() || !hasActiveCatalystInstance) {
             postNotification(null);
-            notifyReceivedBackgroundToJS();
-        } else {
+        }
+        if (hasActiveCatalystInstance) {
             notifyReceivedToJS();
         }
     }
@@ -130,17 +132,13 @@ protected void dispatchImmediately() {
     }
 
     protected void dispatchUponVisibility() {
-        mAppLifecycleFacade.addVisibilityListener(getIntermediateAppVisibilityListener());
+        mAppLifecycleFacade.addVisibilityListener(mAppVisibilityListener);
 
         // Make the app visible so that we'll dispatch the notification opening when visibility changes to 'true' (see
         // above listener registration).
         launchOrResumeApp();
     }
 
-    protected AppVisibilityListener getIntermediateAppVisibilityListener() {
-        return mAppVisibilityListener;
-    }
-
     protected Notification buildNotification(PendingIntent intent) {
         return getNotificationBuilder(intent).build();
     }