infobip-mobile-messaging-react-native-plugin 12.5.1 → 12.5.3

package/README.md

@@ -15,8 +15,8 @@ The document describes library integration steps for your React Native project.
 - React Native (v0.70.8)
 
 For iOS project:
-- Xcode and Command Line Tools (13.2.1)
-- CocoaPods (v1.11.3)
+- Xcode and Command Line Tools (16.1)
+- CocoaPods (v1.15.2)
 - Minimum deployment target 12.4
 
 For Android project:

package/android/build.gradle

@@ -86,7 +86,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '13.1.1'
+    def mmVersion = '13.2.3'
     //react and mm dependencies clash
     if (!overrideKotlinVersion.empty) {
         constraints {

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

@@ -52,8 +52,10 @@ 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.inbox.Inbox;
+import org.infobip.mobile.messaging.inbox.InboxMapper;
 import org.infobip.mobile.messaging.inbox.MobileInbox;
 import org.infobip.mobile.messaging.inbox.MobileInboxFilterOptions;
+import org.infobip.mobile.messaging.inbox.MobileInboxFilterOptionsJson;
 import org.infobip.mobile.messaging.interactive.InteractiveEvent;
 import org.infobip.mobile.messaging.interactive.MobileInteractive;
 import org.infobip.mobile.messaging.interactive.NotificationAction;
@@ -67,14 +69,12 @@ 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.InboxJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.InstallationJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.MessageJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.MobileInboxFilterOptionsJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.PersonalizationCtx;
+import org.infobip.mobile.messaging.plugins.CustomEventJson;
+import org.infobip.mobile.messaging.plugins.InstallationJson;
+import org.infobip.mobile.messaging.plugins.MessageJson;
+import org.infobip.mobile.messaging.plugins.PersonalizationCtx;
+import org.infobip.mobile.messaging.plugins.UserJson;
 import org.infobip.reactlibrary.mobilemessaging.datamappers.ReactNativeJson;
-import org.infobip.reactlibrary.mobilemessaging.datamappers.UserJson;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -587,7 +587,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     @ReactMethod
     public void fetchInboxMessages(@NonNull String token, @NonNull String externalUserId, ReadableMap args, final Callback successCallback, final Callback errorCallback) throws JSONException {
         try {
-            mobileMessagingInbox().fetchInbox(token, externalUserId, MobileInboxFilterOptionsJson.resolveMobileInboxFilterOptions(ReactNativeJson.convertMapToJson(args)), inboxResultListener(successCallback, errorCallback));
+            mobileMessagingInbox().fetchInbox(token, externalUserId, MobileInboxFilterOptionsJson.mobileInboxFilterOptionsFromJSON(ReactNativeJson.convertMapToJson(args)), inboxResultListener(successCallback, errorCallback));
         } catch (IllegalArgumentException e) {
             Log.d(Utils.TAG, "Error fetching inbox:" + e.getMessage());
         }
@@ -596,7 +596,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     @ReactMethod
     public void fetchInboxMessagesWithoutToken(@NonNull String externalUserId, ReadableMap args, final Callback successCallback, final Callback errorCallback) throws JSONException {
         try {
-            mobileMessagingInbox().fetchInbox(externalUserId, MobileInboxFilterOptionsJson.resolveMobileInboxFilterOptions(ReactNativeJson.convertMapToJson(args)), inboxResultListener(successCallback, errorCallback));
+            mobileMessagingInbox().fetchInbox(externalUserId, MobileInboxFilterOptionsJson.mobileInboxFilterOptionsFromJSON(ReactNativeJson.convertMapToJson(args)), inboxResultListener(successCallback, errorCallback));
         } catch (IllegalArgumentException e) {
             Log.d(Utils.TAG, "Error fetching inbox:" + e.getMessage());
         }
@@ -621,7 +621,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @Override
             public void onResult(Result<Inbox, MobileMessagingError> result) {
                 if (result.isSuccess()) {
-                    ReadableMap readableMap = InboxJson.toReadableMap(result.getData());
+                    ReadableMap readableMap = null;
+                    try {
+                        readableMap = ReactNativeJson.convertJsonToMap(InboxMapper.toJSON(result.getData()));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
                     successCallback.invoke(readableMap);
                 } else {
                     errorCallback.invoke(Utils.callbackError(result.getError().getMessage(), null));
@@ -675,7 +680,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @Override
             public void onResult(Result<User, MobileMessagingError> result) {
                 if (result.isSuccess()) {
-                    ReadableMap readableMap = UserJson.toReadableMap(result.getData());
+                    ReadableMap readableMap = null;
+                    try {
+                        readableMap = ReactNativeJson.convertJsonToMap(UserJson.toJSON(result.getData()));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
                     successCallback.invoke(readableMap);
                 } else {
                     errorCallback.invoke(Utils.callbackError(result.getError().getMessage(), null));
@@ -687,8 +697,13 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     @ReactMethod
     public void getUser(final Callback successCallback) {
         User user = mobileMessaging().getUser();
-        ReadableMap userReadableMap = UserJson.toReadableMap(user);
-        successCallback.invoke(userReadableMap);
+        ReadableMap readableMap = null;
+        try {
+            readableMap = ReactNativeJson.convertJsonToMap(UserJson.toJSON(user));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        successCallback.invoke(readableMap);
     }
 
     @ReactMethod
@@ -708,7 +723,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @Override
             public void onResult(Result<Installation, MobileMessagingError> result) {
                 if (result.isSuccess()) {
-                    ReadableMap readableMap = InstallationJson.toReadableMap(result.getData());
+                    ReadableMap readableMap = null;
+                    try {
+                        readableMap = ReactNativeJson.convertJsonToMap(InstallationJson.toJSON(result.getData()));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
                     successCallback.invoke(readableMap);
                 } else {
                     errorCallback.invoke(Utils.callbackError(result.getError().getMessage(), null));
@@ -720,8 +740,13 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     @ReactMethod
     public void getInstallation(final Callback successCallback) {
         Installation installation = mobileMessaging().getInstallation();
-        ReadableMap installationReadableMap = InstallationJson.toReadableMap(installation);
-        successCallback.invoke(installationReadableMap);
+        ReadableMap readableMap = null;
+        try {
+            readableMap = ReactNativeJson.convertJsonToMap(InstallationJson.toJSON(installation));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        successCallback.invoke(readableMap);
     }
 
     @ReactMethod
@@ -732,7 +757,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
                 @Override
                 public void onResult(Result<User, MobileMessagingError> result) {
                     if (result.isSuccess()) {
-                        ReadableMap readableMap = UserJson.toReadableMap(result.getData());
+                        ReadableMap readableMap = null;
+                        try {
+                            readableMap = ReactNativeJson.convertJsonToMap(UserJson.toJSON(result.getData()));
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
                         successCallback.invoke(readableMap);
                     } else {
                         errorCallback.invoke(Utils.callbackError(result.getError().getMessage(), null));
@@ -788,7 +818,12 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             @Override
             public void onResult(Result<List<Installation>, MobileMessagingError> result) {
                 if (result.isSuccess()) {
-                    ReadableArray readableArray = InstallationJson.toReadableArray(result.getData());
+                    ReadableArray readableArray = null;
+                    try {
+                        readableArray = ReactNativeJson.convertJsonToArray(InstallationJson.toJSON(result.getData()));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
                     successCallback.invoke(readableArray);
                 } else {
                     errorCallback.invoke(Utils.callbackError(result.getError().getMessage(), null));

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.14.0"
-  s.dependency "MobileMessaging/InAppChat", "12.14.0"
-  s.dependency "MobileMessaging/Inbox", "12.14.0"
+  s.dependency "MobileMessaging/Core", "12.14.1"
+  s.dependency "MobileMessaging/InAppChat", "12.14.1"
+  s.dependency "MobileMessaging/Inbox", "12.14.1"
   if defined?($WebRTCUIEnabled)
-    s.dependency "MobileMessaging/WebRTCUI", "12.14.0"
+    s.dependency "MobileMessaging/WebRTCUI", "12.14.1"
   end
 end

package/package.json

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

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

@@ -1,42 +0,0 @@
-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 org.infobip.mobile.messaging.api.appinstance.UserCustomEventAtts;
-import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
-import org.json.JSONObject;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-/**
- * User data mapper for JSON conversion
- */
-public class CustomEventJson extends CustomEvent {
-
-    public static CustomEvent fromJSON(JSONObject json) {
-        CustomEvent customEvent = new CustomEvent();
-        try {
-            if (json.has(UserCustomEventAtts.definitionId)) {
-                customEvent.setDefinitionId(json.optString(UserCustomEventAtts.definitionId));
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error when serializing CustomEvent object:" + Log.getStackTraceString(e));
-        }
-        try {
-            if (json.has(UserCustomEventAtts.properties)) {
-                Type type = new TypeToken<Map<String, Object>>() {
-                }.getType();
-                Map<String, Object> properties = new JsonSerializer().deserialize(json.optString(UserCustomEventAtts.properties), type);
-                customEvent.setProperties(CustomAttributesMapper.customAttsFromBackend(properties));
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error when serializing CustomEvent object:" + Log.getStackTraceString(e));
-        }
-        return customEvent;
-    }
-}

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

@@ -1,31 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import com.facebook.react.bridge.ReadableMap;
-import org.infobip.mobile.messaging.inbox.Inbox;
-import org.infobip.mobile.messaging.inbox.InboxMapper;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class InboxJson extends Inbox {
-
-    public static JSONObject toJSON(final Inbox inbox) {
-        if (inbox == null) {
-            return new JSONObject();
-        }
-        try {
-            return new JSONObject(inbox.toString());
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    public static ReadableMap toReadableMap(final Inbox inbox) {
-        try {
-            return ReactNativeJson.convertJsonToMap(toJSON(inbox));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

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

@@ -1,106 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReadableArray;
-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.Installation;
-import org.infobip.mobile.messaging.InstallationMapper;
-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;
-import java.util.List;
-import java.util.Map;
-
-public class InstallationJson extends Installation {
-
-    public static JSONArray toJSON(final List<Installation> installations) {
-        if (installations == null) {
-            return null;
-        }
-        JSONArray installationsJson = new JSONArray();
-        for (Installation installation : installations) {
-            installationsJson.put(toJSON(installation));
-        }
-        return installationsJson;
-    }
-
-    @NonNull
-    public static Installation resolveInstallation(JSONObject args) throws JSONException {
-        if (args == null) {
-            throw new IllegalArgumentException("Cannot resolve installation from arguments");
-        }
-
-        return InstallationJson.fromJSON(args);
-    }
-
-    public static JSONObject toJSON(final Installation installation) {
-        try {
-            String json = InstallationMapper.toJson(installation);
-            JSONObject jsonObject = new JSONObject(json);
-            cleanupJsonMapForClient(installation.getCustomAttributes(), jsonObject);
-            return jsonObject;
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    public static ReadableMap toReadableMap(final Installation installation) {
-        try {
-            return ReactNativeJson.convertJsonToMap(InstallationJson.toJSON(installation));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static ReadableArray toReadableArray(final List<Installation> installations) {
-        try {
-            return ReactNativeJson.convertJsonToArray(InstallationJson.toJSON(installations));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private static Installation fromJSON(JSONObject json) {
-        Installation installation = new Installation();
-
-        try {
-            if (json.has("isPushRegistrationEnabled")) {
-                installation.setPushRegistrationEnabled(json.optBoolean("isPushRegistrationEnabled"));
-            }
-            if (json.has("isPrimaryDevice")) {
-                installation.setPrimaryDevice(json.optBoolean("isPrimaryDevice"));
-            }
-            if (json.has("customAttributes")) {
-                Type type = new TypeToken<Map<String, Object>>() {
-                }.getType();
-                Map<String, Object> customAttributes = new JsonSerializer().deserialize(json.optString("customAttributes"), type);
-                installation.setCustomAttributes(CustomAttributesMapper.customAttsFromBackend(customAttributes));
-            }
-        } catch (Exception e) {
-            //error parsing
-        }
-
-        return installation;
-    }
-
-    private static void cleanupJsonMapForClient(Map<String, CustomAttributeValue> customAttributes, JSONObject jsonObject) throws JSONException {
-        jsonObject.remove("map");
-        if (jsonObject.has("customAttributes")) {
-            if (customAttributes != null) {
-                jsonObject.put("customAttributes", new JSONObject(CustomAttributesMapper.customAttsToBackend(customAttributes)));
-            }
-        }
-    }
-}
-

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

@@ -1,141 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import android.os.Bundle;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import org.infobip.mobile.messaging.Message;
-import org.infobip.reactlibrary.mobilemessaging.Utils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MessageJson {
-    /**
-     * Creates new json object based on message bundle
-     *
-     * @param bundle message bundle
-     * @return message object in json format
-     */
-    public static JSONObject bundleToJSON(Bundle bundle) {
-        Message message = Message.createFrom(bundle);
-        if (message == null) {
-            return null;
-        }
-
-        return toJSON(message);
-    }
-
-    /**
-     * Creates json from a message object
-     *
-     * @param message message object
-     * @return message json
-     */
-    public static JSONObject toJSON(Message message) {
-        try {
-            return new JSONObject()
-                    .putOpt("messageId", message.getMessageId())
-                    .putOpt("title", message.getTitle())
-                    .putOpt("body", message.getBody())
-                    .putOpt("sound", message.getSound())
-                    .putOpt("vibrate", message.isVibrate())
-                    .putOpt("icon", message.getIcon())
-                    .putOpt("silent", message.isSilent())
-                    .putOpt("category", message.getCategory())
-                    .putOpt("from", message.getFrom())
-                    .putOpt("receivedTimestamp", message.getReceivedTimestamp())
-                    .putOpt("customPayload", message.getCustomPayload())
-                    .putOpt("contentUrl", message.getContentUrl())
-                    .putOpt("seen", message.getSeenTimestamp() != 0)
-                    .putOpt("seenDate", message.getSeenTimestamp())
-                    .putOpt("chat", message.isChatMessage())
-                    .putOpt("browserUrl", message.getBrowserUrl())
-                    .putOpt("webViewUrl", message.getWebViewUrl())
-                    .putOpt("deeplink", message.getDeeplink())
-                    .putOpt("inAppOpenTitle", message.getInAppOpenTitle())
-                    .putOpt("inAppDismissTitle", message.getInAppDismissTitle());
-        } catch (JSONException e) {
-            Log.w(Utils.TAG, "Cannot convert message to JSON: " + e.getMessage());
-            Log.d(Utils.TAG, Log.getStackTraceString(e));
-            return null;
-        }
-    }
-
-    /**
-     * Creates array of json objects from list of messages
-     *
-     * @param messages list of messages
-     * @return array of jsons representing messages
-     */
-    public static JSONArray toJSONArray(@NonNull Message messages[]) {
-        JSONArray array = new JSONArray();
-        for (Message message : messages) {
-            JSONObject json = toJSON(message);
-            if (json == null) {
-                continue;
-            }
-            array.put(json);
-        }
-        return array;
-    }
-
-    /**
-     * Creates new messages from json object
-     *
-     * @param json json object
-     * @return new {@link Message} object.
-     */
-    private static Message fromJSON(JSONObject json) {
-        if (json == null) {
-            return null;
-        }
-
-        Message message = new Message();
-        message.setMessageId(json.optString("messageId", null));
-        message.setTitle(json.optString("title", null));
-        message.setBody(json.optString("body", null));
-        message.setSound(json.optString("sound", null));
-        message.setVibrate(json.optBoolean("vibrate", true));
-        message.setIcon(json.optString("icon", null));
-        message.setSilent(json.optBoolean("silent", false));
-        message.setCategory(json.optString("category", null));
-        message.setFrom(json.optString("from", null));
-        message.setReceivedTimestamp(json.optLong("receivedTimestamp", 0));
-        message.setCustomPayload(json.optJSONObject("customPayload"));
-        message.setContentUrl(json.optString("contentUrl", null));
-        message.setSeenTimestamp(json.optLong("seenDate", 0));
-        message.setBrowserUrl(json.optString("browserUrl", null));
-        message.setWebViewUrl(json.optString("webViewUrl", null));
-        message.setDeeplink(json.optString("deeplink", null));
-        message.setInAppOpenTitle(json.optString("inAppOpenTitle", null));
-        message.setInAppDismissTitle(json.optString("inAppDismissTitle", null));
-        if (json.optBoolean("chat", false)) {
-            message.setMessageType(Message.MESSAGE_TYPE_CHAT);
-        }
-        return message;
-    }
-
-    @NonNull
-    public static List<Message> resolveMessages(JSONArray args) throws JSONException {
-        if (args == null || args.length() < 1 || args.getString(0) == null) {
-            throw new IllegalArgumentException("Cannot resolve messages from arguments");
-        }
-
-        List<Message> messages = new ArrayList<Message>(args.length());
-        for (int i = 0; i < args.length(); i++) {
-            Message m = fromJSON(args.optJSONObject(i));
-            if (m == null) {
-                continue;
-            }
-
-            messages.add(m);
-        }
-        return messages;
-    }
-}

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

@@ -1,8 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-public class MobileInboxFilterOptionsAttrs {
-    public static final String fromDateTime = "fromDateTime";
-    public static final String toDateTime = "toDateTime";
-    public static final String topic = "topic";
-    public static final String limit = "limit";
-}

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

@@ -1,84 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import androidx.annotation.NonNull;
-import android.util.Log;
-
-import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
-import org.infobip.mobile.messaging.inbox.MobileInboxFilterOptions;
-import org.infobip.reactlibrary.mobilemessaging.Utils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Inbox filter data mapper for JSON conversion
- */
-public class MobileInboxFilterOptionsJson extends MobileInboxFilterOptions {
-
-    private static final JsonSerializer nullSerializer = new JsonSerializer(true);
-
-    public MobileInboxFilterOptionsJson(Date fromDateTime, Date toDateTime, String topic, Integer limit) {
-        super(fromDateTime, toDateTime, topic, limit);
-    }
-
-    public static JSONObject toJSON(final MobileInboxFilterOptions mobileInboxFilterOptions) {
-        if (mobileInboxFilterOptions == null) {
-            return new JSONObject();
-        }
-        try {
-            return new JSONObject(nullSerializer.serialize(mobileInboxFilterOptions));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    @NonNull
-    public static MobileInboxFilterOptions resolveMobileInboxFilterOptions(JSONObject args) throws IllegalArgumentException {
-        if (args == null) {
-            throw new IllegalArgumentException("Cannot resolve inbox filters from arguments");
-        }
-        return MobileInboxFilterOptionsJson.mobileInboxFilterOptionsFromJSON(args);
-    }
-
-    private static MobileInboxFilterOptions mobileInboxFilterOptionsFromJSON(JSONObject json) throws IllegalArgumentException {
-        MobileInboxFilterOptions mobileInboxFilterOptions = null;
-        String fromDate = null;
-        String toDate = null;
-        String topic = null;
-        Integer limit = null;
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
-        try {
-            if (json.has(MobileInboxFilterOptionsAttrs.fromDateTime)) {
-                fromDate = json.optString(MobileInboxFilterOptionsAttrs.fromDateTime);
-            }
-            if (json.has(MobileInboxFilterOptionsAttrs.toDateTime)) {
-                toDate = json.optString(MobileInboxFilterOptionsAttrs.toDateTime);
-            }
-            if (json.has(MobileInboxFilterOptionsAttrs.topic)) {
-                topic = json.optString(MobileInboxFilterOptionsAttrs.topic);
-            }
-            if (json.has(MobileInboxFilterOptionsAttrs.limit)) {
-                limit = json.optInt(MobileInboxFilterOptionsAttrs.limit);
-            }
-            mobileInboxFilterOptions = new MobileInboxFilterOptions(null, null, null, null);
-            if(fromDate != null) {
-                mobileInboxFilterOptions.setFromDateTime(sdf.parse(fromDate));
-            }
-            if(toDate != null) {
-                mobileInboxFilterOptions.setToDateTime(sdf.parse(toDate));
-            }
-            if(topic != null) {
-                mobileInboxFilterOptions.setTopic(topic);
-            }
-            if(limit != null) {
-                mobileInboxFilterOptions.setLimit(limit);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return mobileInboxFilterOptions;
-    }
-}

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

@@ -1,26 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import org.infobip.mobile.messaging.UserAttributes;
-import org.infobip.mobile.messaging.UserIdentity;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class PersonalizationCtx {
-    public UserIdentity userIdentity;
-    public UserAttributes userAttributes;
-    public boolean forceDepersonalize;
-    public boolean keepAsLead;
-
-    public static PersonalizationCtx resolvePersonalizationCtx(JSONObject args) throws JSONException, IllegalArgumentException {
-        if (args == null) {
-            throw new IllegalArgumentException("Cannot resolve personalization context from arguments");
-        }
-
-        PersonalizationCtx ctx = new PersonalizationCtx();
-        ctx.forceDepersonalize = args.optBoolean("forceDepersonalize", false);
-        ctx.userIdentity = UserJson.userIdentityFromJson(args.getJSONObject("userIdentity"));
-        ctx.userAttributes = UserJson.userAttributesFromJson(args.optJSONObject("userAttributes"));
-        ctx.keepAsLead = args.optBoolean("keepAsLead", false);
-        return ctx;
-    }
-}

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

@@ -1,212 +0,0 @@
-package org.infobip.reactlibrary.mobilemessaging.datamappers;
-
-import androidx.annotation.NonNull;
-
-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.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 java.text.ParseException;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * User data mapper for JSON conversion
- */
-public class UserJson extends User {
-
-    public static JSONObject toJSON(final User user) {
-        if (user == null) {
-            return new JSONObject();
-        }
-        try {
-            JSONObject jsonObject = new JSONObject(UserMapper.toJson(user));
-            cleanupJsonMapForClient(user.getCustomAttributes(), jsonObject);
-            return jsonObject;
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    @NonNull
-    public static User resolveUser(JSONObject args) throws IllegalArgumentException {
-        if (args == null) {
-            throw new IllegalArgumentException("Cannot resolve user from arguments");
-        }
-
-        return UserJson.fromJSON(args);
-    }
-
-    public static ReadableMap toReadableMap(final User user) {
-        try {
-            return ReactNativeJson.convertJsonToMap(toJSON(user));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private static User fromJSON(JSONObject json) throws IllegalArgumentException {
-        User user = new User();
-
-        try {
-            if (json.has(UserAtts.externalUserId)) {
-                user.setExternalUserId(json.optString(UserAtts.externalUserId));
-            }
-            if (json.has(UserAtts.firstName)) {
-                user.setFirstName(json.optString(UserAtts.firstName));
-            }
-            if (json.has(UserAtts.lastName)) {
-                user.setLastName(json.optString(UserAtts.lastName));
-            }
-            if (json.has(UserAtts.middleName)) {
-                user.setMiddleName(json.optString(UserAtts.middleName));
-            }
-            if (json.has(UserAtts.gender)) {
-                user.setGender(UserMapper.genderFromBackend(json.optString(UserAtts.gender)));
-            }
-            if (json.has(UserAtts.birthday)) {
-                Date bday = null;
-                try {
-                    bday = DateTimeUtil.dateFromYMDString(json.optString(UserAtts.birthday));
-                    user.setBirthday(bday);
-                } catch (ParseException e) {
-                }
-            }
-            if (json.has(UserAtts.phones)) {
-                user.setPhones(jsonArrayFromJsonObjectToSet(json, UserAtts.phones));
-            }
-            if (json.has(UserAtts.emails)) {
-                user.setEmails(jsonArrayFromJsonObjectToSet(json, UserAtts.emails));
-            }
-            if (json.has(UserAtts.tags)) {
-                user.setTags(jsonArrayFromJsonObjectToSet(json, UserAtts.tags));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        try {
-            if (json.has(UserAtts.customAttributes)) {
-                java.lang.reflect.Type type = new TypeToken<Map<String, Object>>() {
-                }.getType();
-                Map<String, Object> customAttributes = new JsonSerializer().deserialize(json.optString(UserAtts.customAttributes), type);
-                if (!CustomAttributesMapper.validate(customAttributes)) {
-                    throw new IllegalArgumentException("Custom attributes are invalid.");
-                }
-                user.setCustomAttributes(CustomAttributesMapper.customAttsFromBackend(customAttributes));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return user;
-    }
-
-    public static UserAttributes userAttributesFromJson(JSONObject json) throws IllegalArgumentException {
-        if (json == null) {
-            return null;
-        }
-
-        UserAttributes userAttributes = new UserAttributes();
-
-        try {
-            if (json.has(UserAtts.firstName)) {
-                userAttributes.setFirstName(json.optString(UserAtts.firstName));
-            }
-            if (json.has(UserAtts.lastName)) {
-                userAttributes.setLastName(json.optString(UserAtts.lastName));
-            }
-            if (json.has(UserAtts.middleName)) {
-                userAttributes.setMiddleName(json.optString(UserAtts.middleName));
-            }
-            if (json.has(UserAtts.gender)) {
-                userAttributes.setGender(UserMapper.genderFromBackend(json.optString(UserAtts.gender)));
-            }
-            if (json.has(UserAtts.birthday)) {
-                Date bday = null;
-                try {
-                    bday = DateTimeUtil.dateFromYMDString(json.optString(UserAtts.birthday));
-                    userAttributes.setBirthday(bday);
-                } catch (ParseException e) {
-                }
-            }
-            if (json.has(UserAtts.tags)) {
-                userAttributes.setTags(jsonArrayFromJsonObjectToSet(json, UserAtts.tags));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        try {
-            if (json.has(UserAtts.customAttributes)) {
-                java.lang.reflect.Type type = new TypeToken<Map<String, Object>>() {
-                }.getType();
-                Map<String, Object> customAttributes = new JsonSerializer().deserialize(json.optString(UserAtts.customAttributes), type);
-                if (!CustomAttributesMapper.validate(customAttributes)) {
-                    throw new IllegalArgumentException("Custom attributes are invalid.");
-                }
-                userAttributes.setCustomAttributes(CustomAttributesMapper.customAttsFromBackend(customAttributes));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return userAttributes;
-    }
-
-    public static UserIdentity userIdentityFromJson(JSONObject json) {
-        UserIdentity userIdentity = new UserIdentity();
-        try {
-            if (json.has(UserAtts.externalUserId)) {
-                userIdentity.setExternalUserId(json.optString(UserAtts.externalUserId));
-            }
-            if (json.has(UserAtts.phones)) {
-                userIdentity.setPhones(jsonArrayFromJsonObjectToSet(json, UserAtts.phones));
-            }
-            if (json.has(UserAtts.emails)) {
-                userIdentity.setEmails(jsonArrayFromJsonObjectToSet(json, UserAtts.emails));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return userIdentity;
-    }
-
-    private static Set<String> jsonArrayFromJsonObjectToSet(JSONObject jsonObject, String arrayName) {
-        Set<String> set = new HashSet<String>();
-        JSONArray jsonArray = jsonObject.optJSONArray(arrayName);
-        if (jsonArray != null) {
-            for (int i = 0; i < jsonArray.length(); i++) {
-                set.add(jsonArray.optString(i));
-            }
-        }
-        return set;
-    }
-
-    //TODO: duplicates in InstallationJson
-    private static void cleanupJsonMapForClient(Map<String, CustomAttributeValue> customAttributes, JSONObject jsonObject) throws JSONException {
-        jsonObject.remove("map");
-        if (jsonObject.has("customAttributes")) {
-            if (customAttributes != null) {
-                jsonObject.put("customAttributes", new JSONObject(CustomAttributesMapper.customAttsToBackend(customAttributes)));
-            }
-        }
-    }
-}