infobip-mobile-messaging-react-native-plugin 12.5.6 → 13.0.0

package/README.md

@@ -12,7 +12,7 @@ The document describes library integration steps for your React Native project.
 ## Requirements
 - node (v16.10.0 or higher)
 - ruby (2.6.10 or higher)
-- React Native (v0.70.8)
+- React Native (v0.75.4)
 
 For iOS project:
 - Xcode and Command Line Tools (16.1)
@@ -21,7 +21,7 @@ For iOS project:
 
 For Android project:
 - Android Studio (Bumblebee | 2021.1.1)
-- Gradle (v7.3.3)
+- Gradle (v8.5.2)
 - Supported API Levels: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop)) - 34 ([Android 14.0](https://developer.android.com/about/versions/14))
 
 ## Quick start guide

package/android/build.gradle

@@ -1,7 +1,7 @@
-def defaultCompileSDKVersion = 33
-def defaultBuildToolsVersion = '33.0.0'
+def defaultCompileSDKVersion = 34
+def defaultBuildToolsVersion = '34.0.0'
 def defaultMinSDKVersion = 21
-def defaultTargetSDKVersion = 33
+def defaultTargetSDKVersion = 34
 
 def getRootProjectProperty(property, fallback) {
     rootProject.ext.has(property) ? rootProject.ext.get(property) : fallback
@@ -34,7 +34,7 @@ buildscript {
             }
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.2.2'
+            classpath 'com.android.tools.build:gradle:8.5.2'
         }
     }
 }
