Unify account number naming

Use variations of "account number" rather than
"account token" throughout the kotlin code base.

2 files changed, 12 insertions, 12 deletions

diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
index 432d113fba..a71dbe8efb 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
 import net.mullvad.mullvadvpn.lib.model.AccountData
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.CreateAccountError
 import net.mullvad.mullvadvpn.lib.model.DeviceState
 import net.mullvad.mullvadvpn.lib.model.LoginAccountError
@@ -37,7 +37,7 @@ class AccountRepository(
                 managementService.deviceState.filterNotNull().map { deviceState ->
                     when (deviceState) {
                         is DeviceState.LoggedIn -> {
-                            managementService.getAccountData(deviceState.accountToken).getOrNull()
+                            managementService.getAccountData(deviceState.accountNumber).getOrNull()
                         }
                         DeviceState.LoggedOut,
                         DeviceState.Revoked -> null
@@ -48,18 +48,18 @@ class AccountRepository(
             .distinctUntilChanged()
             .stateIn(scope = scope, SharingStarted.Eagerly, null)
 
-    suspend fun createAccount(): Either<CreateAccountError, AccountToken> =
+    suspend fun createAccount(): Either<CreateAccountError, AccountNumber> =
         managementService.createAccount().onRight { _isNewAccount.update { true } }
 
-    suspend fun login(accountToken: AccountToken): Either<LoginAccountError, Unit> =
-        managementService.loginAccount(accountToken)
+    suspend fun login(accountNumber: AccountNumber): Either<LoginAccountError, Unit> =
+        managementService.loginAccount(accountNumber)
 
     suspend fun logout() {
         managementService.logoutAccount()
         _isNewAccount.update { false }
     }
 
-    suspend fun fetchAccountHistory(): AccountToken? =
+    suspend fun fetchAccountHistory(): AccountNumber? =
         managementService.getAccountHistory().getOrNull()
 
     suspend fun clearAccountHistory() = managementService.clearAccountHistory()
@@ -68,7 +68,7 @@ class AccountRepository(
         val deviceState = ensureNotNull(deviceRepository.deviceState.value as? DeviceState.LoggedIn)
 
         val accountData =
-            managementService.getAccountData(deviceState.accountToken).getOrNull().bind()
+            managementService.getAccountData(deviceState.accountNumber).getOrNull().bind()
 
         // Update stateflow cache
         _mutableAccountDataCache.emit(accountData)
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
index b1b8f4fa41..f518dc02d1 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.DeleteDeviceError
 import net.mullvad.mullvadvpn.lib.model.Device
 import net.mullvad.mullvadvpn.lib.model.DeviceId
@@ -27,10 +27,10 @@ class DeviceRepository(
         )
 
     suspend fun removeDevice(
-        accountToken: AccountToken,
+        accountNumber: AccountNumber,
         deviceId: DeviceId
-    ): Either<DeleteDeviceError, Unit> = managementService.removeDevice(accountToken, deviceId)
+    ): Either<DeleteDeviceError, Unit> = managementService.removeDevice(accountNumber, deviceId)
 
-    suspend fun deviceList(accountToken: AccountToken): Either<GetDeviceListError, List<Device>> =
-        managementService.getDeviceList(accountToken)
+    suspend fun deviceList(accountNumber: AccountNumber): Either<GetDeviceListError, List<Device>> =
+        managementService.getDeviceList(accountNumber)
 }