react-native-radar 3.18.2 → 3.18.3

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.18.2'
+        versionName '3.18.3'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.18.3'
+    api 'io.radar:sdk:3.18.5'
 }
 

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.2");
+        editor.putString("x_platform_sdk_version", "3.18.3");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -250,14 +250,14 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
     @ReactMethod
     public void requestPermissions(boolean background, final Promise promise) {
-        PermissionAwareActivity activity = (PermissionAwareActivity)getCurrentActivity();
+        Activity activity =getCurrentActivity();
         mPermissionsRequestPromise = promise;
         if (activity != null) {
             if (Build.VERSION.SDK_INT >= 23) {
                 if (background && Build.VERSION.SDK_INT >= 29) {
-                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
+                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE);
                 } else {
-                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
+                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE);
                 }
             }
         }
@@ -1113,6 +1113,28 @@ 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 {
+            @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());
+                    }
+                    promise.resolve(map);
+                } else {
+                    promise.reject(status.toString, status.toString());
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void getDistance(ReadableMap optionsMap, final Promise promise) {
         if (promise == null) {

package/dist/@types/RadarNativeInterface.d.ts

@@ -1,4 +1,4 @@
-import { Location, RadarAutocompleteOptions, RadarContextCallback, RadarAddressCallback, RadarEventChannel, RadarGeocodeOptions, RadarGetDistanceOptions, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarReverseGeocodeOptions, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackOnceOptions, RadarTrackVerifiedCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarVerifiedTrackingOptions, RadarListenerCallback, RadarGetMatrixOptions, RadarMetadata, RadarIPGeocodeCallback } from "./types";
+import { Location, RadarAddress, RadarAddressCallback, RadarAutocompleteOptions, RadarContextCallback, RadarEventChannel, RadarGeocodeOptions, RadarGetDistanceOptions, RadarGetMatrixOptions, RadarIPGeocodeCallback, RadarListenerCallback, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMetadata, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarReverseGeocodeOptions, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackOnceOptions, RadarTrackVerifiedCallback, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarValidateAddressCallback, RadarVerifiedTrackingOptions } from "./types";
 export interface RadarNativeInterface {
     initialize: (publishableKey: string, fraud?: boolean) => void;
     setLogLevel: (level: RadarLogLevel) => void;
@@ -42,6 +42,7 @@ export interface RadarNativeInterface {
     geocode: (options: RadarGeocodeOptions) => Promise<RadarAddressCallback>;
     reverseGeocode: (options?: RadarReverseGeocodeOptions) => Promise<RadarAddressCallback>;
     ipGeocode: () => Promise<RadarIPGeocodeCallback>;
+    validateAddress: (address: RadarAddress) => Promise<RadarValidateAddressCallback>;
     getDistance: (option: RadarGetDistanceOptions) => Promise<RadarRouteCallback>;
     getMatrix: (option: RadarGetMatrixOptions) => Promise<RadarRouteMatrix>;
     logConversion: (options: RadarLogConversionOptions) => Promise<RadarLogConversionCallback>;

package/dist/@types/types.d.ts

@@ -435,6 +435,15 @@ export interface RadarAddress {
     stateCode?: string;
     street?: string;
     unit?: string;
+    timeZone?: RadarTimeZone;
+}
+export interface RadarTimeZone {
+    id: string;
+    name: string;
+    code: string;
+    currentTime: string;
+    utcOffset: number;
+    dstOffset: number;
 }
 export type RadarVerificationStatus = "verified" | "partially verified" | "ambiguous" | "unverified";
 export interface RadarRoutes {

package/dist/@types/types.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RadarEventVerification = exports.RadarEventConfidence = exports.presetEfficient = exports.presetEfficientAndroid = exports.presetEfficientIOS = exports.presetResponsive = exports.presetResponsiveAndroid = exports.presetResponsiveIOS = exports.presetContinuous = exports.presetContinuousAndroid = exports.presetContinuousIOS = void 0;
 const react_native_1 = require("react-native");
+const platform = react_native_1.Platform.OS;
 exports.presetContinuousIOS = {
     desiredStoppedUpdateInterval: 30,
     desiredMovingUpdateInterval: 30,
@@ -45,7 +46,7 @@ exports.presetContinuousAndroid = {
     startTrackingAfter: undefined,
     stopTrackingAfter: undefined,
 };
-exports.presetContinuous = react_native_1.Platform.OS === 'ios' ? exports.presetContinuousIOS : exports.presetContinuousAndroid;
+exports.presetContinuous = platform === 'ios' ? exports.presetContinuousIOS : exports.presetContinuousAndroid;
 exports.presetResponsiveIOS = {
     desiredStoppedUpdateInterval: 0,
     desiredMovingUpdateInterval: 150,
@@ -89,7 +90,7 @@ exports.presetResponsiveAndroid = {
     startTrackingAfter: undefined,
     stopTrackingAfter: undefined,
 };
-exports.presetResponsive = react_native_1.Platform.OS === 'ios' ? exports.presetResponsiveIOS : exports.presetResponsiveAndroid;
+exports.presetResponsive = platform === 'ios' ? exports.presetResponsiveIOS : exports.presetResponsiveAndroid;
 exports.presetEfficientIOS = {
     desiredStoppedUpdateInterval: 0,
     desiredMovingUpdateInterval: 0,
@@ -133,7 +134,7 @@ exports.presetEfficientAndroid = {
     startTrackingAfter: undefined,
     stopTrackingAfter: undefined,
 };
-exports.presetEfficient = react_native_1.Platform.OS === 'ios' ? exports.presetEfficientIOS : exports.presetEfficientAndroid;
+exports.presetEfficient = platform === 'ios' ? exports.presetEfficientIOS : exports.presetEfficientAndroid;
 var RadarEventConfidence;
 (function (RadarEventConfidence) {
     RadarEventConfidence[RadarEventConfidence["none"] = 0] = "none";

package/dist/index.native.js

@@ -67,6 +67,7 @@ const autocomplete = (options) => react_native_1.NativeModules.RNRadar.autocompl
 const geocode = (options) => react_native_1.NativeModules.RNRadar.geocode(options);
 const reverseGeocode = (options) => react_native_1.NativeModules.RNRadar.reverseGeocode(options);
 const ipGeocode = () => react_native_1.NativeModules.RNRadar.ipGeocode();
+const validateAddress = (address) => react_native_1.NativeModules.RNRadar.validateAddress(address);
 const getDistance = (options) => react_native_1.NativeModules.RNRadar.getDistance(options);
 const getMatrix = (options) => react_native_1.NativeModules.RNRadar.getMatrix(options);
 const logConversion = (options) => react_native_1.NativeModules.RNRadar.logConversion(options);
@@ -126,6 +127,7 @@ const Radar = {
     geocode,
     reverseGeocode,
     ipGeocode,
+    validateAddress,
     getDistance,
     getMatrix,
     logConversion,

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.18.3"
+github "radarlabs/radar-sdk-ios" "3.18.4"

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.2" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.3" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -968,6 +968,33 @@ RCT_EXPORT_METHOD(ipGeocode:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRe
     }];
 }
 
+RCT_EXPORT_METHOD(validateAddress:(NSDictionary *)addressDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    __block RCTPromiseResolveBlock resolver = resolve;
+    __block RCTPromiseRejectBlock rejecter = reject;
+
+    RadarAddress *address = [RadarAddress addressFromObject:addressDict];
+
+    if (address == nil) {
+        reject([Radar stringForStatus:RadarStatusErrorBadRequest], [Radar stringForStatus:RadarStatusErrorBadRequest], nil);
+    }
+    
+    [Radar validateAddress:address completionHandler:^(RadarStatus status, RadarAddress * _Nullable address, RadarAddressVerificationStatus verificationStatus) {
+        if (status == RadarStatusSuccess && resolver) {
+            NSMutableDictionary *dict = [NSMutableDictionary new];
+            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
+            if (address) {
+                [dict setObject:[address dictionaryValue] forKey:@"address"];
+            }
+            dict[@"verificationStatus"] = [Radar stringForVerificationStatus: verificationStatus];
+            resolver(dict);
+        } else if (rejecter) {
+            rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
+        }
+        resolver = nil;
+        rejecter = nil;
+    }];
+}
+
 RCT_EXPORT_METHOD(getDistance:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     if (optionsDict == nil) {
         if (reject) {

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.2",
+  "version": "3.18.3",
   "main": "dist/index.js",
   "files": [
     "/android",

package/plugin/build/withRadarIOS.js

@@ -51,7 +51,8 @@ const withRadarIOS = (config, args) => {
                 const filePath = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile');
                 const contents = await promises_1.default.readFile(filePath, 'utf-8');
                 // Check if the pod declaration already exists
-                if (contents.indexOf("pod 'RadarSDKMotion', '3.18.3'") === -1) {
+                const RadarSDKMotionVersion = '3.18.3';
+                if (contents.indexOf(`pod 'RadarSDKMotion', ${RadarSDKMotionVersion}`) === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.18.3"
+  s.dependency "RadarSDK", "~> 3.18.4"
 end