react-native-radar 3.19.0-beta.2 → 3.19.0

package/android/build.gradle

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

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.5");
+        editor.putString("x_platform_sdk_version", "3.19.0");
         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) {
-        Activity activity =getCurrentActivity();
+        PermissionAwareActivity activity = (PermissionAwareActivity)getCurrentActivity();
         mPermissionsRequestPromise = promise;
         if (activity != null) {
             if (Build.VERSION.SDK_INT >= 23) {
                 if (background && Build.VERSION.SDK_INT >= 29) {
-                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE);
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 } else {
-                    ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE);
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 }
             }
         }
@@ -383,11 +383,24 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     public void trackVerified(ReadableMap optionsMap, final Promise promise) {
 
         boolean beaconsTrackingOption = false;
+        RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
 
         if (optionsMap != null) {
             if (optionsMap.hasKey("beacons")) {
                 beaconsTrackingOption = optionsMap.getBoolean("beacons");
             }
+            if (optionsMap.hasKey("desiredAccuracy")) {
+                String desiredAccuracy = optionsMap.getString("desiredAccuracy").toLowerCase();
+                if (desiredAccuracy.equals("none")) {
+                    accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.NONE;
+                } else if (desiredAccuracy.equals("low")) {
+                    accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.LOW;
+                } else if (desiredAccuracy.equals("medium")) {
+                    accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
+                } else if (desiredAccuracy.equals("high")) {
+                    accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.HIGH;
+                }
+            }
         }
 
         Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
@@ -415,7 +428,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             }
         };
 
-        Radar.trackVerified(beaconsTrackingOption, trackCallback);
+        Radar.trackVerified(beaconsTrackingOption, accuracyLevel, trackCallback);
     }
 
     @ReactMethod
