MagiskHide is no more

Author: topjohnwu

app/src/main/java/com/topjohnwu/magisk/core/Config.kt

@@ -59,9 +59,6 @@ object Config : PreferenceModel, DBConfig {
         const val BOOT_ID = "boot_id"
         const val ASKED_HOME = "asked_home"
         const val DOH = "doh"
-
-        // system state
-        const val MAGISKHIDE = "magiskhide"
     }
 
     object Value {
@@ -133,7 +130,6 @@ object Config : PreferenceModel, DBConfig {
     var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
     var doh by preference(Key.DOH, false)
-    var magiskHide by preference(Key.MAGISKHIDE, true)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")

app/src/main/java/com/topjohnwu/magisk/core/Const.kt

@@ -27,14 +27,17 @@ object Const {
 
     // Misc
     val USER_ID = Process.myUid() / 100000
+    val APP_IS_CANARY get() = Version.isCanary(BuildConfig.VERSION_CODE)
 
     object Version {
         const val MIN_VERSION = "v20.4"
         const val MIN_VERCODE = 20400
 
         fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
         fun atLeast_21_2() = Info.env.magiskVersionCode >= 21200 || isCanary()
-        fun isCanary() = Info.env.magiskVersionCode % 100 != 0
+        fun isCanary() = isCanary(Info.env.magiskVersionCode)
+
+        fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0
     }
 
     object ID {
@@ -49,7 +52,7 @@ object Const {
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
-        val CHANGELOG_URL = if (BuildConfig.VERSION_CODE % 100 != 0) Info.remote.magisk.note
+        val CHANGELOG_URL = if (APP_IS_CANARY) Info.remote.magisk.note
         else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.VERSION_CODE}.md"
 
         const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
@@ -76,7 +79,6 @@ object Const {
     object Nav {
         const val HOME = "home"
         const val SETTINGS = "settings"
-        const val HIDE = "hide"
         const val MODULES = "modules"
         const val SUPERUSER = "superuser"
     }

app/src/main/java/com/topjohnwu/magisk/core/Info.kt

@@ -51,25 +51,22 @@ object Info {
 
     private fun loadState() = Env(
         fastCmd("magisk -v").split(":".toRegex())[0],
-        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
-        Shell.su("magiskhide status").exec().isSuccess
+        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
     )
 
     class Env(
         val magiskVersionString: String = "",
-        code: Int = -1,
-        hide: Boolean = false
+        code: Int = -1
     ) {
-        val magiskHide get() = Config.magiskHide
         val magiskVersionCode = when {
             code < Const.Version.MIN_VERCODE -> -1
             else -> if (Shell.rootAccess()) code else -1
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
         val isActive = magiskVersionCode >= 0
-
-        init {
-            Config.magiskHide = hide
-        }
+        var denyListEnforced = if (Const.Version.isCanary(code))
+            Shell.su("magisk --denylist status").exec().isSuccess
+        else
+            false
     }
 }

app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt

@@ -42,7 +42,7 @@ open class Receiver : BaseReceiver() {
                 getUid(intent)?.let { rmPolicy(it) }
             }
             Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
-                getPkg(intent)?.let { Shell.su("magiskhide rm $it").submit() }
+                getPkg(intent)?.let { Shell.su("magisk --denylist rm $it").submit() }
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
         }

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

@@ -60,7 +60,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
                 R.id.homeFragment,
                 R.id.modulesFragment,
                 R.id.superuserFragment,
-                R.id.hideFragment,
+                R.id.denyFragment,
                 R.id.logFragment -> true
                 else -> false
             }
@@ -170,7 +170,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
     private fun getScreen(name: String?): NavDirections? {
         return when (name) {
             Const.Nav.SUPERUSER -> MainDirections.actionSuperuserFragment()
-            Const.Nav.HIDE -> MainDirections.actionHideFragment()
             Const.Nav.MODULES -> MainDirections.actionModuleFragment()
             Const.Nav.SETTINGS -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
             else -> null
@@ -183,7 +182,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
             R.id.modulesFragment -> MainDirections.actionModuleFragment()
             R.id.superuserFragment -> MainDirections.actionSuperuserFragment()
             R.id.logFragment -> MainDirections.actionLogFragment()
-            R.id.hideFragment -> MainDirections.actionHideFragment()
+            R.id.denyFragment -> MainDirections.actionDenylistFragment()
             else -> null
         }
     }

…com/topjohnwu/magisk/ui/hide/HideInfo.kt …pjohnwu/magisk/ui/deny/AppProcessInfo.ktapp/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/AppProcessInfo.kt app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/AppProcessInfo.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.hide
+package com.topjohnwu.magisk.ui.deny
 
 import android.annotation.SuppressLint
 import android.content.pm.ApplicationInfo
@@ -13,7 +13,7 @@ import com.topjohnwu.magisk.ktx.getLabel
 import com.topjohnwu.magisk.ktx.isIsolated
 import com.topjohnwu.magisk.ktx.useAppZygote
 
-class CmdlineHiddenItem(line: String) {
+class CmdlineListItem(line: String) {
     val packageName: String
     val process: String
 
@@ -27,19 +27,19 @@ class CmdlineHiddenItem(line: String) {
 const val ISOLATED_MAGIC = "isolated"
 
 @SuppressLint("InlinedApi")
-class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<CmdlineHiddenItem>)
-    : ApplicationInfo(info), Comparable<HideAppInfo> {
+class AppProcessInfo(info: ApplicationInfo, pm: PackageManager, denyList: List<CmdlineListItem>)
+    : ApplicationInfo(info), Comparable<AppProcessInfo> {
 
     val label = info.getLabel(pm)
     val iconImage: Drawable = info.loadIcon(pm)
-    val processes = fetchProcesses(pm, hideList)
+    val processes = fetchProcesses(pm, denyList)
 
-    override fun compareTo(other: HideAppInfo) = comparator.compare(this, other)
+    override fun compareTo(other: AppProcessInfo) = comparator.compare(this, other)
 
     private fun fetchProcesses(
         pm: PackageManager,
-        hideList: List<CmdlineHiddenItem>
-    ): List<HideProcessInfo> {
+        denylist: List<CmdlineListItem>
+    ): List<ProcessInfo> {
         // Fetch full PackageInfo
         val baseFlag = MATCH_DISABLED_COMPONENTS or MATCH_UNINSTALLED_PACKAGES
         val packageInfo = try {
@@ -58,9 +58,9 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
             }
         }
 
-        val hidden = hideList.filter { it.packageName == packageName || it.packageName == ISOLATED_MAGIC }
-        fun createProcess(name: String, pkg: String = packageName): HideProcessInfo {
-            return HideProcessInfo(name, pkg, hidden.any { it.process == name && it.packageName == pkg })
+        val enabledList = denylist.filter { it.packageName == packageName || it.packageName == ISOLATED_MAGIC }
+        fun createProcess(name: String, pkg: String = packageName): ProcessInfo {
+            return ProcessInfo(name, pkg, enabledList.any { it.process == name && it.packageName == pkg })
         }
 
         var haveAppZygote = false
@@ -90,17 +90,17 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
     }
 
     companion object {
-        private val comparator = compareBy<HideAppInfo>(
-            { it.label.toLowerCase(currentLocale) },
+        private val comparator = compareBy<AppProcessInfo>(
+            { it.label.lowercase(currentLocale) },
             { it.packageName }
         )
     }
 }
 
-data class HideProcessInfo(
+data class ProcessInfo(
     val name: String,
     val packageName: String,
-    var isHidden: Boolean
+    var isEnabled: Boolean
 ) {
     val isIsolated get() = packageName == ISOLATED_MAGIC
     val isAppZygote get() = name.endsWith("_zygote")

…topjohnwu/magisk/ui/hide/HideFragment.kt …ohnwu/magisk/ui/deny/DenyListFragment.ktapp/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListFragment.kt app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListFragment.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.hide
+package com.topjohnwu.magisk.ui.deny
 
 import android.content.Context
 import android.os.Bundle
@@ -11,42 +11,42 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseUIFragment
-import com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
+import com.topjohnwu.magisk.databinding.FragmentDenyMd2Binding
 import com.topjohnwu.magisk.di.viewModel
 import com.topjohnwu.magisk.ktx.addSimpleItemDecoration
 import com.topjohnwu.magisk.ktx.addVerticalPadding
 import com.topjohnwu.magisk.ktx.fixEdgeEffect
 import com.topjohnwu.magisk.ktx.hideKeyboard
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 
-class HideFragment : BaseUIFragment<HideViewModel, FragmentHideMd2Binding>() {
+class DenyListFragment : BaseUIFragment<DenyListViewModel, FragmentDenyMd2Binding>() {
 
-    override val layoutRes = R.layout.fragment_hide_md2
-    override val viewModel by viewModel<HideViewModel>()
+    override val layoutRes = R.layout.fragment_deny_md2
+    override val viewModel by viewModel<DenyListViewModel>()
 
     private var isFilterVisible
-        get() = binding.hideFilter.isVisible
+        get() = binding.processFilter.isVisible
         set(value) {
             if (!value) hideKeyboard()
-            MotionRevealHelper.withViews(binding.hideFilter, binding.hideFilterToggle, value)
+            MotionRevealHelper.withViews(binding.processFilter, binding.filterToggle, value)
         }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        activity.setTitle(R.string.magiskhide)
+        activity.setTitle(R.string.denylist)
         setHasOptionsMenu(true)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.hideFilterToggle.setOnClickListener {
+        binding.filterToggle.setOnClickListener {
             isFilterVisible = true
         }
-        binding.hideFilterInclude.hideFilterDone.setOnClickListener {
+        binding.appFilterInclude.filterDone.setOnClickListener {
             isFilterVisible = false
         }
-        binding.hideContent.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        binding.appList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 if (newState != RecyclerView.SCROLL_STATE_IDLE) hideKeyboard()
             }
@@ -55,23 +55,23 @@ class HideFragment : BaseUIFragment<HideViewModel, FragmentHideMd2Binding>() {
         val resource = requireContext().resources
         val l_50 = resource.getDimensionPixelSize(R.dimen.l_50)
         val l1 = resource.getDimensionPixelSize(R.dimen.l1)
-        binding.hideContent.addVerticalPadding(
+        binding.appList.addVerticalPadding(
             l_50,
             l1 + resource.getDimensionPixelSize(R.dimen.internal_action_bar_size)
         )
-        binding.hideContent.addSimpleItemDecoration(
+        binding.appList.addSimpleItemDecoration(
             left = l1,
             top = l_50,
             right = l1,
             bottom = l_50,
         )
-        binding.hideContent.fixEdgeEffect()
+        binding.appList.fixEdgeEffect()
 
-        val lama = binding.hideContent.layoutManager ?: return
+        val lama = binding.appList.layoutManager ?: return
         lama.isAutoMeasureEnabled = false
     }
 
-    override fun onPreBind(binding: FragmentHideMd2Binding) = Unit
+    override fun onPreBind(binding: FragmentDenyMd2Binding) = Unit
 
     override fun onBackPressed(): Boolean {
         if (isFilterVisible) {
@@ -89,10 +89,10 @@ class HideFragment : BaseUIFragment<HideViewModel, FragmentHideMd2Binding>() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_focus_up -> binding.hideContent
+            R.id.action_focus_up -> binding.appList
                 .takeIf { (it.layoutManager as? LinearLayoutManager)?.findFirstVisibleItemPosition() ?: 0 > 10 }
                 ?.also { it.scrollToPosition(10) }
-                .let { binding.hideContent }
+                .let { binding.appList }
                 .also { it.post { it.smoothScrollToPosition(0) } }
         }
         return super.onOptionsItemSelected(item)

…/topjohnwu/magisk/ui/hide/HideRvItems.kt …pjohnwu/magisk/ui/deny/DenyListRvItem.ktapp/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListRvItem.kt app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListRvItem.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.hide
+package com.topjohnwu.magisk.ui.deny
 
 import android.view.View
 import android.view.ViewGroup
@@ -13,13 +13,13 @@ import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.superuser.Shell
 import kotlin.math.roundToInt
 
-class HideRvItem(
-    val info: HideAppInfo
-) : ObservableDiffRvItem<HideRvItem>(), ComparableRv<HideRvItem> {
+class DenyListRvItem(
+    val info: AppProcessInfo
+) : ObservableDiffRvItem<DenyListRvItem>(), ComparableRv<DenyListRvItem> {
 
     override val layoutRes get() = R.layout.item_hide_md2
 
-    val processes = info.processes.map { HideProcessRvItem(it) }
+    val processes = info.processes.map { ProcessRvItem(it) }
 
     @get:Bindable
     var isExpanded = false
@@ -31,25 +31,24 @@ class HideRvItem(
     @get:Bindable
     val checkedPercent get() = (itemsChecked.toFloat() / processes.size * 100).roundToInt()
 
-    private var state: Boolean? = false
-        set(value) = set(value, field, { field = it }, BR.hiddenState)
+    private var _state: Boolean? = false
+        set(value) = set(value, field, { field = it }, BR.state)
 
     @get:Bindable
-    var hiddenState: Boolean?
-        get() = state
-        set(value) = set(value, state, { state = it }, BR.hiddenState) {
+    var state: Boolean?
+        get() = _state
+        set(value) = set(value, _state, { _state = it }, BR.state) {
             if (value == true) {
                 processes
-                    .filterNot { it.isHidden }
+                    .filterNot { it.isEnabled }
                     .filter { isExpanded || it.defaultSelection }
             } else {
-                processes
-                    .filter { it.isHidden }
+                processes.filter { it.isEnabled }
             }.forEach { it.toggle() }
         }
 
     init {
-        processes.forEach { it.addOnPropertyChangedCallback(BR.hidden) { recalculateChecked() } }
+        processes.forEach { it.addOnPropertyChangedCallback(BR.enabled) { recalculateChecked() } }
         addOnPropertyChangedCallback(BR.expanded) { recalculateChecked() }
         recalculateChecked()
     }
@@ -60,62 +59,62 @@ class HideRvItem(
     }
 
     private fun recalculateChecked() {
-        itemsChecked = processes.count { it.isHidden }
-        state = if (isExpanded) {
+        itemsChecked = processes.count { it.isEnabled }
+        _state = if (isExpanded) {
             when (itemsChecked) {
                 0 -> false
                 processes.size -> true
                 else -> null
             }
         } else {
             val defaultProcesses = processes.filter { it.defaultSelection }
-            when (defaultProcesses.count { it.isHidden }) {
+            when (defaultProcesses.count { it.isEnabled }) {
                 0 -> false
                 defaultProcesses.size -> true
                 else -> null
             }
         }
     }
 
-    override fun compareTo(other: HideRvItem) = comparator.compare(this, other)
+    override fun compareTo(other: DenyListRvItem) = comparator.compare(this, other)
 
     companion object {
-        private val comparator = compareBy<HideRvItem>(
+        private val comparator = compareBy<DenyListRvItem>(
             { it.itemsChecked == 0 },
             { it.info }
         )
     }
 
 }
 
-class HideProcessRvItem(
-    val process: HideProcessInfo
-) : ObservableDiffRvItem<HideProcessRvItem>() {
+class ProcessRvItem(
+    val process: ProcessInfo
+) : ObservableDiffRvItem<ProcessRvItem>() {
 
     override val layoutRes get() = R.layout.item_hide_process_md2
 
     val displayName = if (process.isIsolated) "(isolated) ${process.name}" else process.name
 
     @get:Bindable
-    var isHidden
-        get() = process.isHidden
-        set(value) = set(value, process.isHidden, { process.isHidden = it }, BR.hidden) {
+    var isEnabled
+        get() = process.isEnabled
+        set(value) = set(value, process.isEnabled, { process.isEnabled = it }, BR.enabled) {
             val arg = if (it) "add" else "rm"
             val (name, pkg) = process
-            Shell.su("magiskhide $arg $pkg \'$name\'").submit()
+            Shell.su("magisk --denylist $arg $pkg \'$name\'").submit()
         }
 
     fun toggle() {
-        isHidden = !isHidden
+        isEnabled = !isEnabled
     }
 
     val defaultSelection get() =
         process.isIsolated || process.isAppZygote || process.name == process.packageName
 
-    override fun contentSameAs(other: HideProcessRvItem) =
-        process.isHidden == other.process.isHidden
+    override fun contentSameAs(other: ProcessRvItem) =
+        process.isEnabled == other.process.isEnabled
 
-    override fun itemSameAs(other: HideProcessRvItem) =
+    override fun itemSameAs(other: ProcessRvItem) =
         process.name == other.process.name && process.packageName == other.process.packageName
 
 }

…opjohnwu/magisk/ui/hide/HideViewModel.kt …hnwu/magisk/ui/deny/DenyListViewModel.ktapp/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt renamed to app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.hide
+package com.topjohnwu.magisk.ui.deny
 
 import android.annotation.SuppressLint
 import android.content.pm.ApplicationInfo
@@ -20,7 +20,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class HideViewModel : BaseViewModel(), Queryable {
+class DenyListViewModel : BaseViewModel(), Queryable {
 
     override val queryDelay = 1000L
 
@@ -43,11 +43,11 @@ class HideViewModel : BaseViewModel(), Queryable {
             submitQuery()
         }
 
-    val items = filterableListOf<HideRvItem>()
-    val itemBinding = itemBindingOf<HideRvItem> {
+    val items = filterableListOf<DenyListRvItem>()
+    val itemBinding = itemBindingOf<DenyListRvItem> {
         it.bindExtra(BR.viewModel, this)
     }
-    val itemInternalBinding = itemBindingOf<HideProcessRvItem> {
+    val itemInternalBinding = itemBindingOf<ProcessRvItem> {
         it.bindExtra(BR.viewModel, this)
     }
 
@@ -60,14 +60,14 @@ class HideViewModel : BaseViewModel(), Queryable {
         state = State.LOADING
         val (apps, diff) = withContext(Dispatchers.Default) {
             val pm = AppContext.packageManager
-            val hideList = Shell.su("magiskhide ls").exec().out.map { CmdlineHiddenItem(it) }
+            val hideList = Shell.su("magisk --denylist ls").exec().out.map { CmdlineListItem(it) }
             val apps = pm.getInstalledApplications(MATCH_UNINSTALLED_PACKAGES)
                 .asSequence()
                 .filterNot { blacklist.contains(it.packageName) }
-                .map { HideAppInfo(it, pm, hideList) }
+                .map { AppProcessInfo(it, pm, hideList) }
                 .filter { it.processes.isNotEmpty() }
-                .filter { info -> info.enabled || info.processes.any { it.isHidden } }
-                .map { HideRvItem(it) }
+                .filter { info -> info.enabled || info.processes.any { it.isEnabled } }
+                .map { DenyListRvItem(it) }
                 .toList()
                 .sorted()
             apps to items.calculateDiff(apps)