42 files changed, 982 insertions, 931 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 1e96fdc..4b11a3e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,66 +3,66 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-        compileSdkVersion 25
-        buildToolsVersion '26.0.2'
+  compileSdkVersion 25
+  buildToolsVersion '26.0.2'
 
-        defaultConfig {
-                applicationId "org.pacien.tincapp"
-                minSdkVersion 21
-                targetSdkVersion 21
-        multiDexEnabled true
-                versionCode 7
-                versionName "0.7"
-                ndk {
-                        abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
-                }
-        }
+  defaultConfig {
+    applicationId "org.pacien.tincapp"
+    minSdkVersion 21
+    targetSdkVersion 21
+    multiDexEnabled true
+    versionCode 7
+    versionName "0.7"
+    ndk {
+      abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+    }
+  }
 
-        buildTypes {
-                release {
-                        minifyEnabled true
-                        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-                }
-        }
+  buildTypes {
+    release {
+      minifyEnabled true
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    }
+  }
 
-        externalNativeBuild {
-                cmake {
-                        path "CMakeLists.txt"
-                }
-        }
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
+  }
 
-        lintOptions {
-                disable 'MissingTranslation'
-        }
+  lintOptions {
+    disable 'MissingTranslation'
+  }
 }
 
 dependencies {
-        compile fileTree(dir: 'libs', include: ['*.jar'])
+  compile fileTree(dir: 'libs', include: ['*.jar'])
 
-        compile 'com.android.support:appcompat-v7:25.4.0'
-        compile 'com.android.support:design:25.4.0'
-        compile 'com.android.support:support-v4:25.4.0'
-        compile 'com.android.support:recyclerview-v7:25.4.0'
-        compile 'com.android.support.constraint:constraint-layout:1.0.2'
+  compile 'com.android.support:appcompat-v7:25.4.0'
+  compile 'com.android.support:design:25.4.0'
+  compile 'com.android.support:support-v4:25.4.0'
+  compile 'com.android.support:recyclerview-v7:25.4.0'
+  compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
-        compile('org.apache.commons:commons-configuration2:2.1.1') {
-                exclude group: 'commons-logging', module: 'commons-logging'
-        }
-        compile('commons-beanutils:commons-beanutils:1.9.3') {
-                exclude group: 'commons-logging', module: 'commons-logging'
-        }
+  compile('org.apache.commons:commons-configuration2:2.1.1') {
+    exclude group: 'commons-logging', module: 'commons-logging'
+  }
+  compile('commons-beanutils:commons-beanutils:1.9.3') {
+    exclude group: 'commons-logging', module: 'commons-logging'
+  }
 
-        compile 'org.bouncycastle:bcpkix-jdk15on:1.57'
+  compile 'org.bouncycastle:bcpkix-jdk15on:1.57'
 
-        compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
+  compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
 
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+  compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 repositories {
-        mavenCentral()
-        jcenter()
-        maven {
-                url "https://maven.google.com"
-        }
+  mavenCentral()
+  jcenter()
+  maven {
+    url "https://maven.google.com"
+  }
 }
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