diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-01 16:27:02 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-01 16:27:02 +0200 |
| commit | ffa5d846607f680a35b59266845196c34971a2ba (patch) | |
| tree | 576ffb14c14a666371f0fea2bd784f64ce411187 /android/lib | |
| parent | 5ed9fdaff6dcb709a0c1a4101c444c697cb948bc (diff) | |
| parent | fd8f186f7289760532ee0ed56c3405c5700e9822 (diff) | |
| download | mullvadvpn-ffa5d846607f680a35b59266845196c34971a2ba.tar.xz mullvadvpn-ffa5d846607f680a35b59266845196c34971a2ba.zip | |
Merge branch 'rename-account_token-account_number-des-1029'
Diffstat (limited to 'android/lib')
2 files changed, 4 insertions, 4 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 3ffbe0fc4a..4e74a8f78b 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 @@ -270,7 +270,7 @@ class ManagementService( Either.catch { grpc.removeDevice( ManagementInterface.DeviceRemoval.newBuilder() - .setAccountToken(token.value) + .setAccountNumber(token.value) .setDeviceId(deviceId.value.toString()) .build() ) @@ -347,8 +347,8 @@ class ManagementService( suspend fun getAccountHistory(): Either<GetAccountHistoryError, AccountNumber?> = Either.catch { val history = grpc.getAccountHistory(Empty.getDefaultInstance()) - if (history.hasToken()) { - AccountNumber(history.token.value) + if (history.hasNumber()) { + AccountNumber(history.number.value) } else { null } 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 99b4554f0b..4a8ee04683 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 @@ -524,7 +524,7 @@ internal fun ManagementInterface.Device.toDomain(): Device = internal fun ManagementInterface.DeviceState.toDomain(): DeviceState = when (state) { ManagementInterface.DeviceState.State.LOGGED_IN -> - DeviceState.LoggedIn(AccountNumber(device.accountToken), device.device.toDomain()) + DeviceState.LoggedIn(AccountNumber(device.accountNumber), device.device.toDomain()) ManagementInterface.DeviceState.State.LOGGED_OUT -> DeviceState.LoggedOut ManagementInterface.DeviceState.State.REVOKED -> DeviceState.Revoked ManagementInterface.DeviceState.State.UNRECOGNIZED -> |