@trycourier/courier-react-native 5.5.4 → 5.5.6

package/android/src/main/java/com/courierreactnative/Utils.kt

@@ -15,7 +15,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
 internal object Utils {
-  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.4")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.6")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

package/ios/CourierReactNativeDelegate.m

@@ -7,12 +7,18 @@
 
 @import Courier_iOS;
 #import "CourierReactNativeDelegate.h"
+#import <React/RCTBridge.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTUtils.h>
+
 #pragma GCC diagnostic ignored "-Wprotocol"
 #pragma clang diagnostic ignored "-Wprotocol"
 
 @interface CourierReactNativeDelegate ()
 
 @property (nonatomic, assign) UNNotificationPresentationOptions notificationPresentationOptions;
+@property (nonatomic, strong) NSDictionary *pendingNotificationClick;
+@property (nonatomic, assign) BOOL isReactNativeReady;
 
 @end
 
@@ -25,80 +31,111 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
     
     if (self) {
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.4"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.6"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
         [app registerForRemoteNotifications];
         
-        // Register notification center changes
+        // Set notification center delegate
         UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
         center.delegate = self;
         
+        // Detect JS bridge load
+        self.isReactNativeReady = [self detectIfBridgeIsReady];
+
+        [[NSNotificationCenter defaultCenter]
+            addObserver:self
+            selector:@selector(onJavaScriptDidLoad:)
+            name:RCTJavaScriptDidLoadNotification
+            object:nil];
+
         [[NSNotificationCenter defaultCenter]
             addObserver:self
             selector:@selector(notificationPresentationOptionsUpdate:)
             name:CourierForegroundOptionsDidChangeNotification
-            object:nil
-        ];
+            object:nil];
     }
     
     return self;
 }
 
+- (BOOL)detectIfBridgeIsReady {
+    // RCTBridge currentBridge is non-nil only after JS is loaded
+    return [RCTBridge currentBridge] != nil;
+}
+
 - (void)notificationPresentationOptionsUpdate:(NSNotification *)notification
 {
-    if ([[notification name] isEqualToString:CourierForegroundOptionsDidChangeNotification])
-    {
-        NSDictionary *userInfo = notification.userInfo;
-        self.notificationPresentationOptions = ((NSNumber *)[userInfo objectForKey:@"options"]).unsignedIntegerValue;
+    NSDictionary *userInfo = notification.userInfo;
+    self.notificationPresentationOptions = ((NSNumber *)[userInfo objectForKey:@"options"]).unsignedIntegerValue;
+}
+
+- (void)onJavaScriptDidLoad:(NSNotification *)notification
+{
+    self.isReactNativeReady = YES;
+
+    if (self.pendingNotificationClick) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked"
+                                                            object:nil
+                                                          userInfo:self.pendingNotificationClick];
+        self.pendingNotificationClick = nil;
     }
 }
 
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
-       willPresentNotification:(UNNotification *)notification
-         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)(void))completionHandler
 {
-    UNNotificationContent *content = notification.request.content;
+    UNNotificationContent *content = response.notification.request.content;
     NSDictionary *message = content.userInfo;
-    
-    [message trackMessageWithEvent:CourierTrackingEventDelivered completion:^(NSError * _Nullable error) {
+
+    [message trackMessageWithEvent:CourierTrackingEventClicked completion:^(NSError * _Nullable error) {
         if (error) {
-            NSLog(@"Error tracking message: %@", error.localizedDescription);
+            NSLog(@"[Courier] Error tracking message: %@", error.localizedDescription);
         }
     }];
-    
+
+    NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
+
     dispatch_async(dispatch_get_main_queue(), ^{
-        NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
-        completionHandler(self.notificationPresentationOptions);
+        if (self.isReactNativeReady) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked"
+                                                                object:nil
+                                                              userInfo:pushNotification];
+        } else {
+            self.pendingNotificationClick = pushNotification;
+        }
+        completionHandler();
     });
 }
 
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
-didReceiveNotificationResponse:(UNNotificationResponse *)response
-         withCompletionHandler:(void (^)(void))completionHandler
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
 {
-    UNNotificationContent *content = response.notification.request.content;
+    UNNotificationContent *content = notification.request.content;
     NSDictionary *message = content.userInfo;
-    
-    [message trackMessageWithEvent:CourierTrackingEventClicked completion:^(NSError * _Nullable error) {
+
+    [message trackMessageWithEvent:CourierTrackingEventDelivered completion:^(NSError * _Nullable error) {
         if (error) {
-            NSLog(@"Error tracking message: %@", error.localizedDescription);
+            NSLog(@"[Courier] Error tracking delivery: %@", error.localizedDescription);
         }
     }];
 
     dispatch_async(dispatch_get_main_queue(), ^{
         NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:pushNotification];
-        completionHandler();
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered"
+                                                            object:nil
+                                                          userInfo:pushNotification];
+        completionHandler(self.notificationPresentationOptions);
     });
 }
 
 - (void)application:(UIApplication *)application
 didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
 {
-    NSLog(@"Failed to register for remote notification token: %@", error.localizedDescription);
+    NSLog(@"[Courier] Failed to register for remote notifications: %@", error.localizedDescription);
 }
 
 - (void)application:(UIApplication *)application

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("5.5.4")
+        Courier.agent = CourierAgent.reactNativeIOS("5.5.6")
         
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "5.5.4",
+  "version": "5.5.6",
   "description": "Inbox, Push Notifications, and Preferences for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",