From 3cf66d1c5757bb16075194291cd6cda758b602bd Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Wed, 8 Mar 2023 16:59:25 +0800
Subject: [PATCH] Fix currentFocus

Looks like currentFocus does not always exist even after setContentView,
so I hereby use another way to check if setContentView is called
---
 .../java/com/topjohnwu/magisk/arch/NavigationActivity.kt    | 6 ++----
 app/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt   | 2 ++
 2 files changed, 4 insertions(+), 4 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 7c2659f1c..66ad2a157 100644
--- a/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
@@ -20,13 +20,11 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
     val navigation: NavController get() = navHostFragment.navController
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        return currentFocus?.let {
-            currentFragment?.onKeyEvent(event).takeIf { it == true }
-        } ?: super.dispatchKeyEvent(event)
+        return if (binded && currentFragment?.onKeyEvent(event) == true) true else super.dispatchKeyEvent(event)
     }
 
     override fun onBackPressed() {
-        currentFocus?.let {
+        if (binded) {
             if (currentFragment?.onBackPressed() == false) {
                 super.onBackPressed()
             }
diff --git a/app/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt b/app/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
index 73059c770..acc6b209d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
@@ -23,6 +23,8 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
+    protected val binded get() = ::binding.isInitialized
+
     open val snackbarView get() = binding.root
     open val snackbarAnchorView: View? get() = null