Code style

44 files changed, 157 insertions, 87 deletions

diff --git a/app/src/main/c/exec.c b/app/src/main/c/exec.c
index 838135c..5e92b11 100644
--- a/app/src/main/c/exec.c
+++ b/app/src/main/c/exec.c
@@ -40,11 +40,11 @@ static inline void exec(const char **argcv) {
 }
 
 JNIEXPORT jint JNICALL
-Java_org_pacien_tincapp_commands_Executor_forkExec(JNIEnv *env, jclass class, jobjectArray argcv) {
+Java_org_pacien_tincapp_commands_Executor_forkExec(JNIEnv *env, __attribute__((unused)) jclass class, jobjectArray args) {
   pid_t pid = fork();
   switch (pid) {
     case 0:
-      exec(to_string_array(env, argcv));
+      exec(to_string_array(env, args));
       return 0;
 
     default:
@@ -53,7 +53,7 @@ Java_org_pacien_tincapp_commands_Executor_forkExec(JNIEnv *env, jclass class, jo
 }
 
 JNIEXPORT jint JNICALL
-Java_org_pacien_tincapp_commands_Executor_wait(JNIEnv *env, jclass class, jint pid) {
+Java_org_pacien_tincapp_commands_Executor_wait(__attribute__((unused))JNIEnv *env, __attribute__((unused)) jclass class, jint pid) {
   int status;
   waitpid(pid, &status, 0);
   return WIFEXITED(status) ? WEXITSTATUS(status) : -1;
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 }