From f43a8c8ab490d9545891145a26791beb75b500fb Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Wed, 29 May 2024 17:27:16 -0500
Subject: [PATCH] Clear focus when the Activity stops (#1401)

---
 app/src/main/java/com/x8bit/bitwarden/MainActivity.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt
index b7ec4fcd31..6463ca58d8 100644
--- a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt
@@ -85,6 +85,13 @@ class MainActivity : AppCompatActivity() {
         )
     }
 
+    override fun onStop() {
+        super.onStop()
+        // In some scenarios on an emulator the Activity can leak when recreated
+        // if we don't first clear focus anytime we exit and return to the app.
+        currentFocus?.clearFocus()
+    }
+
     private fun observeViewModelEvents() {
         mainViewModel
             .eventFlow