16 files changed, 100 insertions, 84 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 3e2bebd..4b1cb91 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -78,7 +78,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, { _, _ -> Unit })
+      .setPositiveButton(R.string.action_close) { _, _ -> Unit }
       .show()
   }
 
@@ -96,13 +96,13 @@ abstract class BaseActivity : AppCompatActivity() {
         resources.getString(R.string.message_app_crash),
         resources.getString(R.string.message_crash_logged, AppPaths.appLogFile().absolutePath)
       ).joinToString("\n\n"))
-      .setNeutralButton(R.string.action_send_report, { _, _ ->
+      .setNeutralButton(R.string.action_send_report) { _, _ ->
         App.sendMail(
           resources.getString(R.string.app_dev_email),
           listOf(R.string.app_name, R.string.title_app_crash).joinToString(" / ", transform = resources::getString),
           AppPaths.appLogFile().let { if (it.exists()) it.readText() else "" })
-      })
-      .setPositiveButton(R.string.action_close, { _, _ -> Unit })
+      }
+      .setPositiveButton(R.string.action_close) { _, _ -> Unit }
       .show()
   }
 
@@ -111,5 +111,5 @@ abstract class BaseActivity : AppCompatActivity() {
   protected fun showProgressDialog(@StringRes msg: Int): AlertDialog = ProgressModal.show(this, getString(msg))
   protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
     .setTitle(R.string.title_error).setMessage(msg)
-    .setPositiveButton(R.string.action_close, { _, _ -> Unit }).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 45a29bf..f823691 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -76,7 +76,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, { _, _ -> Unit }).show()
+      }.setNegativeButton(R.string.action_cancel) { _, _ -> Unit }.show()
   }
 
   fun openJoinNetworkDialog(@Suppress("UNUSED_PARAMETER") v: View) {
@@ -87,7 +87,7 @@ class ConfigureActivity : BaseActivity() {
           joinDialog!!.net_name.text.toString(),
           joinDialog!!.invitation_url.text.toString(),
           joinDialog!!.join_passphrase.text.toString())
-      }.setNegativeButton(R.string.action_cancel, { _, _ -> Unit }).show()
+      }.setNegativeButton(R.string.action_cancel) { _, _ -> Unit }.show()
   }
 
   fun openEncryptDecryptPrivateKeyDialog(@Suppress("UNUSED_PARAMETER") v: View) {
@@ -98,7 +98,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, { _, _ -> Unit }).show()
+      }.setNegativeButton(R.string.action_cancel) { _, _ -> Unit }.show()
   }
 
   private fun writeContent() {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index fbcde81..4be1609 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -68,7 +68,7 @@ class StartActivity : BaseActivity() {
     }
 
     override fun onRefresh() {
-      val networks = AppPaths.confDir()?.list()?.toList() ?: emptyList()
+      val networks = AppPaths.confDir().list()?.toList() ?: emptyList()
       runOnUiThread {
         networkListAdapter?.setElements(networks)
         setPlaceholderVisibility()
@@ -121,7 +121,7 @@ class StartActivity : BaseActivity() {
         AlertDialog.Builder(this@StartActivity)
           .setTitle(R.string.title_unlock_private_keys).setView(dialog)
           .setPositiveButton(R.string.action_unlock) { _, _ -> tryStart(passphrase = dialog.passphrase.text.toString()) }
-          .setNegativeButton(R.string.action_cancel, { _, _ -> Unit })
+          .setNegativeButton(R.string.action_cancel) { _, _ -> Unit }
           .show()
       }
     }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index cd64355..d5c3278 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -189,7 +189,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
     private const val NOW = 0L
 
     fun getNodeNames(): CompletableFuture<List<String>> = TincVpnService.getCurrentNetName()?.let { netName ->
-      Tinc.dumpNodes(netName).thenApply<List<String>> { it.map { it.substringBefore(' ') } }
+      Tinc.dumpNodes(netName).thenApply<List<String>> { list -> list.map { it.substringBefore(' ') } }
     } ?: Executor.supplyAsyncTask<List<String>> { emptyList() }
   }
 }
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 7630b61..9558b15 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -42,7 +42,7 @@ internal object Executor {
   /**
    * @return FAILED (-1) on error, forked child PID otherwise
    */
-  private external fun forkExec(argcv: Array<String>): Int
+  private external fun forkExec(args: Array<String>): Int
 
   /**
    * @return FAILED (-1) on error, the exit status of the process otherwise
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
index 86d2583..b55e9a1 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt
@@ -31,7 +31,7 @@ object Tincd {
       .withOption("pidfile", AppPaths.pidFile(netName).absolutePath)
       .withOption("logfile", AppPaths.logFile(netName).absolutePath)
       .withOption("option", "DeviceType=fd")
-      .withOption("option", "Device=" + deviceFd)
+      .withOption("option", "Device=$deviceFd")
       .apply { if (ed25519PrivateKeyFd != null) withOption("option", "Ed25519PrivateKeyFile=/proc/self/fd/$ed25519PrivateKeyFd") }
       .apply { if (rsaPrivateKeyFd != null) withOption("option", "PrivateKeyFile=/proc/self/fd/$rsaPrivateKeyFd") })
 }
diff --git a/app/src/main/java/org/pacien/tincapp/context/App.kt b/app/src/main/java/org/pacien/tincapp/context/App.kt
index 89d1c73..2d9151e 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -66,7 +66,7 @@ class App : Application() {
       AlertDialog.Builder(getContext(), R.style.Theme_AppCompat_Dialog)
         .setTitle(title).setMessage(msg)
         .apply { if (manualLink != null) setNeutralButton(R.string.action_open_manual) { _, _ -> openURL(manualLink) } }
-        .setPositiveButton(R.string.action_close, { _, _ -> Unit })
+        .setPositiveButton(R.string.action_close) { _, _ -> Unit }
         .create().apply { window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) }.show()
     }
 
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
index a7f5439..76da98f 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -26,17 +26,17 @@ import org.pacien.tincapp.R
  * @author pacien
  */
 object AppInfo {
-  fun appVersion(): String = App.getResources().getString(
+  private fun appVersion(): String = App.getResources().getString(
     R.string.info_version_format,
     BuildConfig.VERSION_NAME,