diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-28 15:22:30 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-28 15:22:30 -0300 |
| commit | f64673ec1480cf8a887372dbd348e565a4e0d480 (patch) | |
| tree | 9dd4d3f7bd986dbd37632b81f9527c3d5a3e2197 | |
| parent | 3dac78afdbe264a8ea88f4f26cfe1f07991c4418 (diff) | |
| parent | 9eadf9d1b3a30e4c515a17a4b374aeeff216107e (diff) | |
| download | mullvadvpn-f64673ec1480cf8a887372dbd348e565a4e0d480.tar.xz mullvadvpn-f64673ec1480cf8a887372dbd348e565a4e0d480.zip | |
Merge branch 'fix-missing-excluded-apps-with-auto-connect'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ad90e6abcd..a300c23d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ Line wrap the file at 100 chars. Th - Fix rare crash that could occur when the tunnel state changes when showing or hiding the quick settings tile. - Fix app starting by itself sometimes. +- Fix apps not being excluded from the tunnel sometimes if auto-connect was enabled. #### Windows - Fix log output encoding for Windows modules. diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt index eae5fa0219..2e937c7057 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt @@ -114,7 +114,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) { is TunnelState.Disconnecting -> { when (currentState.actionAfterDisconnect) { ActionAfterDisconnect.Nothing -> false - ActionAfterDisconnect.Reconnect -> false + ActionAfterDisconnect.Reconnect -> true ActionAfterDisconnect.Block -> true } } |