Shicheng/3.23.4 play20

sdk/build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 ext {
-    radarVersion = '3.23.3'
+    radarVersion = '3.23.4-beta.1'
 }
 
 String buildNumber = ".${System.currentTimeMillis()}"
@@ -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"

sdk/src/main/java/io/radar/sdk/Radar.kt

@@ -3831,11 +3831,17 @@ object Radar {
         return RadarUtils.sdkVersion
     }
 
-    internal fun showInAppMessages(inAppMessages: Array<RadarInAppMessage>){
+    internal fun showInAppMessages(inAppMessages: Array<RadarInAppMessage>) {
+        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)
     }
 

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,11 @@ 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 = LocationRequest().apply {
+            this.priority = priority
+            this.interval = interval * 1000L
+            this.fastestInterval = fastestInterval * 1000L
         }
-        val locationRequest = locationRequestBuilder.build()
 
         locationClient.requestLocationUpdates(locationRequest, pendingIntent)
     }