infobip-mobile-messaging-react-native-plugin 6.4.5 → 6.4.6

package/android/build.gradle

@@ -1,7 +1,7 @@
-def defaultCompileSDKVersion = 33
-def defaultBuildToolsVersion = '33.0.0'
+def defaultCompileSDKVersion = 31
+def defaultBuildToolsVersion = '31.0.0'
 def defaultMinSDKVersion = 21
-def defaultTargetSDKVersion = 33
+def defaultTargetSDKVersion = 31
 
 def getRootProjectProperty(property, fallback) {
     rootProject.ext.has(property) ? rootProject.ext.get(property) : fallback
@@ -33,7 +33,7 @@ buildscript {
             }
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.2.2'
+            classpath 'com.android.tools.build:gradle:4.2+'
         }
     }
 }
@@ -85,7 +85,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '7.2.4'
+    def mmVersion = '6.4.3'
 
     implementation 'com.facebook.react:react-native:+'
     implementation "androidx.annotation:annotation:1.1.0"

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

@@ -65,4 +65,4 @@ class Configuration {
 
         return config;
     }
-}
+}

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

@@ -2,11 +2,8 @@ package org.infobip.reactlibrary.mobilemessaging;
 
 import android.content.Context;
 import android.os.Build;
-import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
@@ -14,8 +11,6 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -60,25 +55,6 @@ class ReactChatView extends FrameLayout {
             return;
         }
 
-        InAppChatFragment.InAppChatActionBarProvider provider = new InAppChatFragment.InAppChatActionBarProvider() {
-
-            @Nullable
-            @Override
-            public ActionBar getOriginalSupportActionBar() {
-                if (fragmentActivity instanceof AppCompatActivity){
-                    return ((AppCompatActivity) fragmentActivity).getSupportActionBar();
-                }
-                return null;
-            }
-
-            @Override
-            public void onInAppChatBackPressed() {
-                if (fragmentActivity != null){
-                    fragmentActivity.onBackPressed();
-                }
-            }
-        };
-
         //RN issue https://github.com/facebook/react-native/issues/17968
         //Without this layout will not be called and view will not be displayed, because RN doesn't dispatches events to android views properly
         ViewGroup parentView = (ViewGroup) parentLayout.findViewById(reactNativeViewId).getParent();
