From 29c989ad157e1b03b867c7a98158c32358df082f Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Thu, 6 Jul 2017 21:57:47 +0200
Subject: Small cleanup

---
 .../java/org/pacien/tincapp/commands/Command.kt    | 13 ++++---------
 .../main/java/org/pacien/tincapp/commands/Tinc.kt  | 11 -----------
 .../org/pacien/tincapp/service/TincVpnService.kt   | 22 ++++++++++++----------
 3 files changed, 16 insertions(+), 30 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 9b22d5f..6eab66b 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Command.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
@@ -8,16 +8,11 @@ import java.util.*
 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"
+        fun toCommandLineOption(): 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>()
-    }
+    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))
@@ -29,7 +24,7 @@ internal class Command(private val cmd: String) {
         return this
     }
 
-    fun asList(): List<String> = listOf(cmd) + opts.map { it.toString() } + args
+    fun asList(): List<String> = listOf(cmd) + opts.map { it.toCommandLineOption() } + args
 
     fun asArray(): Array<String> = this.asList().toTypedArray()
 
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 e8ebb21..9b57233 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -13,17 +13,6 @@ object Tinc {
                     .withOption("config", AppPaths.confDir(netName).absolutePath)
                     .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
 
-    // independently runnable commands
-
-    @Throws(IOException::class)
-    fun fsck(netName: String, fix: Boolean): List<String> {
-        var cmd = newCommand(netName).withArguments("fsck")
-        if (fix) cmd = cmd.withOption("force")
-        return Executor.call(cmd)
-    }
-
-    // commands requiring a running tinc daemon
-
     @Throws(IOException::class)
     fun stop(netName: String) {
         Executor.call(newCommand(netName).withArguments("stop"))
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 7813601..90b7b87 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -27,16 +27,18 @@ class TincVpnService : VpnService() {
         return Service.START_STICKY
     }
 
-    override fun onDestroy() = try {
-        Tinc.stop(netName!!)
-        fd!!.close()
-    } catch (e: IOException) {
-        e.printStackTrace()
-    } finally {
-        netName = null
-        interfaceCfg = null
-        fd = null
-        super.onDestroy()
+    override fun onDestroy() {
+        try {
+            Tinc.stop(netName!!)
+            fd?.close()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } finally {
+            netName = null
+            interfaceCfg = null
+            fd = null
+            super.onDestroy()
+        }
     }
 
     private fun startVpn(netName: String) {
-- 
cgit v1.2.3