@trycourier/courier-react-native 5.4.3 → 5.5.0

package/android/build.gradle

@@ -103,14 +103,14 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation "com.facebook.react:react-android:0.73.7"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // For converting to json
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:5.1.11'
+  api 'com.github.trycourier:courier-android:5.2.0'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
 }

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

@@ -241,8 +241,17 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod
-  fun addInboxListener(listenerId: String, loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String, promise: Promise) {
-
+  fun addInboxListener(
+    listenerId: String,
+    loadingId: String,
+    errorId: String,
+    unreadCountId: String,
+    totalCountId: String,
+    messagesChangedId: String,
+    pageAddedId: String,
+    messageEventId: String,
+    promise: Promise
+  ) = CoroutineScope(Dispatchers.Main).launch {
     val listener = Courier.shared.addInboxListener(
       onLoading = { isRefresh ->
         reactApplicationContext.sendEvent(
@@ -262,66 +271,56 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
           value = unreadCount
         )
       },
-      onFeedChanged = { messageSet ->
-        reactApplicationContext.sendEvent(
-          eventName = feedId,
-          value = messageSet.toJson()
-        )
-      },
-      onArchiveChanged = { messageSet ->
+      onTotalCountChanged = { totalCount, feed ->
+        val json = Arguments.createMap().apply {
+          putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archive")
+          putInt("totalCount", totalCount)
+        }
         reactApplicationContext.sendEvent(
-          eventName = archiveId,
-          value = messageSet.toJson()
-        )
-      },
-      onPageAdded = { feed, messageSet ->
-        val json = Arguments.createMap()
-        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
-        json.putArray("messages", messageSet.messages.map { it.toJson() }.toWritableArray())
-        json.putInt("totalMessageCount", messageSet.totalCount)
-        json.putBoolean("canPaginate", messageSet.canPaginate)
-        reactApplicationContext.sendEvent(
-          eventName = pageAddedId,
+          eventName = totalCountId,
           value = json
         )
       },
-      onMessageAdded = { feed, index, message ->
-        val json = Arguments.createMap()
-        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
-        json.putInt("index", index)
-        json.putString("message", message.toJson())
+      onMessagesChanged = { messages, canPaginate, feed ->
+        val json = Arguments.createMap().apply {
+          putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archive")
+          putArray("messages", messages.map { it.toJson() }.toWritableArray())
+          putBoolean("canPaginate", canPaginate)
+        }
         reactApplicationContext.sendEvent(
-          eventName = messageAddedId,
+          eventName = messagesChangedId,
           value = json
         )
       },
-      onMessageChanged = { feed, index, message ->
-        val json = Arguments.createMap()
-        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
-        json.putInt("index", index)
-        json.putString("message", message.toJson())
+      onPageAdded = { messages, canPaginate, isFirstPage, feed ->
+        val json = Arguments.createMap().apply {
+          putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archive")
+          putArray("messages", messages.map { it.toJson() }.toWritableArray())
+          putBoolean("canPaginate", canPaginate)
+          putBoolean("isFirstPage", isFirstPage)
+        }
         reactApplicationContext.sendEvent(
-          eventName = messageChangedId,
+          eventName = pageAddedId,
           value = json
         )
       },
-      onMessageRemoved = { feed, index, message ->
-        val json = Arguments.createMap()
-        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
-        json.putInt("index", index)
-        json.putString("message", message.toJson())
+      onMessageEvent = { message, index, feed, event ->
+        val json = Arguments.createMap().apply {
+          putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archive")
+          putInt("index", index)
+          putString("event", event.value)
+          putString("message", message.toJson())
+        }
         reactApplicationContext.sendEvent(
-          eventName = messageRemovedId,
+          eventName = messageEventId,
           value = json
         )
-      },
+      }
     )
 
-    // Add listener
     inboxListeners[listenerId] = listener
 
     promise.resolve(listenerId)
-
   }
 
   private fun InboxMessageSet.toJson(): WritableMap? {

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

package/courier-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   
   # Courier Core Dependency
-  s.dependency "Courier_iOS", "5.6.1"
+  s.dependency "Courier_iOS", "5.7.4"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/ios/CourierReactNativeDelegate.m

@@ -10,10 +10,14 @@
 #pragma GCC diagnostic ignored "-Wprotocol"
 #pragma clang diagnostic ignored "-Wprotocol"
 
-@implementation CourierReactNativeDelegate
+@interface CourierReactNativeDelegate ()
+
+@property (nonatomic, copy) NSString *iosForegroundNotificationPresentationOptions;
+@property (nonatomic, assign) UNNotificationPresentationOptions notificationPresentationOptions;
 
-NSString *iosForegroundNotificationPresentationOptions = @"iosForegroundNotificationPresentationOptions";
-NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNone;
+@end
+
+@implementation CourierReactNativeDelegate
 
 - (id) init {
     
@@ -22,7 +26,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     if (self) {
         
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.4.3"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.0"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
@@ -35,7 +39,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
         [[NSNotificationCenter defaultCenter]
             addObserver:self
             selector:@selector(notificationPresentationOptionsUpdate:)
-            name:iosForegroundNotificationPresentationOptions
+            name:_iosForegroundNotificationPresentationOptions
             object:nil
         ];
         
@@ -47,10 +51,10 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
 
 - (void) notificationPresentationOptionsUpdate:(NSNotification *) notification
 {
-    if ([[notification name] isEqualToString:iosForegroundNotificationPresentationOptions])
+    if ([[notification name] isEqualToString:_iosForegroundNotificationPresentationOptions])
     {
         NSDictionary *userInfo = notification.userInfo;
-        notificationPresentationOptions = ((NSNumber *) [userInfo objectForKey:@"options"]).unsignedIntegerValue;
+        _notificationPresentationOptions = ((NSNumber *) [userInfo objectForKey:@"options"]).unsignedIntegerValue;
     }
 }
 
@@ -71,7 +75,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
         NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
         [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
         
-        completionHandler(notificationPresentationOptions);
+        completionHandler(self->_notificationPresentationOptions);
         
     });
     

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

package/ios/CourierReactNativeModule.m

@@ -139,12 +139,10 @@ RCT_EXTERN_METHOD(
   withLoadingId: (NSString*)loadingId
   withErrorId: (NSString*)errorId
   withUnreadCountId: (NSString*)unreadCountId
-  withFeedId: (NSString*)feedId
-  withArchiveId: (NSString*)archiveId
+  withTotalCountId: (NSString*)totalCountId
+  withMessagesChangedId: (NSString*)messagesChangedId
   withPageAddedId: (NSString*)pageAddedId
-  withMessageChangedId: (NSString*)messageChangedId
-  withMessageAddedId: (NSString*)messageAddedId
-  withMessageRemovedId: (NSString*)messageRemovedId
+  withMessageEventId: (NSString*)messageEventId
   withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )

package/ios/CourierSharedModule.swift

@@ -314,18 +314,27 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
         
     }
     
-    @objc(addInboxListener:withLoadingId:withErrorId:withUnreadCountId:withFeedId:withArchiveId:withPageAddedId:withMessageChangedId:withMessageAddedId:withMessageRemovedId:withResolver:withRejecter:)
-    func addInboxListener(listenerId: String, loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
-        Task {
-            
-            // Create the new listener
-            let listener = await Courier.shared.addInboxListener(
+    @objc(addInboxListener:withLoadingId:withErrorId:withUnreadCountId:withTotalCountId:withMessagesChangedId:withPageAddedId:withMessageEventId:withResolver:withRejecter:)
+    func addInboxListener(
+        listenerId: String,
+        loadingId: String,
+        errorId: String,
+        unreadCountId: String,
+        totalCountId: String,
+        messagesChangedId: String,
+        pageAddedId: String,
+        messageEventId: String,
+        resolve: @escaping RCTPromiseResolveBlock,
+        reject: @escaping RCTPromiseRejectBlock
+    ) -> Void {
+      
+      Task {
+          let listener = await Courier.shared.addInboxListener(
               onLoading: { [weak self] isRefresh in
-                self?.broadcast(
-                    name: loadingId,
-                    body: isRefresh
-                )
+                  self?.broadcast(
+                      name: loadingId,
+                      body: isRefresh
+                  )
               },
               onError: { [weak self] error in
                   self?.broadcast(
@@ -334,122 +343,89 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
                   )
               },
               onUnreadCountChanged: { [weak self] unreadCount in
-                self?.broadcast(
-                    name: unreadCountId,
-                    body: unreadCount
-                )
-              },
-              onFeedChanged: { [weak self] set in
-                do {
-                  let json: [String: Any] = [
-                    "messages": try set.messages.map { try $0.toJson() ?? "" },
-                    "totalMessageCount": set.totalCount,
-                    "canPaginate": set.canPaginate
-                  ]
                   self?.broadcast(
-                    name: feedId,
-                    body: json
+                      name: unreadCountId,
+                      body: unreadCount
                   )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
-                  }
-                }
-              },
-              onArchiveChanged: { [weak self] set in
-                do {
-                  let json: [String: Any] = [
-                    "messages": try set.messages.map { try $0.toJson() ?? "" },
-                    "totalMessageCount": set.totalCount,
-                    "canPaginate": set.canPaginate
-                  ]
-                  self?.broadcast(
-                    name: archiveId,
-                    body: json
-                  )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
-                  }
-                }
               },
-              onPageAdded: { [weak self] feed, set in
-                do {
+              onTotalCountChanged: { [weak self] totalCount, feed in
+                  let feedName = (feed == .archive) ? "archive" : "feed"
                   let json: [String: Any] = [
-                    "feed": feed == .archived ? "archived" : "feed",
-                    "messages": try set.messages.map { try $0.toJson() ?? "" },
-                    "totalMessageCount": set.totalCount,
-                    "canPaginate": set.canPaginate
+                      "totalCount": totalCount,
+                      "feed": feedName
                   ]
                   self?.broadcast(
-                    name: pageAddedId,
-                    body: json
+                      name: totalCountId,
+                      body: json
                   )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
-                  }
-                }
               },
-              onMessageChanged: { [weak self] feed, index, message in
-                do {
-                  let json: [String: Any] = [
-                    "feed": feed == .archived ? "archived" : "feed",
-                    "index": index,
-                    "message": try message.toJson() ?? "",
-                  ]
-                  self?.broadcast(
-                    name: messageChangedId,
-                    body: json
-                  )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
+              onMessagesChanged: { [weak self] messages, canPaginate, feed in
+                  // Convert each InboxMessage to JSON
+                  do {
+                      let feedName = (feed == .archive) ? "archive" : "feed"
+                      let json: [String: Any] = [
+                          "feed": feedName,
+                          "canPaginate": canPaginate,
+                          "messages": try messages.map { try $0.toJson() ?? "" }
+                      ]
+                      self?.broadcast(
+                          name: messagesChangedId,
+                          body: json
+                      )
+                  } catch {
+                      Task {
+                          await Courier.shared.client?.error(error.localizedDescription)
+                      }
                   }
-                }
               },
-              onMessageAdded: { [weak self] feed, index, message in
-                do {
-                  let json: [String: Any] = [
-                    "feed": feed == .archived ? "archived" : "feed",
-                    "index": index,
-                    "message": try message.toJson() ?? "",
-                  ]
-                  self?.broadcast(
-                    name: messageAddedId,
-                    body: json
-                  )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
+              onPageAdded: { [weak self] messages, canPaginate, isFirstPage, feed in
+                  // Convert each InboxMessage to JSON
+                  do {
+                      let feedName = (feed == .archive) ? "archive" : "feed"
+                      let json: [String: Any] = [
+                          "feed": feedName,
+                          "canPaginate": canPaginate,
+                          "isFirstPage": isFirstPage,
+                          "messages": try messages.map { try $0.toJson() ?? "" }
+                      ]
+                      self?.broadcast(
+                          name: pageAddedId,
+                          body: json
+                      )
+                  } catch {
+                      Task {
+                          await Courier.shared.client?.error(error.localizedDescription)
+                      }
                   }
-                }
               },
-              onMessageRemoved: { [weak self] feed, index, message in
-                do {
-                  let json: [String: Any] = [
-                    "feed": feed == .archived ? "archived" : "feed",
-                    "index": index,
-                    "message": try message.toJson() ?? "",
-                  ]
-                  self?.broadcast(
-                    name: messageRemovedId,
-                    body: json
-                  )
-                } catch {
-                  Task {
-                    await Courier.shared.client?.error(error.localizedDescription)
+              onMessageEvent: { [weak self] message, index, feed, event in
+                  do {
+                      let feedName = (feed == .archive) ? "archive" : "feed"
+                      let eventName = event.rawValue  // or handle explicitly as needed
+                      let json: [String: Any] = [
+                          "feed": feedName,
+                          "event": eventName,
+                          "index": index,
+                          "message": try message.toJson() ?? ""
+                      ]
+                      self?.broadcast(
+                          name: messageEventId,
+                          body: json
+                      )
+                  } catch {
+                      Task {
+                          await Courier.shared.client?.error(error.localizedDescription)
+                      }
                   }
-                }
               }
-            )
-          
-            inboxListeners[listenerId] = listener
+          )
           
-            resolve(listenerId)
+          // Store the listener so you can remove it later if needed
+          inboxListeners[listenerId] = listener
           
-        }
-        
+          // Resolve with the listenerId so JS knows the registration succeeded
+          resolve(listenerId)
+      }
     }
     
     @objc(removeInboxListener:withResolver:withRejecter:)
@@ -498,7 +474,7 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     func fetchNextPageOfMessages(inboxMessageFeed: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         Task {
             do {
-                let value: InboxMessageFeed = inboxMessageFeed == "archived" ? .feed : .archived
+                let value: InboxMessageFeed = inboxMessageFeed == "archive" ? .feed : .archive
                 let messages = try await Courier.shared.fetchNextInboxPage(value)
                 resolve(try messages.map { try $0.toJson() ?? "" })
             } catch {