diff options
author | Pacien TRAN-GIRARD | 2017-07-11 14:49:08 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-11 14:49:08 +0200 |
commit | a2bfd75dee9b4952771a66c555ba1d920a072ae9 (patch) | |
tree | 3fcf598fe4e8fe858b296089f651a198b4e5f47c /app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | |
parent | 336a8f9cc02b2f78796fd10ea6244e5d0bc725c7 (diff) | |
download | tincapp-a2bfd75dee9b4952771a66c555ba1d920a072ae9.tar.gz |
Implement create and join network dialogs + refactoring
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.kt | 9 |
1 files changed, 5 insertions, 4 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 45f901b..e2eae00 100644 --- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt +++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | |||
@@ -9,10 +9,11 @@ import org.pacien.tincapp.commands.Tinc | |||
9 | import org.pacien.tincapp.commands.Tincd | 9 | import org.pacien.tincapp.commands.Tincd |
10 | import org.pacien.tincapp.context.App | 10 | import org.pacien.tincapp.context.App |
11 | import org.pacien.tincapp.context.AppPaths | 11 | import org.pacien.tincapp.context.AppPaths |
12 | import org.pacien.tincapp.utils.applyIgnoringException | 12 | import org.pacien.tincapp.data.VpnInterfaceConfiguration |
13 | import org.pacien.tincapp.extensions.Java.applyIgnoringException | ||
14 | import org.pacien.tincapp.extensions.VpnServiceBuilder.applyCfg | ||
13 | import java.io.IOException | 15 | import java.io.IOException |
14 | 16 | ||
15 | |||
16 | /** | 17 | /** |
17 | * @author pacien | 18 | * @author pacien |
18 | */ | 19 | */ |
@@ -46,9 +47,9 @@ class TincVpnService : VpnService() { | |||
46 | private fun startVpn(netName: String) { | 47 | private fun startVpn(netName: String) { |
47 | if (isConnected()) onDestroy() | 48 | if (isConnected()) onDestroy() |
48 | TincVpnService.netName = netName | 49 | TincVpnService.netName = netName |
49 | TincVpnService.interfaceCfg = VpnInterfaceConfiguration(AppPaths.netConfFile(netName)) | 50 | TincVpnService.interfaceCfg = VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.netConfFile(netName)) |
50 | 51 | ||
51 | val net = Builder().setSession(netName).apply(TincVpnService.interfaceCfg!!) | 52 | val net = Builder().setSession(netName).applyCfg(TincVpnService.interfaceCfg!!) |
52 | applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID) | 53 | applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID) |
53 | 54 | ||
54 | try { | 55 | try { |