infobip-mobile-messaging-react-native-plugin 6.2.0 → 6.2.1

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/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/package.json

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