@trycourier/courier-react-native 5.5.3 → 5.5.5

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

@@ -22,7 +22,7 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   init {
 
-    // Handle delivered messages on the main thread
+    // Listen to push notification events
     Courier.shared.onPushNotificationEvent { event ->
       when (event.trackingEvent) {
         CLICKED -> postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, event.remoteMessage)

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

package/ios/CourierReactNativeDelegate.m

@@ -2,7 +2,7 @@
 //  CourierReactNativeDelegate.m
 //  courier-react-native
 //
-//  Created by Michael Miller on 10/7/22.
+//  Created by https://github.com/mikemilla on 10/7/22.
 //
 
 @import Courier_iOS;
@@ -12,21 +12,20 @@
 
 @interface CourierReactNativeDelegate ()
 
-@property (nonatomic, copy) NSString *iosForegroundNotificationPresentationOptions;
 @property (nonatomic, assign) UNNotificationPresentationOptions notificationPresentationOptions;
 
 @end
 
 @implementation CourierReactNativeDelegate
 
-- (id) init {
-    
+static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosForegroundNotificationPresentationOptions";
+
+- (id)init {
     self = [super init];
     
     if (self) {
-        
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.3"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.5"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
@@ -39,28 +38,59 @@
         [[NSNotificationCenter defaultCenter]
             addObserver:self
             selector:@selector(notificationPresentationOptionsUpdate:)
-            name:_iosForegroundNotificationPresentationOptions
+            name:CourierForegroundOptionsDidChangeNotification
             object:nil
         ];
-        
     }
     
-    return(self);
-    
+    return self;
+}
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    // Killed-state launch support
+    [self handleNotificationLaunchFromKilledState:launchOptions];
+
+    return YES;
 }
 
-- (void) notificationPresentationOptionsUpdate:(NSNotification *) notification
+- (void)notificationPresentationOptionsUpdate:(NSNotification *)notification
 {
-    if ([[notification name] isEqualToString:_iosForegroundNotificationPresentationOptions])
+    if ([[notification name] isEqualToString:CourierForegroundOptionsDidChangeNotification])
     {
         NSDictionary *userInfo = notification.userInfo;
-        _notificationPresentationOptions = ((NSNumber *) [userInfo objectForKey:@"options"]).unsignedIntegerValue;
+        self.notificationPresentationOptions = ((NSNumber *)[userInfo objectForKey:@"options"]).unsignedIntegerValue;
     }
 }
 
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+/// Handles notification taps when the app launches from a killed state.
+/// Call this from AppDelegate's didFinishLaunchingWithOptions using UIApplicationLaunchOptionsRemoteNotificationKey.
+- (void)handleNotificationLaunchFromKilledState:(NSDictionary *)launchOptions
+{
+    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];
+        });
+    }
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
 {
-    
     UNNotificationContent *content = notification.request.content;
     NSDictionary *message = content.userInfo;
     
@@ -71,19 +101,16 @@
     }];
     
     dispatch_async(dispatch_get_main_queue(), ^{
-    
         NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
         [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
-        
-        completionHandler(self->_notificationPresentationOptions);
-        
+        completionHandler(self.notificationPresentationOptions);
     });
-    
 }
 
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)(void))completionHandler
 {
-    
     UNNotificationContent *content = response.notification.request.content;
     NSDictionary *message = content.userInfo;
     
@@ -94,22 +121,20 @@
     }];
 
     dispatch_async(dispatch_get_main_queue(), ^{
-
         NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
         [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:pushNotification];
-
         completionHandler();
-
     });
-    
 }
 
-- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
+- (void)application:(UIApplication *)application
+didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
 {
-    NSLog(@"Failed to rgister for remote notification token: %@", error.localizedDescription);
+    NSLog(@"Failed to register for remote notification token: %@", error.localizedDescription);
 }
 
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+- (void)application:(UIApplication *)application
+didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
     [Courier setAPNSToken:deviceToken];
 }

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

package/package.json

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