diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-06 10:50:19 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-06 10:50:19 -0300 |
| commit | 00e6702f059d06c60f015993e44a0eca304b248e (patch) | |
| tree | 6dffbd63b169e4bf045b3aa64cbeef759e437411 | |
| parent | 3a41c3cd5bf5a9260c467579621f51b376d46fa2 (diff) | |
| parent | 397c380ebe94370e9066ed6d1dd430c436a93385 (diff) | |
| download | mullvadvpn-00e6702f059d06c60f015993e44a0eca304b248e.tar.xz mullvadvpn-00e6702f059d06c60f015993e44a0eca304b248e.zip | |
Merge branch 'fix-cancel-not-working'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt index b8b0806285..26abe8a106 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt @@ -76,7 +76,7 @@ class ConnectionProxy(val parentActivity: MainActivity) { private fun anticipateConnectingState(): Boolean { synchronized(this) { - val currentState = state + val currentState = uiState if (currentState is TunnelState.Connecting || currentState is TunnelState.Connected) { return false @@ -89,7 +89,7 @@ class ConnectionProxy(val parentActivity: MainActivity) { private fun anticipateDisconnectingState(): Boolean { synchronized(this) { - val currentState = state + val currentState = uiState if (currentState is TunnelState.Disconnected) { return false |