From c89016e7427defd1f8a095d7aeb30292a42fad92 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Fri, 30 Jun 2017 10:21:51 +0200
Subject: Conversion to Kotlin

---
 app/build.gradle                                   | 15 ++--
 .../pacien/tincapp/activities/BaseActivity.java    | 71 -------------------
 .../org/pacien/tincapp/activities/BaseActivity.kt  | 62 ++++++++++++++++
 .../pacien/tincapp/activities/StartActivity.java   | 82 ----------------------
 .../org/pacien/tincapp/activities/StartActivity.kt | 82 ++++++++++++++++++++++
 .../java/org/pacien/tincapp/commands/Command.java  | 67 ------------------
 .../java/org/pacien/tincapp/commands/Command.kt    | 36 ++++++++++
 .../java/org/pacien/tincapp/commands/Executor.java | 44 ------------
 .../java/org/pacien/tincapp/commands/Executor.kt   | 43 ++++++++++++
 .../pacien/tincapp/commands/PermissionFixer.java   | 34 ---------
 .../org/pacien/tincapp/commands/PermissionFixer.kt | 20 ++++++
 .../java/org/pacien/tincapp/commands/Tinc.java     | 60 ----------------
 .../main/java/org/pacien/tincapp/commands/Tinc.kt  | 49 +++++++++++++
 .../java/org/pacien/tincapp/commands/Tincd.java    | 28 --------
 .../main/java/org/pacien/tincapp/commands/Tincd.kt | 25 +++++++
 .../java/org/pacien/tincapp/context/AppInfo.java   | 42 -----------
 .../java/org/pacien/tincapp/context/AppInfo.kt     | 32 +++++++++
 .../java/org/pacien/tincapp/context/AppPaths.java  | 75 --------------------
 .../java/org/pacien/tincapp/context/AppPaths.kt    | 43 ++++++++++++
 .../org/pacien/tincapp/service/TincVpnService.java | 51 --------------
 .../org/pacien/tincapp/service/TincVpnService.kt   | 49 +++++++++++++
 .../tincapp/service/VpnInterfaceConfigurator.java  | 81 ---------------------
 .../tincapp/service/VpnInterfaceConfigurator.kt    | 52 ++++++++++++++
 .../tincapp/service/VpnServiceBuilderExtensions.kt | 45 ++++++++++++
 .../java/org/pacien/tincapp/util/Function.java     | 28 --------
 build.gradle                                       |  5 +-
 26 files changed, 548 insertions(+), 673 deletions(-)
 delete mode 100644 app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/commands/Command.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Command.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/commands/Executor.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Executor.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tinc.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tincd.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/context/AppInfo.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/context/AppPaths.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.kt
 create mode 100644 app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt
 delete mode 100644 app/src/main/java/org/pacien/tincapp/util/Function.java

diff --git a/app/build.gradle b/app/build.gradle
index 33514ea..840289d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
 	compileSdkVersion 25
