PR zo0r#954: Merge remote-tracking branch 'zhangjunhou/master'

Mike McCartney · Mike McCartney · commit 85d593f4d83d · 2019-02-15T12:09:19.000-06:00
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java
@@ -130,10 +130,11 @@ private void handleRemotePushNotification(ReactApplicationContext context, Bundl
         }
 
         Log.v(LOG_TAG, "sendNotification: " + bundle);
-
-        Application applicationContext = (Application) context.getApplicationContext();
-        RNPushNotificationHelper pushNotificationHelper = new RNPushNotificationHelper(applicationContext);
-        pushNotificationHelper.sendToNotificationCentre(bundle);
+        if (!isForeground) {
+            Application applicationContext = (Application) context.getApplicationContext();
+            RNPushNotificationHelper pushNotificationHelper = new RNPushNotificationHelper(applicationContext);
+            pushNotificationHelper.sendToNotificationCentre(bundle);
+        }
     }
 
     private boolean isApplicationInForeground() {

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,11 @@ private void handleRemotePushNotification(ReactApplicationContext context, Bundl`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`Log.v(LOG_TAG, "sendNotification: " + bundle);`
`133`		`-`
`134`		`- Application applicationContext = (Application) context.getApplicationContext();`
`135`		`- RNPushNotificationHelper pushNotificationHelper = new RNPushNotificationHelper(applicationContext);`
`136`		`- pushNotificationHelper.sendToNotificationCentre(bundle);`
	`133`	`+ if (!isForeground) {`
	`134`	`+ Application applicationContext = (Application) context.getApplicationContext();`
	`135`	`+ RNPushNotificationHelper pushNotificationHelper = new RNPushNotificationHelper(applicationContext);`
	`136`	`+ pushNotificationHelper.sendToNotificationCentre(bundle);`
	`137`	`+ }`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`private boolean isApplicationInForeground() {`