diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-01 17:42:46 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-31 14:36:30 +0000 |
| commit | 0bcea062916c317ccc9aa2ea065623d36d108780 (patch) | |
| tree | 78604e82cbd0953913979733d776b801600fd6e3 /android/src | |
| parent | cc013457eea20c5bdb83f88f7d089e99f12b9375 (diff) | |
| download | mullvadvpn-0bcea062916c317ccc9aa2ea065623d36d108780.tar.xz mullvadvpn-0bcea062916c317ccc9aa2ea065623d36d108780.zip | |
Simplify `AccountCache` constructor parameters
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt | 14 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt index 9a5fbb65b7..a243ea790e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt @@ -2,18 +2,13 @@ package net.mullvad.mullvadvpn.service.endpoint import kotlinx.coroutines.delay import net.mullvad.mullvadvpn.model.GetAccountDataResult -import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.util.ExponentialBackoff -import net.mullvad.mullvadvpn.util.Intermittent import net.mullvad.mullvadvpn.util.JobTracker import net.mullvad.talpid.util.EventNotifier import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat -class AccountCache( - val settingsListener: SettingsListener, - val daemon: Intermittent<MullvadDaemon> -) { +class AccountCache(private val endpoint: ServiceEndpoint) { companion object { public val EXPIRY_FORMAT = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss z") @@ -25,6 +20,9 @@ class AccountCache( private const val MAX_INVALIDATED_RETRIES = 7 } + private val daemon + get() = endpoint.intermittentDaemon + val onAccountNumberChange = EventNotifier<String?>(null) val onAccountExpiryChange = EventNotifier<DateTime?>(null) val onAccountHistoryChange = EventNotifier<List<String>>(listOf<String>()) @@ -42,7 +40,7 @@ class AccountCache( private var oldAccountExpiry: DateTime? = null init { - settingsListener.accountNumberNotifier.subscribe(this) { accountNumber -> + endpoint.settingsListener.accountNumberNotifier.subscribe(this) { accountNumber -> handleNewAccountNumber(accountNumber) } } @@ -107,7 +105,7 @@ class AccountCache( } fun onDestroy() { - settingsListener.accountNumberNotifier.unsubscribe(this) + endpoint.settingsListener.accountNumberNotifier.unsubscribe(this) jobTracker.cancelAllJobs() onAccountNumberChange.unsubscribeAll() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt index d4bd4b25d8..aee7d21d39 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt @@ -33,7 +33,7 @@ class ServiceEndpoint( val settingsListener = SettingsListener(this) - val accountCache = AccountCache(settingsListener, intermittentDaemon) + val accountCache = AccountCache(this) val keyStatusListener = KeyStatusListener(this) val locationInfoCache = LocationInfoCache(this) |