Change the way the initial notification is extracted from intent at a…

…pplication startup
wix · Jul 17, 2023 · 62f2cd8 · 62f2cd8
1 parent c877f54
commit 62f2cd8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
@@ -95,11 +95,13 @@ private void callOnOpenedIfNeed(Activity activity) {
         Intent intent = activity.getIntent();
         if (NotificationIntentAdapter.canHandleIntent(intent)) {
             Context appContext = mApplication.getApplicationContext();
-            Bundle notificationData = NotificationIntentAdapter.canHandleTrampolineActivity(appContext) ?
-                    intent.getExtras() : NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+            Bundle notificationData = intent.getExtras();
             final IPushNotification pushNotification = PushNotification.get(appContext, notificationData);
             if (pushNotification != null) {
                 pushNotification.onOpened();
+                // Erase notification intent after using it, to avoid looping with the same notification
+                // in case the app is moved to background and opened again
+                activity.setIntent(new Intent());
             }
         }
     }