Merge pull request #792 from evollu/pending-notif

hold notification when app is bootstrapping

ios/RNFIRMessaging.m

@@ -217,14 +217,15 @@ RCT_MULTI_ENUM_CONVERTER(UNNotificationCategoryOptions, (@{
 
 @end
 
-static NSDictionary *initialNotificationActionResponse;
-
 @interface RNFIRMessaging ()
 @property (nonatomic, strong) NSMutableDictionary *notificationCallbacks;
 @end
 
 @implementation RNFIRMessaging
 
+static bool jsHandlerRegistered;
+static NSMutableArray* pendingNotifications;
+
 RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents {
@@ -239,14 +240,14 @@ RCT_EXPORT_MODULE();
     NSMutableDictionary* data = [[NSMutableDictionary alloc] initWithDictionary: userInfo];
     [data setValue:@"remote_notification" forKey:@"_notificationType"];
     [data setValue:@(RCTSharedApplication().applicationState == UIApplicationStateInactive) forKey:@"opened_from_tray"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:@{@"data": data, @"completionHandler": completionHandler}];
+    [self sendNotificationEventWhenAvailable:@{@"data": data, @"completionHandler": completionHandler}];
 }
 
 + (void)didReceiveLocalNotification:(UILocalNotification *)notification {
     NSMutableDictionary* data = [[NSMutableDictionary alloc] initWithDictionary: notification.userInfo];
     [data setValue:@"local_notification" forKey:@"_notificationType"];
     [data setValue:@(RCTSharedApplication().applicationState == UIApplicationStateInactive) forKey:@"opened_from_tray"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:@{@"data": data}];
+    [self sendNotificationEventWhenAvailable:@{@"data": data}];
 }
 
 + (void)didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(nonnull RCTNotificationResponseCallback)completionHandler
@@ -263,22 +264,28 @@ RCT_EXPORT_MODULE();
     }
     
     NSDictionary *userInfo = @{@"data": data, @"completionHandler": completionHandler};
+    [self sendNotificationEventWhenAvailable:userInfo];
   
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        if (data[@"_actionIdentifier"] && ![data[@"_actionIdentifier"] isEqualToString:UNNotificationDefaultActionIdentifier]) {
-            initialNotificationActionResponse = userInfo;
-        }
-    });
-
-    [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:userInfo];
 }
 
 + (void)willPresentNotification:(UNNotification *)notification withCompletionHandler:(nonnull RCTWillPresentNotificationCallback)completionHandler
 {
     NSMutableDictionary* data = [[NSMutableDictionary alloc] initWithDictionary: notification.request.content.userInfo];
     [data setValue:@"will_present_notification" forKey:@"_notificationType"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:@{@"data": data, @"completionHandler": completionHandler}];
+    [self sendNotificationEventWhenAvailable:@{@"data": data, @"completionHandler": completionHandler}];
+}
+
++ (void)sendNotificationEventWhenAvailable:(NSDictionary*)data
+{
+  if(!jsHandlerRegistered){
+    // JS hasn't registered callback yet. hold on that
+    if(!pendingNotifications){
+      pendingNotifications = [NSMutableArray array];
+    }
+    [pendingNotifications addObject:data];
+  } else {
+    [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:data];
+  }
 }
 
 - (void)dealloc
@@ -288,6 +295,7 @@ RCT_EXPORT_MODULE();
 
 - (instancetype)init {
     self = [super init];
+  
     [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(handleNotificationReceived:)
                                                name:FCMNotificationReceived
@@ -309,16 +317,25 @@ RCT_EXPORT_MODULE();
     dispatch_async(dispatch_get_main_queue(), ^{
         [[FIRMessaging messaging] setDelegate:self];
     });
+  
     return self;
 }
 
 -(void) addListener:(NSString *)eventName {
-  if([super respondsToSelector:@selector(addListener:)]){
   [super addListener:eventName];
+
+  if([eventName isEqualToString:FCMNotificationReceived]) {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+      jsHandlerRegistered = true;
+      
+      for (NSDictionary* data in pendingNotifications) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:data];
       }
       
-    if([eventName isEqualToString:FCMNotificationReceived] && initialNotificationActionResponse) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:FCMNotificationReceived object:self userInfo:[initialNotificationActionResponse copy]];
+      [pendingNotifications removeAllObjects];
+      
+    });
   }
 }
 
@@ -336,6 +353,7 @@ RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve rejecte
 {
   NSDictionary* initialNotif;
   NSDictionary *localUserInfo = [[self.bridge.launchOptions[UIApplicationLaunchOptionsLocalNotificationKey] userInfo] mutableCopy];
+  
   NSDictionary *remoteUserInfo = [self.bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] mutableCopy];
   if(localUserInfo){
     initialNotif = localUserInfo;
@@ -350,6 +368,8 @@ RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve rejecte
   }
 }
 
+
+
 RCT_EXPORT_METHOD(getAPNSToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSData * deviceToken = [FIRMessaging messaging].APNSToken;
@@ -655,12 +675,7 @@ RCT_EXPORT_METHOD(finishNotificationResponse: (NSString *)completionHandlerId){
         self.notificationCallbacks[completionHandlerId] = completionHandler;
         data[@"_completionHandlerId"] = completionHandlerId;
     }
-
     [self sendEventWithName:FCMNotificationReceived body:data];
-
-    if (initialNotificationActionResponse) {
-        initialNotificationActionResponse = nil;
-    }
 }
 
 - (void)sendDataMessageFailure:(NSNotification *)notification