@trycourier/courier-react-native 5.5.5 → 5.5.7

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.5")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.7")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

package/ios/CourierReactNativeDelegate.m

@@ -7,12 +7,19 @@
 
 @import Courier_iOS;
 #import "CourierReactNativeDelegate.h"
+#import <React/RCTRootView.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 *cachedMessage;
+@property (nonatomic, assign) BOOL isReactNativeReady;
 
 @end
 
@@ -24,119 +31,119 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
     self = [super init];
     
     if (self) {
+      
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.5"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.7"];
         
         // 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;
-        
+
         [[NSNotificationCenter defaultCenter]
             addObserver:self
             selector:@selector(notificationPresentationOptionsUpdate:)
             name:CourierForegroundOptionsDidChangeNotification
-            object:nil
-        ];
+            object:nil];
+      
+        [[NSNotificationCenter defaultCenter]
+            addObserver:self
+            selector:@selector(onBridgeWillReload)
+            name:RCTBridgeWillReloadNotification
+            object:nil];
+      
+        [[NSNotificationCenter defaultCenter]
+            addObserver:self
+            selector:@selector(onReactUIReady:)
+            name:RCTContentDidAppearNotification
+            object:nil];
     }
     
     return self;
 }
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+// Called when React Native is loaded and ready
+- (void)onReactUIReady:(__unused NSNotification *)note
 {
-    // Killed-state launch support
-    [self handleNotificationLaunchFromKilledState:launchOptions];
+  self.isReactNativeReady = YES;
 
-    return YES;
+  // flush anything that was queued while RN was booting
+  if (self.cachedMessage) {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:self.cachedMessage];
+    self.cachedMessage = nil;
+  }
 }
 
-- (void)notificationPresentationOptionsUpdate:(NSNotification *)notification
+// Called when there is a reload to React Native
+- (void)onBridgeWillReload
 {
-    if ([[notification name] isEqualToString:CourierForegroundOptionsDidChangeNotification])
-    {
-        NSDictionary *userInfo = notification.userInfo;
-        self.notificationPresentationOptions = ((NSNumber *)[userInfo objectForKey:@"options"]).unsignedIntegerValue;
-    }
+  self.isReactNativeReady = NO;
 }
 
-/// Handles notification taps when the app launches from a killed state.
-/// Call this from AppDelegate's didFinishLaunchingWithOptions using UIApplicationLaunchOptionsRemoteNotificationKey.
-- (void)handleNotificationLaunchFromKilledState:(NSDictionary *)launchOptions
+- (void)notificationPresentationOptionsUpdate:(NSNotification *)notification
 {
-    NSDictionary *userInfo = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
-    if (userInfo) {
-        // Track event
-        [userInfo trackMessageWithEvent:CourierTrackingEventClicked completion:^(NSError * _Nullable error) {
-            if (error) {
-                NSLog(@"[Courier] Failed to track message click on cold start: %@", error.localizedDescription);
-            }
-        }];
-
-        // Create temporary content for formatting
-        UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init];
-        content.userInfo = userInfo;
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-            NSDictionary *formatted = [Courier formatPushNotificationWithContent:content];
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:formatted];
-        });
-    }
+    NSDictionary *userInfo = notification.userInfo;
+    self.notificationPresentationOptions = ((NSNumber *)[userInfo objectForKey:@"options"]).unsignedIntegerValue;
 }
 
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-       willPresentNotification:(UNNotification *)notification
-         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center 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.cachedMessage = pushNotification;
+      }
+      completionHandler();
     });
 }
 
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-didReceiveNotificationResponse:(UNNotificationResponse *)response
-         withCompletionHandler:(void (^)(void))completionHandler
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center 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
+- (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
-didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
     [Courier setAPNSToken:deviceToken];
 }
 
+- (void)dealloc
+{
+  self.cachedMessage = nil;
+  self.isReactNativeReady = NO;
+}
+
 @end

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.5")
+        Courier.agent = CourierAgent.reactNativeIOS("5.5.7")
         
     }
     

package/package.json

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