6 files changed, 74 insertions, 41 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
new file mode 100644
index 0000000..ae82fe7
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
@@ -0,0 +1,38 @@
+/*
+ * 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.Context
+import android.support.annotation.LayoutRes
+import android.support.v4.app.DialogFragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * @author pacien
+ */
+abstract class BaseDialogFragment : DialogFragment() {
+  protected val parentActivity by lazy { activity as BaseActivity }
+  // getLayoutInflater() calls onCreateDialog. See https://stackoverflow.com/a/15152788
+  private val inflater by lazy { activity!!.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater }
+
+  fun inflate(@LayoutRes layout: Int) = inflater.inflate(layout, null)!!
+  fun inflate(inflateFunc: (LayoutInflater, ViewGroup?, Boolean) -> View) = inflateFunc(inflater, null, false)
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
index 714a7ae..2135f59 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
@@ -18,36 +18,33 @@
 
 package org.pacien.tincapp.activities.configure
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import org.pacien.tincapp.activities.BaseActivity
 import org.pacien.tincapp.activities.BaseFragment
-import org.pacien.tincapp.activities.configure.tools.EncryptDecryptPrivateKeysTool
-import org.pacien.tincapp.activities.configure.tools.GenerateConfigTool
-import org.pacien.tincapp.activities.configure.tools.JoinNetworkTool
+import org.pacien.tincapp.activities.configure.tools.ConfigurationToolDialogFragment
+import org.pacien.tincapp.activities.configure.tools.EncryptDecryptPrivateKeysToolDialogFragment
+import org.pacien.tincapp.activities.configure.tools.GenerateConfigToolDialogFragment
+import org.pacien.tincapp.activities.configure.tools.JoinNetworkToolDialogFragment
 import org.pacien.tincapp.databinding.ConfigureToolsFragmentBinding
 
 /**
  * @author pacien
  */
 class ToolsFragment : BaseFragment() {
-  private val parentActivity by lazy { activity as BaseActivity }
-  private val generateConfigTool by lazy { GenerateConfigTool(parentActivity) }
-  private val joinNetworkTool by lazy { JoinNetworkTool(this, parentActivity) }
-  private val encryptDecryptPrivateKeysTool by lazy { EncryptDecryptPrivateKeysTool(parentActivity) }
+  private val generateConfigTool by lazy { GenerateConfigToolDialogFragment() }
+  private val joinNetworkTool by lazy { JoinNetworkToolDialogFragment() }
+  private val encryptDecryptPrivateKeysTool by lazy { EncryptDecryptPrivateKeysToolDialogFragment() }
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     val binding = ConfigureToolsFragmentBinding.inflate(inflater, container, false)
-    binding.generateConfigAction = generateConfigTool::openGenerateConfDialog
-    binding.joinNetworkAction = joinNetworkTool::openJoinNetworkDialog
-    binding.encryptDecryptPrivateKeysAction = encryptDecryptPrivateKeysTool::openEncryptDecryptPrivateKeyDialog
+    binding.generateConfigAction = openDialog(generateConfigTool)
+    binding.joinNetworkAction = openDialog(joinNetworkTool)
+    binding.encryptDecryptPrivateKeysAction = openDialog(encryptDecryptPrivateKeysTool)
     return binding.root
   }
 
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    joinNetworkTool.onActivityResult(requestCode, resultCode, data)
-  }
+  private fun openDialog(tool: ConfigurationToolDialogFragment) =
+    { tool.show(fragmentManager, tool.javaClass.simpleName) }
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt
index 4fa85f8..9c94bf1 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt
@@ -18,13 +18,13 @@
 
 package org.pacien.tincapp.activities.configure.tools
 
-import android.app.AlertDialog
 import android.support.annotation.LayoutRes
 import android.support.annotation.StringRes
+import android.support.v7.app.AlertDialog
 import android.view.View
 import java8.util.concurrent.CompletableFuture
 import org.pacien.tincapp.R
-import org.pacien.tincapp.activities.BaseActivity
+import org.pacien.tincapp.activities.BaseDialogFragment
 import org.pacien.tincapp.activities.common.ProgressModal
 import org.pacien.tincapp.extensions.Java.exceptionallyAccept
 import java.util.regex.Pattern
@@ -32,23 +32,22 @@ import java.util.regex.Pattern
 /**
  * @author pacien
  */
-abstract class ConfigurationTool(private val parentActivity: BaseActivity) {
+abstract class ConfigurationToolDialogFragment : BaseDialogFragment() {
   private val networkNamePattern by lazy { Pattern.compile("^[^\\x00/]*$")!! }
 
-  protected fun showDialog(@LayoutRes layout: Int, @StringRes title: Int, @StringRes applyButton: Int, applyAction: (View) -> Unit) =
-    showDialog(parentActivity.inflate(layout), title, applyButton, applyAction)
+  protected fun makeDialog(@LayoutRes layout: Int, @StringRes title: Int, @StringRes applyButton: Int, applyAction: (View) -> Unit) =
+    makeDialog(inflate(layout), title, applyButton, applyAction)
 
-  protected fun showDialog(view: View, @StringRes title: Int, @StringRes applyButton: Int, applyAction: (View) -> Unit) {
+  protected fun makeDialog(view: View, @StringRes title: Int, @StringRes applyButton: Int, applyAction: (View) -> Unit) =
     AlertDialog.Builder(parentActivity)
       .setTitle(title)
       .setView(view)
       .setPositiveButton(applyButton) { _, _ -> applyAction(view) }
       .setNegativeButton(R.string.generic_action_cancel) { _, _ -> Unit }
-      .show()
-  }
+      .create()!!
 
   protected fun execAction(@StringRes label: Int, action: CompletableFuture<Unit>) {
-    ProgressModal.show(parentActivity, parentActivity.getString(label)).let { progressDialog ->
+    ProgressModal.show(parentActivity, getString(label)).let { progressDialog ->
       action
         .whenComplete { _, _ -> progressDialog.dismiss() }
         .thenAccept { parentActivity.notify(R.string.configure_tools_message_network_configuration_written) }
@@ -60,5 +59,5 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) {
     if (networkNamePattern.matcher(netName).matches())
       CompletableFuture.completedFuture(Unit)
     else
-      CompletableFuture.failedFuture(IllegalArgumentException(parentActivity.getString(R.string.configure_tools_message_invalid_network_name)))
+      CompletableFuture.failedFuture(IllegalArgumentException(getString(R.string.configure_tools_message_invalid_network_name)))
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/EncryptDecryptPrivateKeysTool.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/EncryptDecryptPrivateKeysToolDialogFragment.kt
index cd55111..20f0b88 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/EncryptDecryptPrivateKeysTool.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/EncryptDecryptPrivateKeysToolDialogFragment.kt
@@ -18,17 +18,17 @@
 
 package org.pacien.tincapp.activities.configure.tools