Rename AccountCache to AccountRepository

13 files changed, 63 insertions, 57 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
index 47054e660a..9c0461022f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.Dispatchers
 import net.mullvad.mullvadvpn.applist.ApplicationsIconManager
 import net.mullvad.mullvadvpn.applist.ApplicationsProvider
 import net.mullvad.mullvadvpn.ipc.EventDispatcher
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling
@@ -39,7 +39,7 @@ val uiModule = module {
 
     single { ServiceConnectionManager(androidContext()) }
 
-    single { AccountCache(get()) }
+    single { AccountRepository(get()) }
     single { DeviceRepository(get()) }
     viewModel { LoginViewModel(get(), get()) }
     viewModel { DeviceRevokedViewModel(get(), get()) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 3251c6df2a..b3e8e9f89b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.widget.Button
 import net.mullvad.mullvadvpn.ui.widget.CopyableInformationView
@@ -28,7 +28,7 @@ import org.koin.android.ext.android.inject
 class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
 
     // Injected dependencies
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
     private val deviceRepository: DeviceRepository by inject()
 
     override val isSecureScreen = true
@@ -105,7 +105,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         }
 
         view.findViewById<Button>(R.id.logout).setOnClickAction("logout", jobTracker) {
-            accountCache.logout()
+            accountRepository.logout()
         }
 
         accountNumberView = view.findViewById<CopyableInformationView>(R.id.account_number).apply {
@@ -121,7 +121,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
 
     override fun onSafelyStart() {
         jobTracker.newUiJob("updateAccountExpiry") {
-            accountCache.accountExpiryState
+            accountRepository.accountExpiryState
                 .map { state -> state.date() }
                 .collect { expiryDate ->
                     currentAccountExpiry = expiryDate
@@ -140,7 +140,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         }
 
         sitePaymentButton.updateAuthTokenCache(authTokenCache)
-        accountCache.fetchAccountExpiry()
+        accountRepository.fetchAccountExpiry()
     }
 
     override fun onSafelyStop() {
@@ -162,7 +162,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
             accountExpiryView.information = expiryFormatter.format(accountExpiry.toDate())
         } else {
             accountExpiryView.information = null
-            accountCache.fetchAccountExpiry()
+            accountRepository.fetchAccountExpiry()
         }
     }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index dccba31b2e..31cf1876f5 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.ui.notification.AccountExpiryNotification
 import net.mullvad.mullvadvpn.ui.notification.TunnelStateNotification
 import net.mullvad.mullvadvpn.ui.notification.VersionInfoNotification
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.widget.HeaderBar
 import net.mullvad.mullvadvpn.ui.widget.NotificationBanner
 import net.mullvad.mullvadvpn.ui.widget.SwitchLocationButton
@@ -26,7 +26,7 @@ class ConnectFragment :
     ServiceDependentFragment(OnNoService.GoToLaunchScreen), NavigationBarPainter {
 
     // Injected dependencies
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
 
     private lateinit var actionButton: ConnectActionButton
     private lateinit var switchLocationButton: SwitchLocationButton
@@ -59,7 +59,13 @@ class ConnectFragment :
             notifications.apply {
                 register(TunnelStateNotification(parentActivity, connectionProxy))
                 register(VersionInfoNotification(parentActivity, appVersionInfoCache))
-                register(AccountExpiryNotification(parentActivity, authTokenCache, accountCache))
+                register(
+                    AccountExpiryNotification(
+                        parentActivity,
+                        authTokenCache,
+                        accountRepository
+                    )
+                )
             }
         }
 
@@ -107,7 +113,7 @@ class ConnectFragment :
         }
 
         jobTracker.newUiJob("updateAccountExpiry") {
-            accountCache.accountExpiryState
+            accountRepository.accountExpiryState
                 .map { state -> state.date() }
                 .collect { expiryDate ->
                     if (expiryDate?.isBeforeNow == true) {
@@ -182,7 +188,7 @@ class ConnectFragment :
             val millisUntilExpiration = expiration.millis - DateTime.now().millis
 
             delay(millisUntilExpiration)
-            accountCache.fetchAccountExpiry()
+            accountRepository.fetchAccountExpiry()
 
             // If the account ran out of time but is still connected, fetching the expiry again will
             // fail. Therefore, after a timeout of 5 seconds the app will assume the account time
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index f15f841e60..02b6f1d059 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.widget.Button
 import net.mullvad.mullvadvpn.ui.widget.HeaderBar
 import net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton
@@ -24,7 +24,7 @@ import org.koin.android.ext.android.inject
 class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
     // Injected dependencies
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
 
     private lateinit var headerBar: HeaderBar
 
@@ -81,7 +81,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
 
     override fun onSafelyStart() {
         jobTracker.newUiJob("updateAccountExpiry") {
-            accountCache.accountExpiryState
+            accountRepository.accountExpiryState
                 .map { state -> state.date() }
                 .collect { expiryDate ->
                     checkExpiry(expiryDate)
@@ -90,7 +90,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
 
         jobTracker.newBackgroundJob("pollAccountData") {
             while (true) {
-                accountCache.fetchAccountExpiry()
+                accountRepository.fetchAccountExpiry()
                 delay(POLL_INTERVAL)
             }
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
index 67536dca55..e12a9cdeef 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.VoucherSubmissionError
 import net.mullvad.mullvadvpn.model.VoucherSubmissionResult
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.VoucherRedeemer
 import net.mullvad.mullvadvpn.ui.widget.Button
@@ -31,7 +31,7 @@ const val FULL_VOUCHER_CODE_LENGTH = "XXXX-XXXX-XXXX-XXXX".length
 class RedeemVoucherDialogFragment : DialogFragment() {
 
     // Injected dependencies
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
     private val serviceConnectionManager: ServiceConnectionManager by inject()
 
     private val jobTracker = JobTracker()
@@ -60,7 +60,7 @@ class RedeemVoucherDialogFragment : DialogFragment() {
         }
 
         jobTracker.newUiJob("updateExpiry") {
-            accountCache.accountExpiryState.collect { accountExpiry = it.date() }
+            accountRepository.accountExpiryState.collect { accountExpiry = it.date() }
         }
 
         updateRedeemButton()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 8d119807b8..d9a28a9ad7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.DeviceState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.AppVersionInfoCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
@@ -24,7 +24,7 @@ import net.mullvad.mullvadvpn.ui.widget.NavigateCell
 import org.koin.android.ext.android.inject
 
 class SettingsFragment : ServiceAwareFragment(), StatusBarPainter, NavigationBarPainter {
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
     private val deviceRepository: DeviceRepository by inject()
 
     private lateinit var accountMenu: AccountCell
@@ -131,14 +131,14 @@ class SettingsFragment : ServiceAwareFragment(), StatusBarPainter, NavigationBar
 
     private fun configureListeners() {
         jobTracker.newUiJob("updateAccountExpiry") {
-            accountCache.accountExpiryState
+            accountRepository.accountExpiryState
                 .map { state -> state.date() }
                 .collect { expiryDate ->
                     accountMenu.accountExpiry = expiryDate
                 }
         }
 
-        accountCache.fetchAccountExpiry()
+        accountRepository.fetchAccountExpiry()
 
         versionInfoCache?.onUpdate = {
             jobTracker.newUiJob("updateVersionInfo") {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index a5220bd758..7b8978e669 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.widget.HeaderBar
 import net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton
@@ -26,7 +26,7 @@ val POLL_INTERVAL: Long = 15 /* s */ * 1000 /* ms */
 class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
     // Injected dependencies
-    private val accountCache: AccountCache by inject()
+    private val accountRepository: AccountRepository by inject()
     private val deviceRepository: DeviceRepository by inject()
 
     private lateinit var accountLabel: TextView
@@ -73,14 +73,14 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         }
 
         jobTracker.newUiJob("checkAccountExpiry") {
-            accountCache.accountExpiryState.collect {
+            accountRepository.accountExpiryState.collect {
                 checkExpiry(it.date())
             }
         }
 
         jobTracker.newBackgroundJob("pollAccountData") {
             while (true) {
-                accountCache.fetchAccountExpiry()
+                accountRepository.fetchAccountExpiry()
                 delay(POLL_INTERVAL)
             }
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
index 794c372f72..5db4c17996 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.ui.notification
 import android.content.Context
 import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache
 import net.mullvad.mullvadvpn.util.TimeLeftFormatter
 import org.joda.time.DateTime
@@ -11,7 +11,7 @@ import org.joda.time.DateTime
 class AccountExpiryNotification(
     context: Context,
     authTokenCache: AuthTokenCache,
-    private val accountCache: AccountCache
+    private val accountRepository: AccountRepository
 ) : NotificationWithUrlWithToken(context, authTokenCache, R.string.account_url) {
     private val timeLeftFormatter = TimeLeftFormatter(context.resources)
 
@@ -22,7 +22,7 @@ class AccountExpiryNotification(
 
     override fun onResume() {
         jobTracker.newUiJob("updateAccountExpiry") {
-            accountCache.accountExpiryState.collect { state ->
+            accountRepository.accountExpiryState.collect { state ->
                 updateAccountExpiry(state.date())
             }
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt
index c95bf14aeb..32b36352ad 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt
@@ -19,7 +19,7 @@ import net.mullvad.mullvadvpn.model.AccountExpiry
 import net.mullvad.mullvadvpn.model.AccountHistory
 import net.mullvad.mullvadvpn.util.flatMapReadyConnectionOrDefault
 
-class AccountCache(
+class AccountRepository(
     private val serviceConnectionManager: ServiceConnectionManager,
     dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModel.kt
index 8487433362..4272a5de35 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModel.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.talpid.util.callbackFlowFromSubscription
@@ -19,7 +19,7 @@ import net.mullvad.talpid.util.callbackFlowFromSubscription
 //  ServiceConnectionManager here.
 class DeviceRevokedViewModel(
     private val serviceConnectionManager: ServiceConnectionManager,
-    private val accountCache: AccountCache,
+    private val accountRepository: AccountRepository,
     dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : ViewModel() {
 
@@ -48,7 +48,7 @@ class DeviceRevokedViewModel(
             if (container.connectionProxy.state.isSecured()) {
                 container.connectionProxy.disconnect()
             }
-            accountCache.logout()
+            accountRepository.logout()
         }
     }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
index ff391c668b..8751089cf8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
@@ -12,18 +12,18 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.model.AccountCreationResult
 import net.mullvad.mullvadvpn.model.LoginResult
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 
 class LoginViewModel(
-    private val accountCache: AccountCache,
+    private val accountRepository: AccountRepository,
     private val deviceRepository: DeviceRepository,
     private val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : ViewModel() {
     private val _uiState = MutableStateFlow<LoginUiState>(LoginUiState.Default)
     val uiState: StateFlow<LoginUiState> = _uiState
 
-    val accountHistory = accountCache.accountHistoryEvents
+    val accountHistory = accountRepository.accountHistoryEvents
 
     sealed class LoginUiState {
         object Default : LoginUiState()
@@ -41,7 +41,7 @@ class LoginViewModel(
         data class OtherError(val errorMessage: String) : LoginUiState()
     }
 
-    fun clearAccountHistory() = accountCache.clearAccountHistory()
+    fun clearAccountHistory() = accountRepository.clearAccountHistory()
 
     fun clearState() {
         _uiState.value = LoginUiState.Default
@@ -50,8 +50,8 @@ class LoginViewModel(
     fun createAccount() {
         _uiState.value = LoginUiState.CreatingAccount
         viewModelScope.launch(dispatcher) {
-            _uiState.value = accountCache.accountCreationEvents
-                .onStart { accountCache.createAccount() }
+            _uiState.value = accountRepository.accountCreationEvents
+                .onStart { accountRepository.createAccount() }
                 .first()
                 .mapToUiState()
         }
@@ -60,8 +60,8 @@ class LoginViewModel(
     fun login(accountToken: String) {
         _uiState.value = LoginUiState.Loading
         viewModelScope.launch(dispatcher) {
-            _uiState.value = accountCache.loginEvents
-                .onStart { accountCache.login(accountToken) }
+            _uiState.value = accountRepository.loginEvents
+                .onStart { accountRepository.login(accountToken) }
                 .map { it.result.mapToUiState(accountToken) }
                 .first()
         }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
index 6dd1c586c9..8d45aa415d 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceRevokedViewModelTest.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.runBlockingTest
 import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
@@ -31,7 +31,7 @@ import org.junit.Test
 class DeviceRevokedViewModelTest {
 
     @MockK
-    private lateinit var mockedAccountCache: AccountCache
+    private lateinit var mockedAccountRepository: AccountRepository
 
     @MockK
     private lateinit var mockedServiceConnectionManager: ServiceConnectionManager
@@ -48,7 +48,7 @@ class DeviceRevokedViewModelTest {
         every { mockedServiceConnectionManager.connectionState } returns serviceConnectionState
         viewModel = DeviceRevokedViewModel(
             mockedServiceConnectionManager,
-            mockedAccountCache,
+            mockedAccountRepository,
             TestCoroutineDispatcher()
         )
     }
@@ -105,7 +105,7 @@ class DeviceRevokedViewModelTest {
         val mockedContainer = mockk<ServiceConnectionContainer>().also {
             every { it.connectionProxy.state } returns TunnelState.Disconnected
             every { it.connectionProxy.disconnect() } just Runs
-            every { mockedAccountCache.logout() } just Runs
+            every { mockedAccountRepository.logout() } just Runs
         }
         serviceConnectionState.value = ServiceConnectionState.ConnectedReady(mockedContainer)
 
@@ -114,7 +114,7 @@ class DeviceRevokedViewModelTest {
 
         // Assert
         verify {
-            mockedAccountCache.logout()
+            mockedAccountRepository.logout()
         }
     }
 
@@ -124,7 +124,7 @@ class DeviceRevokedViewModelTest {
         val mockedContainer = mockk<ServiceConnectionContainer>().also {
             every { it.connectionProxy.state } returns TunnelState.Connected(mockk(), mockk())
             every { it.connectionProxy.disconnect() } just Runs
-            every { mockedAccountCache.logout() } just Runs
+            every { mockedAccountRepository.logout() } just Runs
         }
         serviceConnectionState.value = ServiceConnectionState.ConnectedReady(mockedContainer)
 
@@ -134,7 +134,7 @@ class DeviceRevokedViewModelTest {
         // Assert
         verifyOrder {
             mockedContainer.connectionProxy.disconnect()
-            mockedAccountCache.logout()
+            mockedAccountRepository.logout()
         }
     }
 
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index 6b44989f52..4af15c0cee 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -19,7 +19,7 @@ import net.mullvad.mullvadvpn.model.AccountCreationResult
 import net.mullvad.mullvadvpn.model.AccountHistory
 import net.mullvad.mullvadvpn.model.DeviceListEvent
 import net.mullvad.mullvadvpn.model.LoginResult
-import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
+import net.mullvad.mullvadvpn.ui.serviceconnection.AccountRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.DeviceRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
@@ -29,7 +29,7 @@ import org.junit.Test
 class LoginViewModelTest {
 
     @MockK
-    private lateinit var mockedAccountCache: AccountCache
+    private lateinit var mockedAccountRepository: AccountRepository
 
     @MockK
     private lateinit var mockedDeviceRepository: DeviceRepository
@@ -51,15 +51,15 @@ class LoginViewModelTest {
         Dispatchers.setMain(TestCoroutineDispatcher())
         MockKAnnotations.init(this, relaxUnitFun = true)
 
-        every { mockedAccountCache.accountCreationEvents } returns accountCreationTestEvents
-        every { mockedAccountCache.accountHistoryEvents } returns accountHistoryTestEvents
-        every { mockedAccountCache.loginEvents } returns loginTestEvents
+        every { mockedAccountRepository.accountCreationEvents } returns accountCreationTestEvents
+        every { mockedAccountRepository.accountHistoryEvents } returns accountHistoryTestEvents
+        every { mockedAccountRepository.loginEvents } returns loginTestEvents
 
         serviceConnectionState.value =
             ServiceConnectionState.ConnectedReady(mockedServiceConnectionContainer)
 
         loginViewModel = LoginViewModel(
-            mockedAccountCache,
+            mockedAccountRepository,
             mockedDeviceRepository,
             TestCoroutineDispatcher()
         )
@@ -163,7 +163,7 @@ class LoginViewModelTest {
     @Test
     fun testClearingAccountHistory() = runBlockingTest {
         loginViewModel.clearAccountHistory()
-        verify { mockedAccountCache.clearAccountHistory() }
+        verify { mockedAccountRepository.clearAccountHistory() }
     }
 
     private suspend fun <T> FlowTurbine<T>.skipDefaultItem() where T : Any? {