Update release notes

Fix #3710

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## READ BEFORE OPENING ISSUES
+
+All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
+
+If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT ROOT**.
+
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk Manager, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
+
+If you experience a crash of Magisk Manager, dump the full `logcat` **when the crash happens**. **DO NOT** upload `magisk.log`.
+
+If you experience other issues related to Magisk, upload `magisk.log`, and preferably also include a boot `logcat` (start dumping `logcat` when the device boots up)
+
+**DO NOT** open issues regarding root detection.
+
+**DO NOT** ask for instructions.
+
+**DO NOT** report issues if you have any modules installed.
+
+Without following the rules above, your issue will be closed without explanation.

.github/workflows/build.yml

@@ -3,6 +3,13 @@ name: Magisk Build
 on:
   push:
     branches: [ master ]
+    paths:
+      - 'app/**'
+      - 'native/**'
+      - 'stub/**'
+      - 'buildSrc/**'
+      - 'build.py'
+      - 'gradle.properties'
   pull_request:
     branches: [ master ]
   workflow_dispatch:
@@ -43,6 +50,7 @@ jobs:
           echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
           echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
           echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
+          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
 
       - name: Set up GitHub env (Unix)
         if: runner.os != 'Windows'
@@ -57,7 +65,6 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-            !~/.gradle/caches/**/*.lock
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: ${{ runner.os }}-gradle-
 

.gitmodules

@@ -25,6 +25,9 @@
 [submodule "pcre"]
 	path = native/jni/external/pcre
 	url = https://android.googlesource.com/platform/external/pcre
+[submodule "xhook"]
+	path = native/jni/external/xhook
+	url = https://github.com/iqiyi/xHook.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -15,11 +15,11 @@ Here are some feature highlights:
 
 ## Downloads
 