@@ -7,10 +8,9 @@ android {
 	defaultConfig {
 		applicationId "org.pacien.tincapp"
 		minSdkVersion 21
-		targetSdkVersion 25
+		targetSdkVersion 21
 		versionCode 1
 		versionName "0.1-preview"
-		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 	}
 	buildTypes {
 		release {
@@ -18,10 +18,6 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 	}
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
 	externalNativeBuild {
 		cmake {
 			path "CMakeLists.txt"
@@ -45,5 +41,8 @@ dependencies {
 		exclude group: 'commons-logging', module: 'commons-logging'
 	}
 
-	compile 'com.annimon:stream:1.1.5'
+	compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+}
+repositories {
+	mavenCentral()
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
deleted file mode 100644
index 0e6cb95..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.pacien.tincapp.activities;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-
-import org.pacien.tincapp.BuildConfig;
-import org.pacien.tincapp.R;
-import org.pacien.tincapp.context.AppInfo;
-
-/**
- * @author pacien
- */
-public abstract class BaseActivity extends AppCompatActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.base);
-		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu m) {
-		getMenuInflater().inflate(R.menu.menu_base, m);
-		return true;
-	}
-
-	public void aboutDialog(MenuItem i) {
-		new AlertDialog.Builder(this)
-				.setTitle(BuildConfig.APPLICATION_ID)
-				.setMessage(getResources().getString(R.string.app_short_desc) + "\n\n" +
-						getResources().getString(R.string.app_copyright) + " " +
-						getResources().getString(R.string.app_license) + "\n\n" +
-						AppInfo.all(getResources()))
-				.setNeutralButton(R.string.action_open_project_website, (dialog, which) -> openWebsite(R.string.app_website_url))
-				.setPositiveButton(R.string.action_close, (dialog, which) -> { /* nop */ })
-				.show();
-	}
-
-	protected ViewGroup getContentView() {
-		return (ViewGroup) findViewById(R.id.main_content);
-	}
-
-	protected void openWebsite(@StringRes int url) {
-		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().getString(url))));
-	}
-
-	protected void notify(@StringRes int msg) {
-		Snackbar.make(findViewById(R.id.activity_base), msg, Snackbar.LENGTH_LONG).show();
-	}
-
-	protected void copyIntoClipboard(String label, String str) {
-		ClipboardManager c = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-		c.setPrimaryClip(ClipData.newPlainText(label, str));
-		notify(R.string.message_text_copied);
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
new file mode 100644
index 0000000..6070a0a
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -0,0 +1,62 @@
+package org.pacien.tincapp.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.support.annotation.StringRes
+import android.support.design.widget.Snackbar
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
+import android.view.Menu
+import android.view.MenuItem
+import kotlinx.android.synthetic.main.base.*
+import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.R
+import org.pacien.tincapp.context.AppInfo
+
+/**
+ * @author pacien
+ */
+abstract class BaseActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.base)
+        setSupportActionBar(toolbar)
+    }
+
+    override fun onCreateOptionsMenu(m: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_base, m)
+        return true
+    }
+
+    fun aboutDialog(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
+        AlertDialog.Builder(this)
+                .setTitle(BuildConfig.APPLICATION_ID)
+                .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" +
+                        resources.getString(R.string.app_copyright) + " " +
+                        resources.getString(R.string.app_license) + "\n\n" +
+                        AppInfo.all(resources))
+                .setNeutralButton(R.string.action_open_project_website) { _, _ -> openWebsite(R.string.app_website_url) }
+                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
+                .show()
+    }
+
+    protected fun openWebsite(@StringRes url: Int) {
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(resources.getString(url))))
+    }
+
+    protected fun notify(@StringRes msg: Int) {
+        Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+    }
+
+    protected fun copyIntoClipboard(label: String, str: String) {
+        val c = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        c.primaryClip = ClipData.newPlainText(label, str)
+        notify(R.string.message_text_copied)
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
deleted file mode 100644
index e469fa0..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.pacien.tincapp.activities;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-
-import org.pacien.tincapp.R;
-import org.pacien.tincapp.commands.PermissionFixer;
-import org.pacien.tincapp.context.AppPaths;
-import org.pacien.tincapp.service.TincVpnService;
-
-/**
- * @author pacien
- */
-public class StartActivity extends BaseActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getLayoutInflater().inflate(R.layout.page_start, getContentView());
-	}
-
-	@Override
-	protected void onActivityResult(int request, int result, Intent data) {
-		notify(result == RESULT_OK ? R.string.message_vpn_permissions_granted : R.string.message_vpn_permissions_denied);
-	}
-
-	public void requestVpnPermission(View v) {
-		Intent askPermIntent = TincVpnService.prepare(this);
-
-		if (askPermIntent != null)
-			startActivityForResult(askPermIntent, 0);
-		else
-			onActivityResult(0, RESULT_OK, null);
-	}
-
-	public void startVpnDialog(View v) {
-		final EditText i = new EditText(this);
-		i.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
-		i.setHint(R.string.field_net_name);
-
-		@SuppressLint("InflateParams")
-		ViewGroup vg = (ViewGroup) getLayoutInflater().inflate(R.layout.dialog_frame, null);
-		vg.addView(i);
-
-		new AlertDialog.Builder(this)
-				.setTitle(R.string.title_connect_to_network)
-				.setView(vg)
-				.setPositiveButton(R.string.action_connect, (dialog, which) -> startVpn(i.getText().toString()))
-				.setNegativeButton(R.string.action_close, (dialog, which) -> { /* nop */ })
-				.show();
-	}
-
-	public void confDirDialog(View v) {
-		String confDir = AppPaths.confDir(this).getPath();
-
-		new AlertDialog.Builder(this)
-				.setTitle(R.string.title_tinc_config_dir)
-				.setMessage(confDir)
-				.setNeutralButton(R.string.action_fix_perms, (dialog, which) -> fixPerms())
-				.setNegativeButton(R.string.action_copy,
-						(dialog, which) -> copyIntoClipboard(getResources().getString(R.string.title_tinc_config_dir), confDir))
-				.setPositiveButton(R.string.action_close, (dialog, which) -> { /* nop */ })
-				.show();
-	}
-
-	private void startVpn(String netName) {
-		startService(new Intent(this, TincVpnService.class)
-				.putExtra(TincVpnService.INTENT_EXTRA_NET_NAME, netName));
-	}
-
-	private void fixPerms() {
-		boolean ok = PermissionFixer.makePrivateDirsPublic(getApplicationContext());
-		notify(ok ? R.string.message_perms_fixed : R.string.message_perms_fix_failure);
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
new file mode 100644
index 0000000..6d39a9d
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -0,0 +1,82 @@
+package org.pacien.tincapp.activities
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.net.VpnService
+import android.os.Bundle
+import android.support.v7.app.AlertDialog
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.FrameLayout
+import kotlinx.android.synthetic.main.base.*
+
+import org.pacien.tincapp.R
+import org.pacien.tincapp.commands.PermissionFixer
+import org.pacien.tincapp.context.AppPaths
+import org.pacien.tincapp.service.TincVpnService
+
+/**
+ * @author pacien
+ */
+class StartActivity : BaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        layoutInflater.inflate(R.layout.page_start, main_content)
+    }
+
+    override fun onActivityResult(request: Int, result: Int, data: Intent?) {
+        notify(if (result == Activity.RESULT_OK) R.string.message_vpn_permissions_granted else R.string.message_vpn_permissions_denied)
+    }
+
+    fun requestVpnPermission(@Suppress("UNUSED_PARAMETER") v: View) {
+        val askPermIntent = VpnService.prepare(this)
+
+        if (askPermIntent != null)
+            startActivityForResult(askPermIntent, 0)
+        else
+            onActivityResult(0, Activity.RESULT_OK, null)
+    }
+
+    fun startVpnDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+        val i = EditText(this)
+        i.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        i.setHint(R.string.field_net_name)
+
+        @SuppressLint("InflateParams")
+        val vg = layoutInflater.inflate(R.layout.dialog_frame, null) as ViewGroup
+        vg.addView(i)
+
+        AlertDialog.Builder(this)
+                .setTitle(R.string.title_connect_to_network)
+                .setView(vg)
+                .setPositiveButton(R.string.action_connect) { _, _ -> startVpn(i.text.toString()) }
+                .setNegativeButton(R.string.action_close) { _, _ -> /* nop */ }
+                .show()
+    }
+
+    fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+        val confDir = AppPaths.confDir(this).path
+
+        AlertDialog.Builder(this)
+                .setTitle(R.string.title_tinc_config_dir)
+                .setMessage(confDir)
+                .setNeutralButton(R.string.action_fix_perms) { _, _ -> fixPerms() }
+                .setNegativeButton(R.string.action_copy) { _, _ -> copyIntoClipboard(resources.getString(R.string.title_tinc_config_dir), confDir) }
+                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
+                .show()
+    }
+
+    private fun startVpn(netName: String) {
+        startService(Intent(this, TincVpnService::class.java)
+                .putExtra(TincVpnService.INTENT_EXTRA_NET_NAME, netName))
+    }
+
+    private fun fixPerms() {
+        val ok = PermissionFixer.makePrivateDirsPublic(applicationContext)
+        notify(if (ok) R.string.message_perms_fixed else R.string.message_perms_fix_failure)
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Command.java b/app/src/main/java/org/pacien/tincapp/commands/Command.java
deleted file mode 100644
index 28ff226..0000000
--- a/app/src/main/java/org/pacien/tincapp/commands/Command.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.pacien.tincapp.commands;
-
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author pacien
- */
-class Command {
-
-	static private class Option {
-		final String key;
-		final Optional<java.lang.String> val;
-
-		Option(String key, String val) {
-			this.key = key;
-			this.val = Optional.ofNullable(val);
-		}
-
-		@Override
-		public String toString() {
-			return val.isPresent() ? "--" + key + "=" + val.get() : "--" + key;
-		}
-	}
-
-	final private String cmd;
-	final private List<Option> opts;
-	final private List<String> args;
-
-	public Command(String cmd) {
-		this.cmd = cmd;
-		this.opts = new LinkedList<>();
-		this.args = new LinkedList<>();
-	}
-
-	public Command withOption(String key, String val) {
-		this.opts.add(new Option(key, val));
-		return this;
-	}
-
-	public Command withOption(String key) {
-		return this.withOption(key, null);
-	}
-
-	public Command withArguments(String... args) {
-		this.args.addAll(Arrays.asList(args));
-		return this;
-	}
-
-	public List<String> asList() {
-		return Collections.unmodifiableList(
-				Stream.concat(Stream.of(Collections.singleton(this.cmd)),
-						Stream.concat(Stream.of(this.opts).map(Option::toString), Stream.of(this.args)))
-						.collect(Collectors.toList()));
-	}
-
-	public String[] asArray() {
-		return this.asList().toArray(new String[0]);
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Command.kt b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
new file mode 100644
index 0000000..9b22d5f
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
@@ -0,0 +1,36 @@
+package org.pacien.tincapp.commands
+
+import java.util.*
+
+/**
+ * @author pacien
+ */
+internal class Command(private val cmd: String) {
+
+    private data class Option(val key: String, val value: String?) {
+        override fun toString(): String = if (value != null) "--$key=$value" else "--$key"
+    }
+
+    private val opts: MutableList<Option>
+    private val args: MutableList<String>
+
+    init {
+        this.opts = LinkedList<Option>()
+        this.args = LinkedList<String>()
+    }
+
+    fun withOption(key: String, value: String? = null): Command {
+        this.opts.add(Option(key, value))
+        return this
+    }
+
+    fun withArguments(vararg args: String): Command {
+        this.args.addAll(Arrays.asList(*args))
+        return this
+    }
+
+    fun asList(): List<String> = listOf(cmd) + opts.map { it.toString() } + args
+
+    fun asArray(): Array<String> = this.asList().toTypedArray()
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.java b/app/src/main/java/org/pacien/tincapp/commands/Executor.java
deleted file mode 100644
index edf229c..0000000
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.pacien.tincapp.commands;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author pacien
- */
-final class Executor {
-
-	private Executor() {
-		// static class
-	}
-
-	static {
-		System.loadLibrary("exec");
-	}
-
-	/**
-	 * @return -1 on error, forked child PID otherwise
-	 */
-	static private native int forkExec(String[] argcv);
-
-	static public void forkExec(Command cmd) throws IOException {
-		if (forkExec(cmd.asArray()) == -1)
-			throw new IOException();
-	}
-
-	static public List<String> call(Command cmd) throws IOException {
-		Process proc = new ProcessBuilder(cmd.asList()).start();
-		BufferedReader outputReader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-
-		String line;
-		List<String> list = new LinkedList<>();
-		while ((line = outputReader.readLine()) != null) list.add(line);
-
-		return Collections.unmodifiableList(list);
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
new file mode 100644
index 0000000..160f0cd
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -0,0 +1,43 @@
+package org.pacien.tincapp.commands
+
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.util.*
+
+/**
+ * @author pacien
+ */
+internal object Executor {
+
+    init {
+        System.loadLibrary("exec")
+    }
+
+    /**
+     * @return -1 on error, forked child PID otherwise
+     */
+    private external fun forkExec(argcv: Array<String>): Int
+
+    @Throws(IOException::class)
+    fun forkExec(cmd: Command) {
+        if (forkExec(cmd.asArray()) == -1)
+            throw IOException()
+    }
+
+    @Throws(IOException::class)
+    fun call(cmd: Command): List<String> {
+        val proc = ProcessBuilder(cmd.asList()).start()
+        val outputReader = BufferedReader(InputStreamReader(proc.inputStream))
+
+        var line: String? = outputReader.readLine()
+        val list = LinkedList<String>()
+        while (line != null) {
+            line = outputReader.readLine()
+            list.add(line)
+        }
+
+        return list
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java b/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
deleted file mode 100644
index b00d0d6..0000000
--- a/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.pacien.tincapp.commands;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-
-import com.annimon.stream.Stream;
-
-import org.pacien.tincapp.context.AppPaths;
-
-import java.io.File;
-
-/**
- * @author pacien
- */
-final public class PermissionFixer {
-
-	private PermissionFixer() {
-		// static class
-	}
-
-	@SuppressLint({"SetWorldReadable", "SetWorldWritable"})
-	static private Boolean setAllRWXPermissions(File f) {
-		return f.setReadable(true, false)
-				&& f.setWritable(true, false)
-				&& f.setExecutable(true, false);
-	}
-
-	static public Boolean makePrivateDirsPublic(Context ctx) {
-		return Stream.of(AppPaths.confDir(ctx), AppPaths.logDir(ctx), AppPaths.pidDir(ctx))
-				.map(PermissionFixer::setAllRWXPermissions)
-				.reduce((x, y) -> x && y).get();
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.kt b/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.kt
new file mode 100644
index 0000000..493927c
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.kt
@@ -0,0 +1,20 @@
+package org.pacien.tincapp.commands
+
+import android.annotation.SuppressLint
+import android.content.Context
+import org.pacien.tincapp.context.AppPaths
+import java.io.File
+
+/**
+ * @author pacien
+ */
+object PermissionFixer {
+
+    @SuppressLint("SetWorldReadable", "SetWorldWritable")
+    private fun setAllRWXPermissions(f: File): Boolean =
+            f.setReadable(true, false) && f.setWritable(true, false) && f.setExecutable(true, false)
+
+    fun makePrivateDirsPublic(ctx: Context): Boolean = listOf(AppPaths.confDir(ctx), AppPaths.logDir(ctx), AppPaths.pidDir(ctx))
+            .map { setAllRWXPermissions(it) }.all { it }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.java b/app/src/main/java/org/pacien/tincapp/commands/Tinc.java
deleted file mode 100644
index ca11698..0000000
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.pacien.tincapp.commands;
-
-import android.content.Context;
-
-import com.annimon.stream.Stream;
-
-import org.pacien.tincapp.context.AppPaths;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author pacien
- */
-final public class Tinc {
-
-	private Tinc() {
-		// static class
-	}
-
-	static private Command newCommand(Context ctx, String netName) {
-		return new Command(AppPaths.tinc(ctx).getAbsolutePath())
-				.withOption("config", AppPaths.confDir(ctx, netName).getAbsolutePath())
-				.withOption("pidfile", AppPaths.pidFile(ctx, netName).getAbsolutePath());
-	}
-
-	// independently runnable commands
-
-	static public List<String> network(Context ctx) throws IOException {
-		return Executor.call(new Command(AppPaths.tinc(ctx).getAbsolutePath())
-				.withOption("config", AppPaths.confDir(ctx).getAbsolutePath())
-				.withArguments("network"));
-	}
-
-	static public List<String> fsck(Context ctx, String netName, Boolean fix) throws IOException {
-		Command cmd = newCommand(ctx, netName).withArguments("fsck");
-		if (fix) cmd = cmd.withOption("force");
-		return Executor.call(cmd);
-	}
-
-	// commands requiring a running tinc daemon
-
-	static public void stop(Context ctx, String netName) throws IOException {
-		Executor.call(newCommand(ctx, netName).withArguments("stop"));
-	}
-
-	static public List<String> dumpNodes(Context ctx, String netName, Boolean reachable) throws IOException {
-		Command cmd = reachable
-				? newCommand(ctx, netName).withArguments("dump", "reachable", "nodes")
-				: newCommand(ctx, netName).withArguments("dump", "nodes");
-
-		return Executor.call(cmd);
-	}
-
-	static public String info(Context ctx, String netName, String node) throws IOException {
-		List<String> output = Executor.call(newCommand(ctx, netName).withArguments("info", node));
-		return Stream.of(output).reduce((l, r) -> l + '\n' + r).get();
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
new file mode 100644
index 0000000..eb5689a
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -0,0 +1,49 @@
+package org.pacien.tincapp.commands
+
+import android.content.Context
+import org.pacien.tincapp.context.AppPaths
+import java.io.IOException
+
+/**
+ * @author pacien
+ */
+object Tinc {
+
+    private fun newCommand(ctx: Context, netName: String): Command =
+            Command(AppPaths.tinc(ctx).absolutePath)
+                    .withOption("config", AppPaths.confDir(ctx, netName).absolutePath)
+                    .withOption("pidfile", AppPaths.pidFile(ctx, netName).absolutePath)
+
+    // independently runnable commands
+
+    @Throws(IOException::class)
+    fun network(ctx: Context): List<String> =
+            Executor.call(Command(AppPaths.tinc(ctx).absolutePath)
+                    .withOption("config", AppPaths.confDir(ctx).absolutePath)
+                    .withArguments("network"))
+
+    @Throws(IOException::class)
+    fun fsck(ctx: Context, netName: String, fix: Boolean): List<String> {
+        var cmd = newCommand(ctx, netName).withArguments("fsck")
+        if (fix) cmd = cmd.withOption("force")
+        return Executor.call(cmd)
+    }
+
+    // commands requiring a running tinc daemon
+
+    @Throws(IOException::class)
+    fun stop(ctx: Context, netName: String) {
+        Executor.call(newCommand(ctx, netName).withArguments("stop"))
+    }
+
+    @Throws(IOException::class)
+    fun dumpNodes(ctx: Context, netName: String, reachable: Boolean): List<String> =
+            Executor.call(
+                    if (reachable) newCommand(ctx, netName).withArguments("dump", "reachable", "nodes")
+                    else newCommand(ctx, netName).withArguments("dump", "nodes"))
+
+    @Throws(IOException::class)
+    fun info(ctx: Context, netName: String, node: String): String =
+            Executor.call(newCommand(ctx, netName).withArguments("info", node)).joinToString("\n")
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.java b/app/src/main/java/org/pacien/tincapp/commands/Tincd.java
deleted file mode 100644
index 07acc3d..0000000
--- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.pacien.tincapp.commands;
-
-import android.content.Context;
-
-import org.pacien.tincapp.context.AppPaths;
-
-import java.io.IOException;
-
-/**
- * @author pacien
- */
-final public class Tincd {
-
-	private Tincd() {
-		// static class
-	}
-
-	static public void start(Context ctx, String netName, Integer fd) throws IOException {
-		Executor.forkExec(new Command(AppPaths.tincd(ctx).getAbsolutePath())
-				.withOption("no-detach")
-				.withOption("config", AppPaths.confDir(ctx, netName).getAbsolutePath())
-				.withOption("pidfile", AppPaths.pidFile(ctx, netName).getAbsolutePath())
-				.withOption("logfile", AppPaths.logFile(ctx, netName).getAbsolutePath())
-				.withOption("option", "DeviceType=fd")
-				.withOption("option", "Device=" + fd));
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
new file mode 100644
index 0000000..9f2491e
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
@@ -0,0 +1,25 @@
+package org.pacien.tincapp.commands
+
+import android.content.Context
+
+import org.pacien.tincapp.context.AppPaths
+
+import java.io.IOException
+
+/**
+ * @author pacien
+ */
+object Tincd {
+
+    @Throws(IOException::class)
+    fun start(ctx: Context, netName: String, fd: Int) {
+        Executor.forkExec(Command(AppPaths.tincd(ctx).absolutePath)
+                .withOption("no-detach")
+                .withOption("config", AppPaths.confDir(ctx, netName).absolutePath)
+                .withOption("pidfile", AppPaths.pidFile(ctx, netName).absolutePath)
+                .withOption("logfile", AppPaths.logFile(ctx, netName).absolutePath)
+                .withOption("option", "DeviceType=fd")
+                .withOption("option", "Device=" + fd))
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.java b/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
deleted file mode 100644
index 075402d..0000000
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.pacien.tincapp.context;
-
-import android.content.res.Resources;
-import android.os.Build;
-
-import com.annimon.stream.Stream;
-
-import org.pacien.tincapp.BuildConfig;
-import org.pacien.tincapp.R;
-
-/**
- * @author pacien
- */
-final public class AppInfo {
-
-	private AppInfo() {
-		// static class
-	}
-
-	static public String appVersion(Resources r) {
-		return r.getString(R.string.info_version_format,
-				BuildConfig.VERSION_NAME,
-				BuildConfig.BUILD_TYPE);
-	}
-
-	static public String androidVersion(Resources r) {
-		return r.getString(R.string.info_running_on_format,
-				Build.VERSION.CODENAME,
-				Build.VERSION.RELEASE);
-	}
-
-	static public String supportedABIs(Resources r) {
-		return r.getString(R.string.info_supported_abis_format,
-				Stream.of(Build.SUPPORTED_ABIS).reduce((x, y) -> x + "," + y).get());
-	}
-
-	static public String all(Resources r) {
-		return Stream.of(appVersion(r), androidVersion(r), supportedABIs(r))
-				.reduce((x, y) -> x + '\n' + y).get();
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
new file mode 100644
index 0000000..2eb2aa1
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -0,0 +1,32 @@
+package org.pacien.tincapp.context
+
+import android.content.res.Resources
+import android.os.Build
+import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.R
+
+/**
+ * @author pacien
+ */
+object AppInfo {
+
+    fun appVersion(r: Resources): String = r.getString(
+            R.string.info_version_format,
+            BuildConfig.VERSION_NAME,
+            BuildConfig.BUILD_TYPE)
+
+    fun androidVersion(r: Resources): String = r.getString(
+            R.string.info_running_on_format,
+            Build.VERSION.CODENAME,
+            Build.VERSION.RELEASE)
+
+    fun supportedABIs(r: Resources): String = r.getString(
+            R.string.info_supported_abis_format,
+            Build.SUPPORTED_ABIS.joinToString(","))
+
+    fun all(r: Resources): String = listOf(
+            appVersion(r),
+            androidVersion(r),
+            supportedABIs(r)).joinToString("\n")
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.java b/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
deleted file mode 100644
index d854d4e..0000000
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.pacien.tincapp.context;
-
-import android.content.Context;
-
-import java.io.File;
-
-/**
- * @author pacien
- * @implNote Logs and PID files are stored in the cache directory for easy clean up.
- */
-final public class AppPaths {
-
-	private AppPaths() {
-		// static class
-	}
-
-	static final private String CONFDIR = "conf";
-	static final private String LOGDIR = "log";
-	static final private String PIDDIR = "pid";
-
-	static final private String TINCD_BIN = "libtincd.so";
-	static final private String TINC_BIN = "libtinc.so";
-
-	static final private String LOGFILE_FORMAT = "tinc.%s.log";
-	static final private String PIDFILE_FORMAT = "tinc.%s.pid";
-
-	static final private String NET_CONF_FILE = "network.conf";
-
-	static private File createDirIfNotExists(File basePath, String newDir) {
-		File f = new File(basePath, newDir);
-		f.mkdirs();
-		return f;
-	}
-
-	static public File confDir(Context ctx) {
-		return ctx.getDir(CONFDIR, Context.MODE_PRIVATE);
-	}
-
-	static public File confDir(Context ctx, String netName) {
-		return new File(confDir(ctx), netName);
-	}
-
-	static public File logDir(Context ctx) {
-		return createDirIfNotExists(ctx.getCacheDir(), LOGDIR);
-	}
-
-	static public File pidDir(Context ctx) {
-		return createDirIfNotExists(ctx.getCacheDir(), PIDDIR);
-	}
-
-	static public File logFile(Context ctx, String netName) {
-		return new File(logDir(ctx), String.format(LOGFILE_FORMAT, netName));
-	}
-
-	static public File pidFile(Context ctx, String netName) {
-		return new File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName));
-	}
-
-	static public File netConfFile(Context ctx, String netName) {
-		return new File(confDir(ctx, netName), NET_CONF_FILE);
-	}
-
-	static public File binDir(Context ctx) {
-		return new File(ctx.getApplicationInfo().nativeLibraryDir);
-	}
-
-	static public File tincd(Context ctx) {
-		return new File(binDir(ctx), TINCD_BIN);
-	}
-
-	static public File tinc(Context ctx) {
-		return new File(binDir(ctx), TINC_BIN);
-	}
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
new file mode 100644
index 0000000..21db0a4
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -0,0 +1,43 @@
+package org.pacien.tincapp.context
+
+import android.content.Context
+
+import java.io.File
+
+/**
+ * @author pacien
+ * *
+ * @implNote Logs and PID files are stored in the cache directory for easy clean up.
+ */
+object AppPaths {
+
+    private val CONFDIR = "conf"
+    private val LOGDIR = "log"
+    private val PIDDIR = "pid"
+
+    private val TINCD_BIN = "libtincd.so"
+    private val TINC_BIN = "libtinc.so"
+
+    private val LOGFILE_FORMAT = "tinc.%s.log"
+    private val PIDFILE_FORMAT = "tinc.%s.pid"
+
+    private val NET_CONF_FILE = "network.conf"
+
+    private fun createDirIfNotExists(basePath: File, newDir: String): File {
+        val f = File(basePath, newDir)
+        f.mkdirs()
+        return f
+    }
+
+    fun confDir(ctx: Context): File = ctx.getDir(CONFDIR, Context.MODE_PRIVATE)
+    fun confDir(ctx: Context, netName: String): File = File(confDir(ctx), netName)
+    fun logDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, LOGDIR)
+    fun pidDir(ctx: Context): File = createDirIfNotExists(ctx.cacheDir, PIDDIR)
+    fun logFile(ctx: Context, netName: String): File = File(logDir(ctx), String.format(LOGFILE_FORMAT, netName))
+    fun pidFile(ctx: Context, netName: String): File = File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName))
+    fun netConfFile(ctx: Context, netName: String): File = File(confDir(ctx, netName), NET_CONF_FILE)
+    fun binDir(ctx: Context): File = File(ctx.applicationInfo.nativeLibraryDir)
+    fun tincd(ctx: Context): File = File(binDir(ctx), TINCD_BIN)
+    fun tinc(ctx: Context): File = File(binDir(ctx), TINC_BIN)
+
+}
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
+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
+
+/**
+ * @author pacien
+ */
+object VpnInterfaceConfigurator {
+
+    val KEY_ADDRESSES = "Address"
+    val KEY_ROUTES = "Route"
+    val KEY_DNS_SERVERS = "DNSServer"
+    val KEY_SEARCH_DOMAINS = "SearchDomain"
+    val KEY_ALLOWED_APPLICATIONS = "AllowApplication"
+    val KEY_DISALLOWED_APPLICATIONS = "DisallowApplication"
+    val KEY_ALLOWED_FAMILIES = "AllowFamily"
+    val KEY_ALLOW_BYPASS = "AllowBypass"
+    val KEY_BLOCKING = "Blocking"
+    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())
+
+    fun applyConfiguration(net: VpnService.Builder, cfg: Configuration): VpnService.Builder = net
+            .addAddresses(cfg.getCidrList(KEY_ADDRESSES))
+            .addRoutes(cfg.getCidrList(KEY_ROUTES))
+            .addDnsServers(cfg.getStringList(KEY_DNS_SERVERS))
+            .addSearchDomains(cfg.getStringList(KEY_SEARCH_DOMAINS))
+            .addAllowedApplications(cfg.getStringList(KEY_ALLOWED_APPLICATIONS))
+            .addDisallowedApplications(cfg.getStringList(KEY_DISALLOWED_APPLICATIONS))
+            .allowFamilies(cfg.getIntList(KEY_ALLOWED_FAMILIES))
+            .allowBypass(cfg.getBoolean(KEY_ALLOW_BYPASS, false))
+            .setBlocking(cfg.getBoolean(KEY_BLOCKING, false))
+            .overrideMtu(cfg.getInteger(KEY_MTU, null))
+
+    fun applyConfiguration(net: VpnService.Builder, cfg: File): VpnService.Builder = try {
+        applyConfiguration(net, Configurations().properties(cfg))
+    } catch (e: ConfigurationException) {
+        throw IllegalArgumentException(e.message)
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt b/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt
new file mode 100644
index 0000000..d94d64d
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/VpnServiceBuilderExtensions.kt
@@ -0,0 +1,45 @@
+package org.pacien.tincapp.service
+
+import android.net.VpnService
+
+/**
+ * @author pacien
+ */
+
+data class CidrAddress(val address: String, val prefix: Int) {
+    constructor(slashSeparated: String) :
+            this(slashSeparated.substringBefore("/"), Integer.parseInt(slashSeparated.substringAfter("/")))
+}
+
+
+fun <A, R> applyIgnoringException(f: (A) -> R, x: A, alt: R? = null) = try {
+    f(x)
+} catch (_: Exception) {
+    alt
+}
+
+fun VpnService.Builder.addAddress(cidr: CidrAddress) = addAddress(cidr.address, cidr.prefix)
+fun VpnService.Builder.addRoute(cidr: CidrAddress) = addRoute(cidr.address, cidr.prefix)
+fun VpnService.Builder.allowBypass(allow: Boolean) = if (allow) allowBypass() else this
+fun VpnService.Builder.overrideMtu(mtu: Int?) = if (mtu != null) setMtu(mtu) else this
+
+fun VpnService.Builder.addAddresses(cidrList: List<CidrAddress>) =
+        cidrList.fold(this, { net, cidr -> net.addAddress(cidr) })
+
+fun VpnService.Builder.addRoutes(cidrList: List<CidrAddress>) =
+        cidrList.fold(this, { net, cidr -> net.addRoute(cidr) })
+
+fun VpnService.Builder.addDnsServers(dnsList: List<String>) =
+        dnsList.fold(this, { net, dns -> net.addDnsServer(dns) })
+
+fun VpnService.Builder.addSearchDomains(domainList: List<String>) =
+        domainList.fold(this, { net, domain -> net.addSearchDomain(domain) })
+
+fun VpnService.Builder.allowFamilies(familyList: List<Int>) =
+        familyList.fold(this, { net, family -> net.allowFamily(family) })
+
+fun VpnService.Builder.addAllowedApplications(apps: List<String>) =
+        apps.fold(this, { net, app -> applyIgnoringException(net::addAllowedApplication, app, net)!! })
+
+fun VpnService.Builder.addDisallowedApplications(apps: List<String>) =
+        apps.fold(this, { net, app -> applyIgnoringException(net::addDisallowedApplication, app, net)!! })
diff --git a/app/src/main/java/org/pacien/tincapp/util/Function.java b/app/src/main/java/org/pacien/tincapp/util/Function.java
deleted file mode 100644
index 3a6e115..0000000
--- a/app/src/main/java/org/pacien/tincapp/util/Function.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.pacien.tincapp.util;
-
-import com.annimon.stream.function.FunctionalInterface;
-
-/**
- * @author pacien
- */
-final public class Function {
-
-	private Function() {
-		// static class
-	}
-
-	@FunctionalInterface
-	public interface CheckedFunction<T, R> {
-		R apply(T t) throws Exception;
-	}
-
-	static public <T, R> R applyIgnoringExcept(CheckedFunction<T, R> func, T parm) {
-		try {
-			return func.apply(parm);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-}
diff --git a/build.gradle b/build.gradle
index 4641358..ee23e96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+	ext.kotlin_version = '1.1.3'
 	repositories {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.3.2'
-		classpath 'me.tatarka:gradle-retrolambda:3.5.0'
+		classpath 'com.android.tools.build:gradle:2.3.3'
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
-- 
cgit v1.2.3