summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-15 19:45:21 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-16 12:36:00 +0000
commitd5b83e41bf2d7982f425bc2ef6bbfdce167511f2 (patch)
tree774e06b50908c9ddac329ef656f9528b10130777 /android/src/main
parent5de62ca337490bdff08c7d53d46a795b482cc787 (diff)
downloadmullvadvpn-d5b83e41bf2d7982f425bc2ef6bbfdce167511f2.tar.xz
mullvadvpn-d5b83e41bf2d7982f425bc2ef6bbfdce167511f2.zip
Refactor to improve readability returning error
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 544063476f..352bccb016 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -122,13 +122,13 @@ open class TalpidVpnService : VpnService() {
val vpnInterface = builder.establish()
val tunFd = vpnInterface?.detachFd()
- if (tunFd != null) {
- waitForTunnelUp(tunFd, config.routes.any { route -> route.isIpv6 })
-
- return CreateTunResult.Success(tunFd)
- } else {
+ if (tunFd == null) {
return CreateTunResult.TunnelDeviceError()
}
+
+ waitForTunnelUp(tunFd, config.routes.any { route -> route.isIpv6 })
+
+ return CreateTunResult.Success(tunFd)
}
fun bypass(socket: Int): Boolean {