react-native-radar 3.12.3 → 3.13.0

package/README.md

@@ -16,6 +16,8 @@ Then, see the Radar React Native module documentation [here](https://radar.com/d
 
 See an example app in `example/`.
 
+Setup Radar public key check pre-commit hook with `cp -r hooks .git` to prevent accidental key leak when working with the Example app.
+
 ## Support
 
 Have questions? We're here to help! Email us at [support@radar.com](mailto:support@radar.com).

package/android/build.gradle

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

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -64,6 +64,10 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         verifiedReceiver = new RNRadarVerifiedReceiver();
     }
 
+    public static void onActivityCreate(Activity activity, Context context) {
+        Radar.onActivityCreate(activity, context);
+    }
+
     @ReactMethod
     public void addListener(String eventName) {
         if (listenerCount == 0) {
@@ -97,7 +101,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.12.3");
+        editor.putString("x_platform_sdk_version", "3.13.0");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -248,21 +252,6 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         return true;
     }
 
-    @ReactMethod
-    public void requestPermissions(boolean background, final Promise promise) {
-        PermissionAwareActivity activity = (PermissionAwareActivity)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);
-                } else {
-                    activity.requestPermissions(new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, PERMISSIONS_REQUEST_CODE, this);
-                }
-            }
-        }
-    }
-
     @ReactMethod
     public void getLocation(String desiredAccuracy, final Promise promise) {
         

package/dist/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.12.3",
+    "version": "3.13.0",
     "main": "dist/src/index.js",
     "files": [
         "android",

package/dist/src/@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, 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, RadarLocationPermissionStatus } from "./types";
 export interface RadarNativeInterface {
     initialize: (publishableKey: string, fraud?: boolean) => void;
     setLogLevel: (level: RadarLogLevel) => void;
@@ -10,7 +10,10 @@ export interface RadarNativeInterface {
     getMetadata: () => Promise<RadarMetadata>;
     setAnonymousTrackingEnabled: (enabled: boolean) => void;
     getPermissionsStatus: () => Promise<RadarPermissionsStatus>;
-    requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
+    requestForegroundLocationPermission: () => void;
+    requestBackgroundLocationPermission: () => void;
+    getLocationPermissionStatus: () => Promise<RadarLocationPermissionStatus>;
+    openAppSettings: () => void;
     getLocation: (desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy) => Promise<RadarLocationCallback>;
     trackOnce: (options?: RadarTrackOnceOptions | Location) => Promise<RadarTrackCallback>;
     trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackVerifiedCallback>;

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

@@ -512,5 +512,5 @@ export interface RadarLocationPermissionStatusIOS {
     userRejectedBackgroundPermission: boolean;
 }
 export type RadarLocationPermissionStatus = RadarLocationPermissionStatusAndroid | RadarLocationPermissionStatusIOS;
-export type LocationPermissionState = "NO_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_GRANTED" | "APPROXIMATE_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_REJECTED_ONCE" | "FOREGROUND_PERMISSION_REJECTED" | "FOREGROUND_PERMISSION_PENDING" | "BACKGROUND_PERMISSION_GRANTED" | "BACKGROUND_PERMISSION_REJECTED" | "BACKGROUND_PERMISSION_REJECTED_ONCE" | "PERMISSION_RESTRICTED" | "UNKNOWN";
+export type LocationPermissionState = "NO_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_GRANTED" | "APPROXIMATE_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_REJECTED_ONCE" | "FOREGROUND_PERMISSION_REJECTED" | "FOREGROUND_PERMISSION_PENDING" | "BACKGROUND_PERMISSION_GRANTED" | "BACKGROUND_PERMISSION_REJECTED" | "BACKGROUND_PERMISSION_REJECTED_ONCE" | "BACKGROUND_PERMISSION_PENDING" | "PERMISSION_RESTRICTED" | "UNKNOWN";
 export type LocationManagerStatus = "NotDetermined" | "Restricted" | "Denied" | "AuthorizedAlways" | "AuthorizedWhenInUse" | "Unknown";

package/dist/src/index.native.js

@@ -27,7 +27,10 @@ const setMetadata = (metadata) => {
 const getMetadata = () => react_native_1.NativeModules.RNRadar.getMetadata();
 const setAnonymousTrackingEnabled = (enabled) => react_native_1.NativeModules.RNRadar.setAnonymousTrackingEnabled(enabled);
 const getPermissionsStatus = () => react_native_1.NativeModules.RNRadar.getPermissionsStatus();
-const requestPermissions = (background) => react_native_1.NativeModules.RNRadar.requestPermissions(background);
+const requestForegroundLocationPermission = () => react_native_1.NativeModules.RNRadar.requestForegroundLocationPermission();
+const requestBackgroundLocationPermission = () => react_native_1.NativeModules.RNRadar.requestBackgroundLocationPermission();
+const getLocationPermissionStatus = () => react_native_1.NativeModules.RNRadar.getLocationPermissionStatus();
+const openAppSettings = () => react_native_1.NativeModules.RNRadar.openAppSettings();
 const getLocation = (desiredAccuracy) => react_native_1.NativeModules.RNRadar.getLocation(desiredAccuracy);
 const trackOnce = (options) => {
     let backCompatibleOptions = options;
@@ -95,7 +98,10 @@ const Radar = {
     setAnonymousTrackingEnabled,
     isUsingRemoteTrackingOptions,
     getPermissionsStatus,
-    requestPermissions,
+    requestForegroundLocationPermission,
+    requestBackgroundLocationPermission,
+    getLocationPermissionStatus,
+    openAppSettings,
     getLocation,
     trackOnce,
     trackVerified,

package/ios/RNRadar.m

@@ -44,7 +44,7 @@ RCT_EXPORT_MODULE();
     } else if ([statusString isEqualToString:@"BackgroundPermissionRejected"]) {
         newStatusString = @"BACKGROUND_PERMISSION_REJECTED";
     } else if ([statusString isEqualToString:@"BackgroundPermissionPending"]) {
-        newStatusString = @"FOREGROUND_PERMISSION_PENDING";
+        newStatusString = @"BACKGROUND_PERMISSION_PENDING";
     } else if ([statusString isEqualToString:@"PermissionRestricted"]) {
         newStatusString = @"PERMISSION_RESTRICTED";
     } else {
@@ -73,7 +73,7 @@ RCT_EXPORT_MODULE();
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token"];
+    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token", @"locationPermissionStatus"];
 }
 
 - (void)startObserving {
@@ -140,7 +140,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.12.3" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.13.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -226,19 +226,6 @@ RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTProm
     resolve(statusStr);
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    permissionsRequestResolver = resolve;
-
-    CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
-    if (background && status == kCLAuthorizationStatusAuthorizedWhenInUse) {
-        [locationManager requestAlwaysAuthorization];
-    } else if (status == kCLAuthorizationStatusNotDetermined) {
-        [locationManager requestWhenInUseAuthorization];
-    } else {
-        [self getPermissionsStatusWithResolver:resolve rejecter:reject];
-    }
-}
-
 RCT_EXPORT_METHOD(getLocation:(NSString *)desiredAccuracy resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
@@ -360,7 +347,7 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
             if (token != nil) {
-                [dict setObject:[RNRadar mapLocationPermissionStatus:[token dictionaryValue]] forKey:@"token"];
+                [dict setObject:[token dictionaryValue] forKey:@"token"];
             }
             resolver(dict);
         } else if (rejecter) {

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

package/src/@types/RadarNativeInterface.ts

@@ -50,7 +50,10 @@ export interface RadarNativeInterface {
   getMetadata: () => Promise<RadarMetadata>;
   setAnonymousTrackingEnabled: (enabled: boolean) => void;
   getPermissionsStatus: () => Promise<RadarPermissionsStatus>;
-  requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
+  requestForegroundLocationPermission: () => void;
+  requestBackgroundLocationPermission: () => void;
+  getLocationPermissionStatus: () => Promise<RadarLocationPermissionStatus>;
+  openAppSettings: () => void;
   getLocation: (
     desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy
   ) => Promise<RadarLocationCallback>;

package/src/@types/types.ts

@@ -819,6 +819,7 @@ export type LocationPermissionState =
   | "BACKGROUND_PERMISSION_GRANTED"
   | "BACKGROUND_PERMISSION_REJECTED"
   | "BACKGROUND_PERMISSION_REJECTED_ONCE"
+  | "BACKGROUND_PERMISSION_PENDING"
   | "PERMISSION_RESTRICTED"
   | "UNKNOWN";
 

package/src/index.native.ts

@@ -39,6 +39,7 @@ import {
   RadarIPGeocodeCallback,
   RadarTrackVerifiedOptions,
   RadarTrackVerifiedCallback,
+  RadarLocationPermissionStatus,
 } from "./@types/types";
 
 if (
@@ -84,10 +85,16 @@ const setAnonymousTrackingEnabled = (enabled: boolean): void =>
 const getPermissionsStatus = (): Promise<RadarPermissionsStatus> =>
   NativeModules.RNRadar.getPermissionsStatus();
 
-const requestPermissions = (
-  background: boolean
-): Promise<RadarPermissionsStatus> =>
-  NativeModules.RNRadar.requestPermissions(background);
+const requestForegroundLocationPermission = () => 
+  NativeModules.RNRadar.requestForegroundLocationPermission();
+
+const requestBackgroundLocationPermission = () => 
+  NativeModules.RNRadar.requestBackgroundLocationPermission();
+
+const getLocationPermissionStatus = (): Promise<RadarLocationPermissionStatus> => 
+  NativeModules.RNRadar.getLocationPermissionStatus();
+
+const openAppSettings = () => NativeModules.RNRadar.openAppSettings()
 
 const getLocation = (
   desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy
@@ -244,7 +251,10 @@ const Radar: RadarNativeInterface = {
   setAnonymousTrackingEnabled,
   isUsingRemoteTrackingOptions,
   getPermissionsStatus,
-  requestPermissions,
+  requestForegroundLocationPermission,
+  requestBackgroundLocationPermission,
+  getLocationPermissionStatus,
+  openAppSettings,
   getLocation,
   trackOnce,
   trackVerified,