39 files changed, 921 insertions, 866 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ccc9e6..f03a640 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:tools="http://schemas.android.com/tools"
-                  package="org.pacien.tincapp">
+                                        xmlns:tools="http://schemas.android.com/tools"
+                                        package="org.pacien.tincapp">
 
         <uses-permission android:name="android.permission.INTERNET"/>
         <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
diff --git a/app/src/main/c/exec.c b/app/src/main/c/exec.c
index fdaec0f..a9871a5 100644
--- a/app/src/main/c/exec.c
+++ b/app/src/main/c/exec.c
@@ -3,32 +3,32 @@
 #include <stdlib.h>
 
 static inline const char **to_string_array(JNIEnv *env, jobjectArray ja) {
-        const int len = (*env)->GetArrayLength(env, ja);
-        const char **ca = calloc((size_t) len + 1, sizeof(char *));
+  const int len = (*env)->GetArrayLength(env, ja);
+  const char **ca = calloc((size_t) len + 1, sizeof(char *));
 
-        for (int i = 0; i < len; ++i) {
-                jstring jstr = (jstring) (*env)->GetObjectArrayElement(env, ja, i);
-                ca[i] = (*env)->GetStringUTFChars(env, jstr, NULL);
-        }
+  for (int i = 0; i < len; ++i) {
+    jstring jstr = (jstring) (*env)->GetObjectArrayElement(env, ja, i);
+    ca[i] = (*env)->GetStringUTFChars(env, jstr, NULL);
+  }
 
-        ca[len] = NULL;
-        return ca;
+  ca[len] = NULL;
+  return ca;
 }
 
 static inline void exec(const char **argcv) {
-        execv(argcv[0], (char *const *) argcv);
-        exit(1);
+  execv(argcv[0], (char *const *) argcv);
+  exit(1);
 }
 
 JNIEXPORT jint JNICALL
 Java_org_pacien_tincapp_commands_Executor_forkExec(JNIEnv *env, jclass class, jobjectArray argcv) {
-        pid_t pid = fork();
-        switch (pid) {
-                case 0:
-                        exec(to_string_array(env, argcv));
-                        return 0;
+  pid_t pid = fork();
+  switch (pid) {
+    case 0:
+      exec(to_string_array(env, argcv));
+      return 0;
 
-                default:
-                        return pid;
-        }
+    default:
+      return pid;
+  }
 }
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)