27 files changed, 564 insertions, 685 deletions

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index d115cb6..8114db4 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -2,20 +2,19 @@ cmake_minimum_required(VERSION 3.4.1)
 include(ExternalProject)
 
 set(xCONFIG
-        "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}"
+        "CC=${CMAKE_C_COMPILER} \
+                ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN} \
+                ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET} \
+                ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
         "LD=${CMAKE_LINKER}"
         "AR=${CMAKE_AR}"
         "RANLIB=${CMAKE_RANLIB}"
-        "CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
-        "LDFLAGS=${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}"
+        "CFLAGS=${CMAKE_C_FLAGS}"
+        "LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
         "--host=${CMAKE_C_COMPILER_TARGET}"
 )
 
-if(${ANDROID_ABI} STREQUAL "mips64")
-        list(APPEND xCONFIG --disable-asm)
-endif()
-
-ExternalProject_Add(lzo
+ExternalProject_Add(    lzo
         URL                                     http://files.pacien.net/tmp/lzo-2.10.tar.gz
         URL_HASH                        SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
         CONFIGURE_COMMAND       <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
@@ -24,7 +23,7 @@ ExternalProject_Add(lzo
                                                 rm -r <BINARY_DIR>
 )
 
-ExternalProject_Add(libressl
+ExternalProject_Add(    libressl
         URL                                     http://files.pacien.net/tmp/libressl-2.5.4.tar.gz
         URL_HASH                        SHA256=107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa
         CONFIGURE_COMMAND       <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
@@ -34,7 +33,7 @@ ExternalProject_Add(libressl
                                                 rm -r <BINARY_DIR>
 )
 
-ExternalProject_Add(tinc
+ExternalProject_Add(    tinc
         DEPENDS                         lzo libressl
         URL                                     http://files.pacien.net/tmp/tinc-1.1pre15-SNAPSHOT.tar.gz
         CONFIGURE_COMMAND       autoreconf -fsi <SOURCE_DIR> &&
@@ -45,8 +44,10 @@ ExternalProject_Add(tinc
                                                 --disable-readline
         BUILD_COMMAND           make -j4 -C src
         INSTALL_COMMAND         make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
-                                                ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
-                                                ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
+                                                ${CMAKE_COMMAND} -E copy
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
+                                                ${CMAKE_COMMAND} -E copy
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
                                                 rm -r <BINARY_DIR>
 )
 
diff --git a/app/build.gradle b/app/build.gradle
index 33514ea..a707cbb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
         compileSdkVersion 25
@@ -7,10 +8,12 @@ android {
         defaultConfig {
                 applicationId "org.pacien.tincapp"
                 minSdkVersion 21
-                targetSdkVersion 25
+                targetSdkVersion 21
                 versionCode 1
                 versionName "0.1-preview"
-                testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+                ndk {
+                        abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+                }
         }
         buildTypes {
                 release {
@@ -18,10 +21,6 @@ android {
                         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
                 }
         }
-        compileOptions {
-                sourceCompatibility JavaVersion.VERSION_1_8
-                targetCompatibility JavaVersion.VERSION_1_8
-        }
         externalNativeBuild {
                 cmake {
                         path "CMakeLists.txt"
@@ -45,5 +44,8 @@ dependencies {
                 exclude group: 'commons-logging', module: 'commons-logging'
         }
 
-        compile 'com.annimon:stream:1.1.5'
+        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+}
+repositories {
+        mavenCentral()
 }
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();
-        }