diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-14 13:14:34 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-14 13:14:34 -0300 |
| commit | 525e9eabc592705fc0fcf107284ec164263ca03b (patch) | |
| tree | 589c7f5dc7b744e6eddef4005ec91200dab7dd84 | |
| parent | 15eca76453f10fda768e0a25da9f62c1d52af57f (diff) | |
| parent | 19e05fd4dd8a265fa069102c06969702d2c906ab (diff) | |
| download | mullvadvpn-525e9eabc592705fc0fcf107284ec164263ca03b.tar.xz mullvadvpn-525e9eabc592705fc0fcf107284ec164263ca03b.zip | |
Merge branch 'fix-tile-connect-action'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d53fa6e444..f44e968c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,8 @@ Line wrap the file at 100 chars. Th - Fix Connect screen sometimes becoming unusually tall. This ended up causing the screen to be scrolled up and made the UI elements unable to be seen until the user scrolled down. - Fix app restarting itself after quitting. +- Fix connect action from quick-settings tile or notification sometimes opening the UI instead of + connecting. ## [2020.5] - 2020-06-25 diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 38d6a2e3eb..edc0cfd21b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -42,7 +42,6 @@ class MullvadVpnService : TalpidVpnService() { private var isStopping = false private var shouldStop = false - private var loggedIn = false private var startDaemonJob: Job? = null @@ -54,17 +53,12 @@ class MullvadVpnService : TalpidVpnService() { AccountExpiryNotification(this, daemon) } - accountNumberEvents = newInstance?.accountCache?.onAccountNumberChange accountExpiryEvents = newInstance?.accountCache?.onAccountExpiryChange serviceNotifier.notify(newInstance) } } - private var accountNumberEvents by autoSubscribable<String?>(this, null) { accountNumber -> - loggedIn = accountNumber != null - } - private var accountExpiryEvents by autoSubscribable<DateTime?>(this, null) { expiry -> accountExpiryNotification?.accountExpiry = expiry } @@ -235,7 +229,7 @@ class MullvadVpnService : TalpidVpnService() { val connectionProxy = ConnectionProxy(this, daemon).apply { when (pendingAction) { PendingAction.Connect -> { - if (loggedIn) { + if (settings.accountToken != null) { connect() } else { openUi() |