diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2021-07-06 14:00:08 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2021-07-06 14:00:08 +0100 |
| commit | 86bb6d0efb5d93cfd3054b1dc7d5cddcd1575d04 (patch) | |
| tree | a5ad638c5f1acdcf873b761920512869646b8adb | |
| parent | 6eb930130001a21ac63142ee52afa3f6b215f688 (diff) | |
| parent | c4a4a0b8984119902d29afb3530ada60571e45b6 (diff) | |
| download | mullvadvpn-86bb6d0efb5d93cfd3054b1dc7d5cddcd1575d04.tar.xz mullvadvpn-86bb6d0efb5d93cfd3054b1dc7d5cddcd1575d04.zip | |
Merge branch 'fix-android-vpn-permission-request'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 5 |
1 files changed, 5 insertions, 0 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 7f3f4de4a8..00d3a28b76 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -43,6 +43,11 @@ open class MainActivity : FragmentActivity() { if (newConnection == null) { serviceNotifier.notify(null) + } else { + newConnection.vpnPermission.onRequest = { -> + Unit + this.requestVpnPermission() + } } } |