Implement create and join network dialogs + refactoring

3 files changed, 5 insertions, 112 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
 import org.pacien.tincapp.commands.Tincd
 import org.pacien.tincapp.context.App
 import org.pacien.tincapp.context.AppPaths
-import org.pacien.tincapp.utils.applyIgnoringException
+import org.pacien.tincapp.data.VpnInterfaceConfiguration
+import org.pacien.tincapp.extensions.Java.applyIgnoringException
+import org.pacien.tincapp.extensions.VpnServiceBuilder.applyCfg
 import java.io.IOException
 
-
 /**
  * @author pacien
  */
@@ -46,9 +47,9 @@ class TincVpnService : VpnService() {
     private fun startVpn(netName: String) {
         if (isConnected()) onDestroy()
         TincVpnService.netName = netName
-        TincVpnService.interfaceCfg = VpnInterfaceConfiguration(AppPaths.netConfFile(netName))
+        TincVpnService.interfaceCfg = VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.netConfFile(netName))
 
-        val net = Builder().setSession(netName).apply(TincVpnService.interfaceCfg!!)
+        val net = Builder().setSession(netName).applyCfg(TincVpnService.interfaceCfg!!)
         applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID)
 
         try {
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfiguraton.kt b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfiguraton.kt
deleted file mode 100644
index 50ccb20..0000000
--- a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfiguraton.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.pacien.tincapp.service
-
-/**
- * @author pacien
- */
-
-import org.apache.commons.configuration2.Configuration
-import org.apache.commons.configuration2.builder.fluent.Configurations
-import java.io.File
-
-private val KEY_ADDRESSES = "Address"
-private val KEY_ROUTES = "Route"
-private val KEY_DNS_SERVERS = "DNSServer"
-private val KEY_SEARCH_DOMAINS = "SearchDomain"
-private val KEY_ALLOWED_APPLICATIONS = "AllowApplication"
-private val KEY_DISALLOWED_APPLICATIONS = "DisallowApplication"
-private val KEY_ALLOWED_FAMILIES = "AllowFamily"
-private val KEY_ALLOW_BYPASS = "AllowBypass"
-private val KEY_BLOCKING = "Blocking"
-private val KEY_MTU = "MTU"
-
-private fun Configuration.getStringList(key: String): List<String> = getList(String::class.java, key, emptyList())
-private fun Configuration.getCidrList(key: String): List<CidrAddress> = getStringList(key).map { CidrAddress(it) }
-private fun Configuration.getIntList(key: String): List<Int> = getList(Int::class.java, key, emptyList())
-
-data class CidrAddress(val address: String, val prefix: Int) {
-    constructor(slashSeparated: String) :
-            this(slashSeparated.substringBefore(SEPARATOR), Integer.parseInt(slashSeparated.substringAfter(SEPARATOR)))
-
-    override fun toString() = address + SEPARATOR + prefix
-
-    companion object {
-        private val SEPARATOR = "/"
-    }
-}
-
-data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyList(),
-                                     val routes: List<CidrAddress> = emptyList(),
-                                     val dnsServers: List<String> = emptyList(),
-                                     val searchDomains: List<String> = emptyList(),
-                                     val allowedApplications: List<String> = emptyList(),
-                                     val disallowedApplications: List<String> = emptyList(),
-                                     val allowedFamilies: List<Int> = emptyList(),
-                                     val allowBypass: Boolean = false,
-                                     val blocking: Boolean = false,
-                                     val mtu: Int? = null) {
-
-    constructor(cfg: Configuration) : this(
-            cfg.getCidrList(KEY_ADDRESSES),
-            cfg.getCidrList(KEY_ROUTES),
-            cfg.getStringList(KEY_DNS_SERVERS),
-            cfg.getStringList(KEY_SEARCH_DOMAINS),
-            cfg.getStringList(KEY_ALLOWED_APPLICATIONS),
-            cfg.getStringList(KEY_DISALLOWED_APPLICATIONS),
-            cfg.getIntList(KEY_ALLOWED_FAMILIES),
-            cfg.getBoolean(KEY_ALLOW_BYPASS, false),
-            cfg.getBoolean(KEY_BLOCKING, false),
-            cfg.getInteger(KEY_MTU, null))
-
-    constructor(cfgFile: File) : this(Configurations().properties(cfgFile))
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt b/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt
deleted file mode 100644
index 22edff9..0000000
--- a/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.pacien.tincapp.service
-
-/**
- * @author pacien
- */
-
-import android.net.VpnService
-import org.pacien.tincapp.utils.applyIgnoringException
-
-fun VpnService.Builder.addAddress(cidr: CidrAddress): VpnService.Builder = addAddress(cidr.address, cidr.prefix)
-fun VpnService.Builder.addRoute(cidr: CidrAddress): VpnService.Builder = addRoute(cidr.address, cidr.prefix)
-fun VpnService.Builder.allowBypass(allow: Boolean): VpnService.Builder = if (allow) allowBypass() else this
-fun VpnService.Builder.overrideMtu(mtu: Int?): VpnService.Builder = if (mtu != null) setMtu(mtu) else this
-
-fun VpnService.Builder.addAddresses(cidrList: List<CidrAddress>): VpnService.Builder =
-        cidrList.fold(this, { net, cidr -> net.addAddress(cidr) })
-
-fun VpnService.Builder.addRoutes(cidrList: List<CidrAddress>): VpnService.Builder =
-        cidrList.fold(this, { net, cidr -> net.addRoute(cidr) })
-
-fun VpnService.Builder.addDnsServers(dnsList: List<String>): VpnService.Builder =
-        dnsList.fold(this, { net, dns -> net.addDnsServer(dns) })
-
-fun VpnService.Builder.addSearchDomains(domainList: List<String>): VpnService.Builder =
-        domainList.fold(this, { net, domain -> net.addSearchDomain(domain) })
-
-fun VpnService.Builder.allowFamilies(familyList: List<Int>): VpnService.Builder =
-        familyList.fold(this, { net, family -> net.allowFamily(family) })
-
-fun VpnService.Builder.addAllowedApplications(apps: List<String>): VpnService.Builder =
-        apps.fold(this, { net, app -> applyIgnoringException(net::addAllowedApplication, app, net)!! })
-
-fun VpnService.Builder.addDisallowedApplications(apps: List<String>): VpnService.Builder =
-        apps.fold(this, { net, app -> applyIgnoringException(net::addDisallowedApplication, app, net)!! })
-
-fun VpnService.Builder.apply(cfg: VpnInterfaceConfiguration): VpnService.Builder = this
-        .addAddresses(cfg.addresses)
-        .addRoutes(cfg.routes)
-        .addDnsServers(cfg.dnsServers)
-        .addSearchDomains(cfg.searchDomains)
-        .addAllowedApplications(cfg.allowedApplications)
-        .addDisallowedApplications(cfg.disallowedApplications)
-        .allowFamilies(cfg.allowedFamilies)
-        .allowBypass(cfg.allowBypass)
-        .setBlocking(cfg.blocking)
-        .overrideMtu(cfg.mtu)