summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-20 20:49:48 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-22 20:18:36 +0000
commit22ae56bf0763baed0d08326b8ebe5cb11ed15b07 (patch)
tree46a34974beab60236a2724d0bbd7532c2d82c2b6 /android
parentfa7f499abcd9d2ee34b9b4c111ae74c7a4052697 (diff)
downloadmullvadvpn-22ae56bf0763baed0d08326b8ebe5cb11ed15b07.tar.xz
mullvadvpn-22ae56bf0763baed0d08326b8ebe5cb11ed15b07.zip
Request for VPN permission when service asks to
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index ee1b9c2195..ee471da787 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -55,7 +55,9 @@ open class MainActivity : FragmentActivity() {
serviceConnection?.onDestroy()
serviceConnection = service?.let { safeService ->
- ServiceConnection(safeService, ::handleNewServiceConnection)
+ ServiceConnection(safeService, ::handleNewServiceConnection).apply {
+ vpnPermission.onRequest = ::requestVpnPermission
+ }
}
if (service == null) {