TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 12:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow remove the module to be updated

Browse Source
This commit is contained in:
vvb2060 2021-05-26 23:19:00 +08:00 committed by John Wu
parent 9ac0f11d9a
commit 350144df29
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import com.topjohnwu.superuser.Shell
import com.topjohnwu.superuser.io.SuFile import com.topjohnwu.superuser.io.SuFile
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.util.*
class LocalModule(path: String) : Module() { class LocalModule(path: String) : Module() {
override var id: String = "" override var id: String = ""
@ -44,13 +45,14 @@ class LocalModule(path: String) : Module() {
get() = removeFile.exists() get() = removeFile.exists()
set(remove) { set(remove) {
if (remove) { if (remove) {
if (updateFile.exists()) return
removeFile.createNewFile() removeFile.createNewFile()
if (Const.Version.atLeast_21_2()) if (Const.Version.atLeast_21_2())
Shell.su("copy_sepolicy_rules").submit() Shell.su("copy_sepolicy_rules").submit()
else else
Shell.su("rm -rf $PERSIST/$id").submit() Shell.su("rm -rf $PERSIST/$id").submit()
} else { } else {
!removeFile.delete() removeFile.delete()
if (Const.Version.atLeast_21_2()) if (Const.Version.atLeast_21_2())
Shell.su("copy_sepolicy_rules").submit() Shell.su("copy_sepolicy_rules").submit()
else else
@ -83,7 +85,7 @@ class LocalModule(path: String) : Module() {
.orEmpty() .orEmpty()
.filter { !it.isFile } .filter { !it.isFile }
.map { LocalModule("${Const.MAGISK_PATH}/${it.name}") } .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
.sortedBy { it.name.toLowerCase() } .sortedBy { it.name.lowercase(Locale.ROOT) }
} }
} }
} }

1
app/src/main/res/layout/item_module_md2.xml
View File

@ -138,6 +138,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:enabled="@{!item.updated}"
android:focusable="true" android:focusable="true"
android:onClick="@{() -> item.delete(viewModel)}" android:onClick="@{() -> item.delete(viewModel)}"
android:text="@{item.removed ? @string/module_state_restore : @string/module_state_remove}" android:text="@{item.removed ? @string/module_state_restore : @string/module_state_remove}"

2
scripts/util_functions.sh
View File

@ -765,6 +765,8 @@ install_module() {
if $BOOTMODE; then if $BOOTMODE; then
# Update info for Magisk app # Update info for Magisk app
mktouch $NVBASE/modules/$MODID/update mktouch $NVBASE/modules/$MODID/update
rm -rf $NVBASE/modules/$MODID/remove 2>/dev/null
rm -rf $NVBASE/modules/$MODID/disable 2>/dev/null
cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop
fi fi