android-get-initial-notification (#983)

wix · Jul 20, 2023 · 748e219 · 748e219
1 parent 7925280
commit 748e219
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 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 = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             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());
             }
         }
     }

diff --git a/...id/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/...id/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
@@ -32,7 +32,12 @@ public static boolean canHandleTrampolineActivity(Context appContext) {
     }
 
     public static Bundle extractPendingNotificationDataFromIntent(Intent intent) {
-        return intent.getBundleExtra(PUSH_NOTIFICATION_EXTRA_NAME);
+        Bundle notificationBundle = intent.getBundleExtra(PUSH_NOTIFICATION_EXTRA_NAME);
+        if (notificationBundle != null) {
+            return notificationBundle;
+        } else {
+            return intent.getExtras();
+        }
     }
 
     public static boolean canHandleIntent(Intent intent) {