2 files changed, 10 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
index 5cc6e8ed50..ab0b01c92e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
@@ -137,6 +137,9 @@ class CollapsibleTitleController(val parentView: View) {
         }
     }
 
+    val fullCollapseScrollOffset: Float
+        get() = scrollInterpolation.end
+
     init {
         update()
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
index 23391a9f5c..0cf2c61c84 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
@@ -10,6 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ScrollView
 import android.widget.TextView
 import android.widget.ViewSwitcher
 import kotlinx.coroutines.CompletableDeferred
@@ -39,6 +40,7 @@ class ProblemReportFragment : Fragment() {
     private lateinit var editMessageButton: Button
     private lateinit var tryAgainButton: Button
 
+    private lateinit var scrollArea: ScrollView
     private lateinit var titleController: CollapsibleTitleController
 
     override fun onAttach(context: Context) {
@@ -100,6 +102,7 @@ class ProblemReportFragment : Fragment() {
         setSendButtonEnabled(!userMessageInput.text.isEmpty())
         userMessageInput.addTextChangedListener(InputWatcher())
 
+        scrollArea = view.findViewById(R.id.scroll_area)
         titleController = CollapsibleTitleController(view)
 
         return view
@@ -195,6 +198,8 @@ class ProblemReportFragment : Fragment() {
 
         sendStatusLabel.setText(R.string.sent)
         sendDetailsLabel.setText(R.string.sent_thanks)
+
+        scrollArea.scrollTo(0, titleController.fullCollapseScrollOffset.toInt())
     }
 
     private fun showErrorScreen() {
@@ -209,6 +214,8 @@ class ProblemReportFragment : Fragment() {
 
         editMessageButton.visibility = View.VISIBLE
         tryAgainButton.visibility = View.VISIBLE
+
+        scrollArea.scrollTo(0, titleController.fullCollapseScrollOffset.toInt())
     }
 
     private fun setSendButtonEnabled(enabled: Boolean) {