diff options
Diffstat (limited to 'android/lib/daemon-grpc/src')
2 files changed, 6 insertions, 3 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 bac6e22277..f306c9f833 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 @@ -389,7 +389,9 @@ class ManagementService( suspend fun getAccountData( accountNumber: AccountNumber ): Either<GetAccountDataError, AccountData> = - Either.catch { grpc.getAccountData(StringValue.of(accountNumber.value)).toDomain() } + Either.catch { + grpc.getAccountData(StringValue.of(accountNumber.value)).toDomain(accountNumber) + } .onLeft { Logger.e("Get account data error") } .mapLeft(GetAccountDataError::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 feb181f01d..f3037a8c1a 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 @@ -613,9 +613,10 @@ internal fun ManagementInterface.DeviceState.toDomain(): DeviceState = else -> throw NullPointerException("Device state is null") } -internal fun ManagementInterface.AccountData.toDomain(): AccountData = +internal fun ManagementInterface.AccountData.toDomain(accountNumber: AccountNumber): AccountData = AccountData( - AccountId(UUID.fromString(id)), + id = AccountId(UUID.fromString(id)), + accountNumber = accountNumber, expiryDate = Instant.ofEpochSecond(expiry.seconds).atDefaultZone(), ) |