24 files changed, 538 insertions, 663 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
deleted file mode 100644
index 0e6cb95..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.pacien.tincapp.activities;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-
-import org.pacien.tincapp.BuildConfig;
-import org.pacien.tincapp.R;
-import org.pacien.tincapp.context.AppInfo;
-
-/**
- * @author pacien
- */
-public abstract class BaseActivity extends AppCompatActivity {
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-                super.onCreate(savedInstanceState);
-                setContentView(R.layout.base);
-                Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-                setSupportActionBar(toolbar);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu m) {
-                getMenuInflater().inflate(R.menu.menu_base, m);
-                return true;
-        }
-
-        public void aboutDialog(MenuItem i) {
-                new AlertDialog.Builder(this)
-                                .setTitle(BuildConfig.APPLICATION_ID)
-                                .setMessage(getResources().getString(R.string.app_short_desc) + "\n\n" +
-                                                getResources().getString(R.string.app_copyright) + " " +
-                                                getResources().getString(R.string.app_license) + "\n\n" +
-                                                AppInfo.all(getResources()))
-                                .setNeutralButton(R.string.action_open_project_website, (dialog, which) -> openWebsite(R.string.app_website_url))
-                                .setPositiveButton(R.string.action_close, (dialog, which) -> { /* nop */ })
-                                .show();
-        }
-
-        protected ViewGroup getContentView() {
-                return (ViewGroup) findViewById(R.id.main_content);
-        }
-
-        protected void openWebsite(@StringRes int url) {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().getString(url))));
-        }
-
-        protected void notify(@StringRes int msg) {
-                Snackbar.make(findViewById(R.id.activity_base), msg, Snackbar.LENGTH_LONG).show();
-        }
-
-        protected void copyIntoClipboard(String label, String str) {
-                ClipboardManager c = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                c.setPrimaryClip(ClipData.newPlainText(label, str));
-                notify(R.string.message_text_copied);
-        }
-
-}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
new file mode 100644
index 0000000..6070a0a
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -0,0 +1,62 @@
+package org.pacien.tincapp.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.support.annotation.StringRes
+import android.support.design.widget.Snackbar
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
+import android.view.Menu
+import android.view.MenuItem
+import kotlinx.android.synthetic.main.base.*
+import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.R
+import org.pacien.tincapp.context.AppInfo
+
+/**
+ * @author pacien
+ */
+abstract class BaseActivity : AppCompatActivity() {
+
+    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
+    }
+
+    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(resources))
+                .setNeutralButton(R.string.action_open_project_website) { _, _ -> openWebsite(R.string.app_website_url) }
+                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
+                .show()
+    }
+
+    protected fun openWebsite(@StringRes url: Int) {
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(resources.getString(url))))
+    }
+
+    protected fun notify(@StringRes msg: Int) {
+        Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+    }
+
+    protected fun copyIntoClipboard(label: String, str: String) {
+        val c = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        c.primaryClip = ClipData.newPlainText(label, str)
+        notify(R.string.message_text_copied)
+    }
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
deleted file mode 100644
index e469fa0..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.pacien.tincapp.activities;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-
-import org.pacien.tincapp.R;
-import org.pacien.tincapp.commands.PermissionFixer;
-import org.pacien.tincapp.context.AppPaths;
-import org.pacien.tincapp.service.TincVpnService;
-
-/**
- * @author pacien
- */
-public class StartActivity extends BaseActivity {
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-                super.onCreate(savedInstanceState);
-                getLayoutInflater().inflate(R.layout.page_start, getContentView());
-        }
-
-        @Override
-        protected void onActivityResult(int request, int result, Intent data) {