infobip-mobile-messaging-react-native-plugin 12.5.5 → 12.6.0

package/android/build.gradle

@@ -86,7 +86,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '13.2.3'
+    def mmVersion = '13.4.0'
     //react and mm dependencies clash
     if (!overrideKotlinVersion.empty) {
         constraints {

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/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java

@@ -876,65 +876,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         }.execute();
     }
 
-    @ReactMethod
-    public synchronized void defaultMessageStorage_find(String messageId, final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-
-        for (Message m : messageStore.findAll(reactContext)) {
-            if (messageId.equals(m.getMessageId())) {
-                callback.invoke(ReactNativeJson.convertJsonToMap(MessageJson.toJSON(m)));
-                return;
-            }
-        }
-        callback.invoke();
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_findAll(final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-        List<Message> messages = messageStore.findAll(reactContext);
-        callback.invoke(ReactNativeJson.convertJsonToArray(MessageJson.toJSONArray(messages.toArray(new Message[messages.size()]))));
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_delete(String messageId, final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-
-        List<Message> messagesToKeep = new ArrayList<Message>();
-        for (Message m : messageStore.findAll(reactContext)) {
-            if (messageId.equals(m.getMessageId())) {
-                continue;
-            }
-            messagesToKeep.add(m);
-        }
-        messageStore.deleteAll(reactContext);
-        messageStore.save(reactContext, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
-        callback.invoke();
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_deleteAll(final Callback callback) {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-        messageStore.deleteAll(reactContext);
-        callback.invoke();
-    }
-
     /**
      * Message store adapter for JS layer
      */

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "12.5.5",
+  "version": "12.6.0",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -168,13 +168,13 @@ declare namespace MobileMessagingReactNative {
     }
 
     export interface DefaultMessageStorage {
-        find(messageId: string, callback: (message: Message) => void): void;
+        find(messageId: string, onSuccess: (message: Message) => void, onError: () => void): void;
 
-        findAll(callback: (messages: Message[]) => void): void;
+        findAll(onSuccess: (messages: Message[]) => void, onError: () => void): void;
 
-        delete(messageId: string, callback: () => void): void;
+        delete(messageId: string, onSuccess: () => void, onError: () => void): void;
 
-        deleteAll(callback: () => void): void;
+        deleteAll(onSuccess: () => void, onError: () => void): void;
     }
 
     export interface CustomMessageStorage {
@@ -325,6 +325,12 @@ declare namespace MobileMessagingReactNative {
         inputTextAppearance: string;
     }
 
+    export enum ChatMultithreadStrategy { 
+        active = "ACTIVE",
+        all = "ALL",
+        allPlusNew = "ALL_PLUS_NEW"
+    } 
+
     interface Api {
 
         inAppChatEvents: [
@@ -604,6 +610,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 +623,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

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);
     };
 
     /**