Address comments.

Author: visumickey

firebase-sessions/firebase-sessions.gradle.kts

@@ -26,7 +26,7 @@ firebaseLibrary {
 
 android {
   val targetSdkVersion: Int by rootProject
-  compileSdk = 30
+  compileSdk = 33
   defaultConfig {
     minSdk = 16
     targetSdk = targetSdkVersion

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt

@@ -24,7 +24,6 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 internal class RemoteSettings(val context: Context) : SettingsProvider {
-  private val SESSION_CONFIGS_NAME = "firebase_session_settings"
   private val Context.dataStore by preferencesDataStore(name = SESSION_CONFIGS_NAME)
   private val settingsCache = SettingsCache(context.dataStore)
 
@@ -56,22 +55,24 @@ internal class RemoteSettings(val context: Context) : SettingsProvider {
   }
 
   companion object SettingsFetcher {
-    private val FIREBASE_SESSIONS_BASE_URL_STRING = "https://firebase-settings.crashlytics.com"
-    private val FIREBASE_PLATFORM = "android"
-    private val fetchInProgress = false
+    private const val SESSION_CONFIGS_NAME = "firebase_session_settings"
+    private const val FIREBASE_SESSIONS_BASE_URL_STRING =
+      "https://firebase-settings.crashlytics.com"
+    private const val FIREBASE_PLATFORM = "android"
+    private const val fetchInProgress = false
     private val settingsUrl: URL = run {
-      var uri = Uri.Builder()
-      uri.scheme("https")
-      uri.authority(FIREBASE_SESSIONS_BASE_URL_STRING)
-      uri.appendPath("spi/v2/platforms")
-      uri.appendPath(FIREBASE_PLATFORM)
-      uri.appendPath("gmp")
-      // TODO(visum) Replace below with the GMP APPId
-      uri.appendPath("GMP_APP_ID")
-      uri.appendPath("settings")
-
-      uri.appendQueryParameter("build_version", "")
-      uri.appendQueryParameter("display_version", "")
+      var uri =
+        Uri.Builder()
+          .scheme("https")
+          .authority(FIREBASE_SESSIONS_BASE_URL_STRING)
+          .appendPath("spi/v2/platforms")
+          .appendPath(FIREBASE_PLATFORM)
+          .appendPath("gmp")
+          // TODO(visum) Replace below with the GMP APPId
+          .appendPath("GMP_APP_ID")
+          .appendPath("settings")
+          .appendQueryParameter("build_version", "")
+          .appendQueryParameter("display_version", "")
 
       URL(uri.build().toString())
     }
@@ -84,6 +85,7 @@ internal class RemoteSettings(val context: Context) : SettingsProvider {
 
       // Check if cache is expired. If not, return
       // Initiate a fetch. On successful response cache the fetched values
+
     }
   }
 }

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SessionsSettings.kt

@@ -27,8 +27,8 @@ import kotlin.time.Duration.Companion.minutes
  */
 internal class SessionsSettings(val context: Context) {
 
-  var localOverrideSettings = LocalOverrideSettings(context)
-  var remoteSettings = RemoteSettings(context)
+  private var localOverrideSettings = LocalOverrideSettings(context)
+  private var remoteSettings = RemoteSettings(context)
 
   // Order of preference for all the configs below:
   // 1. Honor local overrides

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt

@@ -26,22 +26,15 @@ import androidx.datastore.preferences.core.longPreferencesKey
 import kotlinx.coroutines.flow.first
 
 internal data class SessionConfigs(
-  val sessionEnabled: Boolean?,
-  val sessionSamplingRate: Double?,
-  val cacheDuration: Int?,
-  val sessionRestartTimeout: Int?,
-  val cacheUpdatedTime: Long?
+  val sessionEnabled: Boolean? = null,
+  val sessionSamplingRate: Double? = null,
+  val cacheDuration: Int? = null,
+  val sessionRestartTimeout: Int? = null,
+  val cacheUpdatedTime: Long? = null
 )
 
 internal class SettingsCache(private val store: DataStore<Preferences>) {
-  private var sessionConfigs =
-    SessionConfigs(
-      sessionEnabled = null,
-      sessionSamplingRate = null,
-      sessionRestartTimeout = null,
-      cacheDuration = null,
-      cacheUpdatedTime = null
-    )
+  private var sessionConfigs = SessionConfigs()
 
   private object SettingsCacheKeys {
     val SETTINGS_CACHE_SESSIONS_ENABLED = booleanPreferencesKey("firebase_sessions_enabled")
@@ -84,17 +77,11 @@ internal class SettingsCache(private val store: DataStore<Preferences>) {
     return true
   }
 
-  fun sessionsEnabled(): Boolean? {
-    return sessionConfigs.sessionEnabled
-  }
+  fun sessionsEnabled(): Boolean? = sessionConfigs.sessionEnabled
 
-  fun sessionSamplingRate(): Double? {
-    return sessionConfigs.sessionSamplingRate
-  }
+  fun sessionSamplingRate(): Double? = sessionConfigs.sessionSamplingRate
 
-  fun sessionRestartTimeout(): Int? {
-    return sessionConfigs.sessionRestartTimeout
-  }
+  fun sessionRestartTimeout(): Int? = sessionConfigs.sessionRestartTimeout
 
   suspend fun updateSettingsEnabled(enabled: Boolean?) {
     store.edit { preferences ->
@@ -155,8 +142,4 @@ internal class SettingsCache(private val store: DataStore<Preferences>) {
       updateSessionConfigs()
     }
   }
-
-  companion object {
-    private const val TAG = "SessionSettings"
-  }
 }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SettingsCacheTest.kt

@@ -20,20 +20,19 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import com.google.firebase.sessions.settings.SettingsCache
-import com.google.firebase.sessions.testing.FakeFirebaseApp
-import org.junit.Test
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.settings.SettingsCache
+import com.google.firebase.sessions.testing.FakeFirebaseApp
 import kotlinx.coroutines.runBlocking
 import org.junit.After
-import org.junit.Before
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import kotlin.time.Duration.Companion.minutes
 
 val SESSION_TEST_CONFIGS_NAME = "firebase_test_session_settings"
-val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = SESSION_TEST_CONFIGS_NAME)
+val Context.dataStore: DataStore<Preferences> by
+  preferencesDataStore(name = SESSION_TEST_CONFIGS_NAME)
 
 @RunWith(RobolectricTestRunner::class)
 class SettingsCacheTest {
@@ -178,4 +177,4 @@ class SettingsCacheTest {
   fun cleanUp() {
     FirebaseApp.clearInstancesForTest()
   }
-}
+}