17 files changed, 7 insertions, 53 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index c092111..44f3210 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -18,7 +18,6 @@ import org.pacien.tincapp.context.AppInfo
  * @author pacien
  */
 abstract class BaseActivity : AppCompatActivity() {
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.base)
@@ -38,7 +37,7 @@ abstract class BaseActivity : AppCompatActivity() {
         resources.getString(R.string.app_license) + "\n\n" +
         AppInfo.all())
       .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) }
-      .setPositiveButton(R.string.action_close, App.dismissAction)
+      .setPositiveButton(R.string.action_close, { _, _ -> Unit })
       .show()
   }
 
@@ -47,6 +46,5 @@ abstract class BaseActivity : AppCompatActivity() {
   protected fun showProgressDialog(@StringRes msg: Int): ProgressDialog = ProgressDialog.show(this, null, getString(msg), true, false)
   protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
     .setTitle(R.string.title_error).setMessage(msg)
-    .setPositiveButton(R.string.action_close, App.dismissAction).show()
-
+    .setPositiveButton(R.string.action_close, { _, _ -> Unit }).show()
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
index ec17c11..a67887c 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -17,7 +17,6 @@ import kotlinx.android.synthetic.main.page_configure.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.commands.TincApp
-import org.pacien.tincapp.context.App
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.extensions.Java.exceptionallyAccept
 
@@ -25,7 +24,6 @@ import org.pacien.tincapp.extensions.Java.exceptionallyAccept
  * @author pacien
  */
 class ConfigureActivity : BaseActivity() {
-
   companion object {
     val REQUEST_SCAN = 0
     val SCAN_PROVIDER = "com.google.zxing.client.android"
@@ -55,7 +53,7 @@ class ConfigureActivity : BaseActivity() {
         .setMessage(R.string.message_no_qr_code_scanner)
         .setPositiveButton(R.string.action_install) { _, _ ->
           startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$SCAN_PROVIDER")))
-        }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+        }.setNegativeButton(R.string.action_cancel, { _, _ -> Unit }).show()
     }
   }
 
@@ -67,7 +65,7 @@ class ConfigureActivity : BaseActivity() {
           genDialog.new_net_name.text.toString(),
           genDialog.new_node_name.text.toString(),
           genDialog.new_passphrase.text.toString())
-      }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+      }.setNegativeButton(R.string.action_cancel, { _, _ -> Unit }).show()
   }
 
   fun openJoinNetworkDialog(@Suppress("UNUSED_PARAMETER") v: View) {
@@ -78,7 +76,7 @@ class ConfigureActivity : BaseActivity() {
           joinDialog!!.net_name.text.toString(),
           joinDialog!!.invitation_url.text.toString(),
           joinDialog!!.join_passphrase.text.toString())
-      }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+      }.setNegativeButton(R.string.action_cancel, { _, _ -> Unit }).show()
   }
 
   fun openEncryptDecryptPrivateKeyDialog(@Suppress("UNUSED_PARAMETER") v: View) {
@@ -89,7 +87,7 @@ class ConfigureActivity : BaseActivity() {
           encryptDecryptDialog!!.enc_dec_net_name.text.toString(),
           encryptDecryptDialog.enc_dec_current_passphrase.text.toString(),
           encryptDecryptDialog.enc_dec_new_passphrase.text.toString())
-      }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+      }.setNegativeButton(R.string.action_cancel, { _, _ -> Unit }).show()
   }
 
   private fun writeContent() {
@@ -123,5 +121,4 @@ class ConfigureActivity : BaseActivity() {
         .exceptionallyAccept { runOnUiThread { showErrorDialog(it.cause!!.localizedMessage) } }
     }
   }
-
 }
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 cb95619..ccb5f10 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Command.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Command.kt
@@ -6,7 +6,6 @@ import java.util.*
  * @author pacien
  */
 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"
   }
@@ -25,7 +24,5 @@ internal class Command(private val cmd: String) {
   }
 
   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/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
index a3b5cea..eb04f6d 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -12,7 +12,6 @@ import java.io.InputStreamReader
  * @author pacien
  */
 internal object Executor {
-
   private const val FAILED = -1
 
   class CommandExecutionException(msg: String) : Exception(msg)
@@ -56,5 +55,4 @@ internal object 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 e0cdb12..556288a 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -7,7 +7,6 @@ import org.pacien.tincapp.context.AppPaths
  * @author pacien
  */
 object Tinc {
-
   private fun newCommand(netName: String): Command =
     Command(AppPaths.tinc().absolutePath)
       .withOption("config", AppPaths.confDir(netName).absolutePath)
@@ -47,5 +46,4 @@ object Tinc {
         .withOption("config", AppPaths.confDir(netName).absolutePath)
         .withArguments("join", invitationUrl))
         .thenApply<String> { it.joinToString("\n") }