Collapse history when logging in with keyboard

1 files changed, 5 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index f4b2ea0f7c..c84961fc53 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -31,6 +31,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     private lateinit var loginFailStatus: View
     private lateinit var accountLogin: AccountLogin
     private lateinit var scrollArea: ScrollView
+    private lateinit var background: View
 
     private val loggedIn = CompletableDeferred<LoginResult>()
 
@@ -57,8 +58,8 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
         scrollArea = view.findViewById(R.id.scroll_area)
 
-        view.findViewById<View>(R.id.contents).setOnClickListener {
-            accountLogin.clearFocus()
+        background = view.findViewById<View>(R.id.contents).apply {
+            setOnClickListener { requestFocus() }
         }
 
         scrollToShow(accountLogin)
@@ -124,6 +125,8 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         loginFailStatus.visibility = View.GONE
         loggedInStatus.visibility = View.GONE
 
+        background.requestFocus()
+
         accountLogin.state = LoginState.InProgress
 
         scrollToShow(loggingInStatus)