From fd3dfcb50232424e23edf34b693bc196eb5814f2 Mon Sep 17 00:00:00 2001 From: Nick Patrick Date: Thu, 9 Oct 2025 10:16:24 -0700 Subject: [PATCH 1/7] downgrade play services to v20 --- sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/build.gradle b/sdk/build.gradle index f701dde8..aed4bd01 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "androidx.appcompat:appcompat:1.4.0" implementation "androidx.core:core-ktx:1.7.0" - implementation "com.google.android.gms:play-services-location:21.0.1" + implementation "com.google.android.gms:play-services-location:20.0.0" implementation "androidx.activity:activity:1.2.0" implementation "androidx.fragment:fragment:1.3.0" compileOnly "com.huawei.hms:location:6.4.0.300" From 06b873f7eda1bfee6ae6c68be55f100697d465a1 Mon Sep 17 00:00:00 2001 From: Nick Patrick Date: Thu, 9 Oct 2025 10:33:42 -0700 Subject: [PATCH 2/7] downgrade play services to v20 --- .../io/radar/sdk/RadarGoogleLocationClient.kt | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt b/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt index 1b54cf18..7f0bc7dd 100644 --- a/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt +++ b/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt @@ -25,23 +25,8 @@ internal class RadarGoogleLocationClient( override fun getCurrentLocation(desiredAccuracy: RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy, block: (location: Location?) -> Unit) { val priority = priorityForDesiredAccuracy(desiredAccuracy) - - var currentLocationRequestBuilder = CurrentLocationRequest.Builder() - .setPriority(priority) - if (desiredAccuracy == RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.HIGH) { - currentLocationRequestBuilder = currentLocationRequestBuilder.setMaxUpdateAgeMillis(0) - } - - val timeout = RadarSettings.getSdkConfiguration(context).locationManagerTimeout - if (timeout > 0) { - logger.d("Requesting location with timeout | timeout = $timeout") - currentLocationRequestBuilder = currentLocationRequestBuilder.setDurationMillis(timeout.toLong()) - } else { - logger.d("Requesting location with default timeout") - } - val currentLocationRequest = currentLocationRequestBuilder.build() - - locationClient.getCurrentLocation(currentLocationRequest, null).addOnSuccessListener { location -> + + locationClient.getCurrentLocation(priority, null).addOnSuccessListener { location -> logger.d("Received current location") block(location) @@ -58,12 +43,10 @@ internal class RadarGoogleLocationClient( ) { val priority = priorityForDesiredAccuracy(desiredAccuracy) - var locationRequestBuilder = LocationRequest.Builder(priority, interval * 1000L) - .setMinUpdateIntervalMillis(fastestInterval * 1000L) - if (desiredAccuracy == RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.HIGH) { - locationRequestBuilder = locationRequestBuilder.setMaxUpdateAgeMillis(0) - } - val locationRequest = locationRequestBuilder.build() + val locationRequest = LocationRequest().apply { + this.priority = priority + this.interval = interval * 1000L + this.fastestInterval = fastestInterval * 1000L locationClient.requestLocationUpdates(locationRequest, pendingIntent) } From 0526404712ec884bbd5dbe060e837436b933fd47 Mon Sep 17 00:00:00 2001 From: Nick Patrick Date: Thu, 9 Oct 2025 10:41:52 -0700 Subject: [PATCH 3/7] downgrade play services to v20 --- sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt b/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt index 7f0bc7dd..8b0ca16a 100644 --- a/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt +++ b/sdk/src/main/java/io/radar/sdk/RadarGoogleLocationClient.kt @@ -47,6 +47,7 @@ internal class RadarGoogleLocationClient( this.priority = priority this.interval = interval * 1000L this.fastestInterval = fastestInterval * 1000L + } locationClient.requestLocationUpdates(locationRequest, pendingIntent) } From 4d74dc1d2b2faf09ac41676551085797bb8e0da9 Mon Sep 17 00:00:00 2001 From: Nick Patrick Date: Thu, 9 Oct 2025 10:53:04 -0700 Subject: [PATCH 4/7] bump version --- sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/build.gradle b/sdk/build.gradle index aed4bd01..877149f1 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' ext { - radarVersion = '3.23.2' + radarVersion = '3.23.3-beta.1' } String buildNumber = ".${System.currentTimeMillis()}" From 6c6d0af29f0d943dfad9f722223754527277a222 Mon Sep 17 00:00:00 2001 From: ShiCheng Lu Date: Thu, 16 Oct 2025 09:44:59 -0400 Subject: [PATCH 5/7] check radar initialized before dismissing IAM in activity pause --- sdk/build.gradle | 2 +- .../main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/build.gradle b/sdk/build.gradle index 1fdef2fe..1ffeba2a 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' ext { - radarVersion = '3.23.3' + radarVersion = '3.23.4' } String buildNumber = ".${System.currentTimeMillis()}" diff --git a/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt b/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt index 29d9e79c..a58e140c 100644 --- a/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt +++ b/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt @@ -116,7 +116,9 @@ internal class RadarActivityLifecycleCallbacks( updatePermissionsDenied(activity) Radar.logResigningActive() - Radar.dismissInAppMessage() + if (Radar.initialized) { + Radar.dismissInAppMessage() + } } override fun onActivityStarted(activity: Activity) { From 412a0c7d9b8cba2c4060db2cfd1e16e897c27f80 Mon Sep 17 00:00:00 2001 From: ShiCheng Lu Date: Thu, 16 Oct 2025 09:52:04 -0400 Subject: [PATCH 6/7] add initialize guards to IAM apis --- sdk/src/main/java/io/radar/sdk/Radar.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sdk/src/main/java/io/radar/sdk/Radar.kt b/sdk/src/main/java/io/radar/sdk/Radar.kt index e721e3a1..23163455 100644 --- a/sdk/src/main/java/io/radar/sdk/Radar.kt +++ b/sdk/src/main/java/io/radar/sdk/Radar.kt @@ -3831,11 +3831,17 @@ object Radar { return RadarUtils.sdkVersion } - internal fun showInAppMessages(inAppMessages: Array){ + internal fun showInAppMessages(inAppMessages: Array) { + if (!initialized || !this::inAppMessageManager.isInitialized) { + return + } inAppMessageManager.showInAppMessages(inAppMessages) } internal fun dismissInAppMessage() { + if (!initialized || !this::inAppMessageManager.isInitialized) { + return + } inAppMessageManager.dismiss() } @@ -3866,6 +3872,9 @@ object Radar { @JvmStatic fun showInAppMessage(payload: RadarInAppMessage) { + if (!initialized || !this::inAppMessageManager.isInitialized) { + return + } this.inAppMessageManager.showInAppMessage(payload) } From 3b60ca202893f4ce51462b8fdd2c005f53cea4af Mon Sep 17 00:00:00 2001 From: ShiCheng Lu Date: Thu, 16 Oct 2025 09:55:37 -0400 Subject: [PATCH 7/7] rm redundent check --- .../main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt b/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt index a58e140c..29d9e79c 100644 --- a/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt +++ b/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt @@ -116,9 +116,7 @@ internal class RadarActivityLifecycleCallbacks( updatePermissionsDenied(activity) Radar.logResigningActive() - if (Radar.initialized) { - Radar.dismissInAppMessage() - } + Radar.dismissInAppMessage() } override fun onActivityStarted(activity: Activity) {