infobip-mobile-messaging-react-native-plugin 9.2.3 → 9.4.0

package/README.md

@@ -84,18 +84,6 @@ This guide is designed to get you up and running with Mobile Messaging SDK plugi
 
       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>
-       > ```
-
      > ### Notice (when targeting Android 13):
      >  Starting from Android 13, Google requires to ask user for notification permission. Follow [this guide](https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/Android-13-Notification-Permission-Handling) to make a permission request.
        

package/android/build.gradle

@@ -11,6 +11,7 @@ def overrideGmsVersion = getRootProjectProperty('overrideGmsVersion', '')
 def overrideFirebaseVersion = getRootProjectProperty('overrideFirebaseVersion', '')
 def overrideKotlinVersion = getRootProjectProperty('overrideKotlinVersion', '')
 def withCryptorMigration = getRootProjectProperty('withCryptorMigration', false)
+def withGeofencingModule = getRootProjectProperty('withGeofencingModule', false)
 def withWebRTCUI = getRootProjectProperty('withWebRTCUI', false)
 
 apply plugin: 'com.android.library'
@@ -86,7 +87,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '11.1.4'
+    def mmVersion = "12.1.0"
     //react and mm dependencies clash
     if (!overrideKotlinVersion.empty) {
         constraints {
@@ -99,10 +100,10 @@ dependencies {
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.databinding:viewbinding:8.0.2'
+    implementation 'com.google.android.gms:play-services-base:18.2.0'
 
     implementation "com.infobip:infobip-mobile-messaging-android-resources:$mmVersion@aar"
     implementation "com.infobip:infobip-mobile-messaging-android-chat-sdk:$mmVersion@aar"
-    implementation "com.infobip:infobip-mobile-messaging-android-geo-sdk:$mmVersion@aar"
     implementation ("com.infobip:infobip-mobile-messaging-android-sdk:$mmVersion@aar") {
         transitive = true;
 
@@ -128,4 +129,10 @@ dependencies {
     if (withCryptorMigration.toBoolean()) {
         implementation "com.infobip:infobip-mobile-messaging-android-cryptor-migration:$mmVersion@aar"
     }
+
+    if (withGeofencingModule.toBoolean()) {
+        implementation ("com.infobip:infobip-mobile-messaging-android-geo-sdk:$mmVersion@aar"){
+            transitive = true
+        }
+    }
 }

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

@@ -47,8 +47,6 @@ import org.infobip.mobile.messaging.User;
 import org.infobip.mobile.messaging.chat.InAppChat;
 import org.infobip.mobile.messaging.chat.core.InAppChatEvent;
 import org.infobip.mobile.messaging.dal.bundle.MessageBundleMapper;
-import org.infobip.mobile.messaging.geo.GeoEvent;
-import org.infobip.mobile.messaging.geo.MobileGeo;
 import org.infobip.mobile.messaging.interactive.InteractiveEvent;
 import org.infobip.mobile.messaging.interactive.MobileInteractive;
 import org.infobip.mobile.messaging.interactive.NotificationAction;
@@ -72,6 +70,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -163,6 +162,10 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private static final String EVENT_INAPPCHAT_LIVECHAT_REGISTRATION_ID_UPDATED = "inAppChat.livechatRegistrationIdUpdated";
     //endregion
 
+    //Geo dependency is opt-out by default. Extracted from GeoEvent.GEOFENCE_AREA_ENTERED module 'infobip-mobile-messaging-android-geo-sdk'
+    private static final String GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY = "org.infobip.mobile.messaging.geo.GEOFENCE_AREA_ENTERED";
+
+
     //region MessageStorageBroadcastReceiver
     private static final Map<String, String> messageStorageEventMap = new HashMap<String, String>() {{
         put(MessageStoreAdapter.EVENT_MESSAGESTORAGE_START, MessageStoreAdapter.EVENT_MESSAGESTORAGE_START);
@@ -282,7 +285,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         put(Event.USER_UPDATED.getKey(), EVENT_USER_UPDATED);
         put(Event.PERSONALIZED.getKey(), EVENT_PERSONALIZED);
         put(Event.DEPERSONALIZED.getKey(), EVENT_DEPERSONALIZED);
-        put(GeoEvent.GEOFENCE_AREA_ENTERED.getKey(), EVENT_GEOFENCE_ENTERED);
+        put(GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY, EVENT_GEOFENCE_ENTERED);
         put(InAppChatEvent.CHAT_VIEW_CHANGED.getKey(), EVENT_INAPPCHAT_VIEW_STATE_CHANGED);
         put(InAppChatEvent.CHAT_CONFIGURATION_SYNCED.getKey(), EVENT_INAPPCHAT_CONFIGURATION_SYNCED);
         put(InAppChatEvent.LIVECHAT_REGISTRATION_ID_UPDATED.getKey(), EVENT_INAPPCHAT_LIVECHAT_REGISTRATION_ID_UPDATED);
@@ -298,7 +301,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
                 return;
             }
 
-            if (GeoEvent.GEOFENCE_AREA_ENTERED.getKey().equals(intent.getAction())) {
+            if (GEO_EVENT_GEOFENCE_AREA_ENTERED_KEY.equals(intent.getAction())) {
                 for (JSONObject geo : MessageJson.geosFromBundle(intent.getExtras())) {
                     ReactNativeEvent.send(event, reactContext, geo);
                 }
@@ -447,7 +450,16 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @Override
             public void onSuccess() {
                 if (configuration.geofencingEnabled) {
-                    MobileGeo.getInstance(context).activateGeofencing();
+                    try {
+                        Class<?> cls = Class.forName("org.infobip.mobile.messaging.geo.MobileGeo");
+                        Method newInstance_method = cls.getDeclaredMethod("getInstance", Context.class);
+                        Method activateGeofencing_method = cls.getDeclaredMethod("activateGeofencing");
+                        Object geoInstance = newInstance_method.invoke(cls, context);
+                        activateGeofencing_method.invoke(geoInstance);
+                    } catch (Exception e) {
+                        Log.d(Utils.TAG, "Geofencing is not enabled.");
+                        e.printStackTrace();
+                    }
                 }
 
                 NotificationCategory categories[] = notificationCategoriesFromConfiguration(configuration.notificationCategories);

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/datamappers/MessageJson.java

@@ -6,9 +6,9 @@ import android.util.Log;
 
 import org.infobip.reactlibrary.mobilemessaging.Utils;
 
+import java.lang.reflect.Method;
+
 import org.infobip.mobile.messaging.Message;
-import org.infobip.mobile.messaging.geo.Area;
-import org.infobip.mobile.messaging.geo.Geo;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -144,31 +144,16 @@ public class MessageJson {
      */
     @NonNull
     public static List<JSONObject> geosFromBundle(Bundle bundle) {
-        Geo geo = Geo.createFrom(bundle);
-        JSONObject message = bundleToJSON(bundle);
-        if (geo == null || geo.getAreasList() == null || geo.getAreasList().isEmpty() || message == null) {
-            return new ArrayList<JSONObject>();
-        }
-
-        List<JSONObject> geos = new ArrayList<JSONObject>();
-        for (final Area area : geo.getAreasList()) {
-            try {
-                geos.add(new JSONObject()
-                        .put("area", new JSONObject()
-                                .put("id", area.getId())
-                                .put("center", new JSONObject()
-                                        .put("lat", area.getLatitude())
-                                        .put("lon", area.getLongitude()))
-                                .put("radius", area.getRadius())
-                                .put("title", area.getTitle()))
-                );
-            } catch (JSONException e) {
-                Log.w(Utils.TAG, "Cannot convert geo to JSON: " + e.getMessage());
-                Log.d(Utils.TAG, Log.getStackTraceString(e));
-            }
+        try {
+            Class<?> cls = Class.forName("org.infobip.mobile.messaging.geo.mapper.GeoBundleMapper");
+            Method geosFromBundle_method = cls.getDeclaredMethod("geosFromBundle", Bundle.class);
+            List<JSONObject> geos = (List<JSONObject>) geosFromBundle_method.invoke(cls, bundle);
+            return geos;
+        } catch (Exception e) {
+            Log.w(Utils.TAG, "Cannot convert geo to JSON: " + e.getMessage());
+            Log.d(Utils.TAG, Log.getStackTraceString(e));
         }
-
-        return geos;
+        return new ArrayList<JSONObject>();
     }
 
     @NonNull
@@ -188,4 +173,4 @@ public class MessageJson {
         }
         return messages;
     }
-}
+}

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.2.3"
-  s.dependency "MobileMessaging/Geofencing", "12.2.3"
-  s.dependency "MobileMessaging/InAppChat", "12.2.3"
+  s.dependency "MobileMessaging/Core", "12.3.1"
+  s.dependency "MobileMessaging/Geofencing", "12.3.1"
+  s.dependency "MobileMessaging/InAppChat", "12.3.1"
   if defined?($WebRTCUIEnabled)
-    s.dependency "MobileMessaging/WebRTCUI", "12.2.3"
+    s.dependency "MobileMessaging/WebRTCUI", "12.3.1"
   end
 end

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -106,7 +106,8 @@ class RNMMChat: NSObject  {
         let localeS = String(localeString)
         let separator = localeS.contains("_") ? "_" : "-"
         let components = localeS.components(separatedBy: separator)
-        let lang = MMLanguage.mapLanguage(from: components.first ??
+        let langCode = localeS.contains("zh") ? localeS : components.first
+        let lang = MMLanguage.mapLanguage(from: langCode ??
                                                          String(localeS.prefix(2)))
         chatVC.setLanguage(lang) { error in
             if let error = error {

package/package.json

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