react-native-radar 3.16.0 → 3.18.0

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.15.0'
+        versionName '3.18.0'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.16.2'
+    api 'io.radar:sdk:3.18.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.15.0");
+        editor.putString("x_platform_sdk_version", "3.18.0");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -971,19 +971,31 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             return;
         }
 
-        if (!optionsMap.hasKey("query") || !optionsMap.hasKey("near")) {
+        if (!optionsMap.hasKey("query")) {
             promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), Radar.RadarStatus.ERROR_BAD_REQUEST.toString());
 
             return;
         }
 
         String query = optionsMap.getString("query");
-        ReadableMap nearMap = optionsMap.getMap("near");
-        double latitude = nearMap.getDouble("latitude");
-        double longitude = nearMap.getDouble("longitude");
-        Location near = new Location("RNRadarModule");
-        near.setLatitude(latitude);
-        near.setLongitude(longitude);
+        Location near = null;
+
+        if (optionsMap.hasKey("near")) {
+            ReadableMap nearMap = optionsMap.getMap("near");
+            if (nearMap != null && nearMap.hasKey("latitude") && nearMap.hasKey("longitude")) {
+                try {
+                    double latitude = nearMap.getDouble("latitude");
+                    double longitude = nearMap.getDouble("longitude");
+                    near = new Location("RNRadarModule");
+                    near.setLatitude(latitude);
+                    near.setLongitude(longitude);
+                } catch (Exception e) {
+                    promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), "Invalid near coordinates");
+                    return;
+                }
+            }
+        }
+
         int limit = optionsMap.hasKey("limit") ? optionsMap.getInt("limit") : 10;
         String country = optionsMap.hasKey("countryCode") ? optionsMap.getString("countryCode") : optionsMap.hasKey("country") ? optionsMap.getString("country") : null;
         String[] layers = optionsMap.hasKey("layers") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("layers")) : null;

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.16.0"
+github "radarlabs/radar-sdk-ios" "3.18.0"

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.15.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -818,10 +818,18 @@ RCT_EXPORT_METHOD(autocomplete:(NSDictionary *)optionsDict resolve:(RCTPromiseRe
     NSDictionary *nearDict = optionsDict[@"near"];
     CLLocation *near = nil;
     if (nearDict && [nearDict isKindOfClass:[NSDictionary class]]) {
-        double latitude = [RCTConvert double:nearDict[@"latitude"]];
-        double longitude = [RCTConvert double:nearDict[@"longitude"]];
-        NSDate *timestamp = [NSDate new];
-        near = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(latitude, longitude) altitude:-1 horizontalAccuracy:5 verticalAccuracy:-1 timestamp:timestamp];
+        id latitudeObj = nearDict[@"latitude"];
+        id longitudeObj = nearDict[@"longitude"];
+        
+        if (latitudeObj && longitudeObj && 
+            [latitudeObj isKindOfClass:[NSNumber class]] && 
+            [longitudeObj isKindOfClass:[NSNumber class]]) {
+            
+            double latitude = [RCTConvert double:latitudeObj];
+            double longitude = [RCTConvert double:longitudeObj];
+            NSDate *timestamp = [NSDate new];
+            near = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(latitude, longitude) altitude:-1 horizontalAccuracy:5 verticalAccuracy:-1 timestamp:timestamp];
+        }       
     }
 
 

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

package/plugin/build/types.d.ts

@@ -6,4 +6,6 @@ export interface RadarPluginProps {
     iosBackgroundMode?: boolean;
     androidBackgroundPermission?: boolean;
     androidFineLocationPermission?: boolean;
+    addRadarSDKMotion?: boolean;
+    iosNSMotionUsageDescription?: string;
 }

package/plugin/build/withRadarAndroid.js

@@ -80,6 +80,9 @@ async function setCustomConfigAsync(config, androidManifest, args) {
     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 modifyAppBuildGradle(buildGradle, androidFraud) {

package/plugin/build/withRadarIOS.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withRadarIOS = void 0;
 const config_plugins_1 = require("expo/config-plugins");
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
 const withRadarIOS = (config, args) => {
-    return (0, config_plugins_1.withInfoPlist)(config, (config) => {
+    config = (0, config_plugins_1.withInfoPlist)(config, (config) => {
         config.modResults.NSLocationWhenInUseUsageDescription =
             args.iosNSLocationWhenInUseUsageDescription ??
                 "This app uses the location service to provide location-based services.";
@@ -32,7 +37,39 @@ const withRadarIOS = (config, args) => {
                 },
             };
         }
+        if (args.addRadarSDKMotion) {
+            config.modResults.NSMotionUsageDescription =
+                args.iosNSMotionUsageDescription ??
+                    "This app uses the motion service to provide motion-based services.";
+        }
         return config;
     });
+    if (args.addRadarSDKMotion) {
+        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 'RadarSDKMotion', '3.18.0'") === -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 'RadarSDKMotion', '3.18.0'`);
+                        const newContents = contents.replace(targetBlock, updatedTargetBlock);
+                        // Write the updated contents back to the Podfile
+                        await promises_1.default.writeFile(filePath, newContents);
+                    }
+                }
+                return config;
+            },
+        ]);
+    }
+    return config;
 };
 exports.withRadarIOS = withRadarIOS;

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.16.0"
+  s.dependency "RadarSDK", "~> 3.18.0"
 end