react-native-ux-cam 5.4.13 → 5.4.14

package/CHANGELOG.md

@@ -5,6 +5,7 @@
 
 Version | Changes
 ------- | ----------
+5.4.14 | Updated iOS SDK to 3.6.9 and Android to 3.6.21
 5.4.13 | Updated iOS SDK to 3.6.7 and Android to 3.6.18, Updated minSdkVersion to 21 for Android
 5.4.12 | Updated iOS SDK to 3.6.6 and Android to 3.6.16
 5.4.11 | Updated iOS SDK to 3.6.5 and Android to 3.6.14

package/RNUxcam.podspec

@@ -17,6 +17,5 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React-Core'
-  s.dependency 'UXCam' , '~> 3.6.7'
-end
-
+  s.dependency 'UXCam' , '~> 3.6.9'
+end

package/android/build.gradle

@@ -43,5 +43,5 @@ rootProject.allprojects {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.uxcam:uxcam:3.6.18'
+    implementation 'com.uxcam:uxcam:3.6.21'
 }

package/android/src/main/java/com/uxcam/RNUxcamModule.java

@@ -3,6 +3,7 @@ package com.uxcam;
 import android.view.View;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.NoSuchKeyException;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -12,6 +13,7 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.UnexpectedNativeTypeException;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -35,7 +37,7 @@ import com.uxcam.datamodel.UXConfig;
 
 public class RNUxcamModule extends ReactContextBaseJavaModule {
     private static final String UXCAM_PLUGIN_TYPE = "react-native";
-    private static final String UXCAM_REACT_PLUGIN_VERSION = "5.4.13";
+    private static final String UXCAM_REACT_PLUGIN_VERSION = "5.4.14";
 
     private static final String UXCAM_VERIFICATION_EVENT_KEY = "UXCam_Verification_Event";
     private static final String PARAM_SUCCESS_KEY = "success";
@@ -306,32 +308,47 @@ public class RNUxcamModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void logEvent(String event) {
-      UXCam.logEvent(event);
+        UXCam.logEvent(event);
     }
 
     @ReactMethod
     public void logEvent(String event, ReadableMap properties) {
-        if (properties != null) {
-            
-            HashMap<String, Object> map = new HashMap<String, Object>();
+        HashMap<String, Object> convertedProperties = new HashMap<>();
 
+        if (properties != null) {
             ReadableMapKeySetIterator iterator = properties.keySetIterator();
+
             while (iterator.hasNextKey()) {
                 String key = iterator.nextKey();
                 ReadableType type = properties.getType(key);
-                if (type == ReadableType.Boolean) {
-                    map.put(key, properties.getBoolean(key));
-                } else if (type == ReadableType.Number) {
-                    map.put(key, properties.getDouble(key));
-                } else {
-                    map.put(key, properties.getString(key));
+                try {
+                    switch (type) {
+                        case Null:
+                            convertedProperties.put(key, "");
+                        case Boolean:
+                            convertedProperties.put(key, properties.getBoolean(key));
+                            break;
+                        case Number:
+                            convertedProperties.put(key, properties.getDouble(key));
+                            break;
+                        case String:
+                            convertedProperties.put(key, properties.getString(key));
+                            break;
+                        case Map:
+                            convertedProperties.put(key, properties.getMap(key).toString());
+                            break;
+                        case Array:
+                            convertedProperties.put(key, properties.getArray(key).toString());
+                            break;
+                    }
+                } catch (NullPointerException | NoSuchKeyException | UnexpectedNativeTypeException e) {
+                    convertedProperties.put(key, "");
+                    e.printStackTrace();
                 }
             }
-            UXCam.logEvent(event, map);
-        } else {
-            UXCam.logEvent(event);
         }
 
+        UXCam.logEvent(event, convertedProperties);
     }
 
     @ReactMethod

package/ios/RNUxcam.m

@@ -54,7 +54,7 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(startWithConfiguration:(NSDictionary *)config)
 {
     self.lastVerifyResult = nil;
-    [UXCam pluginType:@"react-native" version:@"5.4.13"];
+    [UXCam pluginType:@"react-native" version:@"5.4.14"];
     
     NSString *userAppKey = config[RNUxcam_AppKey];
     if (!userAppKey || ![userAppKey isKindOfClass:NSString.class])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ux-cam",
-  "version": "5.4.13",
+  "version": "5.4.14",
   "description": "React Native wrapper for uxcam.com.",
   "license": "MIT",
   "author": "admin@uxcam.com for UXCam Inc. after Mark Miyashita <negativetwelve@gmail.com>",