infobip-mobile-messaging-react-native-plugin 4.0.2 → 4.1.2

package/android/build.gradle

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

package/android/src/main/AndroidManifest.xml

@@ -20,42 +20,43 @@
         <!-- Mobile Messaging components -->
 
         <service
-            android:name="org.infobip.mobile.messaging.cloud.firebase.MobileMessagingFirebaseService"
-            android:exported="false" >
+                android:name="org.infobip.mobile.messaging.cloud.firebase.MobileMessagingFirebaseService"
+                android:exported="false" >
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
 
         <service
-            android:name="org.infobip.mobile.messaging.cloud.MobileMessagingCloudService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" >
+                android:name="org.infobip.mobile.messaging.cloud.MobileMessagingCloudService"
+                android:permission="android.permission.BIND_JOB_SERVICE"
+                android:exported="false" >
         </service>
 
         <service
-            android:name="org.infobip.mobile.messaging.platform.MobileMessagingJobService"
-            android:enabled="false"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+                android:name="org.infobip.mobile.messaging.platform.MobileMessagingJobService"
+                android:enabled="false"
+                android:exported="false"
+                android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <receiver android:name="org.infobip.mobile.messaging.notification.NotificationTapReceiver" />
 
         <receiver
-            android:name="org.infobip.mobile.messaging.MobileMessagingConnectivityReceiver"
-            android:enabled="false"
-            android:exported="false">
+                android:name="org.infobip.mobile.messaging.MobileMessagingConnectivityReceiver"
+                android:enabled="false"
+                android:exported="false">
             <intent-filter>
                 <!-- Intent filter is for pre-7.0 Nougat devices -->
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
         <receiver android:name="org.infobip.mobile.messaging.interactive.notification.NotificationActionTapReceiver" />
-        <receiver android:name="org.infobip.reactlibrary.mobilemessaging.ReactNativeMobileMessagingModule$MessageActionReceiver" android:exported="false">
+        <receiver android:name="org.infobip.reactlibrary.mobilemessaging.ReactNativeMobileMessagingModule$MessageEventReceiver" android:exported="false">
             <intent-filter>
                 <action android:name="org.infobip.mobile.messaging.MESSAGE_RECEIVED" />
                 <action android:name="org.infobip.mobile.messaging.NOTIFICATION_TAPPED" />
                 <action android:name="org.infobip.mobile.messaging.interactive.NOTIFICATION_ACTION_TAPPED" />
+                <action android:name="org.infobip.mobile.messaging.chat.UNREAD_MESSAGES_COUNTER_UPDATED"/>
             </intent-filter>
         </receiver>
 

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

@@ -3,11 +3,7 @@ package org.infobip.reactlibrary.mobilemessaging;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
-import com.facebook.react.bridge.ReactContext;
-
-import org.infobip.mobile.messaging.Message;
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
 import org.infobip.mobile.messaging.dal.json.JSONArrayAdapter;
 import org.infobip.mobile.messaging.dal.json.JSONObjectAdapter;
