Reformat code

5 files changed, 116 insertions, 116 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/commands/Command.kt b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
index 6eab66b..cb95619 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Command.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
@@ -7,25 +7,25 @@ import java.util.*
  */
 internal class Command(private val cmd: String) {
 
-    private data class Option(val key: String, val value: String?) {
-        fun toCommandLineOption(): String = if (value != null) "--$key=$value" else "--$key"
-    }
+  private data class Option(val key: String, val value: String?) {
+    fun toCommandLineOption(): String = if (value != null) "--$key=$value" else "--$key"
+  }
 
-    private val opts: MutableList<Option> = LinkedList()
-    private val args: MutableList<String> = LinkedList()
+  private val opts: MutableList<Option> = LinkedList()
+  private val args: MutableList<String> = LinkedList()
 
-    fun withOption(key: String, value: String? = null): Command {
-        this.opts.add(Option(key, value))
-        return this
-    }
+  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 withArguments(vararg args: String): Command {
+    this.args.addAll(Arrays.asList(*args))
+    return this
+  }
 
-    fun asList(): List<String> = listOf(cmd) + opts.map { it.toCommandLineOption() } + args
+  fun asList(): List<String> = listOf(cmd) + opts.map { it.toCommandLineOption() } + args
 
-    fun asArray(): Array<String> = this.asList().toTypedArray()
+  fun asArray(): Array<String> = this.asList().toTypedArray()
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
index 38c2cb5..eace2e7 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -13,37 +13,37 @@ import java.io.InputStreamReader
  */
 internal object Executor {
 
-    class CommandExecutionException(msg: String) : Exception(msg)
+  class CommandExecutionException(msg: String) : Exception(msg)
 
-    init {
-        System.loadLibrary("exec")
-    }
+  init {
+    System.loadLibrary("exec")
+  }
+
+  /**
+   * @return -1 on error, forked child PID otherwise
+   */
+  private external fun forkExec(argcv: Array<String>): Int
 
-    /**
-     * @return -1 on error, forked child PID otherwise
-     */
-    private external fun forkExec(argcv: Array<String>): Int
+  private fun read(stream: InputStream) = BufferedReader(InputStreamReader(stream)).readLines()
 
-    private fun read(stream: InputStream) = BufferedReader(InputStreamReader(stream)).readLines()
+  fun forkExec(cmd: Command) {
+    if (forkExec(cmd.asArray()) == -1) throw CommandExecutionException("Could not fork child process.")
+  }
 
-    fun forkExec(cmd: Command) {
-        if (forkExec(cmd.asArray()) == -1) throw CommandExecutionException("Could not fork child process.")
+  fun call(cmd: Command): CompletableFuture<List<String>> {
+    val proc = try {
+      ProcessBuilder(cmd.asList()).start()
+    } catch (e: IOException) {
+      throw CommandExecutionException(e.message ?: "Could not start process.")
     }
 
-    fun call(cmd: Command): CompletableFuture<List<String>> {
-        val proc = try {
-            ProcessBuilder(cmd.asList()).start()
-        } catch (e: IOException) {
-            throw CommandExecutionException(e.message ?: "Could not start process.")
-        }
-
-        return supplyAsyncTask<List<String>> {
-            if (proc.waitFor() == 0) read(proc.inputStream)
-            else throw CommandExecutionException(read(proc.errorStream).lastOrNull() ?: "Non-zero exit status.")
-        }
+    return supplyAsyncTask<List<String>> {
+      if (proc.waitFor() == 0) read(proc.inputStream)
+      else throw CommandExecutionException(read(proc.errorStream).lastOrNull() ?: "Non-zero exit status.")
     }
+  }
 
-    fun runAsyncTask(r: () -> Unit) = CompletableFuture.runAsync(Runnable(r), AsyncTask.THREAD_POOL_EXECUTOR)!!
-    fun <U> supplyAsyncTask(s: () -> U) = CompletableFuture.supplyAsync(Supplier(s), AsyncTask.THREAD_POOL_EXECUTOR)!!
+  fun runAsyncTask(r: () -> Unit) = CompletableFuture.runAsync(Runnable(r), AsyncTask.THREAD_POOL_EXECUTOR)!!
+  fun <U> supplyAsyncTask(s: () -> U) = CompletableFuture.supplyAsync(Supplier(s), AsyncTask.THREAD_POOL_EXECUTOR)!!
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
index 6acd4f2..0b1240a 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -8,40 +8,40 @@ import org.pacien.tincapp.context.AppPaths
  */
 object Tinc {
 
-    private fun newCommand(netName: String): Command =
-            Command(AppPaths.tinc().absolutePath)
-                    .withOption("config", AppPaths.confDir(netName).absolutePath)
-                    .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
-
-    fun stop(netName: String): CompletableFuture<Unit> =
-            Executor.call(newCommand(netName).withArguments("stop"))
-                    .thenApply { }
-
-    fun dumpNodes(netName: String, reachable: Boolean = false): CompletableFuture<List<String>> =
-            Executor.call(
-                    if (reachable) newCommand(netName).withArguments("dump", "reachable", "nodes")
-                    else newCommand(netName).withArguments("dump", "nodes"))
-
-    fun info(netName: String, node: String): CompletableFuture<String> =
-            Executor.call(newCommand(netName).withArguments("info", node))
-                    .thenApply<String> { it.joinToString("\n") }
-
-    fun init(netName: String, nodeName: String): CompletableFuture<String> =
-            if (netName.isBlank())
-                CompletableFuture.failedFuture(IllegalArgumentException("Network name cannot be blank."))
-            else
-                Executor.call(Command(AppPaths.tinc().absolutePath)
-                        .withOption("config", AppPaths.confDir(netName).absolutePath)
-                        .withArguments("init", nodeName))
-                        .thenApply<String> { it.joinToString("\n") }
-
-    fun join(netName: String, invitationUrl: String): CompletableFuture<String> =
-            if (netName.isBlank())
-                CompletableFuture.failedFuture(IllegalArgumentException("Network name cannot be blank."))
-            else
-                Executor.call(Command(AppPaths.tinc().absolutePath)
-                        .withOption("config", AppPaths.confDir(netName).absolutePath)
-                        .withArguments("join", invitationUrl))
-                        .thenApply<String> { it.joinToString("\n") }
+  private fun newCommand(netName: String): Command =
+    Command(AppPaths.tinc().absolutePath)
+      .withOption("config", AppPaths.confDir(netName).absolutePath)
+      .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
+
+  fun stop(netName: String): CompletableFuture<Unit> =
+    Executor.call(newCommand(netName).withArguments("stop"))
+      .thenApply { }
+
+  fun dumpNodes(netName: String, reachable: Boolean = false): CompletableFuture<List<String>> =
+    Executor.call(
+      if (reachable) newCommand(netName).withArguments("dump", "reachable", "nodes")
+      else newCommand(netName).withArguments("dump", "nodes"))
+
+  fun info(netName: String, node: String): CompletableFuture<String> =
+    Executor.call(newCommand(netName).withArguments("info", node))
+      .thenApply<String> { it.joinToString("\n") }
+
+  fun init(netName: String, nodeName: String): CompletableFuture<String> =
+    if (netName.isBlank())
+      CompletableFuture.failedFuture(IllegalArgumentException("Network name cannot be blank."))
+    else
+      Executor.call(Command(AppPaths.tinc().absolutePath)
+        .withOption("config", AppPaths.confDir(netName).absolutePath)
+        .withArguments("init", nodeName))
+        .thenApply<String> { it.joinToString("\n") }
+
+  fun join(netName: String, invitationUrl: String): CompletableFuture<String> =
+    if (netName.isBlank())
+      CompletableFuture.failedFuture(IllegalArgumentException("Network name cannot be blank."))
+    else
+      Executor.call(Command(AppPaths.tinc().absolutePath)
+        .withOption("config", AppPaths.confDir(netName).absolutePath)
+        .withArguments("join", invitationUrl))
+        .thenApply<String> { it.joinToString("\n") }
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
index b564b6a..11adb69 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
@@ -15,39 +15,39 @@ import java.io.FileNotFoundException
  */
 object TincApp {
 
-    private val SCRIPT_SUFFIXES = listOf("-up", "-down", "-created", "-accepted")
-    private val STATIC_SCRIPTS = listOf("tinc", "host", "subnet", "invitation").flatMap { s -> SCRIPT_SUFFIXES.map { s + it } }
-
-    private fun listScripts(netName: String) = AppPaths.confDir(netName).listFiles { f -> f.name in STATIC_SCRIPTS } +
-            AppPaths.hostsDir(netName).listFiles { f -> SCRIPT_SUFFIXES.any { f.name.endsWith(it) } }
-
-    fun listPrivateKeys(netName: String) = try {
+  private val SCRIPT_SUFFIXES = listOf("-up", "-down", "-created", "-accepted")
+  private val STATIC_SCRIPTS = listOf("tinc", "host", "subnet", "invitation").flatMap { s -> SCRIPT_SUFFIXES.map { s + it } }