FIX #835: null mNotification (#862)

wix · Apr 24, 2022 · 47161c9 · 47161c9
1 parent c2178bb
commit 47161c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
@@ -88,8 +88,10 @@ public void getInitialNotification(final Promise promise) {
                 return;
             }
 
-            InitialNotificationHolder.getInstance().clear();
             result = Arguments.fromBundle(notification.asBundle());
+            InitialNotificationHolder.getInstance().clear();
+        } catch (NullPointerException e) {
+            Log.e(LOGTAG, "getInitialNotification: Null pointer exception");
         } finally {
             promise.resolve(result);
         }

diff --git a/...roid/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java b/...roid/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
@@ -47,7 +47,7 @@ public synchronized boolean isReactInitialized() {
             return false;
         }
 
-        return mReactContext.hasActiveCatalystInstance();
+        return mReactContext.hasActiveReactInstance();
     }
 
     @Override