Split foreground and background notification type.

Author: lazywei

Libraries/PushNotificationIOS/PushNotificationIOS.js

@@ -19,7 +19,8 @@ var _notifHandlers = {};
 var _initialNotification = RCTPushNotificationManager &&
   RCTPushNotificationManager.initialNotification;
 
-var DEVICE_NOTIF_EVENT = 'remoteNotificationReceived';
+var DEVICE_NOTIF_EVENT_FOREGROUND = 'remoteNotificationReceivedForeground';
+var DEVICE_NOTIF_EVENT_BACKGROUND = 'remoteNotificationReceivedBackground';
 
 /**
  * Handle push notifications for your app, including permission handling and
@@ -52,19 +53,31 @@ class PushNotificationIOS {
    * Attaches a listener to remote notifications while the app is running in the
    * foreground or the background.
    *
-   * The handler will get be invoked with an instance of `PushNotificationIOS`
+   * The handler will get be invoked with an instance of `PushNotificationIOS`.
+   *
    */
   static addEventListener(type: string, handler: Function) {
     invariant(
-      type === 'notification',
-      'PushNotificationIOS only supports `notification` events'
-    );
-    _notifHandlers[handler] = RCTDeviceEventEmitter.addListener(
-      DEVICE_NOTIF_EVENT,
-      (notifData) => {
-        handler(new PushNotificationIOS(notifData));
-      }
+      type === 'notificationForeground' || type === 'notificationBackground',
+      'PushNotificationIOS only supports `notificationForeground` and `notificationBackground` events'
     );
+
+    if (type === 'notificationForeground') {
+      _notifHandlers[handler] = RCTDeviceEventEmitter.addListener(
+        DEVICE_NOTIF_EVENT_FOREGROUND,
+        (notifData) => {
+          handler(new PushNotificationIOS(notifData));
+        }
+      );
+    } else {
+      _notifHandlers[handler] = RCTDeviceEventEmitter.addListener(
+        DEVICE_NOTIF_EVENT_BACKGROUND,
+        (notifData) => {
+          handler(new PushNotificationIOS(notifData));
+        }
+      );
+    }
+
   }
 
   /**
@@ -97,8 +110,8 @@ class PushNotificationIOS {
    */
   static removeEventListener(type: string, handler: Function) {
     invariant(
-      type === 'notification',
-      'PushNotificationIOS only supports `notification` events'
+      type === 'notificationForeground' || type === 'notificationBackground',
+      'PushNotificationIOS only supports `notificationForeground` and `notificationBackground` events'
     );
     if (!_notifHandlers[handler]) {
       return;

Libraries/PushNotificationIOS/RCTPushNotificationManager.m

@@ -12,7 +12,8 @@
 #import "RCTBridge.h"
 #import "RCTEventDispatcher.h"
 
-NSString *const RCTRemoteNotificationReceived = @"RemoteNotificationReceived";
+NSString *const RCTRemoteNotificationReceivedForeground = @"RemoteNotificationReceivedForeground";
+NSString *const RCTRemoteNotificationReceivedBackground = @"RemoteNotificationReceivedBackground";
 
 @implementation RCTPushNotificationManager
 {
@@ -27,8 +28,13 @@ - (instancetype)init
 {
   if ((self = [super init])) {
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(handleRemoteNotificationReceived:)
-                                                 name:RCTRemoteNotificationReceived
+                                             selector:@selector(handleRemoteNotificationReceivedForeground:)
+                                                 name:RCTRemoteNotificationReceivedForeground
+                                               object:nil];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleRemoteNotificationReceivedBackground:)
+                                                 name:RCTRemoteNotificationReceivedBackground
                                                object:nil];
   }
   return self;
@@ -54,14 +60,30 @@ + (void)application:(UIApplication *)application didRegisterUserNotificationSett
 
 + (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)notification
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
-                                                      object:self
-                                                    userInfo:notification];
+  UIApplicationState state = [application applicationState];
+
+  if (state == UIApplicationStateActive) {
+    //app is in foreground
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceivedForeground
+                                                        object:self
+                                                      userInfo:notification];
+  } else {
+    //app is in background
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceivedBackground
+                                                        object:self
+                                                      userInfo:notification];
+  }
+}
+
+- (void)handleRemoteNotificationReceivedForeground:(NSNotification *)notification
+{
+  [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationReceivedForeground"
+                                              body:[notification userInfo]];
 }
 
-- (void)handleRemoteNotificationReceived:(NSNotification *)notification
+- (void)handleRemoteNotificationReceivedBackground:(NSNotification *)notification
 {
-  [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationReceived"
+  [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationReceivedBackground"
                                               body:[notification userInfo]];
 }