@trycourier/courier-react-native 5.5.2 → 5.5.4

package/README.md

@@ -118,12 +118,11 @@ Your app must support at least gradle `8.4`
 
  
 
-### 3. Extend the `CourierReactNativeActivity`
-
-In your Android project, change your `MainActivity` to extend the `CourierReactNativeActivity`.
+### 3. Extend your `MainActivity` with `CourierReactNativeActivity`
 
 This allows the Courier SDK to manage the current user between app sessions.
 
+Java
 ```java
 import com.courierreactnative.CourierReactNativeActivity;
 
@@ -132,6 +131,15 @@ public class MainActivity extends CourierReactNativeActivity {
 }
 ```
 
+Kotlin
+```kotlin
+import com.courierreactnative.CourierReactNativeActivity;
+
+class MainActivity : CourierReactNativeActivity() {
+    ..
+}
+```
+
  
 
 # Getting Started
@@ -152,12 +160,12 @@ These are all the available features of the SDK.
                 1
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Authentication.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/1_Authentication.md">
                     <code>Authentication</code>
                 </a>
             </td>
             <td align="left">
-                Manages user credentials between app sessions. Required if you would like to use <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Inbox.md"><code>Courier Inbox</code></a> and <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/PushNotifications.md"><code>Push Notifications</code></a>.
+                Manages user credentials between app sessions. Required if you would like to use <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/2_Inbox.md"><code>Courier Inbox</code></a> and <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/3_PushNotifications.md"><code>Push Notifications</code></a>.
             </td>
         </tr>
         <tr width="600px">
@@ -165,7 +173,7 @@ These are all the available features of the SDK.
                 2
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Inbox.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/2_Inbox.md">
                     <code>Inbox</code>
                 </a>
             </td>
@@ -178,7 +186,7 @@ These are all the available features of the SDK.
                 3
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/PushNotifications.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/3_PushNotifications.md">
                     <code>Push Notifications</code>
                 </a>
             </td>
@@ -191,7 +199,7 @@ These are all the available features of the SDK.
                 4
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Preferences.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/4_Preferences.md">
                     <code>Preferences</code>
                 </a>
             </td>
@@ -204,7 +212,7 @@ These are all the available features of the SDK.
                 5
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Client.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/5_Client.md">
                     <code>CourierClient</code>
                 </a>
             </td>
@@ -217,6 +225,12 @@ These are all the available features of the SDK.
 
 &emsp;
 
+# Expo
+
+If you are using Expo, you should check out the [Expo Docs](https://github.com/trycourier/courier-react-native/blob/master/Docs/6_Expo.md) for all the details.
+
+&emsp;
+
 # Example Projects
 
 Starter projects using this SDK.

package/android/build.gradle

@@ -110,7 +110,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:5.2.0'
+  api 'com.github.trycourier:courier-android:5.2.2'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
 }

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

@@ -1,15 +1,10 @@
 package com.courierreactnative
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import com.courier.android.Courier
-import com.courier.android.utils.getLastDeliveredMessage
-import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.ReactActivity
-import com.google.firebase.messaging.RemoteMessage
-import org.json.JSONObject
 
 open class CourierReactNativeActivity : ReactActivity() {
 
@@ -27,11 +22,6 @@ open class CourierReactNativeActivity : ReactActivity() {
     // See if there is a pending click event
     checkIntentForPushNotificationClick(intent)
 
-    // Handle delivered messages on the main thread
-    Courier.shared.getLastDeliveredMessage { message ->
-      postPushNotificationDelivered(message)
-    }
-
   }
 
   override fun onNewIntent(intent: Intent?) {
@@ -40,25 +30,7 @@ open class CourierReactNativeActivity : ReactActivity() {
   }
 
   private fun checkIntentForPushNotificationClick(intent: Intent?) {
-    intent?.trackPushNotificationClick { message ->
-      postPushNotificationClicked(message)
-    }
-  }
-
-  @SuppressLint("VisibleForTests")
-  private fun postPushNotificationDelivered(message: RemoteMessage) {
-    reactInstanceManager.currentReactContext?.sendEvent(
-      eventName = CourierEvents.Push.DELIVERED_EVENT,
-      value = JSONObject(message.pushNotification).toString()
-    )
-  }
-
-  @SuppressLint("VisibleForTests")
-  private fun postPushNotificationClicked(message: RemoteMessage) {
-    reactInstanceManager.currentReactContext?.sendEvent(
-      eventName = CourierEvents.Push.CLICKED_EVENT,
-      value = JSONObject(message.pushNotification).toString()
-    )
+    intent?.trackPushNotificationClick {}
   }
 
 }

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

@@ -2,10 +2,14 @@ package com.courierreactnative
 
 import android.content.Intent
 import android.provider.Settings
+import android.util.Log
 import com.courier.android.Courier
+import com.courier.android.models.CourierTrackingEvent.CLICKED
+import com.courier.android.models.CourierTrackingEvent.DELIVERED
 import com.courier.android.modules.isPushPermissionGranted
 import com.courier.android.modules.requestNotificationPermission
 import com.courier.android.utils.error
+import com.courier.android.utils.onPushNotificationEvent
 import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.bridge.Promise
@@ -16,6 +20,19 @@ import org.json.JSONObject
 
 class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeModule(tag = "System Error", name = "CourierSystemModule", reactContext = reactContext) {
 
+  init {
+
+    // Listen to push notification events
+    Courier.shared.onPushNotificationEvent { event ->
+      when (event.trackingEvent) {
+        CLICKED -> postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, event.remoteMessage)
+        DELIVERED -> postPushNotificationJavascriptEvent(CourierEvents.Push.DELIVERED_EVENT, event.remoteMessage)
+        else -> Log.w("CourierSystemModule", "Unknown tracking event: ${event.trackingEvent}")
+      }
+    }
+
+  }
+
   @ReactMethod
   fun addListener(type: String?) {
     // Keep: Required for RN built in Event Emitter Calls.
@@ -35,13 +52,13 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   private fun checkIntentForPushNotificationClick(intent: Intent?) {
     intent?.trackPushNotificationClick { message ->
-      postPushNotificationClicked(message)
+      postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, message)
     }
   }
 
-  private fun postPushNotificationClicked(message: RemoteMessage) {
+  private fun postPushNotificationJavascriptEvent(eventName: String, message: RemoteMessage) {
     reactApplicationContext.sendEvent(
-      eventName = CourierEvents.Push.CLICKED_EVENT,
+      eventName = eventName,
       value = JSONObject(message.pushNotification).toString()
     )
   }

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.2")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.4")
 }
 
 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.2"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.4"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
@@ -39,28 +38,27 @@
         [[NSNotificationCenter defaultCenter]
             addObserver:self
             selector:@selector(notificationPresentationOptionsUpdate:)
-            name:_iosForegroundNotificationPresentationOptions
+            name:CourierForegroundOptionsDidChangeNotification
             object:nil
         ];
-        
     }
     
-    return(self);
-    
+    return self;
 }
 
-- (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
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
 {
-    
     UNNotificationContent *content = notification.request.content;
     NSDictionary *message = content.userInfo;
     
@@ -71,19 +69,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 +89,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.2")
+        Courier.agent = CourierAgent.reactNativeIOS("5.5.4")
         
     }
     

package/package.json

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