diff options
| author | Albin <albin@mullvad.net> | 2024-06-07 18:51:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-06-10 10:36:18 +0200 |
| commit | f937ea54f41f947de8ddd606f6071f191fb1cdfb (patch) | |
| tree | ab5be555271de269a199dcfae85d6050610415b3 /android/lib/model/src | |
| parent | 561c4d8262fde4d70c13fb1de0642bee521fbbe3 (diff) | |
| download | mullvadvpn-f937ea54f41f947de8ddd606f6071f191fb1cdfb.tar.xz mullvadvpn-f937ea54f41f947de8ddd606f6071f191fb1cdfb.zip | |
Unify account number naming
Use variations of "account number" rather than
"account token" throughout the kotlin code base.
Diffstat (limited to 'android/lib/model/src')
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountNumber.kt (renamed from android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountToken.kt) | 2 | ||||
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt | 6 | ||||
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountToken.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountNumber.kt index d03a0d6721..995e3550f7 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountToken.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountNumber.kt @@ -3,4 +3,4 @@ package net.mullvad.mullvadvpn.lib.model import android.os.Parcelable import kotlinx.parcelize.Parcelize -@JvmInline @Parcelize value class AccountToken(val value: String) : Parcelable +@JvmInline @Parcelize value class AccountNumber(val value: String) : Parcelable diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt index 4546cd46b3..ccec166a47 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt @@ -5,7 +5,7 @@ import kotlinx.parcelize.Parcelize sealed class DeviceState : Parcelable { @Parcelize - data class LoggedIn(val accountToken: AccountToken, val device: Device) : DeviceState() + data class LoggedIn(val accountNumber: AccountNumber, val device: Device) : DeviceState() @Parcelize data object LoggedOut : DeviceState() @@ -15,7 +15,7 @@ sealed class DeviceState : Parcelable { return (this as? LoggedIn)?.device?.displayName() } - fun token(): AccountToken? { - return (this as? LoggedIn)?.accountToken + fun token(): AccountNumber? { + return (this as? LoggedIn)?.accountNumber } } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt index 1c58f80bee..99c36bc9d2 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt @@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize sealed class LoginAccountError : Parcelable { data object InvalidAccount : LoginAccountError() - data class MaxDevicesReached(val accountToken: AccountToken) : LoginAccountError() + data class MaxDevicesReached(val accountNumber: AccountNumber) : LoginAccountError() data object RpcError : LoginAccountError() |