react-native-radar 4.31.0 → 4.32.0-beta.0

package/RadarSDKFraud.podspec

@@ -0,0 +1,23 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "RadarSDKFraud"
+  s.version      = package["version"]
+  s.summary      = "RadarSDKFraud extension for react-native-radar"
+  s.homepage     = "https://github.com/radarlabs/react-native-radar"
+  s.license      = package["license"]
+  s.authors      = "radarlabs"
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/radarlabs/react-native-radar.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/RadarSDKFraudStub.m"
+
+  s.vendored_frameworks = "ios/RadarSDKFraud.xcframework"
+
+  s.dependency "Radar", "#{s.version}"
+
+  install_modules_dependencies(s)
+end

package/android/build.gradle

@@ -1,4 +1,4 @@
-def radar_sdk_version = '3.31.0'
+def radar_sdk_version = '3.32.3'
 
 buildscript {
   ext.getExtOrDefault = {name ->

package/android/src/main/java/com/radar/RadarModuleImpl.java

@@ -304,7 +304,26 @@ public class RadarModuleImpl {
     }
 
 
+    private static final String FRAUD_CLASS_NAME = "io.radar.sdk.fraud.RadarSDKFraud";
+    private static final String FRAUD_MISSING_MESSAGE =
+        "Radar fraud module is not on the classpath. Enable `androidFraud: true` " +
+        "in the react-native-radar Expo plugin config, or add " +
+        "`implementation \"io.radar:sdk-fraud:1.1.0\"` to your android/app/build.gradle.";
+
+    private static boolean isFraudModuleAvailable() {
+        try {
+            Class.forName(FRAUD_CLASS_NAME);
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
     public void trackVerified(ReadableMap optionsMap, final Promise promise) {
+        if (!isFraudModuleAvailable()) {
+            promise.reject(Radar.RadarStatus.ERROR_PLUGIN.toString(), FRAUD_MISSING_MESSAGE);
+            return;
+        }
 
         boolean beaconsTrackingOption = false;
         RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy accuracyLevel = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
@@ -369,6 +388,11 @@ public class RadarModuleImpl {
     }
 
     public void getVerifiedLocationToken(final Promise promise) {
+        if (!isFraudModuleAvailable()) {
+            promise.reject(Radar.RadarStatus.ERROR_PLUGIN.toString(), FRAUD_MISSING_MESSAGE);
+            return;
+        }
+
         Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
 
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarVerifiedLocationToken token) {
@@ -430,6 +454,13 @@ public class RadarModuleImpl {
 
 
     public void startTrackingVerified(ReadableMap optionsMap) {
+        if (!isFraudModuleAvailable()) {
+            Log.w(TAG, FRAUD_MISSING_MESSAGE);
+            // Fall through: the underlying SDK will skip the fraud payload and
+            // surface ERROR_PLUGIN per-tick. Logging here makes the misconfig
+            // visible without changing existing behavior.
+        }
+        
         boolean beacons = false;
         int interval = 1200;
 

package/android/src/newarch/java/com/radar/RadarModule.kt

@@ -40,9 +40,12 @@ import org.json.JSONObject
 @ReactModule(name = RadarModule.NAME)
 class RadarModule(reactContext: ReactApplicationContext) :
     NativeRadarSpec(reactContext), PermissionListener {
+        @Volatile
+        private var isInvalidated = false
 
     private val radarReceiver = object : RadarReceiver() {
         override fun onEventsReceived(context: Context, events: Array<RadarEvent>, user: RadarUser?) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 var eventsArray = Arguments.createArray()
                 for (event in events) {
@@ -57,6 +60,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onLocationUpdated(context: Context, location: Location, user: RadarUser) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("location", Radar.jsonForLocation(location).toString())
                 putString("user", user.toJson().toString())
@@ -65,6 +69,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onClientLocationUpdated(context: Context, location: Location, stopped: Boolean, source: Radar.RadarLocationSource) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("location", Radar.jsonForLocation(location).toString())
                 putBoolean("stopped", stopped)
@@ -74,6 +79,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onError(context: Context, status: Radar.RadarStatus) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("status", status.toString())
             }
@@ -81,6 +87,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onLog(context: Context, message: String) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("message", message)
             }
@@ -90,6 +97,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
 
     private val radarInAppMessageReceiver = object : RadarInAppMessageReceiver {
         override fun onNewInAppMessage(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
             val eventBlob = Arguments.createMap().apply {
                 putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -101,6 +109,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onInAppMessageDismissed(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
                 val eventBlob = Arguments.createMap().apply {
                     putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -112,6 +121,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onInAppMessageButtonClicked(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
                 val eventBlob = Arguments.createMap().apply {
                     putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -125,6 +135,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
 
     private val radarVerifiedReceiver = object : RadarVerifiedReceiver() {
         override fun onTokenUpdated(context: Context, token: RadarVerifiedLocationToken) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("token", token.toJson().toString())
             }
@@ -140,10 +151,26 @@ class RadarModule(reactContext: ReactApplicationContext) :
         return NAME
     }
 
+    override fun invalidate() {
+        isInvalidated = true
+
+        // Detach from the process-level Radar singleton so this stale module
+        // instance stops receiving callbacks after its JS runtime is gone.
+        Radar.setReceiver(null)
+
+        try {
+            Radar.setVerifiedReceiver(null)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error detaching verified receiver", e)
+        }
+
+        super.invalidate()
+    }
+
     override fun initialize(publishableKey: String, fraud: Boolean, options: ReadableMap?): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "4.31.0")
+        editor.putString("x_platform_sdk_version", "4.32.0-beta.0")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)
@@ -155,7 +182,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
     override fun initializeWithAuthToken(authToken: String, fraud: Boolean, options: ReadableMap?): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "4.31.0")
+        editor.putString("x_platform_sdk_version", "4.32.0-beta.0")
         editor.apply()
         
         val initOptions = io.radar.sdk.RadarInitializeOptions.builder()

package/android/src/oldarch/java/com/radar/RadarModule.java

@@ -102,7 +102,7 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         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", "4.31.0");
+        editor.putString("x_platform_sdk_version", "4.32.0-beta.0");
         editor.apply();
         Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, inAppMessageReceiver, getCurrentActivity());
         if (fraud) { 
@@ -115,7 +115,7 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         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", "4.31.0");
+        editor.putString("x_platform_sdk_version", "4.32.0-beta.0");
         editor.apply();
         
         io.radar.sdk.RadarInitializeOptions.Builder builder = io.radar.sdk.RadarInitializeOptions.builder()

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.31.0";
+export declare const VERSION = "4.32.0-beta.0";

package/dist/version.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-exports.VERSION = '4.31.0';
+exports.VERSION = '4.32.0-beta.0';

package/ios/RNRadar.h

@@ -6,11 +6,12 @@
 
 #import <RadarSDK/RadarSDK.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTInvalidating.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RNRadar : NativeRadarSpecBase <NativeRadarSpec, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol>
+@interface RNRadar : NativeRadarSpecBase <NativeRadarSpec, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol, RCTInvalidating>
 #else
-@interface RNRadar : RCTEventEmitter <RCTBridgeModule, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol>
+@interface RNRadar : RCTEventEmitter <RCTBridgeModule, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol, RCTInvalidating>
 #endif
 
 @end

package/ios/RNRadar.mm

@@ -55,6 +55,22 @@ RCT_EXPORT_MODULE()
     hasListeners = NO;
 }
 
+- (void)invalidate {
+#ifdef RCT_NEW_ARCH_ENABLED
+    jsEventEmitterReady = NO;
+#endif
+    hasListeners = NO;
+
+    // Detach from the process-level Radar singleton so a stale module
+    // instance doesn't continue to receive events.
+    [Radar setDelegate:nil];
+    [Radar setVerifiedDelegate:nil];
+    [Radar setInAppMessageDelegate:nil];
+
+    locationManager.delegate = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallbackWrapper {
     [super setEventEmitterCallback:eventEmitterCallbackWrapper];
@@ -217,7 +233,7 @@ RCT_EXPORT_MODULE()
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud options:(NSDictionary *)options) {
     _publishableKey = publishableKey; 
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"4.31.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.32.0-beta.0" forKey:@"radar-xPlatformSDKVersion"];
     
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
@@ -240,7 +256,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud option
 RCT_EXPORT_METHOD(initializeWithAuthToken:(NSString *)authToken fraud:(BOOL)fraud options:(NSDictionary *)options) {
     _publishableKey = nil;
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"4.31.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.32.0-beta.0" forKey:@"radar-xPlatformSDKVersion"];
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
         id silentPushValue = options[@"silentPush"];
@@ -494,6 +510,17 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
 
 
 RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    if (!NSClassFromString(@"RadarSDKFraud")) {
+        reject(@"ERROR_PLUGIN",
+               @"trackVerified requires the RadarSDKFraud module. "
+               @"Set iosFraud: true in your react-native-radar Expo config plugin "
+               @"(or add `pod 'RadarSDKFraud', :path => '../node_modules/react-native-radar'` "
+               @"to your ios/Podfile manually), then re-run `npx expo prebuild --clean` "
+               @"and `pod install`.",
+               nil);
+        return;
+    }
+
     BOOL beacons = NO;
     RadarTrackingOptionsDesiredAccuracy desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
     NSString *reason = nil;

package/ios/RadarSDKFraud.xcframework/Info.plist

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>RadarSDKFraud.framework/RadarSDKFraud</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>RadarSDKFraud.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>RadarSDKFraud.framework/RadarSDKFraud</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>RadarSDKFraud.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>