summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-24 00:53:54 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-27 13:18:34 +0000
commit342c97b36bd53cbc13ca4755b47686a46ecc281a (patch)
treece7cc6581c1107a233048d52a2e43b35b15612fb /android/src
parent7ba2ab487d5dc19dec8398662ec1bf138bacea28 (diff)
downloadmullvadvpn-342c97b36bd53cbc13ca4755b47686a46ecc281a.tar.xz
mullvadvpn-342c97b36bd53cbc13ca4755b47686a46ecc281a.zip
Ensure `prepare` is called before creating tunnel
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt5
1 files changed, 5 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index a36e0b1db6..e869a839de 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -18,6 +18,11 @@ open class TalpidVpnService : VpnService() {
}
fun createTun(config: TunConfig): Int {
+ if (VpnService.prepare(this) != null) {
+ // VPN permission wasn't granted
+ return 0
+ }
+
val builder = Builder().apply {
for (address in config.addresses) {
addAddress(address, prefixForAddress(address))