Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add refresh AccountCache from VoucherRedeemer #5345

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Add refresh AccountCache from VoucherRedeemer #5345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ServiceEndpoint(
val locationInfoCache = LocationInfoCache(this)
val relayListListener = RelayListListener(this)
val splitTunneling = SplitTunneling(SplitTunnelingPersistence(context), this)
val voucherRedeemer = VoucherRedeemer(this)
val voucherRedeemer = VoucherRedeemer(this, accountCache)

private val deviceRepositoryBackend = DaemonDeviceDataSource(this)

Expand Down
17 changes: 16 additions & 1 deletion android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.ClosedReceiveChannelException
import kotlinx.coroutines.channels.actor
import kotlinx.coroutines.channels.trySendBlocking
import net.mullvad.mullvadvpn.lib.common.util.parseAsDateTime
import net.mullvad.mullvadvpn.lib.ipc.Event
import net.mullvad.mullvadvpn.lib.ipc.Request
import net.mullvad.mullvadvpn.model.AccountExpiry
import net.mullvad.mullvadvpn.model.VoucherSubmissionResult

class VoucherRedeemer(private val endpoint: ServiceEndpoint) {
class VoucherRedeemer(
private val endpoint: ServiceEndpoint,
private val accountCache: AccountCache
) {
private val daemon
get() = endpoint.intermittentDaemon

Expand All @@ -31,6 +37,15 @@ class VoucherRedeemer(private val endpoint: ServiceEndpoint) {
for (voucher in channel) {
val result = daemon.await().submitVoucher(voucher)

// Let AccountCache know about the new expiry
if (result is VoucherSubmissionResult.Ok) {
val newExpiry = result.submission.newExpiry.parseAsDateTime()
if (newExpiry != null) {
accountCache.onAccountExpiryChange.notify(
AccountExpiry.Available(newExpiry)
)
}
}
endpoint.sendEvent(Event.VoucherSubmissionResult(voucher, result))
}
} catch (exception: ClosedReceiveChannelException) {
Expand Down
Loading