1 files changed, 17 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
index 33b2c36e6b..fcbf1d97b7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
@@ -93,7 +93,10 @@ class ProblemReportFragment : Fragment() {
             sendReportJob = sendReport()
         }
 
-        setSendButtonEnabled(false)
+        userEmailInput.setText(problemReport.userEmail)
+        userMessageInput.setText(problemReport.userMessage)
+
+        setSendButtonEnabled(!userMessageInput.text.isEmpty())
         userMessageInput.addTextChangedListener(InputWatcher())
 
         return view
@@ -101,6 +104,10 @@ class ProblemReportFragment : Fragment() {
 
     override fun onDestroyView() {
         sendReportJob?.cancel()
+
+        problemReport.userEmail = userEmailInput.text.toString()
+        problemReport.userMessage = userMessageInput.text.toString()
+
         super.onDestroyView()
     }
 
@@ -113,12 +120,21 @@ class ProblemReportFragment : Fragment() {
         showSendingScreen()
 
         if (problemReport.send().await()) {
+            clearForm()
             showSuccessScreen(userEmail)
         } else {
             showErrorScreen()
         }
     }
 
+    private fun clearForm() {
+        userEmailInput.setText("")
+        userMessageInput.setText("")
+
+        problemReport.userEmail = ""
+        problemReport.userMessage = ""
+    }
+
     private fun showForm() {
         bodyContainer.displayedChild = 0
     }