Conversion to Kotlin

5 files changed, 146 insertions, 132 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
deleted file mode 100644
index 1a6f58f..0000000
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.pacien.tincapp.service;
-
-import android.app.Service;
-import android.content.Intent;
-import android.net.VpnService;
-
-import org.pacien.tincapp.BuildConfig;
-import org.pacien.tincapp.commands.Tinc;
-import org.pacien.tincapp.commands.Tincd;
-import org.pacien.tincapp.context.AppPaths;
-
-import java.io.IOException;
-
-import static org.pacien.tincapp.util.Function.applyIgnoringExcept;
-
-/**
- * @author pacien
- */
-public class TincVpnService extends VpnService {
-
-        static final public String INTENT_EXTRA_NET_NAME = "netName";
-
-        private String netName;
-
-        @Override
-        public int onStartCommand(Intent intent, int flags, int startId) {
-                this.netName = intent.getStringExtra(INTENT_EXTRA_NET_NAME);
-
-                Builder net = new Builder().setSession(this.netName);
-                VpnInterfaceConfigurator.applyConfiguration(net, AppPaths.netConfFile(this, this.netName));
-                applyIgnoringExcept(net::addDisallowedApplication, BuildConfig.APPLICATION_ID);
-
-                try {
-                        Tincd.start(this, this.netName, net.establish().detachFd());
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-
-                return Service.START_STICKY;
-        }
-
-        @Override
-        public void onDestroy() {
-                try {
-                        Tinc.stop(this, this.netName);
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-        }
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
new file mode 100644
index 0000000..06213df
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -0,0 +1,49 @@
+package org.pacien.tincapp.service
+
+import android.app.Service
+import android.content.Intent
+import android.net.VpnService
+import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.commands.Tinc
+import org.pacien.tincapp.commands.Tincd
+import org.pacien.tincapp.context.AppPaths
+import java.io.IOException
+
+/**
+ * @author pacien
+ */
+class TincVpnService : VpnService() {
+
+    private var netName: String = ""
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        this.netName = intent.getStringExtra(INTENT_EXTRA_NET_NAME)
+
+        val net = Builder().setSession(this.netName)
+        VpnInterfaceConfigurator.applyConfiguration(net, AppPaths.netConfFile(this, this.netName))
+        applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID)
+
+        try {
+            Tincd.start(this, this.netName, net.establish().detachFd())
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+
+        return Service.START_STICKY
+    }
+
+    override fun onDestroy() {
+        try {
+            Tinc.stop(this, this.netName)
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+
+    }
+
+    companion object {
+
+        val INTENT_EXTRA_NET_NAME = "netName"
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
deleted file mode 100644
index 0bf6ada..0000000
--- a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.pacien.tincapp.service;
-
-import android.net.VpnService;
-
-import com.annimon.stream.Stream;
-import com.annimon.stream.function.BiFunction;
-import com.annimon.stream.function.Consumer;
-
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.builder.fluent.Configurations;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-
-import java.io.File;
-
-import static org.pacien.tincapp.util.Function.applyIgnoringExcept;
-
-/**
- * @author pacien
- */
-final public class VpnInterfaceConfigurator {
-
-        private VpnInterfaceConfigurator() {
-                // static class
-        }
-
-        static final public String KEY_ADDRESSES = "Address";
-        static final public String KEY_ROUTES = "Route";
-        static final public String KEY_DNS_SERVERS = "DNSServer";
-        static final public String KEY_SEARCH_DOMAINS = "SearchDomain";
-        static final public String KEY_ALLOWED_APPLICATIONS = "AllowApplication";
-        static final public String KEY_DISALLOWED_APPLICATIONS = "DisallowApplication";
-        static final public String KEY_ALLOWED_FAMILIES = "AllowFamily";
-        static final public String KEY_ALLOW_BYPASS = "AllowBypass";
-        static final public String KEY_BLOCKING = "Blocking";
-        static final public String KEY_MTU = "MTU";
-
-        static private Stream<String> getStringStream(Configuration cfg, String key) {
-                return Stream.ofNullable(cfg.getList(String.class, key));
-        }
-
-        static private Stream<Integer> getIntegerStream(Configuration cfg, String key) {
-                return Stream.ofNullable(cfg.getList(Integer.class, key));
-        }
-
-        static private void doIf(Configuration cfg, String key, Consumer<Boolean> func) {
-                if (cfg.getBoolean(key, false)) func.accept(true);
-        }
-
-        static private void doWithInt(Configuration cfg, String key, Consumer<Integer> func) {
-                Stream.ofNullable(cfg.getInteger(key, null)).forEach(func);
-        }
-
-        static private <R> R applyAddressNetmask(BiFunction<String, Integer, R> func, String addrStr) {
-                String[] addrParts = addrStr.split("/", 2);
-                return func.apply(addrParts[0], Integer.parseInt(addrParts[1]));
-        }
-
-        static public VpnService.Builder applyConfiguration(VpnService.Builder net, Configuration cfg) {
-                getStringStream(cfg, KEY_ADDRESSES).forEach(str -> applyAddressNetmask(net::addAddress, str));
-                getStringStream(cfg, KEY_ROUTES).forEach(str -> applyAddressNetmask(net::addRoute, str));
-                getStringStream(cfg, KEY_DNS_SERVERS).forEach(net::addDnsServer);
-                getStringStream(cfg, KEY_SEARCH_DOMAINS).forEach(net::addSearchDomain);
-                getStringStream(cfg, KEY_ALLOWED_APPLICATIONS).forEach(str -> applyIgnoringExcept(net::addAllowedApplication, str));
-                getStringStream(cfg, KEY_DISALLOWED_APPLICATIONS).forEach(str -> applyIgnoringExcept(net::addDisallowedApplication, str));
-                getIntegerStream(cfg, KEY_ALLOWED_FAMILIES).forEach(net::allowFamily);
-                doIf(cfg, KEY_ALLOW_BYPASS, v -> net.allowBypass());
-                doIf(cfg, KEY_BLOCKING, net::setBlocking);
-                doWithInt(cfg, KEY_MTU, net::setMtu);
-
-                return net;
-        }
-
-        static public VpnService.Builder applyConfiguration(VpnService.Builder net, File cfg) {
-                try {
-                        return applyConfiguration(net, new Configurations().properties(cfg));
-                } catch (ConfigurationException e) {
-                        throw new IllegalArgumentException(e.getMessage());
-                }
-        }
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.kt b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.kt
new file mode 100644
index 0000000..8104940
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.kt
@@ -0,0 +1,52 @@
+package org.pacien.tincapp.service
+
+import android.net.VpnService