20 files changed, 335 insertions, 159 deletions

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 274e1ba..000320c 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -1,5 +1,6 @@
 package org.pacien.tincapp.activities
 
+import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -38,12 +39,18 @@ abstract class BaseActivity : AppCompatActivity() {
                         resources.getString(R.string.app_license) + "\n\n" +
                         AppInfo.all())
                 .setNeutralButton(R.string.action_open_project_website) { _, _ -> openWebsite(R.string.app_website_url) }
-                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
+                .setPositiveButton(R.string.action_close, dismiss)
                 .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 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, dismiss).show()
+
+    protected val dismiss = { _: Any, _: Any -> /* nop */ }
 
 }
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 3590f99..d11809c 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -1,11 +1,20 @@
 package org.pacien.tincapp.activities
 
 import android.os.Bundle
+import android.support.annotation.StringRes
+import android.support.v7.app.AlertDialog
 import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.FrameLayout
+import java8.util.concurrent.CompletableFuture
 import kotlinx.android.synthetic.main.base.*
 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
 
 /**
  * @author pacien
@@ -19,13 +28,61 @@ class ConfigureActivity : BaseActivity() {
         writeContent()
     }
 
+    fun openGenerateConfDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+        val netNameField = EditText(this)
+        netNameField.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        netNameField.setHint(R.string.field_net_name)
+
+        val dialogFrame = layoutInflater.inflate(R.layout.dialog_frame, main_content, false) as ViewGroup
+        dialogFrame.addView(netNameField)
+
+        AlertDialog.Builder(this).setTitle(R.string.title_new_network).setView(dialogFrame)
+                .setPositiveButton(R.string.action_create) { _, _ -> generateConf(netNameField.text.toString()) }
+                .setNegativeButton(R.string.action_cancel, dismiss).show()
+    }
+
+    fun openJoinNetworkDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+        val netNameField = EditText(this)
+        netNameField.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        netNameField.setHint(R.string.field_net_name)
+
+        val joinUrlField = EditText(this)
+        joinUrlField.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        joinUrlField.setHint(R.string.field_invitation_url)
+
+        val dialogFrame = layoutInflater.inflate(R.layout.dialog_frame, main_content, false) as ViewGroup
+        dialogFrame.addView(netNameField)
+        dialogFrame.addView(joinUrlField)
+
+        AlertDialog.Builder(this).setTitle(R.string.title_join_network).setView(dialogFrame)
+                .setPositiveButton(R.string.action_join) { _, _ -> joinNetwork(netNameField.text.toString(), joinUrlField.text.toString()) }
+                .setNegativeButton(R.string.action_cancel, dismiss).show()
+    }
+
     private fun writeContent() {
         text_configuration_directory.text = AppPaths.confDir().absolutePath
         text_log_directory.text = AppPaths.cacheDir().absolutePath
         text_tinc_binary.text = AppPaths.tinc().absolutePath
     }
 
-    fun generateConf(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet")
-    fun joinNetwork(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet")
+    private fun generateConf(netName: String) = execAction(
+            R.string.message_generating_configuration,
+            Tinc.init(netName)
+                    .thenCompose { TincApp.removeScripts(netName) })
+
+    private fun joinNetwork(netName: String, url: String) = execAction(
+            R.string.message_joining_network,
+            Tinc.join(netName, url)
+                    .thenCompose { TincApp.removeScripts(netName) }
+                    .thenCompose { TincApp.generateIfaceCfg(netName) })
+
+    private fun execAction(@StringRes label: Int, action: CompletableFuture<Void>) {
+        showProgressDialog(label).let { progressDialog ->
+            action
+                    .whenComplete { _, _ -> progressDialog.dismiss() }
+                    .thenAccept { notify(R.string.message_network_configuration_created) }
+                    .exceptionallyAccept { runOnUiThread { showErrorDialog(it.cause!!.localizedMessage) } }
+        }
+    }
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index cecd474..6bd845d 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -13,9 +13,9 @@ import kotlinx.android.synthetic.main.base.*
 import kotlinx.android.synthetic.main.page_start.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.context.AppPaths
+import org.pacien.tincapp.extensions.Android.setElements
 import org.pacien.tincapp.service.TincVpnService
 import org.pacien.tincapp.utils.FileObserver
-import org.pacien.tincapp.utils.setElements
 
 /**
  * @author pacien
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index fb6ab73..a2c39dd 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -17,10 +17,10 @@ import kotlinx.android.synthetic.main.fragment_network_status_header.*
 import kotlinx.android.synthetic.main.page_status.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
+import org.pacien.tincapp.data.VpnInterfaceConfiguration
+import org.pacien.tincapp.extensions.Android.setElements
+import org.pacien.tincapp.extensions.Android.setText
 import org.pacien.tincapp.service.TincVpnService
-import org.pacien.tincapp.service.VpnInterfaceConfiguration
-import org.pacien.tincapp.utils.setElements
-import org.pacien.tincapp.utils.setText
 import java.util.*
 import kotlin.concurrent.timerTask
 
@@ -105,8 +105,8 @@ class StatusActivity : BaseActivity(),