@@ -26,15 +22,11 @@ class CacheManager {
 
     static class Event {
         String type;
-        JSONObject object;
-        String actionId = null;
-        String actionInputText = null;
+        Object[] objects = null;
 
-        Event(String type, JSONObject object, String actionId, String actionInputText) {
+        Event(String type, Object ... objects) {
             this.type = type;
-            this.object = object;
-            this.actionId = actionId;
-            this.actionInputText = actionInputText;
+            this.objects = objects;
         }
 
         @Override
@@ -48,6 +40,11 @@ class CacheManager {
         saveStringsToSet(context, EVENTS_KEY, serialized);
     }
 
+    static void saveEvent(Context context, String event, int unreadMessagesCounter) {
+        String serialized = serializer.serialize(new Event(event, unreadMessagesCounter));
+        saveStringsToSet(context, EVENTS_KEY, serialized);
+    }
+
     static Event[] loadEvents(Context context) {
         Set<String> serialized = getAndRemoveStringSet(context, EVENTS_KEY);
         List<Event> events = new ArrayList<Event>(serialized.size());

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

@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -39,6 +40,16 @@ public class RNMMChatModule extends ReactContextBaseJavaModule implements Activi
         InAppChat.getInstance(reactContext).inAppChatView().show();
     }
 
+    @ReactMethod
+    public void getMessageCounter(final Callback successCallback) {
+        successCallback.invoke(InAppChat.getInstance(reactContext).getMessageCounter());
+    }
+
+    @ReactMethod
+    public void resetMessageCounter() {
+        InAppChat.getInstance(reactContext).resetMessageCounter();
+    }
+
     @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/ReactNativeMobileMessagingModule.java

@@ -11,12 +11,14 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.*;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import org.infobip.mobile.messaging.*;
 import org.infobip.mobile.messaging.chat.InAppChat;
+import org.infobip.mobile.messaging.chat.core.InAppChatEvent;
 import org.infobip.mobile.messaging.geo.GeoEvent;
 import org.infobip.mobile.messaging.geo.MobileGeo;
 import org.infobip.mobile.messaging.interactive.InteractiveEvent;
@@ -50,11 +52,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private final ReactApplicationContext reactContext;
 
     private static volatile Boolean broadcastReceiverRegistered = false;
+    private static volatile Boolean pluginInitialized = false;
 
     public ReactNativeMobileMessagingModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
-        while (getReactApplicationContext() == null);
+        while (getReactApplicationContext() == null) ;
         reactContext = getReactApplicationContext();
 
         this.reactContext = reactContext;
@@ -65,8 +68,9 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     public void initialize() {
         super.initialize();
         for (CacheManager.Event event : CacheManager.loadEvents(reactContext)) {
-            ReactNativeEvent.send(event.type, reactContext, event.object, event.actionId, event.actionInputText);
+            ReactNativeEvent.send(event.type, reactContext, event.objects);
         }
+        pluginInitialized = true;
         registerBroadcastReceiver();
     }
 
@@ -87,6 +91,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
 
     @Override
     public void onHostDestroy() {
+        pluginInitialized = false;
         unregisterBroadcastReceiver();
         reactContext.removeLifecycleEventListener(this);
     }
@@ -102,6 +107,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private static final String EVENT_NOTIFICATION_TAPPED = "notificationTapped";
     private static final String EVENT_NOTIFICATION_ACTION_TAPPED = "actionTapped";
     private static final String EVENT_MESSAGE_RECEIVED = "messageReceived";
+    private static final String EVENT_INAPPCHAT_UNREAD_MESSAGES_COUNT_UPDATED = "inAppChat.unreadMessageCounterUpdated";
 
     private static final Map<String, String> broadcastEventMap = new HashMap<String, String>() {{
         put(Event.TOKEN_RECEIVED.getKey(), EVENT_TOKEN_RECEIVED);
@@ -117,6 +123,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         put(Event.MESSAGE_RECEIVED.getKey(), EVENT_MESSAGE_RECEIVED);
         put(Event.NOTIFICATION_TAPPED.getKey(), EVENT_NOTIFICATION_TAPPED);
         put(InteractiveEvent.NOTIFICATION_ACTION_TAPPED.getKey(), EVENT_NOTIFICATION_ACTION_TAPPED);
+        put(InAppChatEvent.UNREAD_MESSAGES_COUNTER_UPDATED.getKey(), EVENT_INAPPCHAT_UNREAD_MESSAGES_COUNT_UPDATED);
     }};
 
     private static final Map<String, String> messageStorageEventMap = new HashMap<String, String>() {{
@@ -125,25 +132,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         put(MessageStoreAdapter.EVENT_MESSAGESTORAGE_FIND_ALL, MessageStoreAdapter.EVENT_MESSAGESTORAGE_FIND_ALL);
     }};
 
-
-    private final BroadcastReceiver messageActionReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String event = getMessageBroadcastEvent(intent);
-            if (event == null) {
-                Log.w(Utils.TAG, "Cannot process event for broadcast: " + intent.getAction());
-                return;
-            }
-            JSONObject message = MessageJson.bundleToJSON(intent.getExtras());
-            if (InteractiveEvent.NOTIFICATION_ACTION_TAPPED.getKey().equals(intent.getAction())) {
-                NotificationAction notificationAction = NotificationAction.createFrom(intent.getExtras());
-                ReactNativeEvent.send(event, reactContext, message, notificationAction.getId(), notificationAction.getInputText());
-            } else {
-                ReactNativeEvent.send(event, reactContext, message);
-            }
-        }
-    };
-
     private final BroadcastReceiver messageStorageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -192,7 +180,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     For event caching, if plugin not yet initialized
     */
 
-    public static class MessageActionReceiver extends BroadcastReceiver {
+    public static class MessageEventReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             String event = getMessageBroadcastEvent(intent);
@@ -200,18 +188,42 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
                 Log.w(Utils.TAG, "Cannot process event for broadcast: " + intent.getAction());
                 return;
             }
+            if (InAppChatEvent.UNREAD_MESSAGES_COUNTER_UPDATED.getKey().equals(intent.getAction())) {
+                handleUnreadMessageCounterIntent(context, intent, event);
+                return;
+            }
             JSONObject message = MessageJson.bundleToJSON(intent.getExtras());
-            if (!broadcastReceiverRegistered) {
-                String actionId = null;
-                String actionInputText = null;
-                if (InteractiveEvent.NOTIFICATION_ACTION_TAPPED.getKey().equals(intent.getAction())) {
-                    NotificationAction notificationAction = NotificationAction.createFrom(intent.getExtras());
-                    actionId = notificationAction.getId();
-                    actionInputText = notificationAction.getInputText();
-                }
+            String actionId = null;
+            String actionInputText = null;
+            if (InteractiveEvent.NOTIFICATION_ACTION_TAPPED.getKey().equals(intent.getAction())) {
+                NotificationAction notificationAction = NotificationAction.createFrom(intent.getExtras());
+                actionId = notificationAction.getId();
+                actionInputText = notificationAction.getInputText();
+            }
+            if (!pluginInitialized) {
                 CacheManager.saveEvent(context, event, message, actionId, actionInputText);
+            } else {
+                ReactContext reactContext = getReactContext(context);
+                ReactNativeEvent.send(event, reactContext, message, actionId, actionInputText);
             }
         }
+
+        private void handleUnreadMessageCounterIntent(Context context, Intent intent, String event) {
+            int unreadChatMessagesCounter = intent.getIntExtra(BroadcastParameter.EXTRA_UNREAD_CHAT_MESSAGES_COUNT, 0);
+            if (!pluginInitialized) {
+                CacheManager.saveEvent(context, event, unreadChatMessagesCounter);
+            } else {
+                ReactContext reactContext = getReactContext(context);
+                ReactNativeEvent.send(event, reactContext, unreadChatMessagesCounter);
+            }
+        }
+
+        @Nullable
+        private ReactContext getReactContext(Context context) {
+            ReactApplication reactApplication = (ReactApplication) context.getApplicationContext();
+            if (reactApplication == null) return null;
+            return reactApplication.getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
+        }
     }
 
     private final BroadcastReceiver commonLibraryBroadcastReceiver = new BroadcastReceiver() {
@@ -360,7 +372,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             messageStorageIntentFilter.addAction(action);
         }
 
