react-native-radar 4.31.0-beta.1 → 4.31.0-beta.2

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

@@ -143,7 +143,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
     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-beta.1")
+        editor.putString("x_platform_sdk_version", "4.31.0-beta.2")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)
@@ -155,7 +155,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-beta.1")
+        editor.putString("x_platform_sdk_version", "4.31.0-beta.2")
         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-beta.1");
+        editor.putString("x_platform_sdk_version", "4.31.0-beta.2");
         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-beta.1");
+        editor.putString("x_platform_sdk_version", "4.31.0-beta.2");
         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-beta.1";
+export declare const VERSION = "4.31.0-beta.2";

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-beta.1';
+exports.VERSION = '4.31.0-beta.2';

package/ios/RNRadar.mm

@@ -217,7 +217,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-beta.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.31.0-beta.2" forKey:@"radar-xPlatformSDKVersion"];
     
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
@@ -240,7 +240,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-beta.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.31.0-beta.2" forKey:@"radar-xPlatformSDKVersion"];
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
         id silentPushValue = options[@"silentPush"];

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

package/plugin/build/withRadarIOS.js

@@ -6,32 +6,32 @@ const fs = require('fs/promises');
 const path = require('path');
 const pkg = require("../../package.json");
 const NATIVE_SETUP_SENTINEL = "@generated react-native-radar nativeSetup";
-function buildObjcSnippet(args) {
+function buildObjcSnippet(args, indent = "  ") {
     const lines = [
-        `  // ${NATIVE_SETUP_SENTINEL}`,
-        `  RadarInitializeOptions *radarInitializeOptions = [[RadarInitializeOptions alloc] init];`,
+        `${indent}// ${NATIVE_SETUP_SENTINEL}`,
+        `${indent}RadarInitializeOptions *radarInitializeOptions = [[RadarInitializeOptions alloc] init];`,
     ];
     if (args.iosAutoHandleNotificationDeepLinks) {
-        lines.push(`  radarInitializeOptions.autoHandleNotificationDeepLinks = YES;`);
+        lines.push(`${indent}radarInitializeOptions.autoHandleNotificationDeepLinks = YES;`);
     }
     if (args.iosAutoLogNotificationConversions) {
-        lines.push(`  radarInitializeOptions.autoLogNotificationConversions = YES;`);
+        lines.push(`${indent}radarInitializeOptions.autoLogNotificationConversions = YES;`);
     }
-    lines.push(`  [Radar nativeSetup:radarInitializeOptions];`);
+    lines.push(`${indent}[Radar nativeSetup:radarInitializeOptions];`);
     return lines.join("\n");
 }
-function buildSwiftSnippet(args) {
+function buildSwiftSnippet(args, indent = "    ") {
     const lines = [
-        `    // ${NATIVE_SETUP_SENTINEL}`,
-        `    let radarInitializeOptions = RadarInitializeOptions()`,
+        `${indent}// ${NATIVE_SETUP_SENTINEL}`,
+        `${indent}let radarInitializeOptions = RadarInitializeOptions()`,
     ];
     if (args.iosAutoHandleNotificationDeepLinks) {
-        lines.push(`    radarInitializeOptions.autoHandleNotificationDeepLinks = true`);
+        lines.push(`${indent}radarInitializeOptions.autoHandleNotificationDeepLinks = true`);
     }
     if (args.iosAutoLogNotificationConversions) {
-        lines.push(`    radarInitializeOptions.autoLogNotificationConversions = true`);
+        lines.push(`${indent}radarInitializeOptions.autoLogNotificationConversions = true`);
     }
-    lines.push(`    Radar.nativeSetup(radarInitializeOptions)`);
+    lines.push(`${indent}Radar.nativeSetup(radarInitializeOptions)`);
     return lines.join("\n");
 }
 function withRadarAppDelegate(config, args) {
@@ -49,23 +49,25 @@ function withRadarAppDelegate(config, args) {
             if (!contents.includes("RadarSDK/RadarSDK.h")) {
                 contents = contents.replace(/(#import\s+"AppDelegate\.h")/, `$1\n#import <RadarSDK/RadarSDK.h>`);
             }
-            const anchor = "[super application:application didFinishLaunchingWithOptions:launchOptions];";
-            if (!contents.includes(anchor)) {
+            const anchorRegex = /^([ \t]*)(return\s+|BOOL\s+\w+\s*=\s*)?\[super\s+application:application\s+didFinishLaunchingWithOptions:launchOptions\]\s*;/m;
+            const match = contents.match(anchorRegex);
+            if (!match) {
                 WarningAggregator.addWarningIOS("react-native-radar", "Could not find didFinishLaunchingWithOptions super call in AppDelegate; skipping nativeSetup injection.");
                 return config;
             }
-            contents = contents.replace(anchor, `${anchor}\n${buildObjcSnippet(args)}`);
+            contents = contents.replace(anchorRegex, `${buildObjcSnippet(args, match[1])}\n${match[0]}`);
         }
         else if (language === "swift") {
             if (!/^import RadarSDK\b/m.test(contents)) {
                 contents = contents.replace(/(import Expo\b.*)/, `$1\nimport RadarSDK`);
             }
-            const anchor = "super.application(application, didFinishLaunchingWithOptions: launchOptions)";
-            if (!contents.includes(anchor)) {
+            const anchorRegex = /^([ \t]*)(return\s+)?super\.application\(application,\s*didFinishLaunchingWithOptions:\s*launchOptions\)/m;
+            const match = contents.match(anchorRegex);
+            if (!match) {
                 WarningAggregator.addWarningIOS("react-native-radar", "Could not find didFinishLaunchingWithOptions super call in AppDelegate.swift; skipping nativeSetup injection.");
                 return config;
             }
-            contents = contents.replace(anchor, `${anchor}\n${buildSwiftSnippet(args)}`);
+            contents = contents.replace(anchorRegex, `${buildSwiftSnippet(args, match[1])}\n${match[0]}`);
         }
         else {
             WarningAggregator.addWarningIOS("react-native-radar", `Unsupported AppDelegate language "${language}"; skipping Radar nativeSetup injection.`);

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-export const VERSION = '4.31.0-beta.1';
+export const VERSION = '4.31.0-beta.2';