22 files changed, 773 insertions, 773 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 4904a66..c092111 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -19,34 +19,34 @@ import org.pacien.tincapp.context.AppInfo
  */
 abstract class BaseActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.base)
-        setSupportActionBar(toolbar)
-    }
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.base)
+    setSupportActionBar(toolbar)
+  }
 
-    override fun onCreateOptionsMenu(m: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_base, m)
-        return true
-    }
+  override fun onCreateOptionsMenu(m: Menu): Boolean {
+    menuInflater.inflate(R.menu.menu_base, m)
+    return true
+  }
 
-    fun aboutDialog(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
-        AlertDialog.Builder(this)
-                .setTitle(BuildConfig.APPLICATION_ID)
-                .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" +
-                        resources.getString(R.string.app_copyright) + " " +
-                        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)
-                .show()
-    }
+  fun aboutDialog(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
+    AlertDialog.Builder(this)
+      .setTitle(BuildConfig.APPLICATION_ID)
+      .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" +
+        resources.getString(R.string.app_copyright) + " " +
+        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)
+      .show()
+  }
 
-    protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
-    protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
-    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()
+  protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+  protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+  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()
 
 }
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 6c29a53..ec17c11 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -26,102 +26,102 @@ import org.pacien.tincapp.extensions.Java.exceptionallyAccept
  */
 class ConfigureActivity : BaseActivity() {
 
-    companion object {
-        val REQUEST_SCAN = 0
-        val SCAN_PROVIDER = "com.google.zxing.client.android"
+  companion object {
+    val REQUEST_SCAN = 0
+    val SCAN_PROVIDER = "com.google.zxing.client.android"
+  }
+
+  private var joinDialog: View? = null
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+
+    if (requestCode == REQUEST_SCAN && resultCode == Activity.RESULT_OK)
+      joinDialog?.invitation_url?.setText(data!!.getStringExtra("SCAN_RESULT").trim())
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+    layoutInflater.inflate(R.layout.page_configure, main_content)
+    writeContent()
+  }
+
+  fun scanCode(@Suppress("UNUSED_PARAMETER") v: View) {
+    try {
+      startActivityForResult(Intent("$SCAN_PROVIDER.SCAN"), REQUEST_SCAN)
+    } catch (e: ActivityNotFoundException) {
+      AlertDialog.Builder(this).setTitle(R.string.action_scan_qr_code)
+        .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()
     }
-
-    private var joinDialog: View? = null
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (requestCode == REQUEST_SCAN && resultCode == Activity.RESULT_OK)
-            joinDialog?.invitation_url?.setText(data!!.getStringExtra("SCAN_RESULT").trim())
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-        layoutInflater.inflate(R.layout.page_configure, main_content)
-        writeContent()
-    }
-
-    fun scanCode(@Suppress("UNUSED_PARAMETER") v: View) {
-        try {
-            startActivityForResult(Intent("$SCAN_PROVIDER.SCAN"), REQUEST_SCAN)
-        } catch (e: ActivityNotFoundException) {
-            AlertDialog.Builder(this).setTitle(R.string.action_scan_qr_code)
-                    .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()
-        }
-    }
-
-    fun openGenerateConfDialog(@Suppress("UNUSED_PARAMETER") v: View) {
-        val genDialog = layoutInflater.inflate(R.layout.dialog_network_generate, main_content, false)
-        AlertDialog.Builder(this).setTitle(R.string.title_new_network).setView(genDialog)
-                .setPositiveButton(R.string.action_create) { _, _ ->
-                    generateConf(
-                            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()
-    }
+  }
+
+  fun openGenerateConfDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+    val genDialog = layoutInflater.inflate(R.layout.dialog_network_generate, main_content, false)
+    AlertDialog.Builder(this).setTitle(R.string.title_new_network).setView(genDialog)
+      .setPositiveButton(R.string.action_create) { _, _ ->
+        generateConf(
+          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()
+  }
+
+  fun openJoinNetworkDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+    joinDialog = layoutInflater.inflate(R.layout.dialog_network_join, main_content, false)
+    AlertDialog.Builder(this).setTitle(R.string.title_join_network).setView(joinDialog)
+      .setPositiveButton(R.string.action_join) { _, _ ->
+        joinNetwork(
+          joinDialog!!.net_name.text.toString(),
+          joinDialog!!.invitation_url.text.toString(),
+          joinDialog!!.join_passphrase.text.toString())
+      }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+  }
+
+  fun openEncryptDecryptPrivateKeyDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+    val encryptDecryptDialog = layoutInflater.inflate(R.layout.dialog_encrypt_decrypt_keys, main_content, false)
+    AlertDialog.Builder(this).setTitle(R.string.title_private_keys_encryption).setView(encryptDecryptDialog)
+      .setPositiveButton(R.string.action_apply) { _, _ ->
+        encryptDecryptPrivateKeys(
+          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()
+  }
+
+  private fun writeContent() {
+    text_configuration_directory.text = AppPaths.confDir().absolutePath
+    text_log_directory.text = AppPaths.cacheDir().absolutePath
+    text_tinc_binary.text = AppPaths.tinc().absolutePath