@imatis/react-native-notifications 4.3.3-imatis.10 → 4.3.3-imatis.11

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java

@@ -63,7 +63,7 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule implements
     @Override
     public void onNewIntent(Intent intent) {
         if (NotificationIntentAdapter.canHandleIntent(intent)) {
-            Bundle notificationData = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+            Bundle notificationData = intent.getExtras();
             final IPushNotification notification = PushNotification.get(getReactApplicationContext().getApplicationContext(), notificationData);
             if (notification != null) {
                 notification.onOpened();

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java

@@ -19,7 +19,6 @@ import com.wix.reactnativenotifications.core.notification.IPushNotification;
 import com.wix.reactnativenotifications.core.notification.PushNotification;
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
-import com.wix.reactnativenotifications.core.ReactAppLifecycleFacade;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -67,12 +66,7 @@ public class RNNotificationsPackage implements ReactPackage, AppLifecycleFacade.
 
     @Override
     public void onActivityStarted(Activity activity) {
-          boolean isReactInitialized = false;
-        if (AppLifecycleFacadeHolder.get() instanceof ReactAppLifecycleFacade) {
-            isReactInitialized = AppLifecycleFacadeHolder.get().isReactInitialized();
-        }
-
-        if (InitialNotificationHolder.getInstance().get() == null && !isReactInitialized) {
+        if (InitialNotificationHolder.getInstance().get() == null) {
             callOnOpenedIfNeed(activity);
         }
     }
@@ -101,7 +95,8 @@ public class RNNotificationsPackage implements ReactPackage, AppLifecycleFacade.
         Intent intent = activity.getIntent();
         if (NotificationIntentAdapter.canHandleIntent(intent)) {
             Context appContext = mApplication.getApplicationContext();
-            Bundle notificationData = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+            Bundle notificationData = NotificationIntentAdapter.canHandleTrampolineActivity(appContext) ?
+                    intent.getExtras() : NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             final IPushNotification pushNotification = PushNotification.get(appContext, notificationData);
             if (pushNotification != null) {
                 pushNotification.onOpened();

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java

@@ -14,9 +14,17 @@ public class NotificationIntentAdapter {
 
     @SuppressLint("UnspecifiedImmutableFlag")
     public static PendingIntent createPendingNotificationIntent(Context appContext, PushNotificationProps notification) {
-        Intent intent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName());
-        intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
-        return PendingIntent.getActivity(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+        if (canHandleTrampolineActivity(appContext)) {
+            Intent intent = new Intent(appContext, ProxyService.class);
+            intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
+            return PendingIntent.getService(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
+        } else {
+            Intent mainActivityIntent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName());
+            mainActivityIntent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
+            TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(appContext);
+            taskStackBuilder.addNextIntentWithParentStack(mainActivityIntent);
+            return taskStackBuilder.getPendingIntent((int) System.currentTimeMillis(), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+        }
     }
 
     public static boolean canHandleTrampolineActivity(Context appContext) {

package/lib/android/app/src/reactNative59/java/com/wix/reactnativenotifications/NotificationManagerCompatFacade.java

@@ -2,8 +2,8 @@
 package com.wix.reactnativenotifications;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationManagerCompat;
+import android.support.annotation.NonNull;
+import android.support.v4.app.NotificationManagerCompat;
 
 public abstract class NotificationManagerCompatFacade {
     public static NotificationManagerCompat from(@NonNull Context context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imatis/react-native-notifications",
-  "version": "4.3.3-imatis.10",
+  "version": "4.3.3-imatis.11",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "license": "MIT",
   "keywords": [