From 07469672ba2810f149993d35cee8ce5d0b9817a3 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 5 May 2025 09:51:47 -0500
Subject: [PATCH] PM-21156: Fix ConfigService retrofit instance (#5126)

---
 .../platform/feature/settings/autofill/AutoFillViewModel.kt  | 5 +++--
 .../feature/settings/autofill/AutoFillViewModelTest.kt       | 4 +---
 .../com/bitwarden/network/BitwardenServiceClientImpl.kt      | 2 +-
 .../com/bitwarden/network/service/ConfigServiceImpl.kt       | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModel.kt
index 2245ed36cb..e7dfd0e4c4 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModel.kt
@@ -18,7 +18,6 @@ import com.x8bit.bitwarden.ui.platform.feature.settings.autofill.chrome.model.Ch
 import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -58,7 +57,9 @@ class AutoFillViewModel @Inject constructor(
                 defaultUriMatchType = settingsRepository.defaultUriMatchType,
                 showAutofillActionCard = false,
                 activeUserId = userId,
-                chromeAutofillSettingsOptions = persistentListOf(),
+                chromeAutofillSettingsOptions = chromeThirdPartyAutofillEnabledManager
+                    .chromeThirdPartyAutofillStatus
+                    .toChromeAutoFillSettingsOptions(),
             )
         },
 ) {
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModelTest.kt
index d7ef45ceed..6c087073f0 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillViewModelTest.kt
@@ -50,6 +50,7 @@ class AutoFillViewModelTest : BaseViewModelTest() {
     private val chromeThirdPartyAutofillEnabledManager =
         mockk<ChromeThirdPartyAutofillEnabledManager> {
             every { chromeThirdPartyAutofillStatusFlow } returns mutableChromeAutofillStatusFlow
+            every { chromeThirdPartyAutofillStatus } returns DEFAULT_AUTOFILL_STATUS
         }
 
     private val settingsRepository: SettingsRepository = mockk {
@@ -79,7 +80,6 @@ class AutoFillViewModelTest : BaseViewModelTest() {
 
     @Test
     fun `initial state should be correct when not set`() {
-        mockkStatic(::isBuildVersionBelow)
         every { isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) } returns false
 
         val viewModel = createViewModel(state = null)
@@ -90,7 +90,6 @@ class AutoFillViewModelTest : BaseViewModelTest() {
 
     @Test
     fun `initial state should be correct when set`() {
-        mockkStatic(::isBuildVersionBelow)
         every { isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) } returns false
 
         mutableIsAutofillEnabledStateFlow.value = true
@@ -106,7 +105,6 @@ class AutoFillViewModelTest : BaseViewModelTest() {
 
     @Test
     fun `initial state should be correct when sdk is below min`() {
-        mockkStatic(::isBuildVersionBelow)
         every { isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) } returns true
 
         val expected = DEFAULT_STATE.copy(
diff --git a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt
index d79bb8f2f3..3b87d69d04 100644
--- a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt
@@ -118,7 +118,7 @@ internal class BitwardenServiceClientImpl(
 
     override val configService: ConfigService by lazy {
         ConfigServiceImpl(
-            configApi = retrofits.createStaticRetrofit().create(),
+            configApi = retrofits.unauthenticatedApiRetrofit.create(),
         )
     }
 
diff --git a/network/src/main/kotlin/com/bitwarden/network/service/ConfigServiceImpl.kt b/network/src/main/kotlin/com/bitwarden/network/service/ConfigServiceImpl.kt
index 015e8d25be..447f35d43d 100644
--- a/network/src/main/kotlin/com/bitwarden/network/service/ConfigServiceImpl.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/service/ConfigServiceImpl.kt
@@ -7,7 +7,6 @@ import com.bitwarden.network.util.toResult
 /**
  * Default implementation of [ConfigService] for querying app configurations.
  */
-// TODO [PM-19846] Make internal when dependents are migrated.
 internal class ConfigServiceImpl(private val configApi: ConfigApi) : ConfigService {
     override suspend fun getConfig(): Result<ConfigResponseJson> = configApi.getConfig().toResult()
 }