Unify account number naming

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

2 files changed, 15 insertions, 15 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 2200fa2ce2..6cc6d25c36 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -41,7 +41,7 @@ import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.toDomain
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.LogInterceptor
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.connectivityFlow
 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.AddSplitTunnelingAppError
 import net.mullvad.mullvadvpn.lib.model.AppId
 import net.mullvad.mullvadvpn.lib.model.AppVersionInfo as ModelAppVersionInfo
@@ -210,13 +210,13 @@ class ManagementService(
             .map { it.toDomain() }
             .mapLeft { GetDeviceStateError.Unknown(it) }
 
-    suspend fun getDeviceList(token: AccountToken): Either<GetDeviceListError, List<Device>> =
+    suspend fun getDeviceList(token: AccountNumber): Either<GetDeviceListError, List<Device>> =
         Either.catch { grpc.listDevices(StringValue.of(token.value)) }
             .map { it.devicesList.map(ManagementInterface.Device::toDomain) }
             .mapLeft { GetDeviceListError.Unknown(it) }
 
     suspend fun removeDevice(
-        token: AccountToken,
+        token: AccountNumber,
         deviceId: DeviceId
     ): Either<DeleteDeviceError, Unit> =
         Either.catch {
@@ -257,13 +257,13 @@ class ManagementService(
         grpc.logoutAccount(Empty.getDefaultInstance())
     }
 
-    suspend fun loginAccount(accountToken: AccountToken): Either<LoginAccountError, Unit> =
-        Either.catch { grpc.loginAccount(StringValue.of(accountToken.value)) }
+    suspend fun loginAccount(accountNumber: AccountNumber): Either<LoginAccountError, Unit> =
+        Either.catch { grpc.loginAccount(StringValue.of(accountNumber.value)) }
             .mapLeftStatus {
                 when (it.status.code) {
                     Status.Code.UNAUTHENTICATED -> LoginAccountError.InvalidAccount
                     Status.Code.RESOURCE_EXHAUSTED ->
-                        LoginAccountError.MaxDevicesReached(accountToken)
+                        LoginAccountError.MaxDevicesReached(accountNumber)
                     Status.Code.UNAVAILABLE -> LoginAccountError.RpcError
                     else -> LoginAccountError.Unknown(it)
                 }
@@ -274,11 +274,11 @@ class ManagementService(
         grpc.clearAccountHistory(Empty.getDefaultInstance())
     }
 
-    suspend fun getAccountHistory(): Either<GetAccountHistoryError, AccountToken?> =
+    suspend fun getAccountHistory(): Either<GetAccountHistoryError, AccountNumber?> =
         Either.catch {
                 val history = grpc.getAccountHistory(Empty.getDefaultInstance())
                 if (history.hasToken()) {
-                    AccountToken(history.token.value)
+                    AccountNumber(history.token.value)
                 } else {
                     null
                 }
@@ -298,15 +298,15 @@ class ManagementService(
     }
 
     suspend fun getAccountData(
-        accountToken: AccountToken
+        accountNumber: AccountNumber
     ): Either<GetAccountDataError, AccountData> =
-        Either.catch { grpc.getAccountData(StringValue.of(accountToken.value)).toDomain() }
+        Either.catch { grpc.getAccountData(StringValue.of(accountNumber.value)).toDomain() }
             .mapLeft(GetAccountDataError::Unknown)
 
-    suspend fun createAccount(): Either<CreateAccountError, AccountToken> =
+    suspend fun createAccount(): Either<CreateAccountError, AccountNumber> =
         Either.catch {
-                val accountTokenStringValue = grpc.createNewAccount(Empty.getDefaultInstance())
-                AccountToken(accountTokenStringValue.value)
+                val accountNumberStringValue = grpc.createNewAccount(Empty.getDefaultInstance())
+                AccountNumber(accountNumberStringValue.value)
             }
             .mapLeft(CreateAccountError::Unknown)
 
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
index 0fe64e09f2..59a94f62dc 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
@@ -11,7 +11,7 @@ import net.mullvad.mullvadvpn.lib.daemon.grpc.GrpcConnectivityState
 import net.mullvad.mullvadvpn.lib.daemon.grpc.RelayNameComparator
 import net.mullvad.mullvadvpn.lib.model.AccountData
 import net.mullvad.mullvadvpn.lib.model.AccountId
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.ActionAfterDisconnect
 import net.mullvad.mullvadvpn.lib.model.AppId
 import net.mullvad.mullvadvpn.lib.model.AppVersionInfo
@@ -491,7 +491,7 @@ internal fun ManagementInterface.Device.toDomain(): Device =
 internal fun ManagementInterface.DeviceState.toDomain(): DeviceState =
     when (state) {
         ManagementInterface.DeviceState.State.LOGGED_IN ->
-            DeviceState.LoggedIn(AccountToken(device.accountToken), device.device.toDomain())
+            DeviceState.LoggedIn(AccountNumber(device.accountToken), device.device.toDomain())
         ManagementInterface.DeviceState.State.LOGGED_OUT -> DeviceState.LoggedOut
         ManagementInterface.DeviceState.State.REVOKED -> DeviceState.Revoked
         ManagementInterface.DeviceState.State.UNRECOGNIZED ->