diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 10:31:59 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-23 10:31:59 -0300 |
| commit | 998c5bca3317cad11b6cc33bfec8019bd749ab04 (patch) | |
| tree | 394f5c8d55585c5aa8a6263ca8db5a2809e09940 /android/src | |
| parent | 1e514b22e961f8f29941fdd8188e0874cc9b8e11 (diff) | |
| parent | e6864e708a8701309b218ae76d67a8a8bad7a8c5 (diff) | |
| download | mullvadvpn-998c5bca3317cad11b6cc33bfec8019bd749ab04.tar.xz mullvadvpn-998c5bca3317cad11b6cc33bfec8019bd749ab04.zip | |
Merge branch 'fix-incorrect-blocked-message-without-vpn-permission'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt index 93c7f32c36..a0dfd029f2 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt @@ -55,11 +55,13 @@ open class TalpidVpnService : VpnService() { } } - fun createTunIfClosed() { + fun createTunIfClosed(): Boolean { synchronized(this) { if (activeTunDevice == null) { activeTunDevice = createTun(currentTunConfig) } + + return activeTunDevice?.let { tunFd -> tunFd > 0 } ?: false } } |