summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt14
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt4
2 files changed, 4 insertions, 14 deletions
diff --git a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
index c9eac5598c..150382bb1a 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
@@ -19,17 +19,7 @@ sealed class CreateTunResult {
get() = true
}
- class PermissionDenied : CreateTunResult() {
- companion object {
- @JvmStatic
- val INSTANCE = PermissionDenied()
- }
- }
+ object PermissionDenied : CreateTunResult()
- class TunnelDeviceError : CreateTunResult() {
- companion object {
- @JvmStatic
- val INSTANCE = TunnelDeviceError()
- }
- }
+ object TunnelDeviceError : CreateTunResult()
}
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 7da32ad71b..0dd94749c5 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -98,7 +98,7 @@ open class TalpidVpnService : VpnService() {
private fun createTun(config: TunConfig): CreateTunResult {
if (VpnService.prepare(this) != null) {
// VPN permission wasn't granted
- return CreateTunResult.PermissionDenied()
+ return CreateTunResult.PermissionDenied
}
var invalidDnsServerAddresses = ArrayList<InetAddress>()
@@ -138,7 +138,7 @@ open class TalpidVpnService : VpnService() {
val tunFd = vpnInterface?.detachFd()
if (tunFd == null) {
- return CreateTunResult.TunnelDeviceError()
+ return CreateTunResult.TunnelDeviceError
}
waitForTunnelUp(tunFd, config.routes.any { route -> route.isIpv6 })