fix android object conversion

Author: fadi-george

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -739,6 +739,6 @@ public void removeListeners(int count) {
 
     @ReactMethod
     public void trackEvent(String name, @Nullable ReadableMap properties) {
-        OneSignal.getUser().trackEvent(name, properties != null ? RNUtils.convertReadableMapIntoStringMap(properties) : null);
+        OneSignal.getUser().trackEvent(name, properties != null ? RNUtils.convertReadableMapToMap(properties) : null);
     }
 }

android/src/main/java/com/onesignal/rnonesignalandroid/RNUtils.java

@@ -284,6 +284,54 @@ public static HashMap<String, String> convertReadableMapIntoStringMap(ReadableMa
         return stringMap;
     }
 
+    public static Map<String, Object> convertReadableMapToMap(ReadableMap readableMap) {
+        Map<String, Object> map = new HashMap<>();
+        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+    
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            ReadableType type = readableMap.getType(key);
+            map.put(key, convertValue(type, readableMap, key));
+        }
+    
+        return map;
+    }
+    
+    public static List<Object> convertReadableArrayToList(ReadableArray readableArray) {
+        List<Object> list = new ArrayList<>();
+    
+        for (int i = 0; i < readableArray.size(); i++) {
+            ReadableType type = readableArray.getType(i);
+            list.add(convertValue(type, readableArray, i));
+        }
+    
+        return list;
+    }
+    
+    private static Object convertValue(ReadableType type, ReadableMap map, String key) {
+        switch (type) {
+            case Null: return null;
+            case Boolean: return map.getBoolean(key);
+            case Number: return map.getDouble(key);
+            case String: return map.getString(key);
+            case Map: return convertReadableMapToMap(map.getMap(key));
+            case Array: return convertReadableArrayToList(map.getArray(key));
+            default: throw new IllegalArgumentException("Unknown type for key: " + key);
+        }
+    }
+    
+    private static Object convertValue(ReadableType type, ReadableArray array, int index) {
+        switch (type) {
+            case Null: return null;
+            case Boolean: return array.getBoolean(index);
+            case Number: return array.getDouble(index);
+            case String: return array.getString(index);
+            case Map: return convertReadableMapToMap(array.getMap(index));
+            case Array: return convertReadableArrayToList(array.getArray(index));
+            default: throw new IllegalArgumentException("Unknown type for index: " + index);
+        }
+    }
+
     public static HashMap<String, Object> convertPermissionToMap(boolean granted) {
         HashMap<String, Object> hash = new HashMap<>();
 

examples/RNOneSignalTS/OSButtons.tsx

@@ -437,6 +437,7 @@ class OSButtons extends React.Component<Props> {
       OneSignal.User.trackEvent(`ReactNative-${platform}-noprops`);
       OneSignal.User.trackEvent(`ReactNative-${platform}`, {
         someNum: 123,
+        someFloat: 3.14159,
         someString: 'abc',
         someBool: true,
         someObject: {
@@ -445,7 +446,8 @@ class OSButtons extends React.Component<Props> {
             def: '456',
           },
         },
-        someArray: [1, 2, 3],
+        someArray: [1, 2, 3, 4],
+        someMixedArray: [1, '2', { abc: '123' }],
         someNull: null,
       });
     });

examples/RNOneSignalTS/OSDemo.tsx

@@ -38,7 +38,7 @@ class OSDemo extends React.Component<Props, State> {
 
   async componentDidMount() {
     OneSignal.initialize(APP_ID);
-    OneSignal.Debug.setLogLevel(LogLevel.None);
+    OneSignal.Debug.setLogLevel(LogLevel.Verbose);
 
     OneSignal.LiveActivities.setupDefault();
     // OneSignal.LiveActivities.setupDefault({