@@ -86,7 +62,7 @@ class ReactChatView extends FrameLayout {
 
         FragmentManager fragmentManager = fragmentActivity.getSupportFragmentManager();
         InAppChatFragment chatFragment = new InAppChatFragment();
-        chatFragment.setInAppChatActionBarProvider(provider);
+        chatFragment.setIsToolbarHidden(true);
 
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         if (fragmentManager.findFragmentByTag(Utils.RN_IN_APP_CHAT_FRAGMENT_TAG) == null) {

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

@@ -3,47 +3,22 @@ package org.infobip.reactlibrary.mobilemessaging;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
+import android.content.*;
 import android.graphics.Color;
 import android.os.AsyncTask;
-import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.ReactApplication;
-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.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.modules.core.PermissionAwareActivity;
+import com.facebook.react.bridge.*;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
-import org.infobip.mobile.messaging.BroadcastParameter;
-import org.infobip.mobile.messaging.CustomEvent;
-import org.infobip.mobile.messaging.Event;
-import org.infobip.mobile.messaging.Installation;
-import org.infobip.mobile.messaging.Message;
-import org.infobip.mobile.messaging.MobileMessaging;
-import org.infobip.mobile.messaging.MobileMessagingProperty;
-import org.infobip.mobile.messaging.NotificationSettings;
-import org.infobip.mobile.messaging.SuccessPending;
-import org.infobip.mobile.messaging.User;
+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.dal.bundle.MessageBundleMapper;
 import org.infobip.mobile.messaging.geo.GeoEvent;
 import org.infobip.mobile.messaging.geo.MobileGeo;
 import org.infobip.mobile.messaging.interactive.InteractiveEvent;
@@ -59,23 +34,20 @@ import org.infobip.mobile.messaging.storage.SQLiteMessageStore;
 import org.infobip.mobile.messaging.util.Cryptor;
 import org.infobip.mobile.messaging.util.DeviceInformation;
 import org.infobip.mobile.messaging.util.PreferenceHelper;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.CustomEventJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.InstallationJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.MessageJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.PersonalizationCtx;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.ReactNativeJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.UserJson;
+import org.infobip.reactlibrary.mobilemessaging.datamappers.*;
+import org.infobip.mobile.messaging.dal.bundle.MessageBundleMapper;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import android.os.Bundle;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import java.util.*;
+
 public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
     public static final String MODULE_NAME = "ReactNativeMobileMessaging";
 
@@ -328,8 +300,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         PreferenceHelper.saveString(context, MobileMessagingProperty.SYSTEM_DATA_VERSION_POSTFIX, "reactNative " + configuration.reactNativePluginVersion);
 
         MobileMessaging.Builder builder = new MobileMessaging.Builder(context)
-                .withApplicationCode(configuration.applicationCode)
-                .withoutRegisteringForRemoteNotifications();
+                .withApplicationCode(configuration.applicationCode);
 
         if (configuration.privacySettings.userDataPersistingDisabled) {
             builder.withoutStoringUserData();
@@ -440,7 +411,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         try {
             reactContext.unregisterReceiver(commonLibraryBroadcastReceiver);
             LocalBroadcastManager.getInstance(reactContext).unregisterReceiver(messageStorageReceiver);
-        } catch (IllegalArgumentException e) {
+        } catch(IllegalArgumentException e) {
             Log.d(Utils.TAG, "Can't unregister broadcast receivers");
         }
         broadcastReceiverRegistered = false;
@@ -715,24 +686,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         });
     }
 
-    @ReactMethod
-    public void registerForAndroidRemoteNotifications() {
-        mobileMessaging().registerForRemoteNotifications((Activity) getPermissionAwareActivity());
-    }
-
-    private PermissionAwareActivity getPermissionAwareActivity() {
-        Activity activity = getCurrentActivity();
-        if (activity == null) {
-            throw new IllegalStateException(
-                    "Tried to use permissions API while not attached to an " + "Activity.");
-        } else if (!(activity instanceof PermissionAwareActivity)) {
-            throw new IllegalStateException(
-                    "Tried to use permissions API but the host Activity doesn't"
-                            + " implement PermissionAwareActivity.");
-        }
-        return (PermissionAwareActivity) activity;
-    }
-
     private static void runInBackground(final Runnable runnable) {
         new AsyncTask<Void, Void, Void>() {
 

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

@@ -1,13 +1,13 @@
 package org.infobip.reactlibrary.mobilemessaging.datamappers;
 
 import android.util.Log;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.infobip.mobile.messaging.CustomAttributesMapper;
-import org.infobip.mobile.messaging.CustomEvent;
+import com.facebook.react.bridge.ReadableMap;
+import org.infobip.mobile.messaging.*;
 import org.infobip.mobile.messaging.api.appinstance.UserCustomEventAtts;
+import org.infobip.mobile.messaging.api.shaded.google.gson.reflect.TypeToken;
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
+import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.reflect.Type;

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

@@ -1,28 +1,27 @@
 package org.infobip.reactlibrary.mobilemessaging.datamappers;
 
-import androidx.annotation.NonNull;
+import org.infobip.mobile.messaging.*;
 
-import com.facebook.react.bridge.ReadableMap;
-import com.google.gson.reflect.TypeToken;
-
-import org.infobip.mobile.messaging.CustomAttributeValue;
-import org.infobip.mobile.messaging.CustomAttributesMapper;
-import org.infobip.mobile.messaging.User;
-import org.infobip.mobile.messaging.UserAttributes;
-import org.infobip.mobile.messaging.UserIdentity;
-import org.infobip.mobile.messaging.UserMapper;
 import org.infobip.mobile.messaging.api.appinstance.UserAtts;
+import org.infobip.mobile.messaging.api.shaded.google.gson.reflect.TypeToken;
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
+
 import org.infobip.mobile.messaging.util.DateTimeUtil;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.lang.reflect.Type;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableMap;
+
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.lang.reflect.Type;
 import java.util.Set;
 
 /**

package/index.d.ts

@@ -1,4 +1,4 @@
-import {EmitterSubscription, Rationale} from "react-native";
+import { EmitterSubscription, Rationale } from "react-native";
 
 declare namespace MobileMessagingReactNative {
     export type OS = 'Android' | 'iOS';
@@ -497,12 +497,7 @@ declare namespace MobileMessagingReactNative {
          * ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION
          * @return
          */
-        requestAndroidLocationPermissions(rationale?: Rationale): Promise<boolean>;
-
-        /**
-         * Registering for POST_NOTIFICATIONS permission for Android 13+
-         */
-        registerForAndroidRemoteNotifications(): void;
+        requestAndroidPermissions(rationale?: Rationale): Promise<boolean>;
     }
 }
 