-[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.3-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.3/MagiskManager-v8.0.3.apk)
+[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.6-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.6/MagiskManager-v8.0.6.apk)
 [![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
 <br>
-[![](https://img.shields.io/badge/Magisk-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v20.4)
-[![](https://img.shields.io/badge/Magisk%20Beta-v21.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.1)
+[![](https://img.shields.io/badge/Magisk-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
+[![](https://img.shields.io/badge/Magisk%20Beta-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
 
 ## Useful Links
 

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIFragment.kt

@@ -41,6 +41,11 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
         return binding.root
     }
 
+    override fun onStart() {
+        super.onStart()
+        activity.supportActionBar?.subtitle = null
+    }
+
     override fun onEventDispatched(event: ViewEvent) = when(event) {
         is ContextExecutor -> event(requireContext())
         is ActivityExecutor -> event(activity)

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

@@ -25,6 +25,7 @@ object Const {
         fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200 || isCanary()
         fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400 || isCanary()
         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
     }
 
@@ -36,7 +37,6 @@ object Const {
         // notifications
         const val MAGISK_UPDATE_NOTIFICATION_ID = 4
         const val APK_UPDATE_NOTIFICATION_ID = 5
-        const val HIDE_MANAGER_NOTIFICATION_ID = 8
         const val UPDATE_NOTIFICATION_CHANNEL = "update"
         const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
         const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"

app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt

@@ -27,13 +27,13 @@ class LocalModule(path: String) : Module() {
             val dir = "$PERSIST/$id"
             if (enable) {
                 disableFile.delete()
-                if (Const.Version.isCanary())
+                if (Const.Version.atLeast_21_2())
                     Shell.su("copy_sepolicy_rules").submit()
                 else
                     Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
             } else {
                 !disableFile.createNewFile()
-                if (Const.Version.isCanary())
+                if (Const.Version.atLeast_21_2())
                     Shell.su("copy_sepolicy_rules").submit()
                 else
                     Shell.su("rm -rf $dir").submit()
@@ -45,13 +45,13 @@ class LocalModule(path: String) : Module() {
         set(remove) {
             if (remove) {
                 removeFile.createNewFile()
-                if (Const.Version.isCanary())
+                if (Const.Version.atLeast_21_2())
                     Shell.su("copy_sepolicy_rules").submit()
                 else
                     Shell.su("rm -rf $PERSIST/$id").submit()
             } else {
                 !removeFile.delete()
-                if (Const.Version.isCanary())
+                if (Const.Version.atLeast_21_2())
                     Shell.su("copy_sepolicy_rules").submit()
                 else
                     Shell.su("cp -af $ruleFile $PERSIST/$id").submit()

app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt

@@ -191,9 +191,10 @@ abstract class MagiskInstallImpl : KoinComponent {
                     if (rawData.size < 256)
                         continue
 
-                    // Patch flags to AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
+                    // Patch flags to AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED |
+                    // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
                     console.add("-- Patching: vbmeta.img")
-                    ByteBuffer.wrap(rawData).putInt(120, 2)
+                    ByteBuffer.wrap(rawData).putInt(120, 3)
                     tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
                     tarOut.write(rawData)
                 } else {
@@ -204,7 +205,7 @@ abstract class MagiskInstallImpl : KoinComponent {
             }
             val boot = SuFile.open(installDir, "boot.img")
             val recovery = SuFile.open(installDir, "recovery.img")
-            if (recovery.exists() && boot.exists()) {
+            if (Config.recovery && recovery.exists() && boot.exists()) {
                 // Install Magisk to recovery
                 srcBoot = recovery.path
                 // Repack boot image to prevent restore
@@ -360,9 +361,10 @@ abstract class MagiskInstallImpl : KoinComponent {
     }
 
     private fun copySepolicyRules(): Boolean {
-        if (Info.remote.magisk.versionCode >= 21100) return true
-        // Copy existing rules for migration
-        "copy_sepolicy_rules".sh()
+        if (Info.remote.magisk.versionCode >= 21100) {
+            // Copy existing rules for migration
+            "copy_sepolicy_rules".sh()
+        }
         return true
     }
 

app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt

@@ -29,6 +29,6 @@ val viewModelModules = module {
     viewModel { MainViewModel() }
 
     // Legacy
-    viewModel { (args: FlashFragmentArgs) -> FlashViewModel(args, get()) }
+    viewModel { (args: FlashFragmentArgs) -> FlashViewModel(args) }
     viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
 }

app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt

@@ -7,9 +7,11 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.content.pm.ComponentInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
+import android.content.pm.ServiceInfo
+import android.content.pm.ServiceInfo.FLAG_ISOLATED_PROCESS
+import android.content.pm.ServiceInfo.FLAG_USE_APP_ZYGOTE
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.database.Cursor
@@ -57,32 +59,10 @@ import java.lang.reflect.Array as JArray
 
 val packageName: String get() = get<Context>().packageName
 
-val ApplicationInfo.processes: List<String> @SuppressLint("InlinedApi") get() {
-    val pm = get<PackageManager>()
-    val appProcessName = processName ?: packageName
-    val baseFlag = MATCH_DISABLED_COMPONENTS or MATCH_UNINSTALLED_PACKAGES
-    val packageInfo = try {
-        val request = GET_ACTIVITIES or GET_SERVICES or GET_RECEIVERS or GET_PROVIDERS
-        pm.getPackageInfo(packageName, baseFlag or request)
-    } catch (e: NameNotFoundException) { // EdXposed hooked, issue#3276
-        return listOf(appProcessName)
-    } catch (e: Exception) {
-        // Exceed binder data transfer limit, fetch each component type separately
-        pm.getPackageInfo(packageName, baseFlag).apply {
-            runCatching { activities = pm.getPackageInfo(packageName, GET_ACTIVITIES).activities }
-            runCatching { services = pm.getPackageInfo(packageName, GET_SERVICES).services }
-            runCatching { receivers = pm.getPackageInfo(packageName, GET_RECEIVERS).receivers }
-            runCatching { providers = pm.getPackageInfo(packageName, GET_PROVIDERS).providers }
-        }
-    }
-    fun Array<out ComponentInfo>.processNames() = map { it.processName ?: appProcessName }
-    return with(packageInfo) {
-        activities?.processNames().orEmpty() +
-        services?.processNames().orEmpty() +
-        receivers?.processNames().orEmpty() +
-        providers?.processNames().orEmpty()
-    }
-}
+val ServiceInfo.isIsolated get() = (flags and FLAG_ISOLATED_PROCESS) != 0
+
+@get:SuppressLint("InlinedApi")
+val ServiceInfo.useAppZygote get() = (flags and FLAG_USE_APP_ZYGOTE) != 0
 
 fun Context.rawResource(id: Int) = resources.openRawResource(id)
 

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt

@@ -32,6 +32,10 @@ class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>()
         super.onStart()
         setHasOptionsMenu(true)
         activity.setTitle(R.string.flash_screen_title)
+
+        viewModel.subtitle.observe(this) {
+            activity.supportActionBar?.setSubtitle(it)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -1,9 +1,10 @@
 package com.topjohnwu.magisk.ui.flash
 
-import android.content.res.Resources
 import android.net.Uri
 import android.view.MenuItem
 import androidx.databinding.Bindable
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
@@ -26,17 +27,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class FlashViewModel(
-    args: FlashFragmentArgs,
-    private val resources: Resources
+    args: FlashFragmentArgs
 ) : BaseViewModel() {
 
     @get:Bindable
     var showReboot = Shell.rootAccess()
         set(value) = set(value, field, { field = it }, BR.showReboot)
 
-    @get:Bindable
-    var behaviorText = resources.getString(R.string.flashing)
-        set(value) = set(value, field, { field = it }, BR.behaviorText)
+    private val _subtitle = MutableLiveData(R.string.flashing)
+    val subtitle get() = _subtitle as LiveData<Int>
 
     val adapter = RvBindingAdapter<ConsoleItem>()
     val items = diffListOf<ConsoleItem>()
@@ -91,9 +90,9 @@ class FlashViewModel(
 
     private fun onResult(success: Boolean) {
         state = if (success) State.LOADED else State.LOADING_FAILED
-        behaviorText = when {
-            success -> resources.getString(R.string.done)
-            else -> resources.getString(R.string.failure)
+        when {
+            success -> _subtitle.postValue(R.string.done)
+            else -> _subtitle.postValue(R.string.failure)
         }
     }
 

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideApp.kt

@@ -1,47 +0,0 @@
-package com.topjohnwu.magisk.ui.hide
-
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.graphics.drawable.Drawable
-import com.topjohnwu.magisk.core.utils.currentLocale
-import com.topjohnwu.magisk.ktx.getLabel
-
-class HideTarget(line: String) {
-    val packageName: String
-    val process: String
-
-    init {
-        val split = line.split(Regex("\\|"), 2)
-        packageName = split[0]
-        process = split.getOrElse(1) { packageName }
-    }
-}
-
-class HideAppInfo(info: ApplicationInfo, pm: PackageManager)
-    : ApplicationInfo(info), Comparable<HideAppInfo> {
-
-    val label = info.getLabel(pm)
-    val iconImage: Drawable = info.loadIcon(pm)
-
-    override fun compareTo(other: HideAppInfo) = comparator.compare(this, other)
-
-    companion object {
-        private val comparator = compareBy<HideAppInfo>(
-            { it.label.toLowerCase(currentLocale) },
-            { it.packageName }
-        )
-    }
-}
-
-data class HideProcessInfo(
-    val name: String,
-    val packageName: String,
-    val isHidden: Boolean
-)
-
-class HideAppTarget(
-    val info: HideAppInfo,
-    val processes: List<HideProcessInfo>
-) : Comparable<HideAppTarget> {
-    override fun compareTo(other: HideAppTarget) = compareValuesBy(this, other) { it.info }
-}

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt

@@ -0,0 +1,105 @@
+package com.topjohnwu.magisk.ui.hide
+
+import android.annotation.SuppressLint
+import android.content.pm.ApplicationInfo
+import android.content.pm.ComponentInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.*
+import android.content.pm.ServiceInfo
+import android.graphics.drawable.Drawable
+import com.topjohnwu.magisk.core.utils.currentLocale
+import com.topjohnwu.magisk.ktx.getLabel
+import com.topjohnwu.magisk.ktx.isIsolated
+import com.topjohnwu.magisk.ktx.useAppZygote
+
+class CmdlineHiddenItem(line: String) {
+    val packageName: String
+    val process: String
+
+    init {
+        val split = line.split(Regex("\\|"), 2)
+        packageName = split[0]
+        process = split.getOrElse(1) { packageName }
+    }
+}
+
+const val ISOLATED_MAGIC = "isolated"
+
+@SuppressLint("InlinedApi")
+class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<CmdlineHiddenItem>)
+    : ApplicationInfo(info), Comparable<HideAppInfo> {
+
+    val label = info.getLabel(pm)
+    val iconImage: Drawable = info.loadIcon(pm)
+    val processes = fetchProcesses(pm, hideList)
+
+    override fun compareTo(other: HideAppInfo) = comparator.compare(this, other)
+
+    private fun fetchProcesses(
+        pm: PackageManager,
+        hideList: List<CmdlineHiddenItem>
+    ): List<HideProcessInfo> {
+        // Fetch full PackageInfo
+        val baseFlag = MATCH_DISABLED_COMPONENTS or MATCH_UNINSTALLED_PACKAGES
+        val packageInfo = try {
+            val request = GET_ACTIVITIES or GET_SERVICES or GET_RECEIVERS or GET_PROVIDERS
+            pm.getPackageInfo(packageName, baseFlag or request)
+        } catch (e: NameNotFoundException) {
+            // EdXposed hooked, issue#3276
+            return emptyList()
+        } catch (e: Exception) {
+            // Exceed binder data transfer limit, fetch each component type separately
+            pm.getPackageInfo(packageName, baseFlag).apply {
+                runCatching { activities = pm.getPackageInfo(packageName, baseFlag or GET_ACTIVITIES).activities }
+                runCatching { services = pm.getPackageInfo(packageName, baseFlag or GET_SERVICES).services }
+                runCatching { receivers = pm.getPackageInfo(packageName, baseFlag or GET_RECEIVERS).receivers }
+                runCatching { providers = pm.getPackageInfo(packageName, baseFlag or GET_PROVIDERS).providers }
+            }
+        }
+
+        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 })
+        }
+
+        var haveAppZygote = false
+        fun Array<out ComponentInfo>.processes() = map { createProcess(it.processName) }
+        fun Array<ServiceInfo>.processes() = map {
+            if (it.isIsolated) {
+                if (it.useAppZygote) {
+                    haveAppZygote = true
+                    // Using app zygote, don't need to track the process
+                    null
+                } else {
+                    createProcess("${it.processName}:${it.name}", ISOLATED_MAGIC)
+                }
+            } else {
+                createProcess(it.processName)
+            }
+        }
+
+        return with(packageInfo) {
+            activities?.processes().orEmpty() +
+            services?.processes().orEmpty() +
+            receivers?.processes().orEmpty() +
+            providers?.processes().orEmpty() +
+            listOf(if (haveAppZygote) createProcess("${processName}_zygote") else null)
+        }.filterNotNull().distinctBy { it.name }.sortedBy { it.name }
+    }
+
+    companion object {
+        private val comparator = compareBy<HideAppInfo>(
+            { it.label.toLowerCase(currentLocale) },
+            { it.packageName }
+        )
+    }
+}
+
+data class HideProcessInfo(
+    val name: String,
+    val packageName: String,
+    var isHidden: Boolean
+) {
+    val isIsolated get() = name == ISOLATED_MAGIC
+    val isAppZygote get() = name.endsWith("_zygote")
+}

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt

@@ -12,14 +12,13 @@ import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlin.math.roundToInt
 
-class HideItem(
-    app: HideAppTarget
-) : ObservableItem<HideItem>(), Comparable<HideItem> {
+class HideRvItem(
+    val info: HideAppInfo
+) : ObservableItem<HideRvItem>(), Comparable<HideRvItem> {
 
-    override val layoutRes = R.layout.item_hide_md2
+    override val layoutRes get() = R.layout.item_hide_md2
 
-    val info = app.info
-    val processes = app.processes.map { HideProcessItem(it) }
+    val processes = info.processes.map { HideProcessRvItem(it) }
 
     @get:Bindable
     var isExpanded = false
@@ -41,11 +40,10 @@ class HideItem(
             if (value == true) {
                 processes
                     .filterNot { it.isHidden }
-                    .filter { isExpanded || it.process.name == it.process.packageName }
+                    .filter { isExpanded || it.defaultSelection }
             } else {
                 processes
                     .filter { it.isHidden }
-                    .filter { isExpanded || it.process.name == it.process.packageName }
             }.forEach { it.toggle() }
         }
 
@@ -69,14 +67,19 @@ class HideItem(
                 else -> null
             }
         } else {
-            processes.find { it.isHidden && it.process.name == it.process.packageName } != null
+            val defaultProcesses = processes.filter { it.defaultSelection }
+            when (defaultProcesses.count { it.isHidden }) {
+                0 -> false
+                defaultProcesses.size -> true
+                else -> null
+            }
         }
     }
 
-    override fun compareTo(other: HideItem) = comparator.compare(this, other)
+    override fun compareTo(other: HideRvItem) = comparator.compare(this, other)
 
     companion object {
-        private val comparator = compareBy<HideItem>(
+        private val comparator = compareBy<HideRvItem>(
             { it.itemsChecked == 0 },
             { it.info }
         )
@@ -84,16 +87,17 @@ class HideItem(
 
 }
 
-class HideProcessItem(
+class HideProcessRvItem(
     val process: HideProcessInfo
-) : ObservableItem<HideProcessItem>() {
+) : ObservableItem<HideProcessRvItem>() {
 
-    override val layoutRes = R.layout.item_hide_process_md2
+    override val layoutRes get() = R.layout.item_hide_process_md2
 
     @get:Bindable
-    var isHidden = process.isHidden
-        set(value) = set(value, field, { field = it }, BR.hidden) {
-            val arg = if (isHidden) "add" else "rm"
+    var isHidden
+        get() = process.isHidden
+        set(value) = set(value, process.isHidden, { process.isHidden = it }, BR.hidden) {
+            val arg = if (it) "add" else "rm"
             val (name, pkg) = process
             Shell.su("magiskhide --$arg $pkg $name").submit()
         }
@@ -102,7 +106,10 @@ class HideProcessItem(
         isHidden = !isHidden
     }
 
-    override fun contentSameAs(other: HideProcessItem) = process == other.process
-    override fun itemSameAs(other: HideProcessItem) = process.name == other.process.name
+    val defaultSelection get() =
+        process.isIsolated || process.isAppZygote || process.name == process.packageName
+
+    override fun contentSameAs(other: HideProcessRvItem) = process == other.process
+    override fun itemSameAs(other: HideProcessRvItem) = process.name == other.process.name
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt

@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.hide
 import android.annotation.SuppressLint
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
+import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
 import android.os.Process
 import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
@@ -14,7 +15,6 @@ import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.packageName
-import com.topjohnwu.magisk.ktx.processes
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
@@ -45,11 +45,11 @@ class HideViewModel : BaseViewModel(), Queryable {
             submitQuery()
         }
 
-    val items = filterableListOf<HideItem>()
-    val itemBinding = itemBindingOf<HideItem> {
+    val items = filterableListOf<HideRvItem>()
+    val itemBinding = itemBindingOf<HideRvItem> {
         it.bindExtra(BR.viewModel, this)
     }
-    val itemInternalBinding = itemBindingOf<HideProcessItem> {
+    val itemInternalBinding = itemBindingOf<HideProcessRvItem> {
         it.bindExtra(BR.viewModel, this)
     }
 
@@ -62,14 +62,13 @@ class HideViewModel : BaseViewModel(), Queryable {
         state = State.LOADING
         val (apps, diff) = withContext(Dispatchers.Default) {
             val pm = get<PackageManager>()
-            val hides = Shell.su("magiskhide --ls").exec().out.map { HideTarget(it) }
-            val apps = pm.getInstalledApplications(PackageManager.MATCH_UNINSTALLED_PACKAGES)
+            val hideList = Shell.su("magiskhide --ls").exec().out.map { CmdlineHiddenItem(it) }
+            val apps = pm.getInstalledApplications(MATCH_UNINSTALLED_PACKAGES)
                 .asSequence()
                 .filter { it.enabled && !blacklist.contains(it.packageName) }
-                .map { HideAppInfo(it, pm) }
-                .map { createTarget(it, hides) }
+                .map { HideAppInfo(it, pm, hideList) }
                 .filter { it.processes.isNotEmpty() }
-                .map { HideItem(it) }
+                .map { HideRvItem(it) }
                 .toList()
                 .sorted()
             apps to items.calculateDiff(apps)
@@ -80,18 +79,6 @@ class HideViewModel : BaseViewModel(), Queryable {
 
     // ---
 
-    private fun createTarget(info: HideAppInfo, hideList: List<HideTarget>): HideAppTarget {
-        val pkg = info.packageName
-        val hidden = hideList.filter { it.packageName == pkg }
-        val processNames = info.processes.distinct()
-        val processes = processNames.map { name ->
-            HideProcessInfo(name, pkg, hidden.any { name == it.process })
-        }
-        return HideAppTarget(info, processes)
-    }
-
-    // ---
-
     override fun query() {
         items.filter {
             fun showHidden() = it.itemsChecked != 0

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -312,7 +312,7 @@ object RequestTimeout : BaseSettingsItem.Selector() {
 
     override var value = selected
         set(value) = setV(value, field, { field = it }) {
-            Config.suDefaultTimeout = it
+            Config.suDefaultTimeout = entryValues[it].toInt()
         }
 
     private val selected: Int

app/src/main/res/layout/fragment_flash_md2.xml

@@ -56,29 +56,6 @@
             app:icon="@drawable/ic_restart"
             app:iconTint="?colorOnPrimary" />
 
-        <com.google.android.material.card.MaterialCardView
-            style="@style/WidgetFoundation.Card.Elevated"
-            goneUnless="@{viewModel.loading}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:contentPadding="@dimen/l1">
-
-            <TextView
-                movieBehavior="@{viewModel.loading}"
-                movieBehaviorText="@{viewModel.behaviorText}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:fontFamily="monospace"
-                android:gravity="center"
-                android:textAppearance="@style/AppearanceFoundation.Body"
-                android:textColor="?colorOnSurface"
-                android:textStyle="bold"
-                tools:text="Flashing..." />
-
-        </com.google.android.material.card.MaterialCardView>
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>

app/src/main/res/layout/item_hide_md2.xml

@@ -9,7 +9,7 @@
 
         <variable
             name="item"
-            type="com.topjohnwu.magisk.ui.hide.HideItem" />
+            type="com.topjohnwu.magisk.ui.hide.HideRvItem" />
 
         <variable
             name="viewModel"

app/src/main/res/layout/item_hide_process_md2.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="item"
-            type="com.topjohnwu.magisk.ui.hide.HideProcessItem" />
+            type="com.topjohnwu.magisk.ui.hide.HideProcessRvItem" />
 
         <variable
             name="viewModel"

app/src/main/res/raw/changelog.md

@@ -1,10 +1,8 @@
-## v8.0.4
+## v8.0.7
 
-- A lot of stability changes and minor bug fixes
-- Collect device properties, app logcat, and Magisk logs when saving logs in the logs menu
+- Fix sepolicy rule migration when upgrading
 
-## v8.0.3
+## v8.0.6
 
-- Switch to the new Magisk Module Repo setup in preparation to allow 3rd party repos
-- Add tapjacking protection on Superuser request dialog
-- Stability changes and bug fixes
+- Minor UI changes
+- Update internal scripts

app/src/main/res/values-de/strings.xml

@@ -15,7 +15,7 @@
     <string name="no_connection">Keine Verbindung verfügbar</string>
     <string name="app_changelog">Änderungen</string>
     <string name="manager">Manager</string>
-    <string name="loading">Lädt…</string>
+    <string name="loading">Laden…</string>
     <string name="update">Update</string>
     <string name="not_available">N/A</string>
     <string name="hide">Verstecken</string>
@@ -40,7 +40,7 @@
     <string name="recovery_mode">Recovery Modus</string>
     <string name="install_options_title">Optionen</string>
     <string name="install_method_title">Methode</string>
-    <string name="install_next">Nächste</string>
+    <string name="install_next">Nächster Schritt</string>
     <string name="install_start">Los geht\'s</string>
     <string name="manager_download_install">Tippen zum Herunterladen und Installieren</string>
     <string name="download_zip_only">Nur Zip herunterladen</string>

app/src/main/res/values-sk/strings.xml

@@ -44,7 +44,7 @@
     <string name="install_next">Ďalej</string>
     <string name="install_start">Poďme na to</string>
     <string name="manager_download_install">Stlačte pre stiahnutie a inštaláciu</string>
-    <string name="download_zip_only">Len tiahnuť zip</string>
+    <string name="download_zip_only">Len stiahnuť zip</string>
     <string name="direct_install">Priama inštalácia (Odporúča sa)</string>
     <string name="install_inactive_slot">Inštalovať na neaktívny slot (Po OTA)</string>
     <string name="install_inactive_slot_msg">Vaše zariadenie bude po reštarte PRINÚTENÉ nabootovať do aktuálne neaktívneho slotu!\nTúto voľbu použite iba po skončení OTA.\nPokračovať?</string>

app/src/main/res/values-sq/strings.xml

@@ -28,11 +28,11 @@
     <string name="home_support_content">Magisk është, dhe gjithmonë do të jetë, falas dhe me burim të hapur. Megjithatë mund të na tregoni se ju interesoni duke dërguar një donacion të vogël.</string>
     <string name="home_status_normal">Normale</string>
     <string name="home_status_stub">Stub</string>
-    <string name="home_installed_version">Instaluar</string>
-    <string name="home_latest_version">Më të fundit</string>
+    <string name="home_installed_version">E instaluar</string>
+    <string name="home_latest_version">Më e fundit</string>
     <string name="invalid_update_channel">Kanal i pavlefshëm i azhurnimit</string>
     <string name="uninstall_magisk_title">Çinstalo Magisk</string>
-    <string name="uninstall_magisk_msg">Të gjitha modulet do të çaktivizohen/hiqen! \n Rrënja do të hiqet! \n Të dhënat tuaja potencialisht të koduara nëse jo tashmë!</string>
+    <string name="uninstall_magisk_msg">Të gjitha modulet do të çaktivizohen/hiqen! \n Rrënja do të hiqet! \n\n Të dhënat tuaja potencialisht të koduara nëse jo tashmë!</string>
     <string name="home_check_safetynet">Kontrolloni Rrjetin e Sigurisë</string>
 
     <!--Install-->
@@ -60,7 +60,7 @@
     <string name="prompt">Pyet</string>
     <string name="grant">Lejo</string>
     <string name="su_warning">Jep akses të plotë në pajisjen tuaj. \n Moho nëse nuk je i sigurt!</string>
-    <string name="forever">Përgjithmonë</string>
+    <string name="forever">Gjithmonë</string>
     <string name="once">Një herë</string>
     <string name="tenmin">10 minuta</string>
     <string name="twentymin">20 minuta</string>
@@ -77,6 +77,7 @@
     <string name="su_revoke_title">Anulohet?</string>
     <string name="su_revoke_msg">Konfirmo të heqësh të drejtat e %1$s?</string>
     <string name="toast">dolli</string>
+    <string name="none">Asnjë</string>
     <string name="superuser_toggle_notification">Njoftimet</string>
     <string name="superuser_toggle_revoke">Anulo</string>
     <string name="superuser_policy_none">Asnjë aplikacion nuk ka kërkuar ende leje për superpërdoruesin.</string>
@@ -95,7 +96,7 @@
     <string name="safetynet_res_invalid">Përgjigjja është e pavlefshme </string>
     <string name="safetynet_attest_success">Suksese!</string>
     <string name="safetynet_attest_failure">Vërtetimi dështoi!</string>
-    <string name="safetynet_attest_loading">Thjesht një sekondë…</string>
+    <string name="safetynet_attest_loading">Prit një sekondë…</string>
     <string name="safetynet_attest_restart">Provo përsëri</string>
 
     <!--MagiskHide-->
@@ -111,7 +112,7 @@
     <string name="reboot_userspace">Ristartim normal</string>
     <string name="reboot_recovery">Ristartoni në recovery</string>
     <string name="reboot_bootloader">Ristartoni në bootloader</string>
-    <string name="reboot_download">Ristartoni për në download</string>
+    <string name="reboot_download">Ristartoni në download</string>
     <string name="reboot_edl">Ristartoni në EDL</string>
     <string name="module_version_author">%1$s nga %2$s</string>
     <string name="module_state_remove">Hiq</string>
@@ -156,6 +157,12 @@
     <string name="settings_su_app">Vetëm aplikacionet</string>
     <string name="settings_su_adb">Vetëm ADB</string>
     <string name="settings_su_disable">Çaktivizuar</string>
+    <string name="settings_su_request_10">10 Sekonda</string>
+    <string name="settings_su_request_15">15 Sekonda</string>
+    <string name="settings_su_request_20">20 Sekonda</string>
+    <string name="settings_su_request_30">30 Sekonda</string>
+    <string name="settings_su_request_45">45 Sekonda</string>
+    <string name="settings_su_request_60">60 Sekonda</string>
     <string name="superuser_access">Hyrja në superpërdorues</string>
     <string name="auto_response">Përgjigje Automatike</string>
     <string name="request_timeout">Koha e kërkesës</string>
@@ -207,7 +214,7 @@
     <string name="failure">Dështoi!</string>
     <string name="hide_manager_title">Fshehja e Magisk manager…</string>
     <string name="hide_manager_fail_toast">Fsheh Menaxherin e Magisk dështoi</string>
-    <string name="restore_manager_fail_toast">Rikthe menaxherin e Magisk dështoi</string>
+    <string name="restore_manager_fail_toast">Rikthimi i menaxherin e Magisk dështoi</string>
     <string name="open_link_failed_toast">Asnjë aplikacion nuk u gjet për të hapur lidhjen</string>
     <string name="complete_uninstall">Çinstalimi i plotë</string>
     <string name="restore_img">Rikthe Imazhet</string>

app/src/main/res/values-tr/strings.xml

@@ -132,7 +132,7 @@
     <string name="settings_dark_mode_message">Stilinize en iyi uyan modu seçin!</string>
     <string name="settings_dark_mode_light">Her Zaman Aydınlık</string>
     <string name="settings_dark_mode_system">Sistemi Takip Et</string>
-    <string name="settings_dark_mode_dark">Her Zmana Karanlık</string>
+    <string name="settings_dark_mode_dark">Her Zaman Karanlık</string>
     <string name="settings_download_path_title">İndirme dizini</string>
     <string name="settings_download_path_message">Dosyalar %1$s konumuna kaydedilecek</string>
     <string name="settings_clear_cache_title">Depo Önbelleğini Temizle</string>

docs/README.md

@@ -1,5 +1,4 @@
 # Magisk Documentation
-(Updated on 2020.11.13)
 
 - [Installation Instructions](install.md)
 - [Frequently Asked Questions](faq.md)

docs/app_changes.md

@@ -1,5 +1,18 @@
 # Magisk Manager Changelog
 
+### v8.0.7
+
+- Fix sepolicy rule migration when upgrading
+
+### v8.0.6
+
+- Minor UI changes
+- Update internal scripts
+
+### v8.0.5
+
+- Fix sepolicy rule copying
+
 ### v8.0.4
 
 - A lot of stability changes and minor bug fixes

docs/changes.md

@@ -1,5 +1,16 @@
 # Magisk Changelog
 
+### v21.4
+
+- [MagiskSU] Fix `su -c` behavior that broke many root apps
+- [General] Properly handle read/write over sockets (the `broken pipe` issue)
+
+### v21.3
+
+- [MagiskInit] Avoid mounting `f2fs` userdata as it may result in kernel crashes. This shall fix a lot of bootloops
+- [MagiskBoot] Fix a minor header checksum bug for `DHTB` header and ASUS `blob` image formats
+- [MagiskHide] Allowing hiding isolated processes if the mount namespace is separated
+
 ### v21.2
 
 - [MagiskInit] Detect 2SI after mounting `system_root` on legacy SAR devices

docs/releases/21400.md

@@ -0,0 +1,18 @@
+## 2021.1.17 Magisk v21.4
+
+**Update**: v21.4 adds more regression hot fixes.
+
+Happy 2021! v21.3 adds a workaround for devices with buggy F2FS Linux kernel drivers. This F2FS bug may cause bootloops on many devices. Checkout the full [v21.0 release notes](https://topjohnwu.github.io/Magisk/releases/21000.html) if coming from older releases.
+
+### v21.4
+
+- [MagiskSU] Fix `su -c` behavior that broke many root apps
+- [General] Properly handle read/write over sockets (the `broken pipe` issue)
+
+### v21.3
+
+- [MagiskInit] Avoid mounting `f2fs` userdata as it may result in kernel crashes. This shall fix a lot of bootloops
+- [MagiskBoot] Fix a minor header checksum bug for `DHTB` header and ASUS `blob` image formats
+- [MagiskHide] Allowing hiding isolated processes if the mount namespace is separated
+
+### Full Changelog: [here](https://topjohnwu.github.io/Magisk/changes.html)

docs/releases/index.md

@@ -1,5 +1,7 @@
 # Release Notes
 
+- [v21.3](21300.md)
+- [v21.2](21200.md)
 - [v21.1](21100.md)
 - [v21.0](21000.md)
 - [v20.4](20400.md)