Conversion to Kotlin

10 files changed, 173 insertions, 233 deletions

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
+    }
+