react-native-radar 3.20.1-beta.5 → 3.20.1

package/android/build.gradle

@@ -18,7 +18,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.20.1-beta.5'
+        versionName '3.20.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.21.3-beta.4'
+    api 'io.radar:sdk:3.21.2'
 }
 

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.20.1-beta.5");
+        editor.putString("x_platform_sdk_version", "3.20.1");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -255,7 +255,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         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);
+                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_BACKGROUND_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 } else {
                     activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
                 }

package/ios/Cartfile.resolved

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

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.20.1-beta.5" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.20.1" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -189,15 +189,30 @@ RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTProm
 }
 
 RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    permissionsRequestResolver = resolve;
-
+    
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     if (background && status == kCLAuthorizationStatusAuthorizedWhenInUse) {
+        permissionsRequestResolver = resolve;
         [locationManager requestAlwaysAuthorization];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleAppBecomingActive)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
     } else if (status == kCLAuthorizationStatusNotDetermined) {
+        permissionsRequestResolver = resolve;
         [locationManager requestWhenInUseAuthorization];
     } else {
         [self getPermissionsStatusWithResolver:resolve rejecter:reject];
+        permissionsRequestResolver = nil;
+    }
+}
+
+- (void)handleAppBecomingActive
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+     if (permissionsRequestResolver) {
+        [self getPermissionsStatusWithResolver:permissionsRequestResolver rejecter:nil];
+        permissionsRequestResolver = nil;
     }
 }
 

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.20.1-beta.5",
+  "version": "3.20.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.21.1'") === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.21.2'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -60,6 +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);
+                        // Just for this version of the SDK, we will be using 3.21.1 of the SDKMotion pod. There is no difference between the source code of 3.21.2 and 3.21.1 for RadarSDKMotion.
                         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

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