@@ -43,6 +43,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
 android {
+    namespace "org.infobip.reactlibrary.mobilemessaging"
     compileSdkVersion getRootProjectProperty('compileSdkVersion', defaultCompileSDKVersion)
     buildToolsVersion getRootProjectProperty('buildToolsVersion', defaultBuildToolsVersion)
     defaultConfig {
@@ -86,7 +87,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '13.2.3'
+    def mmVersion = '13.4.0'
     //react and mm dependencies clash
     if (!overrideKotlinVersion.empty) {
         constraints {

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.infobip.reactlibrary.mobilemessaging">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Mobile Messaging permissions -->
 
@@ -26,7 +26,10 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <!-- Infobip rtc ui permissions -->
 
-    <application>
+    <application
+            tools:replace="android:usesCleartextTraffic"
+                   android:usesCleartextTraffic="true"
+    >
         <!-- Mobile Messaging components -->
         <service
             android:name="org.infobip.mobile.messaging.cloud.MobileMessagingCloudService"

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/RNMMChatModule.java

@@ -33,6 +33,7 @@ import org.infobip.mobile.messaging.mobileapi.Result;
 import org.infobip.mobile.messaging.util.StringUtils;
 import org.infobip.reactlibrary.mobilemessaging.datamappers.ReactNativeJson;
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
+import org.infobip.mobile.messaging.chat.core.MultithreadStrategy;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -120,9 +121,10 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
     }
 
     @ReactMethod
-    public void sendContextualData(String data, Boolean allMultiThreadStrategy, Callback onSuccess, Callback onError) {
+    public void sendContextualData(String data, String multithreadStrategyFlag, Callback onSuccess, Callback onError) {
         try {
-            InAppChat.getInstance(reactContext).sendContextualData(data, allMultiThreadStrategy);
+            MultithreadStrategy multithreadStrategy = MultithreadStrategy.valueOf(multithreadStrategyFlag);
+            InAppChat.getInstance(reactContext).sendContextualData(data, multithreadStrategy);
             onSuccess.invoke();
         } catch (Throwable t) {
             onError.invoke(Utils.callbackError(t.getMessage(), null));

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -19,10 +19,10 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "MobileMessaging/Core", "12.14.1"
-  s.dependency "MobileMessaging/InAppChat", "12.14.1"
-  s.dependency "MobileMessaging/Inbox", "12.14.1"
+  s.dependency "MobileMessaging/Core", "12.17.0"
+  s.dependency "MobileMessaging/InAppChat", "12.17.0"
+  s.dependency "MobileMessaging/Inbox", "12.17.0"
   if defined?($WebRTCUIEnabled)
-    s.dependency "MobileMessaging/WebRTCUI", "12.14.1"
+    s.dependency "MobileMessaging/WebRTCUI", "12.17.0"
   end
 end

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -159,20 +159,31 @@ class RNMMChat: NSObject  {
         }    
     }
 
-    @objc(sendContextualData:multiThreadStrategy:onSuccess:onError:)
-    func sendContextualData(data: NSString, multiThreadStrategy: Bool,  onSuccess: @escaping RCTResponseSenderBlock, onError: @escaping RCTResponseSenderBlock) {
-        if let chatVC = RNMMChatView.viewController  {
-            chatVC.sendContextualData(String(data), multiThreadStrategy: multiThreadStrategy ? .ALL : .ACTIVE) { error in
-                if let error = error {
-                    onError([error.reactNativeObject])
-                } else {
-                    onSuccess(nil)
-                }
-            }
-        } else if let inAppChat = MobileMessaging.inAppChat {
-            inAppChat.sendContextualData(String(data), multiThreadStrategy: multiThreadStrategy ? .ALL : .ACTIVE)
-            onSuccess(nil)
+    @objc(sendContextualData:chatMultiThreadStrategy:onSuccess:onError:)
+    func sendContextualData(data: NSString, chatMultiThreadStrategy: NSString, onSuccess: @escaping RCTResponseSenderBlock, onError: @escaping RCTResponseSenderBlock) {
+        var strategy: MMChatMultiThreadStrategy
+        switch chatMultiThreadStrategy {
+            case "ACTIVE": strategy = .ACTIVE
+            case "ALL": strategy = .ALL
+            case "ALL_PLUS_NEW": strategy = .ALL_PLUS_NEW
+            default: 
+                onError([NSError(type: .InvalidArguments)])
+                return
         }
+
+        
+         if let chatVC = RNMMChatView.viewController {
+             chatVC.sendContextualData(String(data), multiThreadStrategy: strategy) { error in
+                 if let error = error {
+                     onError([error.reactNativeObject])
+                 } else {
+                     onSuccess(nil)
+                 }
+             }
+         } else if let inAppChat = MobileMessaging.inAppChat {
+             inAppChat.sendContextualData(String(data), multiThreadStrategy: strategy)
+             onSuccess(nil)
+         }
     }
 
     @objc(setJwt:)

package/ios/MobileMessagingPlugin/RNMMChatBridge.m

@@ -24,6 +24,7 @@ RCT_EXTERN_METHOD(setupChatSettings:)
 RCT_EXTERN_METHOD(setLanguage:(NSString *)data onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 RCT_EXTERN_METHOD(setJwt:)
 RCT_EXTERN_METHOD(sendContextualData:(NSString *)data multiThreadStrategy:(BOOL)multiThreadStrategy onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
+RCT_EXTERN_METHOD(sendContextualData:(NSString *)data chatMultiThreadStrategy:(NSString *)chatMultiThreadStrategy onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 RCT_EXTERN_METHOD(showThreadsList)
 RCT_EXTERN_METHOD(restartConnection)
 RCT_EXTERN_METHOD(stopConnection)

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -182,7 +182,7 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
             if let error = error {
                 onError([error.reactNativeObject])
             } else {
-                onSuccess([inbox?.dictionary ?? [:]])
+                onSuccess([inbox?.dictionary() ?? [:]])
             }
         })
     }
@@ -198,7 +198,7 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
             if let error = error {
                 onError([error.reactNativeObject])
             } else {
-                onSuccess([inbox?.dictionary ?? [:]])
+                onSuccess([inbox?.dictionary() ?? [:]])
             }
         })
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "12.5.6",
+  "version": "13.0.0",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {
@@ -32,12 +32,12 @@
     "url": "https://github.com/infobip/mobile-messaging-react-native-plugin/issues"
   },
   "peerDependencies": {
-    "react": "^18.1.0",
+    "react": "^18.3.1",
     "react-native": ">=0.68.0 <1.0.x"
   },
   "devDependencies": {
-    "metro-react-native-babel-preset": "^0.72.3",
-    "react": "^18.1.0",
-    "react-native": "^0.70.8"
+    "metro-react-native-babel-preset": "^0.77.0",
+    "react": "^18.3.1",
+    "react-native": "^0.75.4"
   }
 }

package/src/index.d.ts

@@ -129,6 +129,7 @@ declare namespace MobileMessagingReactNative {
         userIdentity: UserIdentity;
         userAttributes?: Record<string, string | number | boolean | object[]> | undefined;
         forceDepersonalize?: boolean | undefined;
+        keepAsLead?: boolean | undefined;
     }
 
     export interface Message {
@@ -325,6 +326,12 @@ declare namespace MobileMessagingReactNative {
         inputTextAppearance: string;
     }
 
+    export enum ChatMultithreadStrategy { 
+        active = "ACTIVE",
+        all = "ALL",
+        allPlusNew = "ALL_PLUS_NEW"
+    } 
+
     interface Api {
 
         inAppChatEvents: [
@@ -604,6 +611,7 @@ declare namespace MobileMessagingReactNative {
         setWidgetTheme(widgetTheme: string): void;
 
         /**
+         * @deprecated use sendContextualData with chatMultiThreadStrategy string param instead of allMultiThreadStrategy bool.
          * Set contextual data of the Livechat Widget.
          * If the function is called when the chat is loaded, data will be sent immediately, otherwise they will be sent to the chat once it is loaded.
          * Every function invocation will overwrite the previous contextual data.
@@ -616,6 +624,19 @@ declare namespace MobileMessagingReactNative {
          */
         sendContextualData(data: string, allMultiThreadStrategy: boolean, onSuccess: () => void, onError: (error: MobileMessagingError) => void): void;
 
+        /**
+         * Set contextual data of the Livechat Widget.
+         * If the function is called when the chat is loaded, data will be sent immediately, otherwise they will be sent to the chat once it is loaded.
+         * Every function invocation will overwrite the previous contextual data.
+         *
+         * @name sendContextualData
+         * @param data contextual data in the form of JSON string
+         * @param chatMultiThreadStrategy multi-thread strategy: 'ACTIVE', 'ALL', 'ALL_PLUS_NEW'
+         * @param {Function} onSuccess success callback
+         * @param {Function} onError error callback
+         */
+        sendContextualData(data: string, chatMultiThreadStrategy: ChatMultithreadStrategy, onSuccess: () => void, onError: (error: MobileMessagingError) => void): void;
+
         /**
          * Set chat language
          * @name setLanguage
@@ -726,4 +747,4 @@ declare namespace WebRTCUI {
      * @param {Function} onError error callback
      */
     function disableCalls(onSuccess:() => void, onError:(error: MobileMessagingError) => void):void;
-}
+}

package/src/index.js

@@ -615,6 +615,7 @@ class MobileMessaging {
     };
 
     /**
+     * @deprecated use sendContextualData with chatMultiThreadStrategy string param instead of allMultiThreadStrategy bool.
      * Set contextual data of the Livechat Widget.
      * If the function is called when the chat is loaded, data will be sent immediately, otherwise they will be sent to the chat once it is loaded.
      * Every function invocation will overwrite the previous contextual data.
@@ -626,7 +627,26 @@ class MobileMessaging {
      * @param {Function} onError error callback
      */
     sendContextualData(data, allMultiThreadStrategy = false, onSuccess = function() {}, onError = function() {}) {
-        RNMMChat.sendContextualData(data, allMultiThreadStrategy, onSuccess, onError);
+        if (allMultiThreadStrategy) {
+            sendContextualData(data, 'ALL', onSuccess, onError)
+        } else { 
+            sendContextualData(data, 'ACTIVE', onSuccess, onError)            
+        }
+    };
+
+    /**
+     * Set contextual data of the Livechat Widget.
+     * If the function is called when the chat is loaded, data will be sent immediately, otherwise they will be sent to the chat once it is loaded.
+     * Every function invocation will overwrite the previous contextual data.
+     *
+     * @name sendContextualData
+     * @param data - contextual data in the form of JSON string
+     * @param chatMultiThreadStrategy - multi-thread strategy flag: ACTIVE, ALL, ALL_PLUS_NEW
+     * @param {Function} onSuccess success callback
+     * @param {Function} onError error callback
+    */
+    sendContextualData(data, chatMultiThreadStrategy = 'ACTIVE', onSuccess = function() {}, onError = function() {}) {
+        RNMMChat.sendContextualData(data, chatMultiThreadStrategy, onSuccess, onError);
     };
 
     /**