android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "kernel: expose umount list to ioctl interface #2950"

Browse Source 
This reverts commit 029ae8d389.
This commit is contained in:
ShirkNeko
2025-11-20 18:48:59 +08:00
parent 52a3a04b11
commit 088996da9b
48 changed files with 271 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
manager/app/src/main/java/com/sukisu/ultra/ui/screen/UmountManagerScreen.kt
View File

@@ -38,6 +38,7 @@ private val SPACING_LARGE = 16.dp
data class UmountPathEntry(
val path: String,
val checkMnt: Boolean,
val flags: Int,
val isDefault: Boolean
)
@@ -243,11 +244,11 @@ fun UmountManagerScreen(navigator: DestinationsNavigator) {
if (showAddDialog) {
AddUmountPathDialog(
onDismiss = { showAddDialog = false },
onConfirm = { path, flags ->
onConfirm = { path, checkMnt, flags ->
showAddDialog = false
scope.launch(Dispatchers.IO) {
val success = addUmountPath(path, flags)
val success = addUmountPath(path, checkMnt, flags)
withContext(Dispatchers.Main) {
if (success) {
saveUmountConfig()
@@ -308,6 +309,10 @@ fun UmountPathCard(
Spacer(modifier = Modifier.height(SPACING_SMALL))
Text(
text = buildString {
append(context.getString(R.string.check_mount_type))
append(": ")
append(if (entry.checkMnt) context.getString(R.string.yes) else context.getString(R.string.no))
append(" | ")
append(context.getString(R.string.flags))
append(": ")
append(entry.flags.toUmountFlagName(context))
@@ -348,9 +353,10 @@ fun UmountPathCard(
@Composable
fun AddUmountPathDialog(
onDismiss: () -> Unit,
onConfirm: (String, Int) -> Unit
onConfirm: (String, Boolean, Int) -> Unit
) {
var path by rememberSaveable { mutableStateOf("") }
var checkMnt by rememberSaveable { mutableStateOf(false) }
var flags by rememberSaveable { mutableStateOf("-1") }
AlertDialog(
@@ -368,6 +374,20 @@ fun AddUmountPathDialog(
Spacer(modifier = Modifier.height(SPACING_MEDIUM))
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
Checkbox(
checked = checkMnt,
onCheckedChange = { checkMnt = it }
)
Spacer(modifier = Modifier.width(SPACING_SMALL))
Text(stringResource(R.string.check_mount_type_overlay))
}
Spacer(modifier = Modifier.height(SPACING_MEDIUM))
OutlinedTextField(
value = flags,
onValueChange = { flags = it },
@@ -383,7 +403,7 @@ fun AddUmountPathDialog(
TextButton(
onClick = {
val flagsInt = flags.toIntOrNull() ?: -1
onConfirm(path, flagsInt)
onConfirm(path, checkMnt, flagsInt)
},
enabled = path.isNotBlank()
) {
@@ -404,11 +424,12 @@ private fun parseUmountPaths(output: String): List<UmountPathEntry> {
return lines.drop(2).mapNotNull { line ->
val parts = line.trim().split(Regex("\\s+"))
if (parts.size >= 3) {
if (parts.size >= 4) {
UmountPathEntry(
path = parts[0],
flags = parts[1].toIntOrNull() ?: -1,
isDefault = parts[2].equals("Yes", ignoreCase = true)
checkMnt = parts[1].equals("true", ignoreCase = true),
flags = parts[2].toIntOrNull() ?: -1,
isDefault = parts[3].equals("Yes", ignoreCase = true)
)
} else null
}

9
manager/app/src/main/java/com/sukisu/ultra/ui/util/KsuCli.kt
View File

@@ -13,6 +13,7 @@ import android.util.Log
import com.topjohnwu.superuser.CallbackList
import com.topjohnwu.superuser.Shell
import com.topjohnwu.superuser.ShellUtils
import com.topjohnwu.superuser.io.SuFile
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.parcelize.Parcelize
@@ -21,6 +22,7 @@ import com.sukisu.ultra.Natives
import com.sukisu.ultra.ksuApp
import org.json.JSONArray
import java.io.File
import java.util.concurrent.CountDownLatch
/**
@@ -667,14 +669,15 @@ fun readUidScannerFile(): Boolean {
return try {
ShellUtils.fastCmd(shell, "cat /data/adb/ksu/.uid_scanner").trim() == "1"
} catch (_: Exception) {
false
false
}
}
fun addUmountPath(path: String, flags: Int): Boolean {
fun addUmountPath(path: String, checkMnt: Boolean, flags: Int): Boolean {
val shell = getRootShell()
val checkMntFlag = if (checkMnt) "--check-mnt" else ""
val flagsArg = if (flags >= 0) "--flags $flags" else ""
val cmd = "${getKsuDaemonPath()} umount add $path $flagsArg"
val cmd = "${getKsuDaemonPath()} umount add $path $checkMntFlag $flagsArg"
val result = ShellUtils.fastCmdResult(shell, cmd)
Log.i(TAG, "add umount path $path result: $result")
return result