28 files changed, 787 insertions, 452 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 517097e..ed9ddf0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
                 </activity>
 
                 <activity
-                        android:name=".activities.ConfigureActivity"
+                        android:name=".activities.configure.ConfigureActivity"
                         android:configChanges="orientation|screenSize"
                         android:parentActivityName=".activities.StartActivity">
                 </activity>
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 4dc2381..af71544 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -19,19 +19,18 @@
 package org.pacien.tincapp.activities
 
 import android.os.Bundle
+import android.support.annotation.LayoutRes
 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 android.view.*
 import kotlinx.android.synthetic.main.base.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.context.App
 import org.pacien.tincapp.context.AppInfo
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.context.CrashRecorder
-import org.pacien.tincapp.utils.ProgressModal
 
 /**
  * @author pacien
@@ -105,10 +104,13 @@ abstract class BaseActivity : AppCompatActivity() {
       .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): AlertDialog = ProgressModal.show(this, getString(msg))
-  protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
+  fun inflate(@LayoutRes layout: Int) = layoutInflater.inflate(layout, main_content, false)!!
+  fun inflate(inflateFunc: (LayoutInflater, ViewGroup, Boolean) -> View) = inflateFunc(layoutInflater, main_content, false)
+
+  fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+  fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+
+  fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
     .setTitle(R.string.title_error).setMessage(msg)
     .setPositiveButton(R.string.action_close) { _, _ -> Unit }.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
deleted file mode 100644
index 2aab304..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.pacien.tincapp.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v7.app.AlertDialog
-import android.view.View
-import com.google.zxing.integration.android.IntentIntegrator
-import com.google.zxing.integration.android.IntentResult
-import java8.util.concurrent.CompletableFuture
-import kotlinx.android.synthetic.main.base.*
-import kotlinx.android.synthetic.main.dialog_encrypt_decrypt_keys.view.*
-import kotlinx.android.synthetic.main.dialog_network_generate.view.*
-import kotlinx.android.synthetic.main.dialog_network_join.view.*
-import kotlinx.android.synthetic.main.page_configure.*
-import org.pacien.tincapp.R
-import org.pacien.tincapp.commands.Tinc
-import org.pacien.tincapp.commands.TincApp
-import org.pacien.tincapp.context.AppPaths
-import org.pacien.tincapp.extensions.Java.exceptionallyAccept
-import java.util.regex.Pattern
-
-/**
- * @author pacien
- */
-class ConfigureActivity : BaseActivity() {
-  companion object {
-    private val NETWORK_NAME_PATTERN = Pattern.compile("^[^\\x00/]*$")
-  }
-
-  private var joinDialog: View? = null
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    super.onActivityResult(requestCode, resultCode, data)
-
-    IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
-      ?.let(IntentResult::getContents)
-      ?.let(String::trim)
-      ?.let { joinDialog?.invitation_url?.setText(it) }
-  }
-
-  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) {
-    IntentIntegrator(this).initiateScan()
-  }
-
-  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) { _, _ -> Unit }.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())