diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 11:25:56 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 11:25:56 -0300 |
| commit | 796e29a41ba991ce5335658353ee7a00fb8997e0 (patch) | |
| tree | 4ea18a0c8a7e71acbd03bf3d3a178e6ce0655523 | |
| parent | 998c5bca3317cad11b6cc33bfec8019bd749ab04 (diff) | |
| parent | f7b14940e18f83068e7e77b7159ccb21298c5f42 (diff) | |
| download | mullvadvpn-796e29a41ba991ce5335658353ee7a00fb8997e0.tar.xz mullvadvpn-796e29a41ba991ce5335658353ee7a00fb8997e0.zip | |
Merge branch 'show-error-message-on-vpn-permission-denial'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a60774a3c..e88896eb84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,8 @@ Line wrap the file at 100 chars. Th - Improve navigation in the app using a keyboard, so that touchless devices (like TVs) can be used more smoothly. - Run app in landscape mode on TVs. +- Try to connect even if VPN permission is denied, so that the app shows an error message saying + that the VPN permission was denied. #### Linux - Make route monitor ignore loopback routes. 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 2e937c7057..e460d27cd8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt @@ -52,9 +52,8 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) { requestVpnPermission() activeAction = GlobalScope.launch(Dispatchers.Default) { - if (vpnPermission.await()) { - daemon.connect() - } + vpnPermission.await() + daemon.connect() } } } |