infobip-mobile-messaging-react-native-plugin 13.2.2 → 13.3.0

package/android/build.gradle

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

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

@@ -26,6 +26,7 @@ import org.infobip.mobile.messaging.chat.view.styles.InAppChatToolbarStyle;
 import org.infobip.mobile.messaging.interactive.NotificationAction;
 import org.infobip.mobile.messaging.interactive.NotificationCategory;
 import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
+import org.infobip.mobile.messaging.util.StringUtils;
 
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
 import org.json.JSONException;
@@ -44,8 +45,8 @@ public class ChatCustomization {
     // Toolbar
     private ToolbarCustomization chatToolbar;
     private ToolbarCustomization attachmentPreviewToolbar;
-    private String attachmentPreviewSaveMenuItemIcon;
-    private String attachmentPreviewMenuItemsIconTint;
+    private String attachmentPreviewToolbarSaveMenuItemIcon;
+    private String attachmentPreviewToolbarMenuItemsIconTint;
 
     // NetworkError
     private String networkErrorText;
@@ -191,7 +192,7 @@ public class ChatCustomization {
 
     public InAppChatTheme createTheme(Context context) {
 
-        InAppChatToolbarStyle toolbarStyle = new InAppChatToolbarStyle.Builder()
+        InAppChatToolbarStyle chatToolbarStyle = new InAppChatToolbarStyle.Builder()
                 .setStatusBarBackgroundColor(parseColor(chatStatusBarBackgroundColor))
                 .setLightStatusBarIcons(chatStatusBarIconsColorMode == "light")
                 .setToolbarBackgroundColor(parseColor(chatToolbar.backgroundColor))
@@ -207,14 +208,14 @@ public class ChatCustomization {
                 .setIsSubtitleCentered(chatToolbar.subtitleCentered)
                 .build();
 
-        InAppChatToolbarStyle attachmentToolbarStyle = new InAppChatToolbarStyle.Builder()
+        InAppChatToolbarStyle attachmentPreviewToolbarStyle = new InAppChatToolbarStyle.Builder()
                 .setStatusBarBackgroundColor(parseColor(chatStatusBarBackgroundColor))
                 .setLightStatusBarIcons(chatStatusBarIconsColorMode == "light")
                 .setToolbarBackgroundColor(parseColor(attachmentPreviewToolbar.backgroundColor))
                 .setNavigationIcon(loadDrawable(attachmentPreviewToolbar.navigationIcon, context))
                 .setNavigationIconTint(parseColor(attachmentPreviewToolbar.navigationIconTint))
-                .setSaveAttachmentMenuItemIcon(loadDrawable(attachmentPreviewSaveMenuItemIcon, context))
-                .setMenuItemsIconTint(parseColor(attachmentPreviewMenuItemsIconTint))
+                .setSaveAttachmentMenuItemIcon(loadDrawable(attachmentPreviewToolbarSaveMenuItemIcon, context))
+                .setMenuItemsIconTint(parseColor(attachmentPreviewToolbarMenuItemsIconTint))
                 .setTitleTextAppearance(getResId(context.getResources(), attachmentPreviewToolbar.titleTextAppearance, context.getPackageName()))
                 .setTitleTextColor(parseColor(attachmentPreviewToolbar.titleTextColor))
                 .setTitleText(attachmentPreviewToolbar.titleText)
@@ -260,18 +261,18 @@ public class ChatCustomization {
         }
 
         return new InAppChatTheme(
-                toolbarStyle,
-                attachmentToolbarStyle,
+                chatToolbarStyle,
+                attachmentPreviewToolbarStyle,
                 chatStyle,
                 inputViewStyleBuilder.build()
         );
     }
 
     private @Nullable Integer parseColor(@Nullable String color) {
-        @Nullable Integer result = null;
-        if (color == null) {
-            return result;
+        if (StringUtils.isBlank(color)) {
+            return null;
         }
+        @Nullable Integer result = null;
         try {
             result = Integer.valueOf(Color.parseColor(color));
         } catch (IllegalArgumentException e) {
@@ -289,6 +290,9 @@ public class ChatCustomization {
      * @return resource identifier or 0 if not found
      */
     private @Nullable Integer getResId(Resources res, String resPath, String packageName) {
+        if (StringUtils.isBlank(resPath)) {
+            return null;
+        }
         try {
             int resId = res.getIdentifier(resPath, "mipmap", packageName);
             if (resId == 0) {
@@ -307,7 +311,10 @@ public class ChatCustomization {
         }
     }
 
-    private Drawable loadDrawable(String drawableUri, Context context) {
+    private @Nullable Drawable loadDrawable(String drawableUri, Context context) {
+        if (StringUtils.isBlank(drawableUri)) {
+            return null;
+        }
         try (InputStream drawableStream = new URL(drawableUri).openStream()) {
             return new BitmapDrawable(context.getResources(), drawableStream);
         } catch (IOException e) {
@@ -350,6 +357,22 @@ public class ChatCustomization {
         this.chatToolbar = chatToolbar;
     }
 
+    public String getAttachmentPreviewToolbarSaveMenuItemIcon() {
+        return attachmentPreviewToolbarSaveMenuItemIcon;
+    }
+
+    public void setAttachmentPreviewToolbarSaveMenuItemIcon(String attachmentPreviewToolbarSaveMenuItemIcon) {
+        this.attachmentPreviewToolbarSaveMenuItemIcon = attachmentPreviewToolbarSaveMenuItemIcon;
+    }
+
+    public String getAttachmentPreviewToolbarMenuItemsIconTint() {
+        return attachmentPreviewToolbarMenuItemsIconTint;
+    }
+
+    public void setAttachmentPreviewToolbarMenuItemsIconTint(String attachmentPreviewToolbarMenuItemsIconTint) {
+        this.attachmentPreviewToolbarMenuItemsIconTint = attachmentPreviewToolbarMenuItemsIconTint;
+    }
+
     public String getNetworkErrorText() {
         return networkErrorText;
     }

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

@@ -28,6 +28,7 @@ import org.infobip.mobile.messaging.chat.view.styles.InAppChatInputViewStyle;
 import org.infobip.mobile.messaging.chat.view.styles.InAppChatStyle;
 import org.infobip.mobile.messaging.chat.view.styles.InAppChatTheme;
 import org.infobip.mobile.messaging.chat.view.styles.InAppChatToolbarStyle;
+import org.infobip.mobile.messaging.chat.core.widget.LivechatWidgetLanguage;
 import org.infobip.mobile.messaging.mobileapi.MobileMessagingError;
 import org.infobip.mobile.messaging.mobileapi.Result;
 import org.infobip.mobile.messaging.util.StringUtils;
@@ -108,11 +109,12 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
 
     @ReactMethod
     public void setLanguage(String localeString, final Callback onSuccess, final Callback onError) {
-        InAppChat.getInstance(reactContext).setLanguage(localeString, new MobileMessaging.ResultListener<String>() {
+        LivechatWidgetLanguage widgetLanguage = LivechatWidgetLanguage.findLanguageOrDefault(localeString);
+        InAppChat.getInstance(reactContext).setLanguage(widgetLanguage, new MobileMessaging.ResultListener<LivechatWidgetLanguage>() {
             @Override
-            public void onResult(Result<String, MobileMessagingError> result) {
+            public void onResult(Result<LivechatWidgetLanguage, MobileMessagingError> result) {
                 if (result.isSuccess()) {
-                    onSuccess.invoke(result.getData());
+                    onSuccess.invoke(result.getData().toString());
                 } else {
                     onError.invoke(Utils.callbackError(result.getError().getMessage(), null));
                 }
@@ -154,7 +156,7 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
     }
 
     @ReactMethod
-    public void  setWidgetTheme(String widgetTheme) {
+    public void setWidgetTheme(String widgetTheme) {
         if (widgetTheme != null) {
             InAppChat inAppChat = InAppChat.getInstance(reactContext);
             inAppChat.setWidgetTheme(widgetTheme);

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

@@ -1,6 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+mmVersion = "13.5.0"
 
 Pod::Spec.new do |s|
   s.name         = "infobip-mobile-messaging-react-native-plugin"
@@ -20,10 +21,10 @@ Pod::Spec.new do |s|
 
   s.dependency "React-Core"
 
-  s.dependency "MobileMessaging/Core", "13.0.1"
-  s.dependency "MobileMessaging/InAppChat", "13.0.1"
-  s.dependency "MobileMessaging/Inbox", "13.0.1"
+  s.dependency "MobileMessaging/Core", mmVersion
+  s.dependency "MobileMessaging/InAppChat", mmVersion
+  s.dependency "MobileMessaging/Inbox", mmVersion
   if defined?($WebRTCUIEnabled)
-    s.dependency "MobileMessaging/WebRTCUI", "13.0.1"
+    s.dependency "MobileMessaging/WebRTCUI", mmVersion
   end
 end

package/ios/MobileMessagingPlugin/RNMMChatBridge.m

@@ -23,7 +23,6 @@ RCT_EXTERN_METHOD(setChatCustomization:)
 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)

package/package.json

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