aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2017-07-01 15:27:20 +0200
committerPacien TRAN-GIRARD2017-07-01 15:27:20 +0200
commit3619cf121b5b496ede1a0588f77b44f9bdb8386b (patch)
tree6cd06b128d7b7ca53457d98db2ba9bfe98b9f886 /app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
parent82ea8deab12d664dc4f941f329285ce4315057ad (diff)
downloadtincapp-3619cf121b5b496ede1a0588f77b44f9bdb8386b.tar.gz
Refactor VPN interface configuration loading
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.kt4
1 files changed, 2 insertions, 2 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 06213df..c5e1c51 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -7,6 +7,7 @@ import org.pacien.tincapp.BuildConfig
7import org.pacien.tincapp.commands.Tinc 7import org.pacien.tincapp.commands.Tinc
8import org.pacien.tincapp.commands.Tincd 8import org.pacien.tincapp.commands.Tincd
9import org.pacien.tincapp.context.AppPaths 9import org.pacien.tincapp.context.AppPaths
10import org.pacien.tincapp.utils.applyIgnoringException
10import java.io.IOException 11import java.io.IOException
11 12
12/** 13/**
@@ -20,7 +21,7 @@ class TincVpnService : VpnService() {
20 this.netName = intent.getStringExtra(INTENT_EXTRA_NET_NAME) 21 this.netName = intent.getStringExtra(INTENT_EXTRA_NET_NAME)
21 22
22 val net = Builder().setSession(this.netName) 23 val net = Builder().setSession(this.netName)
23 VpnInterfaceConfigurator.applyConfiguration(net, AppPaths.netConfFile(this, this.netName)) 24 net.apply(VpnInterfaceConfiguration(AppPaths.netConfFile(this, this.netName)))
24 applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID) 25 applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID)
25 26
26 try { 27 try {
@@ -42,7 +43,6 @@ class TincVpnService : VpnService() {
42 } 43 }
43 44
44 companion object { 45 companion object {
45
46 val INTENT_EXTRA_NET_NAME = "netName" 46 val INTENT_EXTRA_NET_NAME = "netName"
47 } 47 }
48 48