@@ -449,13 +462,8 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void startVerifyServer() {
-        Radar.startVerifyServer();
-    }
-
-    @ReactMethod
-    public void stopVerifyServer() {
-        Radar.stopVerifyServer();
+    public void clearVerifiedLocationToken() {
+        Radar.clearVerifiedLocationToken();
     }
 
     @ReactMethod

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

@@ -15,8 +15,7 @@ export interface RadarNativeInterface {
     trackOnce: (options?: RadarTrackOnceOptions | Location) => Promise<RadarTrackCallback>;
     trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackVerifiedCallback>;
     getVerifiedLocationToken: () => Promise<RadarTrackVerifiedCallback>;
-    startVerifyServer: () => void;
-    stopVerifyServer: () => void;
+    clearVerifiedLocationToken: () => void;
     startTrackingEfficient: () => void;
     startTrackingResponsive: () => void;
     startTrackingContinuous: () => void;

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

@@ -6,6 +6,7 @@ export interface RadarTrackOnceOptions {
 }
 export interface RadarTrackVerifiedOptions {
     beacons?: boolean;
+    desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy;
 }
 /**
  * Options for tracking the user's location.

package/dist/index.native.js

@@ -40,8 +40,7 @@ const trackOnce = (options) => {
 };
 const trackVerified = (options) => react_native_1.NativeModules.RNRadar.trackVerified(options);
 const getVerifiedLocationToken = () => react_native_1.NativeModules.RNRadar.getVerifiedLocationToken();
-const startVerifyServer = () => react_native_1.NativeModules.RNRadar.startVerifyServer();
-const stopVerifyServer = () => react_native_1.NativeModules.RNRadar.stopVerifyServer();
+const clearVerifiedLocationToken = () => react_native_1.NativeModules.RNRadar.clearVerifiedLocationToken();
 const startTrackingEfficient = () => react_native_1.NativeModules.RNRadar.startTrackingEfficient();
 const startTrackingResponsive = () => react_native_1.NativeModules.RNRadar.startTrackingResponsive();
 const startTrackingContinuous = () => react_native_1.NativeModules.RNRadar.startTrackingContinuous();
@@ -102,8 +101,7 @@ const Radar = {
     trackOnce,
     trackVerified,
     getVerifiedLocationToken,
-    startVerifyServer,
-    stopVerifyServer,
+    clearVerifiedLocationToken,
     startTrackingEfficient,
     startTrackingResponsive,
     startTrackingContinuous,

package/dist/index.web.d.ts

@@ -15,8 +15,6 @@ declare namespace Radar {
     export { trackOnce };
     export { trackVerified };
     export { getVerifiedLocationToken };
-    export { startVerifyServer };
-    export { stopVerifyServer };
     export { startTrackingEfficient };
     export { startTrackingResponsive };
     export { startTrackingContinuous };
@@ -73,8 +71,6 @@ declare function getLocation(): Promise<any>;
 declare function trackOnce(options: any): Promise<any>;
 declare function trackVerified(): Promise<any>;
 declare function getVerifiedLocationToken(): Promise<any>;
-declare function startVerifyServer(): void;
-declare function stopVerifyServer(): void;
 declare function startTrackingEfficient(): void;
 declare function startTrackingResponsive(): void;
 declare function startTrackingContinuous(): void;

package/dist/index.web.js

@@ -118,14 +118,6 @@ const getVerifiedLocationToken = () => {
         throw new Error("getVerifiedLocationToken() is not implemented on web");
     return new Promise((resolve, reject) => { reject("getVerifiedLocationToken() is not implemented on web"); });
 };
-const startVerifyServer = () => {
-    if (throws)
-        throw new Error("startVerifyServer() is not implemented on web");
-};
-const stopVerifyServer = () => {
-    if (throws)
-        throw new Error("stopVerifyServer() is not implemented on web");
-};
 const startTrackingEfficient = () => {
     if (throws)
         throw new Error("startTrackingEfficient() is not implemented on web");
@@ -479,8 +471,6 @@ const Radar = {
     trackOnce,
     trackVerified,
     getVerifiedLocationToken,
-    startVerifyServer,
-    stopVerifyServer,
     startTrackingEfficient,
     startTrackingResponsive,
     startTrackingContinuous,

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.18.5"
+github "radarlabs/radar-sdk-ios" "3.19.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.5" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.19.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -307,11 +307,25 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
 
 RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     BOOL beacons = NO;
+    RadarTrackingOptionsDesiredAccuracy desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
+
     if (optionsDict != nil) {
         NSNumber *beaconsNumber = optionsDict[@"beacons"];
         if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
             beacons = [beaconsNumber boolValue]; 
         }
+
+        NSString *accuracy = optionsDict[@"desiredAccuracy"];
+        if (accuracy != nil && [accuracy isKindOfClass:[NSString class]]) {
+            NSString *lowerAccuracy = [accuracy lowercaseString];
+            if ([lowerAccuracy isEqualToString:@"high"]) {
+                desiredAccuracy = RadarTrackingOptionsDesiredAccuracyHigh;
+            } else if ([lowerAccuracy isEqualToString:@"medium"]) {
+                desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
+            } else if ([lowerAccuracy isEqualToString:@"low"]) {
+                desiredAccuracy = RadarTrackingOptionsDesiredAccuracyLow;
+            }
+        }
     }
 
     __block RCTPromiseResolveBlock resolver = resolve;
@@ -332,7 +346,7 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
         rejecter = nil;
     };
 
-    [Radar trackVerifiedWithBeacons:beacons completionHandler:completionHandler];
+    [Radar trackVerifiedWithBeacons:beacons desiredAccuracy:desiredAccuracy completionHandler:completionHandler];
 }
 
 RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
@@ -357,12 +371,8 @@ RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve rejec
     [Radar getVerifiedLocationToken:completionHandler];
 }
 
-RCT_EXPORT_METHOD(startVerifyServer) {
-    [Radar startVerifyServer];
-}
-
-RCT_EXPORT_METHOD(stopVerifyServer) {
-    [Radar stopVerifyServer];
+RCT_EXPORT_METHOD(clearVerifiedLocationToken) {
+    [Radar clearVerifiedLocationToken];
 }
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {

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

package/plugin/build/types.d.ts

@@ -8,5 +8,4 @@ export interface RadarPluginProps {
     androidFineLocationPermission?: boolean;
     addRadarSDKMotion?: boolean;
     iosNSMotionUsageDescription?: string;
-    addRadarSDKVerify?: boolean;
 }

package/plugin/build/withRadarAndroid.js

@@ -33,7 +33,6 @@ const withRadarAndroid = (config, args) => {
           <!-- for React Native -->
           <domain-config cleartextTrafficPermitted="true">
               <domain includeSubdomains="true">localhost</domain>
-              <domain includeSubdomains="true">10.0.2.2</domain>
           </domain-config>
       
           <!-- for SSL pinning -->
@@ -52,7 +51,7 @@ const withRadarAndroid = (config, args) => {
     ]);
     return (0, config_plugins_1.withAppBuildGradle)(config, (config) => {
         if (config.modResults.language === "groovy") {
-            config.modResults.contents = modifyAppBuildGradle(config.modResults.contents, args.androidFraud ?? false, args.addRadarSDKVerify ?? false);
+            config.modResults.contents = modifyAppBuildGradle(config.modResults.contents, args.androidFraud ?? false);
         }
         else {
             throw new Error("Cannot configure Sentry in the app gradle because the build.gradle is not groovy");
@@ -86,19 +85,15 @@ async function setCustomConfigAsync(config, androidManifest, args) {
     }
     return androidManifest;
 }
-function modifyAppBuildGradle(buildGradle, androidFraud, addRadarSDKVerify) {
+function modifyAppBuildGradle(buildGradle, androidFraud) {
     let hasLocationService = false;
     let hasPlayIntegrity = false;
-    let hasNanoHTTPD = false;
     if (buildGradle.includes('com.google.android.gms:play-services-location:21.0.1"')) {
         hasLocationService = true;
     }
     if (buildGradle.includes('com.google.android.play:integrity:1.2.0"')) {
         hasPlayIntegrity = true;
     }
-    if (buildGradle.includes('org.nanohttpd:nanohttpd:2.3.1"')) {
-        hasNanoHTTPD = true;
-    }
     const pattern = /^dependencies {/m;
     if (!buildGradle.match(pattern)) {
         config_plugins_1.WarningAggregator.addWarningAndroid("react-native-radar", "Could not find react.gradle script in android/app/build.gradle.");
@@ -111,9 +106,5 @@ function modifyAppBuildGradle(buildGradle, androidFraud, addRadarSDKVerify) {
         replacementString +=
             "\n\n" + '    implementation "com.google.android.play:integrity:1.2.0"';
     }
-    if (addRadarSDKVerify && !hasNanoHTTPD) {
-        replacementString +=
-            "\n\n" + '    implementation "org.nanohttpd:nanohttpd:2.3.1"';
-    }
     return buildGradle.replace(pattern, (match) => match + replacementString);
 }

package/plugin/build/withRadarIOS.js

@@ -51,7 +51,7 @@ 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.5'") === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.19.4'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -60,33 +60,7 @@ const withRadarIOS = (config, args) => {
                         const targetEndIndex = contents.indexOf('end', targetStartIndex) + 3;
                         // Insert the pod declaration within the target block
                         const targetBlock = contents.substring(targetStartIndex, targetEndIndex);
-                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.18.5'`);
-                        const newContents = contents.replace(targetBlock, updatedTargetBlock);
-                        // Write the updated contents back to the Podfile
-                        await promises_1.default.writeFile(filePath, newContents);
-                    }
-                }
-                return config;
-            },
-        ]);
-    }
-    if (args.addRadarSDKVerify) {
-        config = (0, config_plugins_1.withDangerousMod)(config, [
-            'ios',
-            async (config) => {
-                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 'RadarSDK/Verify', '3.19.2-beta.9'") === -1) {
-                    // Find the target block
-                    const targetRegex = /target '(\w+)' do/g;
-                    const match = targetRegex.exec(contents);
-                    if (match) {
-                        const targetStartIndex = match.index;
-                        const targetEndIndex = contents.indexOf('end', targetStartIndex) + 3;
-                        // Insert the pod declaration within the target block
-                        const targetBlock = contents.substring(targetStartIndex, targetEndIndex);
-                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDK/Verify', '3.19.2-beta.9'\n    pod 'CocoaAsyncSocket', :modular_headers => true\n  pod 'HTTPParserC', :modular_headers => true`);
+                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.19.4'`);
                         const newContents = contents.replace(targetBlock, updatedTargetBlock);
                         // Write the updated contents back to the Podfile
                         await promises_1.default.writeFile(filePath, newContents);

package/react-native-radar.podspec

@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
   s.summary = package[:description]
   s.source = { git: package[:repository][:url] }
   s.source_files = "ios/*.{h,m}"
-  s.platform = :ios, "12.0"
+  s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.19.2-beta.9"
+  s.dependency "RadarSDK", "~> 3.20.0"
 end