Fix currentFocus

Looks like currentFocus does not always exist even after setContentView, so I hereby use another way to check if setContentView is called
topjohnwu · Mar 10, 2023 · 3cf66d1 · 3cf66d1
1 parent 382568b
commit 3cf66d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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