@trycourier/courier-react-native 5.2.3 → 5.3.2

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.1.4"
+    classpath "com.android.tools.build:gradle:8.1.0"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -50,6 +50,7 @@ def supportsNamespace() {
 }
 
 android {
+
   if (supportsNamespace()) {
     namespace "com.courierreactnative"
 
@@ -62,11 +63,16 @@ android {
 
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
+  buildFeatures {
+    buildConfig true
+  }
+
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -104,7 +110,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:5.0.2'
+  api 'com.github.trycourier:courier-android:5.1.8'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
 }

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

@@ -33,7 +33,6 @@ import com.facebook.react.bridge.WritableMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.util.UUID
 
 
 class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeModule(tag = "Shared Instance Error", name = "CourierSharedModule", reactContext = reactContext) {
@@ -52,29 +51,34 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     // Keep: Required for RN built in Event Emitter Calls.
   }
 
+  @ReactMethod
+  fun attachEmitter(emitterId: String, promise: Promise) {
+    promise.resolve(emitterId)
+  }
+
   // Client
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun getClient(): String? {
-    val options = Courier.shared.client?.options ?: return null
-    return options.toJson()
+  @ReactMethod
+  fun getClient(promise: Promise) {
+    val options = Courier.shared.client?.options
+    promise.resolve(options?.toJson())
   }
 
   // Authentication
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun getUserId(): String? {
-    return Courier.shared.userId
+  @ReactMethod
+  fun getUserId(promise: Promise) {
+    promise.resolve(Courier.shared.userId)
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun getTenantId(): String? {
-    return Courier.shared.tenantId
+  @ReactMethod
+  fun getTenantId(promise: Promise) {
+    promise.resolve(Courier.shared.tenantId)
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun getIsUserSignedIn(): String {
-    return Courier.shared.isUserSignedIn.toString()
+  @ReactMethod
+  fun getIsUserSignedIn(promise: Promise) {
+    promise.resolve(Courier.shared.isUserSignedIn.toString())
   }
 
   @ReactMethod
@@ -95,8 +99,8 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     promise.resolve(null)
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun addAuthenticationListener(listenerId: String): String {
+  @ReactMethod
+  fun addAuthenticationListener(listenerId: String, promise: Promise) {
 
     // Create the listener
     val listener = Courier.shared.addAuthenticationListener { userId ->
@@ -109,12 +113,12 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     // Add the listener to the map
     authenticationListeners[listenerId] = listener
 
-    return listenerId
+    promise.resolve(listenerId)
 
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun removeAuthenticationListener(listenerId: String): String {
+  @ReactMethod
+  fun removeAuthenticationListener(listenerId: String, promise: Promise) {
 
     val listener = authenticationListeners[listenerId]
 
@@ -124,15 +128,15 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     // Remove the id from the map
     authenticationListeners.remove(listenerId)
 
-    return listenerId
+    promise.resolve(listenerId)
 
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun removeAllAuthenticationListeners(): String? {
+  @ReactMethod
+  fun removeAllAuthenticationListeners(promise: Promise) {
     authenticationListeners.values.forEach { it.remove() }
     authenticationListeners.clear()
-    return null
+    promise.resolve(null)
   }
 
   // Push
@@ -165,15 +169,15 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   // Inbox
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun getInboxPaginationLimit(): String {
-    return Courier.shared.inboxPaginationLimit.toString()
+  @ReactMethod
+  fun getInboxPaginationLimit(promise: Promise) {
+    promise.resolve(Courier.shared.inboxPaginationLimit.toString())
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun setInboxPaginationLimit(limit: Double): String {
+  @ReactMethod
+  fun setInboxPaginationLimit(limit: Double, promise: Promise) {
     Courier.shared.inboxPaginationLimit = limit.toInt()
-    return Courier.shared.inboxPaginationLimit.toString()
+    promise.resolve(Courier.shared.inboxPaginationLimit.toString())
   }
 
   @ReactMethod
@@ -236,8 +240,8 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     }
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun addInboxListener(loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String): String {
+  @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 = {
@@ -314,10 +318,9 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     )
 
     // Add listener
-    val id = UUID.randomUUID().toString()
-    inboxListeners[id] = listener
+    inboxListeners[listenerId] = listener
 
-    return id
+    promise.resolve(listenerId)
 
   }
 
@@ -329,19 +332,19 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
     return json
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun removeInboxListener(listenerId: String): String {
+  @ReactMethod
+  fun removeInboxListener(listenerId: String, promise: Promise) {
     val listener = inboxListeners[listenerId]
     listener?.remove()
     inboxListeners.remove(listenerId)
-    return listenerId
+    promise.resolve(listenerId)
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  fun removeAllInboxListeners(): String? {
+  @ReactMethod
+  fun removeAllInboxListeners(promise: Promise) {
     inboxListeners.values.forEach { it.remove() }
     inboxListeners.clear()
-    return null
+    promise.resolve(null)
   }
 
   @ReactMethod

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

package/courier-react-native.podspec

@@ -11,13 +11,13 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "13.0" }
+  s.platforms    = { :ios => "15.0" }
   s.source       = { :git => "https://github.com/trycourier/courier-react-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   
   # Courier Core Dependency
-  s.dependency "Courier_iOS", "5.3.2"
+  s.dependency "Courier_iOS", "5.5.5"
 
   # 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

@@ -22,7 +22,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     if (self) {
         
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.2.3"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.3.2"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
@@ -107,11 +107,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
-    [[Courier shared] setAPNSTokenWithRawToken:deviceToken completion:^(NSError * _Nullable error) {
-        if (error) {
-            NSLog(@"Error setting APNS Token: %@", error.localizedDescription);
-        }
-    }];
+    [Courier setAPNSToken:deviceToken];
 }
 
 @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.2.3")
+        Courier.agent = CourierAgent.reactNativeIOS("5.3.2")
         
     }
     

package/ios/CourierReactNativeModule.m

@@ -3,19 +3,33 @@
 @interface RCT_EXTERN_MODULE(CourierSharedModule, NSObject)
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getClient
+  addEmitter:(NSString *)emitterId
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getUserId
+RCT_EXTERN_METHOD(
+  attachEmitter: (NSString*)emitterId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getTenantId
+RCT_EXTERN_METHOD(
+  getClient: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getIsUserSignedIn
+RCT_EXTERN_METHOD(
+  getUserId: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getTenantId: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getIsUserSignedIn: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
 RCT_EXTERN_METHOD(
@@ -33,16 +47,27 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+RCT_EXTERN_METHOD(
+  addAuthenticationListener: (NSString*)listenerId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
   addAuthenticationListener: (NSString*)authId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+RCT_EXTERN_METHOD(
   removeAuthenticationListener: (NSString*)listenerId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  removeAllAuthenticationListeners
+RCT_EXTERN_METHOD(
+  removeAllAuthenticationListeners: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
 RCT_EXTERN_METHOD(
@@ -63,12 +88,15 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getInboxPaginationLimit
+RCT_EXTERN_METHOD(
+  getInboxPaginationLimit: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+RCT_EXTERN_METHOD(
   setInboxPaginationLimit: (double)limit
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
 RCT_EXTERN_METHOD(
@@ -106,8 +134,9 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  addInboxListener: (NSString*)loadingId
+RCT_EXTERN_METHOD(
+  addInboxListener: (NSString*)listenerId
+  withLoadingId: (NSString*)loadingId
   withErrorId: (NSString*)errorId
   withUnreadCountId: (NSString*)unreadCountId
   withFeedId: (NSString*)feedId
@@ -116,14 +145,19 @@ RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   withMessageChangedId: (NSString*)messageChangedId
   withMessageAddedId: (NSString*)messageAddedId
   withMessageRemovedId: (NSString*)messageRemovedId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+RCT_EXTERN_METHOD(
   removeInboxListener: (NSString*)listenerId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  removeAllInboxListeners
+RCT_EXTERN_METHOD(
+  removeAllInboxListeners: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
 )
 
 RCT_EXTERN_METHOD(