package/index.js

@@ -547,7 +547,7 @@ class MobileMessaging {
     };
 
     /**
-     * The predefined messages prompted within the In-app chat (such as status updates, button titles, input field prompt) by default are
+     * 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"
      */
@@ -582,17 +582,7 @@ class MobileMessaging {
      */
     resetMessageCounter() {
         RNMMChat.resetMessageCounter();
-    };
-
-    /**
-     * Registering for POST_NOTIFICATIONS permission for Android 13+
-     */
-    registerForAndroidRemoteNotifications() {
-        if (Platform.OS === "ios") {
-            return;
-        }
-        ReactNativeMobileMessaging.registerForAndroidRemoteNotifications();
-    };
+    }
 
     /* Geofencing permissions */
 
@@ -603,7 +593,7 @@ class MobileMessaging {
      * ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION
      * @return {Promise<boolean>}
      */
-    async requestAndroidLocationPermissions(rationale?: Rationale): Promise<Boolean> {
+    async requestAndroidPermissions(rationale?: Rationale): Promise<Boolean> {
         const requiredPermissions = await this.requiredAndroidLocationPermissions();
         if (requiredPermissions.length === 0) {
             return Promise.resolve(true);
@@ -613,7 +603,7 @@ class MobileMessaging {
             if (!granted) {
                 return Promise.resolve(false);
             } else {
-                return this.requestAndroidLocationPermissions(rationale);
+                return this.requestAndroidPermissions(rationale);
             }
         });
     };

package/ios/Cartfile

@@ -0,0 +1 @@
+github "infobip/mobile-messaging-sdk-ios" "10.5.3"

package/ios/Cartfile.resolved

@@ -0,0 +1 @@
+github "infobip/mobile-messaging-sdk-ios" "10.5.3"

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "6.4.5",
+  "version": "6.4.6",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "index.js",
   "scripts": {
+    "mm_build": "./scripts/build_mobile_messaging_framework.sh",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

package/release.sh

@@ -25,4 +25,4 @@ git commit -a -m "Release: $RELEASE_VERSION"
 git tag $RELEASE_VERSION -m "Release: $RELEASE_VERSION"
 
 # Push changes
-git push origin master --tags
+git push origin $BRANCH_NAME_TO_BUILD --tags

package/scripts/build_mobile_messaging_framework.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+echo "Building MobileMessaging.xcframework with Carthage started..."
+cd ios || { echo "[MobileMessagingPlugin] can't find ios folder"; exit 1; }
+carthage update --cache-builds --use-xcframeworks
+echo "Building MobileMessaging.xcframework with Carthage finished."
+cd -