Merge pull request #807 from Truebill/fix-pop-initial

Fix pop initial for firebase
zo0r · Aug 1, 2018 · b61ce08 · b61ce08
2 parents a071458 + 1510612
commit b61ce08
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java
@@ -61,9 +61,18 @@ public Map<String, Object> getConstants() {
         return constants;
     }
 
-    public void onNewIntent(Intent intent) {
+    private Bundle getBundleFromIntent(Intent intent) {
+        Bundle bundle = null;
         if (intent.hasExtra("notification")) {
-            Bundle bundle = intent.getBundleExtra("notification");
+            bundle = intent.getBundleExtra("notification");
+        } else if (intent.hasExtra("google.message_id")) {
+            bundle = intent.getExtras();
+        }
+        return bundle;
+    }
+    public void onNewIntent(Intent intent) {
+        Bundle bundle = this.getBundleFromIntent(intent);
+        if (bundle != null) {
             bundle.putBoolean("foreground", false);
             intent.putExtra("notification", bundle);
             mJsDelivery.notifyNotification(bundle);
@@ -155,8 +164,7 @@ public void getInitialNotification(Promise promise) {
         WritableMap params = Arguments.createMap();
         Activity activity = getCurrentActivity();
         if (activity != null) {
-            Intent intent = activity.getIntent();
-            Bundle bundle = intent.getBundleExtra("notification");
+            Bundle bundle = this.getBundleFromIntent(activity.getIntent());
             if (bundle != null) {
                 bundle.putBoolean("foreground", false);
                 String bundleString = mJsDelivery.convertJSON(bundle);
@@ -210,12 +218,12 @@ public void cancelLocalNotifications(ReadableMap userInfo) {
     }
 
     @ReactMethod
-        /**
-         * Clear notification from the notification centre.
-         */
-        public void clearLocalNotification(int notificationID) {
-            mRNPushNotificationHelper.clearNotification(notificationID);
-        }
+    /**
+     * Clear notification from the notification centre.
+     */
+    public void clearLocalNotification(int notificationID) {
+        mRNPushNotificationHelper.clearNotification(notificationID);
+    }
 
     @ReactMethod
     public void registerNotificationActions(ReadableArray actions) {