react-native-radar 3.19.1 → 3.20.1-beta.1

package/android/build.gradle

@@ -18,7 +18,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.19.1'
+        versionName '3.20.1-beta.1'
+        consumerProguardFiles 'proguard-rules.pro'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +46,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.19.0'
+    api 'io.radar:sdk:3.21.1'
 }
 

package/android/proguard-rules.pro

@@ -0,0 +1,4 @@
+-dontwarn com.huawei.**
+
+-dontwarn com.google.android.play.integrity.**
+-dontwarn com.google.android.play.core.integrity.**

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.19.1");
+        editor.putString("x_platform_sdk_version", "3.20.1-beta.1");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -431,6 +431,16 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         Radar.trackVerified(beaconsTrackingOption, accuracyLevel, trackCallback);
     }
 
+    @ReactMethod
+    public void isTrackingVerified(final Promise promise) {
+        promise.resolve(Radar.isTrackingVerified());
+    }
+
+    @ReactMethod
+    public void setProduct(String product) {
+        Radar.setProduct(product);
+    }
+
     @ReactMethod
     public void getVerifiedLocationToken(final Promise promise) {
         Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
@@ -861,6 +871,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         Map<String, String> chainMetadata = RNRadarUtils.stringStringMap(optionsMap.getMap("chainMetadata"));
         String[] categories = optionsMap.hasKey("categories") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("categories")) : null;
         String[] groups = optionsMap.hasKey("groups") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("groups")) : null;
+        String[] countryCodes = optionsMap.hasKey("countryCodes") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("countryCodes")) : null;
         int limit = optionsMap.hasKey("limit") ? optionsMap.getInt("limit") : 10;
 
         Radar.RadarSearchPlacesCallback callback = new Radar.RadarSearchPlacesCallback() {
@@ -888,9 +899,9 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         };
 
         if (near != null) {
-            Radar.searchPlaces(near, radius, chains, chainMetadata, categories, groups, limit, callback);
+            Radar.searchPlaces(near, radius, chains, chainMetadata, categories, groups, countryCodes, limit, callback);
         } else {
-            Radar.searchPlaces(radius, chains, chainMetadata, categories, groups, limit, callback);
+            Radar.searchPlaces(radius, chains, chainMetadata, categories, groups, countryCodes, limit, callback);
         }
     }
 

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

@@ -21,6 +21,8 @@ export interface RadarNativeInterface {
     startTrackingContinuous: () => void;
     startTrackingCustom: (options: RadarTrackingOptions) => void;
     startTrackingVerified: (options?: RadarVerifiedTrackingOptions) => void;
+    isTrackingVerified: () => Promise<boolean>;
+    setProduct(product: string): void;
     mockTracking: (options: RadarMockTrackingOptions) => void;
     stopTracking: () => void;
     stopTrackingVerified: () => void;

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

@@ -111,6 +111,7 @@ export interface RadarSearchPlacesOptions {
     chainMetadata?: RadarMetadata;
     categories?: string[];
     groups?: string[];
+    countryCodes?: string[];
     limit?: number;
 }
 export interface RadarAutocompleteOptions {

package/dist/index.native.js

@@ -50,6 +50,8 @@ const mockTracking = (options) => react_native_1.NativeModules.RNRadar.mockTrack
 const stopTracking = () => react_native_1.NativeModules.RNRadar.stopTracking();
 const stopTrackingVerified = () => react_native_1.NativeModules.RNRadar.stopTrackingVerified();
 const isTracking = () => react_native_1.NativeModules.RNRadar.isTracking();
+const isTrackingVerified = () => react_native_1.NativeModules.RNRadar.isTrackingVerified();
+const setProduct = (product) => react_native_1.NativeModules.RNRadar.setProduct(product);
 const getTrackingOptions = () => react_native_1.NativeModules.RNRadar.getTrackingOptions();
 const isUsingRemoteTrackingOptions = () => react_native_1.NativeModules.RNRadar.isUsingRemoteTrackingOptions();
 const setForegroundServiceOptions = (options) => react_native_1.NativeModules.RNRadar.setForegroundServiceOptions(options);
@@ -100,6 +102,8 @@ const Radar = {
     getLocation,
     trackOnce,
     trackVerified,
+    isTrackingVerified,
+    setProduct,
     getVerifiedLocationToken,
     clearVerifiedLocationToken,
     startTrackingEfficient,

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.20.1"
+github "radarlabs/radar-sdk-ios" "3.21.1"

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.19.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.20.1-beta.1" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -194,6 +194,10 @@ RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolve
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     if (background && status == kCLAuthorizationStatusAuthorizedWhenInUse) {
         [locationManager requestAlwaysAuthorization];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleAppBecomingActive)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
     } else if (status == kCLAuthorizationStatusNotDetermined) {
         [locationManager requestWhenInUseAuthorization];
     } else {
@@ -201,6 +205,15 @@ RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolve
     }
 }
 
+- (void)handleAppBecomingActive
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+     if (permissionsRequestResolver) {
+        [self getPermissionsStatusWithResolver:permissionsRequestResolver rejecter:nil];
+        permissionsRequestResolver = nil;
+    }
+}
+
 RCT_EXPORT_METHOD(getLocation:(NSString *)desiredAccuracy resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
@@ -349,6 +362,15 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
     [Radar trackVerifiedWithBeacons:beacons desiredAccuracy:desiredAccuracy completionHandler:completionHandler];
 }
 
