summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-22 19:32:52 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-28 18:03:44 +0000
commit54f8c3701a576408f45e107b650ffd333f236098 (patch)
treeec84b468aca4b66e44d432d4ed6ab6c688b510aa /android/src
parent8515788fb6084de7b1189af9bb80e2438ad9a6b7 (diff)
downloadmullvadvpn-54f8c3701a576408f45e107b650ffd333f236098.tar.xz
mullvadvpn-54f8c3701a576408f45e107b650ffd333f236098.zip
Remove old event notifications
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt16
1 files changed, 1 insertions, 15 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 4a52e017a0..97d2125112 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
@@ -30,14 +30,6 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
val onAccountNumberChange = EventNotifier<String?>(null)
val onAccountExpiryChange = EventNotifier<DateTime?>(null)
- var onAccountDataChange: ((String?, DateTime?) -> Unit)? = null
- set(value) {
- synchronized(this) {
- field = value
- notifyChange()
- }
- }
-
init {
settingsListener.accountNumberNotifier.subscribe(this) { accountNumber ->
handleNewAccountNumber(accountNumber)
@@ -61,7 +53,7 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
retryAttempt += 1
delay(calculateRetryFetchDelay(retryAttempt))
- } while (onAccountDataChange != null || onAccountExpiryChange.hasListeners())
+ } while (onAccountExpiryChange.hasListeners())
}
}
}
@@ -76,7 +68,6 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
accountNumber = newAccountNumber
accountExpiry = null
- notifyChange()
fetchAccountExpiry()
}
}
@@ -85,15 +76,10 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
synchronized(this) {
if (accountNumber === accountNumberUsedForFetch) {
accountExpiry = DateTime.parse(expiryString, EXPIRY_FORMAT)
- notifyChange()
}
}
}
- private fun notifyChange() {
- onAccountDataChange?.invoke(accountNumber, accountExpiry)
- }
-
private fun calculateRetryFetchDelay(retryAttempt: Int): Long {
// delay in seconds = 2 ^ retryAttempt capped at 2^13 (8192)
val exponent = min(retryAttempt, 13)