infobip-mobile-messaging-react-native-plugin 6.1.0 → 6.2.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm](https://img.shields.io/npm/v/infobip-mobile-messaging-react-native-plugin.svg)](https://www.npmjs.com/package/infobip-mobile-messaging-react-native-plugin)
 
-Mobile Messaging SDK is designed and developed to easily enable push notification channel in your mobile application. In almost no time of implementation you get push notification in your application and access to the features of [Infobip IP Messaging Platform](https://portal.infobip.com/push/). 
+Mobile Messaging SDK is designed and developed to easily enable push notification channel in your mobile application. In almost no time of implementation you get push notification in your application and access to the features of [Infobip IP Messaging Platform](https://portal.infobip.com/push/).
 The document describes library integration steps for your React Native project.
 
 * [Requirements](#requirements)
@@ -17,12 +17,12 @@ The document describes library integration steps for your React Native project.
 For iOS project:
 - Xcode and Command Line Tools (13.2.1)
 - CocoaPods (v1.11.3)
-- Minimum deployment target 11.0
+- Minimum deployment target 12.0
 
 For Android project:
 - Android Studio (Bumblebee | 2021.1.1)
 - Gradle (v7.3.3)
-- Minimum API Level: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop))
+- Supported API Levels: 21 (Android 5.0 - [Lollipop](https://developer.android.com/about/versions/lollipop)) - 31 (Android 12.0)
 
 ## Quick start guide
 
@@ -38,51 +38,63 @@ This guide is designed to get you up and running with Mobile Messaging SDK plugi
 
 3. Configure platforms
 
-    - **iOS**
-        1. Add `use_frameworks!` into `/ios/Podfile` (required for Swift frameworks such as our Mobile Messaging SDK)
-        2. Run `pod install` from `/ios` folder (installs Mobile Messaging native SDK)
-        3. Import following header `#import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>` and add `[MobileMessagingPluginApplicationDelegate install];` into `/ios/<ProjectName>/AppDelegate.m` (this is required for OS callbacks such as `didRegisterForRemoteNotifications` to be intercepted by native MobileMessaging SDK)
-        ```objective-c
-            ...
-            #import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>
-      
-            @implementation AppDelegate
-
-            - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-            {
-                [MobileMessagingPluginApplicationDelegate install];
-                ...
-            }
-            ...
-        ```
-        4. Configure your project to support Push Notification as described in item 2 of [iOS integration quick start guide](https://github.com/infobip/mobile-messaging-sdk-ios#quick-start-guide)
-        5. [Integrate Notification Service Extension](https://github.com/infobip/mobile-messaging-sdk-ios/wiki/Notification-Service-Extension-for-Rich-Notifications-and-better-delivery-reporting-on-iOS-10) into your app in order to obtain:
-            - more accurate processing of messages and delivery stats
-            - support of rich notifications on the lock screen
-    - **Android**
-        1. Following paths should be provided in .bash_profile
-        ```sh
-        export ANDROID_HOME=$HOME/Library/Android/sdk
-        export PATH=$PATH:$ANDROID_HOME/emulator
-        export PATH=$PATH:$ANDROID_HOME/tools
-        export PATH=$PATH:$ANDROID_HOME/tools/bin
-        export PATH=$PATH:$ANDROID_HOME/platform-tools
-        ```
-        2. Add 'com.google.gms:google-services' to `android/build.gradle` file
-        ```groovy
-        buildscript {
+   - **iOS**
+      > ### Notice
+      > Starting from the [6.2.0](https://github.com/infobip/mobile-messaging-react-native-plugin/releases/tag/6.1.0) plugin version it's not mandatory to add `use_frameworks!` to the `Podfile`, check the [Migration guide](https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Migration-guides#migration-from-610-to-620-in-case-you-are-getting-rid-of-use_frameworks-in-the-podfile) if you want to get rid of it.
+      1. Run `pod install` from `/ios` folder (installs Mobile Messaging native SDK)
+      2. Import following header `#import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>` and add `[MobileMessagingPluginApplicationDelegate install];` into `/ios/<ProjectName>/AppDelegate.m` (this is required for OS callbacks such as `didRegisterForRemoteNotifications` to be intercepted by native MobileMessaging SDK)
+       ```objective-c
            ...
-           dependencies {
+           #import <MobileMessaging/MobileMessagingPluginApplicationDelegate.h>
+     
+           @implementation AppDelegate
+
+           - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+           {
+               [MobileMessagingPluginApplicationDelegate install];
                ...
-              //GMS Gradle plugin
-              classpath 'com.google.gms:google-services:4.3.10'
            }
-        }
-        ```
-        And add `apply plugin: 'com.google.gms.google-services'` at the end of your `android/app/build.gradle` in order to apply [Google Services Gradle Plugin](https://developers.google.com/android/guides/google-services-plugin)
-        3. Add a Firebase configuration file (google-services.json) as described in <a href="https://firebase.google.com/docs/android/setup#add-config-file" target="_blank">`Firebase documentation`</a>
-      > ### Notice:
-      > Check <a href="https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Applying-Firebase-configuration-in-MobileMessaging-SDK">Applying Firebase configuration in MobileMessaging SDK Guide</a> for alternatives.
+           ...
+       ```
+      3. Configure your project to support Push Notification as described in item 2 of [iOS integration quick start guide](https://github.com/infobip/mobile-messaging-sdk-ios#quick-start-guide)
+      4. [Integrate Notification Service Extension](https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Delivery-improvements-and-rich-content-notifications#setting-up-ios-part) into your app in order to obtain:
+         - more accurate processing of messages and delivery stats
+         - support of rich notifications on the lock screen
+   - **Android**
+      1. Following paths should be provided in .bash_profile
+         ```sh
+         export ANDROID_HOME=$HOME/Library/Android/sdk
+         export PATH=$PATH:$ANDROID_HOME/emulator
+         export PATH=$PATH:$ANDROID_HOME/tools
+         export PATH=$PATH:$ANDROID_HOME/tools/bin
+         export PATH=$PATH:$ANDROID_HOME/platform-tools
+         ```
+      2. Add 'com.google.gms:google-services' to `android/build.gradle` file
+         ```groovy
+         buildscript {
+            ...
+            dependencies {
+                ...
+               //GMS Gradle plugin
+               classpath 'com.google.gms:google-services:4.3.10'
+            }
+         }
+         ```
+         And add `apply plugin: 'com.google.gms.google-services'` at the end of your `android/app/build.gradle` in order to apply [Google Services Gradle Plugin](https://developers.google.com/android/guides/google-services-plugin)
+
+      3. Add a Firebase configuration file (google-services.json) as described in <a href="https://firebase.google.com/docs/android/setup#add-config-file" target="_blank">`Firebase documentation`</a>. Check <a href="https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Applying-Firebase-configuration-in-MobileMessaging-SDK">Applying Firebase configuration in MobileMessaging SDK Guide</a> for alternatives.
+
+     > ### Notice (check if you don't plan to use [Geofencing](https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Geofencing#android)):
+     > As long as Geofencing is automatically included to the plugin, it adds required geo permissions automatically. You can remove them from `/android/app/src/main/AndroidManifest.xml` by adding following:
+     > ```
+       > <manifest ... xmlns:tools="http://schemas.android.com/tools">
+       > ...
+       > <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" tools:node="remove"  />
+       > <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove"  />
+       > <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove"  />
+       > ...
+       > </manifest>
+       > ```
 
 ## Initialization configuration
 
@@ -90,24 +102,24 @@ Initialize Mobile Messaging React Native plugin, provide application configurati
 
 ```javascript
 import { mobileMessaging } from 'infobip-mobile-messaging-react-native-plugin';
- 
+
 someMethod(): void {
-...
- 
-    mobileMessaging.init(
-      {
-            applicationCode: '<your app code>',
-            ios: {
-                notificationTypes: ['alert', 'badge', 'sound'],
-            },
-      },
-      () => {
-        console.log('MobileMessaging started');
-      },
-      error => {
-        console.log('MobileMessaging error: ', error);
-      },
-    );
+   ...
+
+           mobileMessaging.init(
+                   {
+                      applicationCode: '<your app code>',
+                      ios: {
+                         notificationTypes: ['alert', 'badge', 'sound'],
+                      },
+                   },
+                   () => {
+                      console.log('MobileMessaging started');
+                   },
+                   error => {
+                      console.log('MobileMessaging error: ', error);
+                   },
+           );
 }
 ```
 <details><summary>expand to see TypeScript code</summary>
@@ -115,24 +127,24 @@ someMethod(): void {
 
 ```typescript
 import { mobileMessaging } from 'infobip-mobile-messaging-react-native-plugin';
- 
+
 someMethod(): void {
-...
- 
-    mobileMessaging.init(
-      {
-            applicationCode: '<your app code>',
-            ios: {
-                notificationTypes: ['alert', 'badge', 'sound'],
-            },
-      },
-      () => {
-        console.log('MobileMessaging started');
-      }, 
-      (error: MobileMessagingError) => {
-        console.log('MobileMessaging error: ', error);
-      },
-    );
+   ...
+
+           mobileMessaging.init(
+                   {
+                      applicationCode: '<your app code>',
+                      ios: {
+                         notificationTypes: ['alert', 'badge', 'sound'],
+                      },
+                   },
+                   () => {
+                      console.log('MobileMessaging started');
+                   },
+                   (error: MobileMessagingError) => {
+                      console.log('MobileMessaging error: ', error);
+                   },
+           );
 }
 ```
 

package/android/build.gradle

@@ -78,7 +78,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '6.2.1'
+    def mmVersion = '6.3.0'
 
     implementation 'com.facebook.react:react-native:+'
     implementation "androidx.annotation:annotation:1.1.0"

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

@@ -22,10 +22,12 @@ class CacheManager {
 
     static class Event {
         String type;
+        JSONObject jsonObject;
         Object[] objects = null;
 
-        Event(String type, Object ... objects) {
+        Event(String type, JSONObject object, Object ... objects) {
             this.type = type;
+            this.jsonObject = object;
             this.objects = objects;
         }
 
@@ -33,6 +35,7 @@ class CacheManager {
         public String toString() {
             return type;
         }
+
     }
 
     static void saveEvent(Context context, String event, JSONObject object, String actionId, String actionInputText) {
@@ -41,7 +44,8 @@ class CacheManager {
     }
 
     static void saveEvent(Context context, String event, int unreadMessagesCounter) {
-        String serialized = serializer.serialize(new Event(event, unreadMessagesCounter));
+        //int `unreadMessagesCounter` isn't a JSONObject, so it'll go as a second argument
+        String serialized = serializer.serialize(new Event(event, null, unreadMessagesCounter));
         saveStringsToSet(context, EVENTS_KEY, serialized);
     }
 

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

@@ -50,6 +50,10 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
         InAppChat.getInstance(reactContext).resetMessageCounter();
     }
 
+    @ReactMethod
+    public void setLanguage(String localeString){
+        InAppChat.getInstance(reactContext).setLanguage(localeString);
+    }
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
         FragmentActivity fragmentActivity = Utils.getFragmentActivity(reactContext);

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

@@ -2,16 +2,13 @@ package org.infobip.reactlibrary.mobilemessaging;
 
 import android.util.Log;
 
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.google.gson.JsonIOException;
+
 import org.infobip.reactlibrary.mobilemessaging.datamappers.ReactNativeJson;
 
 import org.json.JSONArray;
@@ -20,8 +17,13 @@ import org.json.JSONObject;
 
 
 class ReactNativeEvent {
+
     static void send(String eventName, ReactContext reactContext, Object... objects) {
-        if (objects == null) {
+        send(eventName, reactContext, null, objects);
+    }
+
+    static void send(String eventName, ReactContext reactContext, JSONObject jsonObject, Object... objects) {
+        if (jsonObject == null && objects == null) {
             Log.d(Utils.TAG, "objects are null, so another method should be used");
             send(eventName, reactContext);
             return;
@@ -31,6 +33,11 @@ class ReactNativeEvent {
         array.pushString(eventName);
 
         try {
+
+            if (jsonObject != null) {
+                array.pushMap(ReactNativeJson.convertJsonToMap(jsonObject));
+            }
+
             for (Object value : objects) {
                 if (value == null) {
                     continue;

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

@@ -70,7 +70,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     public void initialize() {
         super.initialize();
         for (CacheManager.Event event : CacheManager.loadEvents(reactContext)) {
-            ReactNativeEvent.send(event.type, reactContext, event.objects);
+            ReactNativeEvent.send(event.type, reactContext, event.jsonObject, event.objects);
         }
         pluginInitialized = true;
         registerBroadcastReceiver();

package/index.d.ts

@@ -460,6 +460,13 @@ declare namespace MobileMessagingReactNative {
          */
         setupiOSChatSettings(settings: ChatSettingsIOS): void;
 
+        /**
+         * Set chat language
+         *
+         * @param localeString
+         */
+        setLanguage(localeString: string): void;
+
         /**
          * Returns unread in-app chat push messages counter.
          * The counter increments each time the application receives in-app chat push message

package/index.js

@@ -546,6 +546,15 @@ class MobileMessaging {
         }
     };
 
+    /**
+     * The predefined messages prompted within the In-app chat (such as status updates, button titles, input field prompt) by default are 
+     * localized using system locale setting, but can be easily changed providing your locale string with the following formats:
+     *  "es_ES", "es-ES" or "es"
+     */
+    setLanguage(localeString) {
+        RNMMChat.setLanguage(localeString);
+    };
+
     /**
      * Returns unread in-app chat push messages counter.
      * The counter increments each time the application receives in-app chat push message

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

@@ -12,15 +12,15 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/infobip/mobile-messaging-react-native-plugin"
   s.license      = "MIT"
   s.authors      = { "Infobip" => "Push.Support@infobip.com" }
-  s.platforms    = { :ios => "10.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => 'https://github.com/infobip/mobile-messaging-react-native-plugin.git', :tag => s.version}
   s.swift_version = '5'
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "MobileMessaging/Core", "9.2.16"
-  s.dependency "MobileMessaging/Geofencing", "9.2.16"
-  s.dependency "MobileMessaging/InAppChat", "9.2.16"
+  s.dependency "MobileMessaging/Core", "10.2.1"
+  s.dependency "MobileMessaging/Geofencing", "10.2.1"
+  s.dependency "MobileMessaging/InAppChat", "10.2.1"
 
 end

package/ios/Cartfile

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.2.16"
+github "infobip/mobile-messaging-sdk-ios" "10.2.1"

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.2.16"
+github "infobip/mobile-messaging-sdk-ios" "10.2.1"

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -46,4 +46,9 @@ class RNMMChat: NSObject  {
             MobileMessaging.inAppChat?.settings.configureWith(rawConfig: chatSettings)
         }
     }
+    
+    @objc(setLanguage:)
+    func setLanguage(localeString: String) {
+        MobileMessaging.inAppChat?.setLanguage(localeString)
+    }
 }

package/ios/MobileMessagingPlugin/RNMMChatBridge.m

@@ -20,6 +20,7 @@ RCT_EXTERN_METHOD(showChat:)
 RCT_EXTERN_METHOD(getMessageCounter:(RCTResponseSenderBlock)resultCallback)
 RCT_EXTERN_METHOD(resetMessageCounter)
 RCT_EXTERN_METHOD(setupChatSettings:)
+RCT_EXTERN_METHOD(setLanguage:)
 
 - (dispatch_queue_t)methodQueue {
    return dispatch_get_main_queue();

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -8,6 +8,10 @@
 import Foundation
 import MobileMessaging
 
+// It may happen that RN call module initialization more than once,
+// Not needed to perform early start more than once per application session.
+var isEarlyStartPerformed = false;
+
 @objc(ReactNativeMobileMessaging)
 class ReactNativeMobileMessaging: RCTEventEmitter  {
     private var messageStorageAdapter: MessageStorageAdapter?
@@ -47,6 +51,13 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         super.stopObserving()
     }
 
+    override func sendEvent(withName name: String!, body: Any!) {
+        guard let _eventsManager = eventsManager, _eventsManager.hasEventListeners == true else {
+            return
+        }
+        super.sendEvent(withName: name, body: body)
+    }
+
     @objc
     override static func requiresMainQueueSetup() -> Bool {
       return true
@@ -79,8 +90,9 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         let cachedConfigDict = RNMobileMessagingConfiguration.getRawConfigFromDefaults()
         if let cachedConfigDict = cachedConfigDict, (config as NSDictionary) != (cachedConfigDict as NSDictionary)
         {
-            stop()
-            start(configuration: configuration, onSuccess: successCallback)
+            stop {
+                self.start(configuration: configuration, onSuccess: successCallback)
+            }
         } else if cachedConfigDict == nil {
             start(configuration: configuration, onSuccess: successCallback)
         } else {
@@ -91,9 +103,12 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
     private func performEarlyStartIfPossible() {
         if let cachedConfigDict = RNMobileMessagingConfiguration.getRawConfigFromDefaults(),
            let configuration = RNMobileMessagingConfiguration(rawConfig: cachedConfigDict),
-           !self.isStarted
+           !self.isStarted,
+           !isEarlyStartPerformed
         {
-            self.start(configuration: configuration) { response in }
+            MMLogDebug("[RNMobileMessaging] Performing early start")
+            isEarlyStartPerformed = true
+            start(configuration: configuration) { response in }
         }
     }
 
@@ -134,9 +149,9 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         })
     }
 
-    private func stop() {
-        MobileMessaging.stop()
+    private func stop(completion: @escaping () -> Void) {
         eventsManager?.stop()
+        MobileMessaging.stop(false, completion: completion)
     }
 
     /*User Profile Management*/

package/ios/MobileMessagingPlugin/RNMobileMessagingEventsManager.swift

@@ -10,7 +10,7 @@ import MobileMessaging
 
 class RNMobileMessagingEventsManager {
     private var eventEmitter: RCTEventEmitter!
-    private var hasEventListeners = false
+    public var hasEventListeners = false
     private var cachedMobileMessagingNotifications = [Notification]()
 
     private let supportedNotifications: [String: String] = [

package/ios/ReactNativeMobileMessaging-Bridging-Header.h

@@ -4,3 +4,4 @@
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTViewManager.h>

package/package.json

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