Merge pull request #345 from radarlabs/track-verified-config

pass status to getConfig() callback, fetch Google Play project number on trackVerified()
radarlabs · Mar 13, 2024 · 2b77fbd · 2b77fbd
2 parents bd0636c + 9413062
commit 2b77fbd
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 267 deletions.
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -10,7 +10,7 @@ apply plugin: "org.jetbrains.dokka"
 apply plugin: 'io.radar.mvnpublish'
 
 ext {
-    radarVersion = '3.9.6'
+    radarVersion = '3.9.7'
 }
 
 String buildNumber = ".${System.currentTimeMillis()}"

diff --git a/sdk/src/main/java/io/radar/sdk/Radar.kt b/sdk/src/main/java/io/radar/sdk/Radar.kt
@@ -535,15 +535,9 @@ object Radar {
         }
         val usage = "initialize"
         this.apiClient.getConfig(usage, false, object : RadarApiClient.RadarGetConfigApiCallback {
-            override fun onComplete(config: RadarConfig) {
+            override fun onComplete(status: RadarStatus, config: RadarConfig) {
                 locationManager.updateTrackingFromMeta(config?.meta)
                 RadarSettings.setFeatureSettings(context, config?.meta.featureSettings)
-                if (config?.googlePlayProjectNumber != null) {
-                    RadarSettings.setGooglePlayProjectNumber(
-                        context,
-                        config?.googlePlayProjectNumber
-                    )
-                }
             }
         })
 

diff --git a/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt b/sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt
@@ -50,7 +50,7 @@ internal class RadarActivityLifecycleCallbacks(
                 if (updated) {
                     val usage = "resume"
                     Radar.apiClient.getConfig(usage, false, object : RadarApiClient.RadarGetConfigApiCallback {
-                        override fun onComplete(config: RadarConfig) {
+                        override fun onComplete(status: Radar.RadarStatus, config: RadarConfig) {
                             Radar.locationManager.updateTrackingFromMeta(config.meta)
                             RadarSettings.setFeatureSettings(activity.applicationContext, config.meta.featureSettings)
                         }

diff --git a/sdk/src/main/java/io/radar/sdk/RadarApiClient.kt b/sdk/src/main/java/io/radar/sdk/RadarApiClient.kt
@@ -34,7 +34,7 @@ internal class RadarApiClient(
     }
 
     interface RadarGetConfigApiCallback {
-        fun onComplete(config: RadarConfig)
+        fun onComplete(status: RadarStatus, config: RadarConfig)
     }
 
     interface RadarTripApiCallback {
@@ -138,7 +138,7 @@ internal class RadarApiClient(
                 if (status == RadarStatus.SUCCESS) {
                     Radar.flushLogs()
                 }
-                callback?.onComplete(RadarConfig.fromJson(res))
+                callback?.onComplete(status, RadarConfig.fromJson(res))
             }
         }, false, true, verified)
     }

diff --git a/sdk/src/main/java/io/radar/sdk/RadarSettings.kt b/sdk/src/main/java/io/radar/sdk/RadarSettings.kt
@@ -36,7 +36,6 @@ internal object RadarSettings {
     private const val KEY_VERIFIED_HOST = "verified_host"
     private const val KEY_LAST_APP_OPEN_TIME = "last_app_open_time"
     private const val KEY_SHARING = "sharing"
-    private const val KEY_GOOGLE_PLAY_PROJECT_NUMBER = "google_play_project_number"
     private const val KEY_X_PLATFORM_SDK_TYPE = "x_platform_sdk_type"
     private const val KEY_X_PLATFORM_SDK_VERSION = "x_platform_sdk_version"
 
@@ -376,14 +375,6 @@ internal object RadarSettings {
         getSharedPreferences(context).edit { putBoolean(KEY_SHARING, sharing) }
     }
 
-    internal fun getGooglePlayProjectNumber(context: Context): Long {
-        return getSharedPreferences(context).getLong(KEY_GOOGLE_PLAY_PROJECT_NUMBER, 0)
-    }
-
-    internal fun setGooglePlayProjectNumber(context: Context, googlePlayProjectNumber: Long) {
-        getSharedPreferences(context).edit { putLong(KEY_GOOGLE_PLAY_PROJECT_NUMBER, googlePlayProjectNumber) }
-    }
-
     internal fun isXPlatform(context: Context): Boolean {
         return getSharedPreferences(context).contains(KEY_X_PLATFORM_SDK_TYPE) &&
                 getSharedPreferences(context).contains(KEY_X_PLATFORM_SDK_VERSION)