-        reactContext.registerReceiver(messageActionReceiver, messageActionIntentFilter);
         Context context = reactContext.getCurrentActivity();
         LocalBroadcastManager.getInstance(context).registerReceiver(messageStorageReceiver, messageStorageIntentFilter);
         broadcastReceiverRegistered = true;
@@ -369,7 +380,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private void unregisterBroadcastReceiver() {
         if (!broadcastReceiverRegistered) return;
         reactContext.unregisterReceiver(commonLibraryBroadcastReceiver);
-        reactContext.unregisterReceiver(messageActionReceiver);
         Context context = reactContext.getCurrentActivity();
         LocalBroadcastManager.getInstance(context).unregisterReceiver(messageStorageReceiver);
         broadcastReceiverRegistered = false;

package/index.js

@@ -42,8 +42,10 @@ class MobileMessaging {
         ];
 
         this.inAppChatEvents = [
-            'inAppChat.availabilityUpdated'
+            'inAppChat.availabilityUpdated',
+            'inAppChat.unreadMessageCounterUpdated'
         ];
+
         this.eventEmitter = new NativeEventEmitter(ReactNativeMobileMessaging);
     }
 
@@ -522,6 +524,23 @@ class MobileMessaging {
             console.log("method setupiOSChatSettings isn't supported for Android, use settings.xml to provide appearance settings.");
         }
     };
