react-native-radar 3.18.3 → 3.18.4

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.18.3'
+        versionName '3.18.4'
     }
     lintOptions {
         abortOnError false

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -96,7 +96,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.18.3");
+        editor.putString("x_platform_sdk_version", "3.18.4");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -1115,21 +1115,37 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
     @ReactMethod
     public void validateAddress(ReadableMap addressMap, final Promise promise) {
-        RadarAddress address = RadarAddress.fromJson(RNRadarUtils.jsonForMap(addressMap));
-        Radar.validateAddress(address, new RadarValidateAddressCallback {
+        if (promise == null) {
+            return;
+        }
+
+        RadarAddress address;
+        try {
+            address = RadarAddress.fromJson(RNRadarUtils.jsonForMap(addressMap));
+        } catch (JSONException e) {
+            promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), Radar.RadarStatus.ERROR_BAD_REQUEST.toString());
+            return;
+        }
+        Radar.validateAddress(address, new Radar.RadarValidateAddressCallback() {
             @Override
-            onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress address, @Nullable RadarAddressVerificationStatus verificationStatus) {
-                if (status == Radar.RadarStatus.SUCCESS && ) {
-                    map.putString("status", status.toString());
-                    if (address != null) {
-                        map.putMap("address", RNRadarUtils.mapForJson(address.toJson()));
-                    }
-                    if (verificationStatus != null) {
-                        map.putString("verificationStatus", verificationStatus.toString());
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress address, @Nullable Radar.RadarAddressVerificationStatus verificationStatus) {
+                if (status == Radar.RadarStatus.SUCCESS) {
+                    try {
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (address != null) {
+                            map.putMap("address", RNRadarUtils.mapForJson(address.toJson()));
+                        }
+                        if (verificationStatus != null) {
+                            map.putString("verificationStatus", verificationStatus.toString());
+                        }
+                        promise.resolve(map);
+                    } catch (JSONException e) {
+                        Log.e(TAG, "JSONException", e);
+                        promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                     }
-                    promise.resolve(map);
                 } else {
-                    promise.reject(status.toString, status.toString());
+                    promise.reject(status.toString(), status.toString());
                 }
             }
         });

package/ios/RNRadar.m

@@ -102,7 +102,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.3" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.4" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.18.3",
+  "version": "3.18.4",
   "main": "dist/index.js",
   "files": [
     "/android",