Avoid undefined payloads

* Avoid undefined payloads * Check for null instead of relying on try/catch * Remove redundant null check * Wrap in try/catch instead of null checks
wix · May 22, 2023 · 574d3f3 · 574d3f3
1 parent 102d64f
commit 574d3f3
Showing 1 changed file with 18 additions and 4 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
@@ -198,18 +198,32 @@ protected int createNotificationId(Notification notification) {
     }
 
     private void notifyReceivedToJS() {
-        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
+        try {
+            Bundle bundle = mNotificationProps.asBundle();
+            mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, bundle, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyReceivedToJS: Null pointer exception");
+        }
     }
 
     private void notifyReceivedBackgroundToJS() {
-        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_BACKGROUND_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
+        try {
+            Bundle bundle = mNotificationProps.asBundle();
+            mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_BACKGROUND_EVENT_NAME, bundle, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyReceivedBackgroundToJS: Null pointer exception");
+        }
     }
 
     private void notifyOpenedToJS() {
         Bundle response = new Bundle();
-        response.putBundle("notification", mNotificationProps.asBundle());
 
-        mJsIOHelper.sendEventToJS(NOTIFICATION_OPENED_EVENT_NAME, response, mAppLifecycleFacade.getRunningReactContext());
+        try {
+            response.putBundle("notification", mNotificationProps.asBundle());
+            mJsIOHelper.sendEventToJS(NOTIFICATION_OPENED_EVENT_NAME, response, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyOpenedToJS: Null pointer exception");
+        }
     }
 
     protected void launchOrResumeApp() {