+
+    /**
+     * Returns unread in-app chat push messages counter.
+     * The counter increments each time the application receives in-app chat push message
+     * (this usually happens when chat screen is inactive or the application is in background/terminated state).
+     */
+    getMessageCounter(onResult) {
+        RNMMChat.getMessageCounter(onResult);
+    };
+
+    /**
+     * MobileMessaging plugin automatically resets the counter to 0 whenever user opens the in-app chat screen.
+     * However, use the following API in case you need to manually reset the counter.
+     */
+    resetMessageCounter() {
+        RNMMChat.resetMessageCounter();
+    }
 }
 
 export class ChatView extends React.Component {

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

@@ -19,8 +19,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "MobileMessaging/Core", "9.1.10"
-  s.dependency "MobileMessaging/Geofencing", "9.1.10"
-  s.dependency "MobileMessaging/InAppChat", "9.1.10"
+  s.dependency "MobileMessaging/Core", "9.2.7"
+  s.dependency "MobileMessaging/Geofencing", "9.2.7"
+  s.dependency "MobileMessaging/InAppChat", "9.2.7"
 
 end

package/ios/Cartfile

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.1.10"
+github "infobip/mobile-messaging-sdk-ios" "9.2.7"

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "infobip/mobile-messaging-sdk-ios" "9.1.10"
+github "infobip/mobile-messaging-sdk-ios" "9.2.7"

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -15,8 +15,8 @@ class RNMMChat: NSObject  {
     func showChat(presentingOptions: NSDictionary) {
         var presentVCModally = false
         if let presentingOptions = presentingOptions as? [String: Any],
-            let iosOptions = presentingOptions["ios"] as? [String: Any],
-            let shouldBePresentedModally = iosOptions["shouldBePresentedModally"] as? Bool {
+           let iosOptions = presentingOptions["ios"] as? [String: Any],
+           let shouldBePresentedModally = iosOptions["shouldBePresentedModally"] as? Bool {
             presentVCModally = shouldBePresentedModally
         }
         let vc = presentVCModally ? MMChatViewController.makeRootNavigationViewController(): MMChatViewController.makeRootNavigationViewControllerWithCustomTransition()
@@ -30,10 +30,20 @@ class RNMMChat: NSObject  {
         }
     }
 
-     @objc(setupChatSettings:)
-     func setupChatSettings(settings: NSDictionary) {
-          if let chatSettings = settings as? [String: AnyObject] {
-               MobileMessaging.inAppChat?.settings.configureWith(rawConfig: chatSettings)
-          }
-      }
+    @objc(getMessageCounter:)
+    func getMessageCounter(onResult: @escaping RCTResponseSenderBlock) {
+        onResult([MobileMessaging.inAppChat?.getMessageCounter ?? 0])
+    }
+
+    @objc(resetMessageCounter)
+    func resetMessageCounter() {
+        MobileMessaging.inAppChat?.resetMessageCounter()
+    }
+
+    @objc(setupChatSettings:)
+    func setupChatSettings(settings: NSDictionary) {
+        if let chatSettings = settings as? [String: AnyObject] {
+            MobileMessaging.inAppChat?.settings.configureWith(rawConfig: chatSettings)
+        }
+    }
 }

package/ios/MobileMessagingPlugin/RNMMChatBridge.m

@@ -17,6 +17,8 @@
 @implementation RNMMChat (RCTExternModule)
 RCT_EXPORT_MODULE_NO_LOAD(RNMMChat, RNMMChat)
 RCT_EXTERN_METHOD(showChat:)
+RCT_EXTERN_METHOD(getMessageCounter:(RCTResponseSenderBlock)resultCallback)
+RCT_EXTERN_METHOD(resetMessageCounter)
 RCT_EXTERN_METHOD(setupChatSettings:)
 
 - (dispatch_queue_t)methodQueue {

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -31,7 +31,8 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
             EventName.messageStorage_save,
             EventName.messageStorage_find,
             EventName.messageStorage_findAll,
-            EventName.inAppChat_availabilityUpdated
+            EventName.inAppChat_availabilityUpdated,
+            EventName.inAppChat_unreadMessageCounterUpdated
         ]
     }
 

package/ios/MobileMessagingPlugin/RNMobileMessagingEventsManager.swift

@@ -23,7 +23,8 @@ class RNMobileMessagingEventsManager {
         EventName.personalized: MMNotificationPersonalized,
         EventName.installationUpdated: MMNotificationInstallationSynced,
         EventName.userUpdated: MMNotificationUserSynced,
-        EventName.inAppChat_availabilityUpdated: MMNotificationInAppChatAvailabilityUpdated
+        EventName.inAppChat_availabilityUpdated: MMNotificationInAppChatAvailabilityUpdated,
+        EventName.inAppChat_unreadMessageCounterUpdated: MMNotificationInAppChatUnreadMessagesCounterUpdated
     ]
 
     func startObserving() {
@@ -110,6 +111,9 @@ class RNMobileMessagingEventsManager {
         case MMNotificationInAppChatAvailabilityUpdated:
             eventName = EventName.inAppChat_availabilityUpdated
             notificationResult = notification.userInfo?[MMNotificationKeyInAppChatEnabled] as? Bool
+        case MMNotificationInAppChatUnreadMessagesCounterUpdated:
+            eventName = EventName.inAppChat_unreadMessageCounterUpdated
+            notificationResult = notification.userInfo?[MMNotificationKeyInAppChatUnreadMessagesCounter] as? Int
         default: break
         }
 

package/ios/MobileMessagingPlugin/RNMobileMessagingUtils.swift

@@ -116,4 +116,5 @@ struct EventName {
     static let messageStorage_find = "messageStorage.find"
     static let messageStorage_findAll = "messageStorage.findAll"
     static let inAppChat_availabilityUpdated = "inAppChat.availabilityUpdated"
+    static let inAppChat_unreadMessageCounterUpdated = "inAppChat.unreadMessageCounterUpdated"
 }

package/package.json

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