Cleanup code

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -20,7 +20,6 @@ import com.topjohnwu.magisk.MainDirections
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseMainActivity
 import com.topjohnwu.magisk.arch.BaseViewModel
-import com.topjohnwu.magisk.arch.ReselectionTarget
 import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
 import com.topjohnwu.magisk.di.viewModel
@@ -82,9 +81,6 @@ class MainActivity : BaseMainActivity<MainViewModel, ActivityMainMd2Binding>() {
             getScreen(it.itemId)?.navigate()
             true
         }
-        binding.mainNavigation.setOnItemReselectedListener {
-            (currentFragment as? ReselectionTarget)?.onReselected()
-        }
         binding.mainNavigation.menu.apply {
             findItem(R.id.superuserFragment)?.isEnabled = Utils.showSuperUser()
             findItem(R.id.modulesFragment)?.isEnabled = Info.env.isActive

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt

@@ -5,7 +5,6 @@ import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.arch.BaseViewModel
-import com.topjohnwu.magisk.arch.Queryable
 import com.topjohnwu.magisk.databinding.filterableListOf
 import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.di.AppContext
@@ -15,29 +14,25 @@ import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import java.util.*
-import kotlin.collections.ArrayList
 
-@FlowPreview
-class DenyListViewModel : BaseViewModel(), Queryable {
-
-    override val queryDelay = 0L
+class DenyListViewModel : BaseViewModel() {
 
     var isShowSystem = false
         set(value) {
             field = value
-            submitQuery()
+            query()
         }
 
     var isShowOS = false
         set(value) {
             field = value
-            submitQuery()
+            query()
         }
 
     var query = ""
         set(value) {
             field = value
-            submitQuery()
+            query()
         }
 
     val items = filterableListOf<DenyListRvItem>()
@@ -71,10 +66,10 @@ class DenyListViewModel : BaseViewModel(), Queryable {
             apps to items.calculateDiff(apps)
         }
         items.update(apps, diff)
-        submitQuery()
+        query()
     }
 
-    override fun query() {
+    fun query() {
         items.filter {
             fun filterSystem() = isShowSystem || !it.info.isSystemApp()