From e14f7b6908d3b9148c9788d3f7a519265d925726 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Wed, 8 Mar 2023 10:36:48 +0800
Subject: [PATCH] No KeyDispatch or OnBackPress when no currentFocus

---
 .../com/topjohnwu/magisk/arch/NavigationActivity.kt    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt b/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
index abcd52b5d..7c2659f1c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
@@ -20,12 +20,16 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
     val navigation: NavController get() = navHostFragment.navController
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
+        return currentFocus?.let {
+            currentFragment?.onKeyEvent(event).takeIf { it == true }
+        } ?: super.dispatchKeyEvent(event)
     }
 
     override fun onBackPressed() {
-        if (currentFragment?.onBackPressed()?.not() == true) {
-            super.onBackPressed()
+        currentFocus?.let {
+            if (currentFragment?.onBackPressed() == false) {
+                super.onBackPressed()
+            }
         }
     }