infobip-mobile-messaging-react-native-plugin 13.8.0 → 13.8.1

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

@@ -221,16 +221,6 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
         }
     }
 
-    @ReactMethod
-    public void setupChatSettings(ReadableMap settings) throws JSONException {
-        Configuration.InAppChatCustomization inAppChatCustomization = Configuration.resolveChatSettings(ReactNativeJson.convertMapToJson(settings));
-        InAppChat inAppChat = InAppChat.getInstance(reactContext);
-        inAppChat.setTheme(createTheme(inAppChatCustomization));
-        if (inAppChatCustomization.widgetTheme != null) {
-            inAppChat.setWidgetTheme(inAppChatCustomization.widgetTheme);
-        }
-    }
-
     @ReactMethod
     public void setWidgetTheme(String widgetTheme) {
         if (widgetTheme != null) {

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

@@ -456,6 +456,13 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             if (configuration.android.firebaseOptions != null) {
                 builder.withFirebaseOptions(configuration.android.firebaseOptions);
             }
+
+            String notificationChannelId = configuration.android.notificationChannelId;
+            String notificationChannelName = configuration.android.notificationChannelName;
+            String notificationSound = configuration.android.notificationSound;
+            if (notificationChannelId != null && notificationChannelName != null && notificationSound != null) {
+                builder.withCustomNotificationChannel(notificationChannelId, notificationChannelName, notificationSound);
+            }
         }
 
         if (configuration.userDataJwt != null) {

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -57,89 +57,37 @@ class RNMMChat: NSObject  {
     @objc(setChatCustomization:)
     func setChatCustomization(settings: NSDictionary) {
         guard let settings = settings as? [String: AnyObject] else { return }
-        let chatsettings = MMChatSettings.sharedInstance
-        if let chatToolbar = ChatCustomizationKeys.chatToolbar.getDict(from: settings) {
-            setNotNil(&chatsettings.navBarColor, ToolbarCustomizationKeys.backgroundColor.getColor(from: chatToolbar))
-            setNotNil(&chatsettings.navBarTitleColor, ToolbarCustomizationKeys.titleTextColor.getColor(from: chatToolbar))
-            setNotNil(&chatsettings.title, ToolbarCustomizationKeys.titleText.getString(from: chatToolbar))
-            setNotNil(&chatsettings.navBarItemsTintColor, ToolbarCustomizationKeys.navigationIconTint.getColor(from: chatToolbar))
-        }
-        if let attachmentPreviewToolbar = ChatCustomizationKeys.attachmentPreviewToolbar.getDict(from: settings) {
-            setNotNil(&chatsettings.attachmentPreviewBarsColor, ToolbarCustomizationKeys.backgroundColor.getColor(from: attachmentPreviewToolbar))
-            setNotNil(&chatsettings.attachmentPreviewItemsColor, ToolbarCustomizationKeys.navigationIconTint.getColor(from: attachmentPreviewToolbar))
-        }
-        setNotNil(&chatsettings.backgroundColor, ChatCustomizationKeys.chatBackgroundColor.getColor(from: settings))
-        setNotNil(&chatsettings.advancedSettings.mainTextColor, ChatCustomizationKeys.chatInputTextColor.getColor(from: settings))
-        setNotNil(&chatsettings.advancedSettings.textInputBackgroundColor, ChatCustomizationKeys.chatInputBackgroundColor.getColor(from: settings))
-        setNotNil(&chatsettings.advancedSettings.attachmentButtonIcon,
-                  ChatCustomizationKeys.chatInputAttachmentIcon.getImage(from: settings))
-        setNotNil(&chatsettings.advancedSettings.sendButtonIcon,
-                  ChatCustomizationKeys.chatInputSendIcon.getImage(from: settings))
-        setNotNil(&chatsettings.sendButtonTintColor, ChatCustomizationKeys.chatInputSendIconTint.getColor(from: settings))
-        setNotNil(&chatsettings.chatInputSeparatorLineColor, ChatCustomizationKeys.chatInputSeparatorLineColor.getColor(from: settings))
-        setNotNil(&chatsettings.advancedSettings.isLineSeparatorHidden, ChatCustomizationKeys.chatInputSeparatorLineVisible.getBool(from: settings))
-        setNotNil(&chatsettings.advancedSettings.typingIndicatorColor, ChatCustomizationKeys.chatInputCursorColor.getColor(from: settings))
-        setNotNil(&chatsettings.errorLabelTextColor, ChatCustomizationKeys.networkErrorTextColor.getColor(from: settings))
-        setNotNil(&chatsettings.errorLabelBackgroundColor, ChatCustomizationKeys.networkErrorLabelBackgroundColor.getColor(from: settings))
-        setNotNil(&chatsettings.advancedSettings.mainPlaceholderTextColor, ChatCustomizationKeys.chatInputHintTextColor.getColor(from: settings))
-        func setNotNil<T>(_ forVariable: inout T, _ value:T?) {
-           if let value = value { forVariable = value }
+        Task { [weak self] in
+            let chatsettings = MMChatSettings.sharedInstance
+            if let chatToolbar = ChatCustomizationKeys.chatToolbar.getDict(from: settings) {
+                self?.setNotNil(&chatsettings.navBarColor, ToolbarCustomizationKeys.backgroundColor.getColor(from: chatToolbar))
+                self?.setNotNil(&chatsettings.navBarTitleColor, ToolbarCustomizationKeys.titleTextColor.getColor(from: chatToolbar))
+                self?.setNotNil(&chatsettings.title, ToolbarCustomizationKeys.titleText.getString(from: chatToolbar))
+                self?.setNotNil(&chatsettings.navBarItemsTintColor, ToolbarCustomizationKeys.navigationIconTint.getColor(from: chatToolbar))
+            }
+            if let attachmentPreviewToolbar = ChatCustomizationKeys.attachmentPreviewToolbar.getDict(from: settings) {
+                self?.setNotNil(&chatsettings.attachmentPreviewBarsColor, ToolbarCustomizationKeys.backgroundColor.getColor(from: attachmentPreviewToolbar))
+                self?.setNotNil(&chatsettings.attachmentPreviewItemsColor, ToolbarCustomizationKeys.navigationIconTint.getColor(from: attachmentPreviewToolbar))
+            }
+            self?.setNotNil(&chatsettings.backgroundColor, ChatCustomizationKeys.chatBackgroundColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.mainTextColor, ChatCustomizationKeys.chatInputTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.textInputBackgroundColor, ChatCustomizationKeys.chatInputBackgroundColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.attachmentButtonIcon,
+                      ChatCustomizationKeys.chatInputAttachmentIcon.getImage(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.sendButtonIcon,
+                      ChatCustomizationKeys.chatInputSendIcon.getImage(from: settings))
+            self?.setNotNil(&chatsettings.sendButtonTintColor, ChatCustomizationKeys.chatInputSendIconTint.getColor(from: settings))
+            self?.setNotNil(&chatsettings.chatInputSeparatorLineColor, ChatCustomizationKeys.chatInputSeparatorLineColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.isLineSeparatorHidden, ChatCustomizationKeys.chatInputSeparatorLineVisible.getBool(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.typingIndicatorColor, ChatCustomizationKeys.chatInputCursorColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.errorLabelTextColor, ChatCustomizationKeys.networkErrorTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.errorLabelBackgroundColor, ChatCustomizationKeys.networkErrorLabelBackgroundColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.advancedSettings.mainPlaceholderTextColor, ChatCustomizationKeys.chatInputHintTextColor.getColor(from: settings))
         }
     }
-
-    @objc(setupChatSettings:)
-    func setupChatSettings(settings: NSDictionary) {
-        guard let settings = settings as? [String: AnyObject] else { return }
-        let chatSettings = MMChatSettings.sharedInstance        
-        
-        setNotNil(&chatSettings.title, CustomizationKeys.toolbarTitle.getString(from: settings))
-        /// Colors
-        setNotNil(&chatSettings.navBarItemsTintColor, CustomizationKeys.toolbarTintColor.getColor(from: settings))
-        setNotNil(&chatSettings.navBarColor, CustomizationKeys.toolbarBackgroundColor.getColor(from: settings))
-        setNotNil(&chatSettings.navBarTitleColor, CustomizationKeys.toolbarTitleColor.getColor(from: settings))
-        setNotNil(&chatSettings.advancedSettings.mainTextColor, CustomizationKeys.inputTextColor.getColor(from: settings))
     
-        setNotNil(&chatSettings.sendButtonTintColor, CustomizationKeys.sendButtonTintColor.getColor(from: settings))
-        setNotNil(&chatSettings.backgroundColor, CustomizationKeys.chatBackgroundColor.getColor(from: settings))
-        setNotNil(&chatSettings.errorLabelTextColor, CustomizationKeys.noConnectionAlertTextColor.getColor(from: settings))
-        setNotNil(&chatSettings.errorLabelBackgroundColor, CustomizationKeys.noConnectionAlertBackgroundColor.getColor(from: settings))
-        setNotNil(&chatSettings.widgetTheme, CustomizationKeys.widgetTheme.getString(from: settings))
-
-        setNotNil(&chatSettings.advancedSettings.mainPlaceholderTextColor, CustomizationKeys.chatInputPlaceholderTextColor.getColor(from: settings))
-        setNotNil(&chatSettings.advancedSettings.typingIndicatorColor, CustomizationKeys.chatInputCursorColor.getColor(from: settings))
-        /// Icons
-        setNotNil(&chatSettings.advancedSettings.sendButtonIcon, CustomizationKeys.sendButtonIcon.getImage(from: settings))
-        setNotNil(&chatSettings.advancedSettings.attachmentButtonIcon, CustomizationKeys.attachmentButtonIcon.getImage(from: settings))
-        /// Attachment colors
-        setNotNil(&chatSettings.attachmentPreviewBarsColor, CustomizationKeys.attachmentPreviewBarsColor.getColor(from: settings))
-        setNotNil(&chatSettings.attachmentPreviewItemsColor, CustomizationKeys.attachmentPreviewItemsColor.getColor(from: settings))
-        
-        if let chatInputSeparatorVisible = CustomizationKeys.chatInputSeparatorVisible.getBool(from: settings) {
-            chatSettings.advancedSettings.isLineSeparatorHidden = !chatInputSeparatorVisible
-        }
-        /// Sizes
-        setNotNil(&chatSettings.advancedSettings.textContainerTopMargin, CustomizationKeys.textContainerTopMargin.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.textContainerLeftPadding, CustomizationKeys.textContainerLeftPadding.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.textContainerCornerRadius, CustomizationKeys.textContainerCornerRadius.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.textViewTopMargin, CustomizationKeys.textViewTopMargin.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.placeholderHeight, CustomizationKeys.placeholderHeight.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.placeholderSideMargin, CustomizationKeys.placeholderSideMargin.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.buttonHeight, CustomizationKeys.buttonHeight.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.buttonTouchableOverlap, CustomizationKeys.buttonTouchableOverlap.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.buttonRightMargin, CustomizationKeys.buttonRightMargin.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.utilityButtonWidth, CustomizationKeys.utilityButtonWidth.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.utilityButtonBottomMargin, CustomizationKeys.utilityButtonBottomMargin.getCGFloat(from: settings))
-        setNotNil(&chatSettings.advancedSettings.initialHeight, CustomizationKeys.initialHeight.getCGFloat(from: settings))
-        /// Fonts
-        if let mainFontSize = chatSettings.advancedSettings.mainFont?.pointSize {
-            setNotNil(&chatSettings.advancedSettings.mainFont, CustomizationKeys.mainFont.getFont(from: settings, with: mainFontSize))
-        }
-        if let charCountFontSize = chatSettings.advancedSettings.charCountFont?.pointSize {
-            setNotNil(&chatSettings.advancedSettings.charCountFont, CustomizationKeys.chatCountFont.getFont(from: settings, with: charCountFontSize))
-        }
-        func setNotNil<T>(_ forVariable: inout T, _ value:T?) {
-            if let value = value { forVariable = value }
-        }
+    func setNotNil<T>(_ forVariable: inout T, _ value:T?) {
+       if let value = value { forVariable = value }
     }
     
     @objc(setLanguage:onSuccess:onError:)

package/ios/MobileMessagingPlugin/RNMMChatBridge.m

@@ -20,7 +20,6 @@ RCT_EXTERN_METHOD(showChat:)
 RCT_EXTERN_METHOD(getMessageCounter:(RCTResponseSenderBlock)resultCallback)
 RCT_EXTERN_METHOD(setWidgetTheme:)
 RCT_EXTERN_METHOD(setChatCustomization:)
-RCT_EXTERN_METHOD(setupChatSettings:)
 RCT_EXTERN_METHOD(setLanguage:(NSString *)data onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 RCT_EXTERN_METHOD(setChatJwt:)
 RCT_EXTERN_METHOD(setChatJwtProvider)

package/package.json

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

package/src/index.d.ts

@@ -49,6 +49,9 @@ declare namespace MobileMessagingReactNative {
                 storageBucket?: string;
                 projectId: string;
             };
+            notificationChannelId?: string;
+            notificationChannelName?: string;
+            notificationSound?: string;
         } | undefined;
         privacySettings?: {
             applicationCodePersistingDisabled?: boolean | undefined;
@@ -218,12 +221,12 @@ declare namespace MobileMessagingReactNative {
     }
 
     export interface ToolbarCustomization {
-        titleTextAppearance: string; 
-        titleTextColor: string; 
-        titleText: string; 
-        titleCentered: boolean; 
-        backgroundColor: string; 
-        navigationIcon: string; 
+        titleTextAppearance: string;
+        titleTextColor: string;
+        titleText: string;
+        titleCentered: boolean;
+        backgroundColor: string;
+        navigationIcon: string;
         navigationIconTint: string;
         subtitleTextAppearance: string; // android only
         subtitleTextColor: string; // android only
@@ -236,8 +239,8 @@ declare namespace MobileMessagingReactNative {
         chatStatusBarIconsColorMode: string;
         chatToolbar: ToolbarCustomization;
         attachmentPreviewToolbar: ToolbarCustomization;
-        attachmentPreviewToolbarSaveMenuItemIcon: string; 
-        attachmentPreviewToolbarMenuItemsIconTint: string; 
+        attachmentPreviewToolbarSaveMenuItemIcon: string;
+        attachmentPreviewToolbarMenuItemsIconTint: string;
 	    networkErrorText: string;
 	    networkErrorTextColor: string;
 	    networkErrorTextAppearance: string;
@@ -587,40 +590,12 @@ declare namespace MobileMessagingReactNative {
          */
         setChatCustomization(customization: ChatCustomization): void;
 
-        /**
-         * Set custom style of In-app chat
-         * @deprecated use setChatCustomization above
-         * @param configuration various colors in hex format, texts, margins etc.
-         * example:
-         * {
-         *   toolbarTitle: "Chat",
-         *   toolbarTitleColor: "#FFFFFF",
-         *   toolbarTintColor: "#FFFFFF",
-         *   ...
-         * }
-         */
-        setupChatSettings(configuration: ChatCustomizationConfiguration): void;
-
         /**
          * Set widget theme for In-app chat messages
          * @param widgetTheme the name of the existing widget theme to be applied to customize the chat messages.
          */
         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.
-         *
-         * @name sendContextualData
-         * @param data contextual data in the form of JSON string
-         * @param allMultiThreadStrategy multi-thread strategy flag, true -> ALL, false -> ACTIVE
-         * @param {Function} onSuccess success callback
-         * @param {Function} onError error callback
-         */
-        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.

package/src/index.js

@@ -1,8 +1,8 @@
-import {    
+import {
     EmitterSubscription,
     NativeEventEmitter,
     NativeModules,
-    Platform,    
+    Platform,
 } from 'react-native';
 
 
@@ -147,8 +147,11 @@ class MobileMessaging {
      *	    android: {
      *			notificationIcon: <String>,
      *			multipleNotifications: <Boolean>,
-     *			notificationAccentColor: <String>
-     *			firebaseOptions: <Object>
+     *			notificationAccentColor: <String>,
+     *			firebaseOptions: <Object>,
+     *          notificationChannelId: <String>,
+ *              notificationChannelName: <String>,
+ *              notificationSound: <String>
      *	    }
      *		privacySettings: {
      *			applicationCodePersistingDisabled: <Boolean>,
@@ -578,22 +581,6 @@ class MobileMessaging {
          RNMMChat.setChatCustomization(customization)
      };
 
-    /**
-     * Set custom style of In-app chat
-     * @deprecated use setChatCustomization instead
-     * @param configuration various colors in hex format, texts, margins etc.
-     * example:
-     * {
-     *   toolbarTitle: "Chat",
-     *   toolbarTitleColor: "#FFFFFF",
-     *   toolbarTintColor: "#FFFFFF",
-     *   ...
-     * }
-     */
-    setupChatSettings(configuration) {
-        RNMMChat.setupChatSettings(configuration)
-    };
-
     /**
     * Set widget theme for In-app chat messages
     * @param widgetTheme the name of the existing widget theme to be applied to customize the chat messages.
@@ -615,26 +602,6 @@ class MobileMessaging {
         RNMMChat.setLanguage(localeString, onSuccess, onError);
     };
 
-    /**
-     * @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.
-     *
-     * @name sendContextualData
-     * @param data - contextual data in the form of JSON string
-     * @param allMultiThreadStrategy - multi-thread strategy flag, true -> ALL, false -> ACTIVE
-     * @param {Function} onSuccess success callback
-     * @param {Function} onError error callback
-     */
-    sendContextualData(data, allMultiThreadStrategy = false, onSuccess = function() {}, onError = function() {}) {
-        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.
@@ -705,7 +672,7 @@ class MobileMessaging {
      * });
      * ```
      *
-     * > ⚠️ This callback may be invoked multiple times during the widget's lifecycle 
+     * > ⚠️ This callback may be invoked multiple times during the widget's lifecycle
      * (e.g., due to screen orientation changes or network reconnection).
      * It is important to return a **fresh and valid JWT** each time.
      *
@@ -827,7 +794,7 @@ export const mobileMessaging = new MobileMessaging();
 class WebRTCUI {
     /**
      * Manually enable WebRTCUI calls, provided a valid configuration Id exists in the webRTCUI configuration. This function is used to control when to start
-     * calls, for example if you want to enabled it only after a successful user authentication. Note: Device settings, such as "Do not disturb" modes, will 
+     * calls, for example if you want to enabled it only after a successful user authentication. Note: Device settings, such as "Do not disturb" modes, will
      * ignore this method until the operating system allows calls.
      * @name enableCalls
      * @param identity String value to use as identity in the registration for WebRTC calls. If empty string is set, push registration Id will be used
@@ -840,7 +807,7 @@ class WebRTCUI {
 
     /**
      * Manually enable WebRTCUI calls, provided a valid configuration Id exists in the webRTCUI configuration. This function is used to control when to start
-     * calls, for example if you want to enabled it only after a successful user authentication. Note: Device settings, such as "Do not disturb" modes, will 
+     * calls, for example if you want to enabled it only after a successful user authentication. Note: Device settings, such as "Do not disturb" modes, will
      * ignore this method until the operating system allows calls.
      * @name enableChatCalls
      * @param {Function} onSuccess success callback