Use `MullvadProblemReport` to store confirmation

2 files changed, 29 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConfirmNoEmailDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConfirmNoEmailDialogFragment.kt
index ed56559fa7..1502d01a4f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConfirmNoEmailDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConfirmNoEmailDialogFragment.kt
@@ -1,6 +1,10 @@
 package net.mullvad.mullvadvpn
 
+import kotlinx.coroutines.CompletableDeferred
+
 import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
@@ -9,7 +13,19 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 
+import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
+
 class ConfirmNoEmailDialogFragment : DialogFragment() {
+    private var confirmNoEmail: CompletableDeferred<Boolean>? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        val parentActivity = context as MainActivity
+
+        confirmNoEmail = parentActivity.problemReport.confirmNoEmail
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -21,6 +37,12 @@ class ConfirmNoEmailDialogFragment : DialogFragment() {
             activity?.onBackPressed()
         }
 
+        view.findViewById<Button>(R.id.send_button).setOnClickListener {
+            confirmNoEmail?.complete(true)
+            confirmNoEmail = null
+            dismiss()
+        }
+
         return view
     }
 
@@ -31,4 +53,8 @@ class ConfirmNoEmailDialogFragment : DialogFragment() {
 
         return dialog
     }
+
+    override fun onDismiss(dialogInterface: DialogInterface) {
+        confirmNoEmail?.complete(false)
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
index d1794fbc3f..4a8ac58a24 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.dataproxy
 import java.io.File
 
 import kotlinx.coroutines.async
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -13,6 +14,8 @@ class MullvadProblemReport {
     private var collectJob: Deferred<Boolean>? = null
     private var sendJob: Deferred<Boolean>? = null
 
+    var confirmNoEmail: CompletableDeferred<Boolean>? = null
+
     var userEmail = ""
     var userMessage = ""