summaryrefslogtreecommitdiffhomepage
path: root/android/lib/talpid/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-09-11 15:59:09 +0200
committerDavid Göransson <david.goransson90@gmail.com>2023-09-12 11:22:16 +0200
commitd63db4ab40c71b07368f7778d8fb0f23392352e2 (patch)
treea9392bfc7a24f5fa6f595b9d35cfd8c97951d142 /android/lib/talpid/src
parentfa733200f25e9ef89f138f848af2b0be9eba2e2b (diff)
downloadmullvadvpn-d63db4ab40c71b07368f7778d8fb0f23392352e2.tar.xz
mullvadvpn-d63db4ab40c71b07368f7778d8fb0f23392352e2.zip
Perform AS Code Cleanup
Diffstat (limited to 'android/lib/talpid/src')
-rw-r--r--android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index caa8f11447..1d43b6f9f9 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -82,7 +82,7 @@ open class TalpidVpnService : VpnService() {
}
private fun createTun(config: TunConfig): CreateTunResult {
- if (VpnService.prepare(this) != null) {
+ if (prepare(this) != null) {
// VPN permission wasn't granted
return CreateTunResult.PermissionDenied
}
@@ -126,7 +126,7 @@ open class TalpidVpnService : VpnService() {
waitForTunnelUp(tunFd, config.routes.any { route -> route.isIpv6 })
- if (!invalidDnsServerAddresses.isEmpty()) {
+ if (invalidDnsServerAddresses.isNotEmpty()) {
return CreateTunResult.InvalidDnsServers(invalidDnsServerAddresses, tunFd)
}
@@ -138,9 +138,9 @@ open class TalpidVpnService : VpnService() {
}
private fun prefixForAddress(address: InetAddress): Int {
- when (address) {
- is Inet4Address -> return 32
- is Inet6Address -> return 128
+ return when (address) {
+ is Inet4Address -> 32
+ is Inet6Address -> 128
else -> throw RuntimeException("Invalid IP address (not IPv4 nor IPv6)")
}
}