@trycourier/courier-react-native 5.4.3 → 5.5.1

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

@@ -34,8 +34,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-
-class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeModule(tag = "Shared Instance Error", name = "CourierSharedModule", reactContext = reactContext) {
+class CourierSharedModule(
+  reactContext: ReactApplicationContext
+) : ReactNativeModule(
+  tag = "Shared Instance Error",
+  name = "CourierSharedModule",
+  reactContext = reactContext
+) {
 
   // Listeners
   private var authenticationListeners = mutableMapOf<String, CourierAuthenticationListener>()
@@ -82,26 +87,36 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod
-  fun signIn(accessToken: String, clientKey: String?, userId: String, tenantId: String?, showLogs: Boolean, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    Courier.shared.signIn(
-      userId = userId,
-      tenantId = tenantId,
-      accessToken = accessToken,
-      clientKey = clientKey,
-      showLogs = showLogs
-    )
-    promise.resolve(null)
+  fun signIn(
+    accessToken: String,
+    clientKey: String?,
+    userId: String,
+    tenantId: String?,
+    showLogs: Boolean,
+    promise: Promise
+  ) {
+    CoroutineScope(Dispatchers.Main).launch {
+      Courier.shared.signIn(
+        userId = userId,
+        tenantId = tenantId,
+        accessToken = accessToken,
+        clientKey = clientKey,
+        showLogs = showLogs
+      )
+      promise.resolve(null)
+    }
   }
 
   @ReactMethod
-  fun signOut(promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    Courier.shared.signOut()
-    promise.resolve(null)
+  fun signOut(promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      Courier.shared.signOut()
+      promise.resolve(null)
+    }
   }
 
   @ReactMethod
   fun addAuthenticationListener(listenerId: String, promise: Promise) {
-
     // Create the listener
     val listener = Courier.shared.addAuthenticationListener { userId ->
       reactApplicationContext.sendEvent(
@@ -112,24 +127,15 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
 
     // Add the listener to the map
     authenticationListeners[listenerId] = listener
-
     promise.resolve(listenerId)
-
   }
 
   @ReactMethod
   fun removeAuthenticationListener(listenerId: String, promise: Promise) {
-
     val listener = authenticationListeners[listenerId]
-
-    // Disable the listener
     listener?.remove()
-
-    // Remove the id from the map
     authenticationListeners.remove(listenerId)
-
     promise.resolve(listenerId)
-
   }
 
   @ReactMethod
@@ -142,28 +148,34 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   // Push
 
   @ReactMethod
-  fun getAllTokens(promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    val tokens = Courier.shared.tokens
-    val resultMap = Arguments.createMap()
-    tokens.forEach { (key, value) ->
-      resultMap.putString(key, value)
+  fun getAllTokens(promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      val tokens = Courier.shared.tokens
+      val resultMap = Arguments.createMap()
+      tokens.forEach { (key, value) ->
+        resultMap.putString(key, value)
+      }
+      promise.resolve(resultMap)
     }
-    promise.resolve(resultMap)
   }
 
   @ReactMethod
-  fun getToken(provider: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    val token = Courier.shared.getToken(provider)
-    promise.resolve(token)
+  fun getToken(provider: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      val token = Courier.shared.getToken(provider)
+      promise.resolve(token)
+    }
   }
 
   @ReactMethod
-  fun setToken(provider: String, token: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.setToken(provider, token)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun setToken(provider: String, token: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.setToken(provider, token)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
@@ -181,147 +193,159 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod
-  fun openMessage(messageId: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.openMessage(messageId)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun openMessage(messageId: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.openMessage(messageId)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @ReactMethod
-  fun archiveMessage(messageId: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.archiveMessage(messageId)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun archiveMessage(messageId: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.archiveMessage(messageId)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @ReactMethod
-  fun clickMessage(messageId: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.clickMessage(messageId)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun clickMessage(messageId: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.clickMessage(messageId)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @ReactMethod
-  fun readMessage(messageId: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.readMessage(messageId)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun readMessage(messageId: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.readMessage(messageId)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @ReactMethod
-  fun unreadMessage(messageId: String, promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.unreadMessage(messageId)
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun unreadMessage(messageId: String, promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.unreadMessage(messageId)
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @ReactMethod
-  fun readAllInboxMessages(promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      Courier.shared.readAllInboxMessages()
-      promise.resolve(null)
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun readAllInboxMessages(promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        Courier.shared.readAllInboxMessages()
+        promise.resolve(null)
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
 
   @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) {
-
-    val listener = Courier.shared.addInboxListener(
-      onLoading = { isRefresh ->
-        reactApplicationContext.sendEvent(
-          eventName = loadingId,
-          value = isRefresh
-        )
-      },
-      onError = { e ->
-        reactApplicationContext.sendEvent(
-          eventName = errorId,
-          value = e.message ?: "Courier Inbox Error"
-        )
-      },
-      onUnreadCountChanged = { unreadCount ->
-        reactApplicationContext.sendEvent(
-          eventName = unreadCountId,
-          value = unreadCount
-        )
-      },
-      onFeedChanged = { messageSet ->
-        reactApplicationContext.sendEvent(
-          eventName = feedId,
-          value = messageSet.toJson()
-        )
-      },
-      onArchiveChanged = { messageSet ->
-        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,
-          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())
-        reactApplicationContext.sendEvent(
-          eventName = messageAddedId,
-          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())
-        reactApplicationContext.sendEvent(
-          eventName = messageChangedId,
-          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())
-        reactApplicationContext.sendEvent(
-          eventName = messageRemovedId,
-          value = json
-        )
-      },
-    )
-
-    // Add listener
-    inboxListeners[listenerId] = listener
-
-    promise.resolve(listenerId)
+  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(
+            eventName = loadingId,
+            value = isRefresh
+          )
+        },
+        onError = { e ->
+          reactApplicationContext.sendEvent(
+            eventName = errorId,
+            value = e.message ?: "Courier Inbox Error"
+          )
+        },
+        onUnreadCountChanged = { unreadCount ->
+          reactApplicationContext.sendEvent(
+            eventName = unreadCountId,
+            value = unreadCount
+          )
+        },
+        onTotalCountChanged = { totalCount, feed ->
+          val json = Arguments.createMap().apply {
+            putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archive")
+            putInt("totalCount", totalCount)
+          }
+          reactApplicationContext.sendEvent(
+            eventName = totalCountId,
+            value = json
+          )
+        },
+        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 = messagesChangedId,
+            value = json
+          )
+        },
+        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 = pageAddedId,
+            value = json
+          )
+        },
+        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 = messageEventId,
+            value = json
+          )
+        }
+      )
 
+      inboxListeners[listenerId] = listener
+      promise.resolve(listenerId)
+    }
   }
 
   private fun InboxMessageSet.toJson(): WritableMap? {
@@ -348,19 +372,24 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod
-  fun refreshInbox(promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
-    Courier.shared.refreshInbox()
-    promise.resolve(null)
+  fun refreshInbox(promise: Promise) {
+    CoroutineScope(Dispatchers.Main).launch {
+      Courier.shared.refreshInbox()
+      promise.resolve(null)
+    }
   }
 
   @ReactMethod
-  fun fetchNextPageOfMessages(promise: Promise, inboxMessageFeed: String) = CoroutineScope(Dispatchers.Main).launch {
-    try {
-      val messageSet = Courier.shared.fetchNextInboxPage(if (inboxMessageFeed == "archived") InboxMessageFeed.ARCHIVE else InboxMessageFeed.FEED)
-      promise.resolve(messageSet?.toJson())
-    } catch (e: Exception) {
-      promise.apiError(e)
+  fun fetchNextPageOfMessages(promise: Promise, inboxMessageFeed: String) {
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        val messageSet = Courier.shared.fetchNextInboxPage(
+          if (inboxMessageFeed == "archived") InboxMessageFeed.ARCHIVE else InboxMessageFeed.FEED
+        )
+        promise.resolve(messageSet?.toJson())
+      } catch (e: Exception) {
+        promise.apiError(e)
+      }
     }
   }
-
 }

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.1")
 }
 
 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.1"];
         
         // 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.1")
         
     }
     

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
 )