aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt')
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
index 263fea4..40e9004 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -23,7 +23,7 @@ import android.content.Context
23import android.content.Intent 23import android.content.Intent
24import android.net.VpnService 24import android.net.VpnService
25import android.os.ParcelFileDescriptor 25import android.os.ParcelFileDescriptor
26import android.support.v4.content.LocalBroadcastManager 26import androidx.localbroadcastmanager.content.LocalBroadcastManager
27import java8.util.concurrent.CompletableFuture 27import java8.util.concurrent.CompletableFuture
28import org.apache.commons.configuration2.ex.ConversionException 28import org.apache.commons.configuration2.ex.ConversionException
29import org.bouncycastle.openssl.PEMException 29import org.bouncycastle.openssl.PEMException
@@ -61,7 +61,7 @@ class TincVpnService : VpnService() {
61 61
62 when { 62 when {
63 intent.action == Actions.ACTION_CONNECT && intent.scheme == Actions.TINC_SCHEME -> 63 intent.action == Actions.ACTION_CONNECT && intent.scheme == Actions.TINC_SCHEME ->
64 startVpn(intent.data.schemeSpecificPart, intent.data.fragment) 64 startVpn(intent.data!!.schemeSpecificPart, intent.data!!.fragment)
65 intent.action == Actions.ACTION_DISCONNECT -> 65 intent.action == Actions.ACTION_DISCONNECT ->
66 stopVpn() 66 stopVpn()
67 intent.action == Actions.ACTION_SYSTEM_CONNECT -> 67 intent.action == Actions.ACTION_SYSTEM_CONNECT ->
@@ -197,7 +197,7 @@ class TincVpnService : VpnService() {
197 companion object { 197 companion object {
198 private const val SETUP_DELAY = 500L // ms 198 private const val SETUP_DELAY = 500L // ms
199 199
200 private val STORE_NAME = this::class.java.`package`.name 200 private val STORE_NAME = this::class.java.`package`!!.name
201 private const val STORE_KEY_NETNAME = "netname" 201 private const val STORE_KEY_NETNAME = "netname"
202 private const val STORE_KEY_PASSPHRASE = "passphrase" 202 private const val STORE_KEY_PASSPHRASE = "passphrase"
203 203