diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-22 09:30:47 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-22 09:30:47 -0300 |
| commit | cde23508dd4a7b242725a7f4639a7aa8d875c872 (patch) | |
| tree | 2b775658b163761aba7a21c87dcd869bb98c340d /android/src | |
| parent | 8a06a0740699a5bb5cda971ab83489e00c8b0fa2 (diff) | |
| parent | 62479a3984f7dafd59a9d9c60820fda32fb4926d (diff) | |
| download | mullvadvpn-cde23508dd4a7b242725a7f4639a7aa8d875c872.tar.xz mullvadvpn-cde23508dd4a7b242725a7f4639a7aa8d875c872.zip | |
Merge branch 'fix-missing-account-expiry'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt index 8cae8baee1..b75450b438 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt @@ -33,7 +33,7 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList jobTracker.newBackgroundJob("fetch") { var retryAttempt = 0 - while (onAccountDataChange != null) { + do { val result = daemon.getAccountData(account) if (result is GetAccountDataResult.Ok) { @@ -45,7 +45,7 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList retryAttempt += 1 delay(calculateRetryFetchDelay(retryAttempt)) - } + } while (onAccountDataChange != null) } } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt index d3687af700..5aa649e0cc 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt @@ -121,12 +121,12 @@ class SettingsFragment : ServiceAwareFragment() { private fun configureListeners() { accountCache?.apply { - fetchAccountExpiry() - onAccountDataChange = { account, expiry -> updateAccountInfoJob?.cancel() updateAccountInfoJob = updateAccountInfo(account != null, expiry) } + + fetchAccountExpiry() } versionInfoCache?.apply { |