+RCT_EXPORT_METHOD(isTrackingVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL res = [Radar isTrackingVerified];
+    resolve(@(res));
+}
+
+RCT_EXPORT_METHOD(setProduct:(NSString *)product) {
+    [Radar setProduct:product];
+}
+
 RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
@@ -720,6 +742,7 @@ RCT_EXPORT_METHOD(searchPlaces:(NSDictionary *)optionsDict resolve:(RCTPromiseRe
     NSDictionary *chainMetadata = optionsDict[@"chainMetadata"];
     NSArray *categories = optionsDict[@"categories"];
     NSArray *groups = optionsDict[@"groups"];
+    NSArray *countryCodes = optionsDict[@"countryCodes"];
     NSNumber *limitNumber = optionsDict[@"limit"];
     int limit;
     if (limitNumber != nil && [limitNumber isKindOfClass:[NSNumber class]]) {
@@ -750,9 +773,9 @@ RCT_EXPORT_METHOD(searchPlaces:(NSDictionary *)optionsDict resolve:(RCTPromiseRe
     };
 
     if (near) {
-        [Radar searchPlacesNear:near radius:radius chains:chains chainMetadata:chainMetadata categories:categories groups:groups limit:limit completionHandler:completionHandler];
+        [Radar searchPlacesNear:near radius:radius chains:chains chainMetadata:chainMetadata categories:categories groups:groups countryCodes:countryCodes limit:limit completionHandler:completionHandler];
     } else {
-        [Radar searchPlacesWithRadius:radius chains:chains chainMetadata:chainMetadata categories:categories groups:groups limit:limit completionHandler:completionHandler];
+        [Radar searchPlacesWithRadius:radius chains:chains chainMetadata:chainMetadata categories:categories groups:groups countryCodes:countryCodes limit:limit completionHandler:completionHandler];
     }
 }
 

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

package/plugin/build/types.d.ts

@@ -5,7 +5,8 @@ export interface RadarPluginProps {
     iosNSLocationAlwaysAndWhenInUseUsageDescription?: string;
     iosBackgroundMode?: boolean;
     androidBackgroundPermission?: boolean;
-    androidFineLocationPermission?: boolean;
+    androidForegroundService?: boolean;
+    androidActivityRecognition?: boolean;
     addRadarSDKMotion?: boolean;
     iosNSMotionUsageDescription?: string;
 }

package/plugin/build/withRadarAndroid.js

@@ -7,12 +7,8 @@ exports.withRadarAndroid = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const { addPermission } = config_plugins_1.AndroidConfig.Permissions;
 const withRadarAndroid = (config, args) => {
-    config = (0, config_plugins_1.withAndroidManifest)(config, async (config) => {
-        config.modResults = await setCustomConfigAsync(config, config.modResults, args);
-        return config;
-    });
+    config = withAndroidPermissions(config, args);
     config = (0, config_plugins_1.withDangerousMod)(config, [
         "android",
         async (config) => {
@@ -60,30 +56,19 @@ const withRadarAndroid = (config, args) => {
     });
 };
 exports.withRadarAndroid = withRadarAndroid;
-async function setCustomConfigAsync(config, androidManifest, args) {
-    if (!androidManifest.manifest["uses-permission"]) {
-        androidManifest.manifest["uses-permission"] = [];
-    }
-    // Add permissions
-    if (args.androidFineLocationPermission &&
-        !androidManifest.manifest["uses-permission"].some((e) => e["$"]["android:name"] === "android.permission.ACCESS_FINE_LOCATION")) {
-        addPermission(androidManifest, "android.permission.ACCESS_FINE_LOCATION");
-    }
-    if (args.androidBackgroundPermission &&
-        !androidManifest.manifest["uses-permission"].some((e) => e["$"]["android:name"] ===
-            "android.permission.ACCESS_BACKGROUND_LOCATION")) {
-        addPermission(androidManifest, "android.permission.ACCESS_BACKGROUND_LOCATION");
-    }
-    if (!androidManifest.manifest["uses-permission"].some((e) => e["$"]["android:name"] === "android.permission.ACCESS_COARSE_LOCATION")) {
-        addPermission(androidManifest, "android.permission.ACCESS_COARSE_LOCATION");
-    }
-    if (!androidManifest.manifest["uses-permission"].some((e) => e["$"]["android:name"] === "android.permission.FOREGROUND_SERVICE")) {
-        addPermission(androidManifest, "android.permission.FOREGROUND_SERVICE");
-    }
-    if (!androidManifest.manifest["uses-permission"].some((e) => e["$"]["android:name"] === "android.permission.ACTIVITY_RECOGNITION")) {
-        addPermission(androidManifest, "android.permission.ACTIVITY_RECOGNITION");
-    }
-    return androidManifest;
+function withAndroidPermissions(config, args) {
+    const isAndroidBackgroundLocationEnabled = !!args.androidBackgroundPermission;
+    const enableAndroidForegroundService = !!args.androidForegroundService;
+    const enableAndroidActivityRecognition = !!args.androidActivityRecognition;
+    return config_plugins_1.AndroidConfig.Permissions.withPermissions(config, [
+        isAndroidBackgroundLocationEnabled &&
+            "android.permission.ACCESS_BACKGROUND_LOCATION",
+        enableAndroidForegroundService && "android.permission.FOREGROUND_SERVICE",
+        enableAndroidForegroundService &&
+            "android.permission.FOREGROUND_SERVICE_LOCATION",
+        enableAndroidActivityRecognition &&
+            "android.permission.ACTIVITY_RECOGNITION",
+    ].filter(Boolean));
 }
 function modifyAppBuildGradle(buildGradle, androidFraud) {
     let hasLocationService = false;
@@ -96,7 +81,10 @@ function modifyAppBuildGradle(buildGradle, androidFraud) {
     }
     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.");
+        throw new Error(`Failed to find react.gradle script in android/app/build.gradle.
+      This is required for react-native-radar to function properly.
+      Please ensure your android/app/build.gradle includes the react.gradle script.
+      Current build.gradle content: ${buildGradle}`);
     }
     let replacementString = "\n\n" +
         (!hasLocationService

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.20.1'") === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.21.1'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -60,7 +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.20.1'`);
+                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.21.1'`);
                         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

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