Fix behaviour of popInitialNotification and onNotification.

Fix foreground value.

Author: Dallas62

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java

@@ -89,8 +89,6 @@ private Bundle getBundleFromIntent(Intent intent) {
     public void onNewIntent(Intent intent) {
         Bundle bundle = this.getBundleFromIntent(intent);
         if (bundle != null) {
-            bundle.putBoolean("foreground", false);
-            intent.putExtra("notification", bundle);
             mJsDelivery.notifyNotification(bundle);
         }
     }

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java

@@ -422,6 +422,7 @@ public void sendToNotificationCentreWithPicture(Bundle bundle, Bitmap largeIconB
 
             Intent intent = new Intent(context, intentClass);
             intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            bundle.putBoolean("foreground", this.isApplicationInForeground());
             bundle.putBoolean("userInteraction", true);
             intent.putExtra("notification", bundle);
 
@@ -583,7 +584,7 @@ public void sendToNotificationCentreWithPicture(Bundle bundle, Bitmap largeIconB
                 editor.apply();
             }
 
-            if (!(this.isApplicationInForeground(context) && bundle.getBoolean("ignoreInForeground"))) {
+            if (!(this.isApplicationInForeground() && bundle.getBoolean("ignoreInForeground"))) {
                 Notification info = notification.build();
                 info.defaults |= Notification.DEFAULT_LIGHTS;
 
@@ -938,7 +939,7 @@ private void checkOrCreateChannel(NotificationManager manager, String channel_id
         }
     }
 
-    public boolean isApplicationInForeground(Context context) {
+    public boolean isApplicationInForeground() {
         ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         List<RunningAppProcessInfo> processInfos = activityManager.getRunningAppProcesses();
         if (processInfos != null) {

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationPublisher.java

@@ -40,7 +40,7 @@ private void handleLocalNotification(Context context, Bundle bundle) {
         Application applicationContext = (Application) context.getApplicationContext();
         RNPushNotificationHelper pushNotificationHelper = new RNPushNotificationHelper(applicationContext);
 
-        boolean isForeground = pushNotificationHelper.isApplicationInForeground(applicationContext);
+        boolean isForeground = pushNotificationHelper.isApplicationInForeground();
 
         Log.v(LOG_TAG, "sendNotification: " + bundle);
 

index.js

@@ -20,7 +20,7 @@ var Notifications = {
   onAction: false,
   onRemoteFetch: false,
   isLoaded: false,
-  idInitialNotification: null,
+  isPopInitialNotification: false,
 
   isPermissionsRequestPending: false,
 
@@ -102,15 +102,16 @@ Notifications.configure = function(options) {
 
     if (options.popInitialNotification === undefined || options.popInitialNotification === true) {
       this.popInitialNotification(function(firstNotification) {
-        if (!firstNotification) {
+        if(this.isPopInitialNotification) {
           return;
         }
-
-        if(false === firstNotification.userInteraction || this.idInitialNotification === firstNotification.id) {
+        
+        this.isPopInitialNotification = true;
+        
+        if (!firstNotification || false === firstNotification.userInteraction) {
           return;
         }
 
-        this.idInitialNotification = firstNotification.id;
         this._onNotification(firstNotification, true);
       }.bind(this));
     }