br0kenpixel/KernelSU-Next
1
0
Fork 0
mirror of https://github.com/KernelSU-Next/KernelSU-Next.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Revert "manager: keep mount system preference persistent"

Browse Source 
This reverts commit 609926bff1.
This commit is contained in:
Rifat Azad
2025-06-10 02:31:14 +06:00
parent 0c883ddfd6
commit 10f7d5cf50
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/BackupRestore.kt
View File

@@ -165,7 +165,9 @@ fun BackupRestoreScreen(navigator: DestinationsNavigator) {
val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE) val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
var useOverlayFs by rememberSaveable { var useOverlayFs by rememberSaveable {
mutableStateOf(readMountSystemFile()) mutableStateOf(
prefs.getBoolean("use_overlay_fs", false)
)
} }
val moduleRestore = stringResource(id = R.string.module_restore) val moduleRestore = stringResource(id = R.string.module_restore)

10
manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Settings.kt
View File

@@ -224,11 +224,9 @@ fun SettingScreen(navigator: DestinationsNavigator) {
} }
var useOverlayFs by rememberSaveable { var useOverlayFs by rememberSaveable {
mutableStateOf(readMountSystemFile()) mutableStateOf(
} prefs.getBoolean("use_overlay_fs", false)
)
LaunchedEffect(Unit) {
useOverlayFs = readMountSystemFile()
} }
var showRebootDialog by remember { mutableStateOf(false) } var showRebootDialog by remember { mutableStateOf(false) }
@@ -246,10 +244,8 @@ fun SettingScreen(navigator: DestinationsNavigator) {
useOverlayFs = it useOverlayFs = it
if (useOverlayFs) { if (useOverlayFs) {
moduleBackup() moduleBackup()
updateMountSystemFile(true)
} else { } else {
moduleMigration() moduleMigration()
updateMountSystemFile(false)
} }
if (isManager) install() if (isManager) install()
showRebootDialog = true showRebootDialog = true

20
manager/app/src/main/java/com/rifsxd/ksunext/ui/util/KsuCli.kt
View File

@@ -37,16 +37,10 @@ private fun ksuDaemonOverlayfsPath(): String {
return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libksud_overlayfs.so" return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libksud_overlayfs.so"
} }
fun readMountSystemFile(): Boolean {
val shell = getRootShell()
val filePath = "/data/adb/ksu/mount_system"
val result = ShellUtils.fastCmd(shell, "cat $filePath").trim()
return result == "OVERLAYFS"
}
// Get the path based on the user's choice // Get the path based on the user's choice
fun getKsuDaemonPath(): String { fun getKsuDaemonPath(): String {
val useOverlayFs = readMountSystemFile() val prefs = ksuApp.getSharedPreferences("settings", Context.MODE_PRIVATE)
val useOverlayFs = prefs.getBoolean("use_overlay_fs", false)
return if (useOverlayFs) { return if (useOverlayFs) {
ksuDaemonOverlayfsPath() ksuDaemonOverlayfsPath()
@@ -55,16 +49,6 @@ fun getKsuDaemonPath(): String {
} }
} }
fun updateMountSystemFile(useOverlayFs: Boolean) {
val shell = getRootShell()
val filePath = "/data/adb/ksu/mount_system"
if (useOverlayFs) {
ShellUtils.fastCmd(shell, "echo -n OVERLAYFS > $filePath")
} else {
ShellUtils.fastCmd(shell, "echo -n MAGIC_MOUNT > $filePath")
}
}
data class FlashResult(val code: Int, val err: String, val showReboot: Boolean) { data class FlashResult(val code: Int, val err: String, val showReboot: Boolean) {
constructor(result: Shell.Result, showReboot: Boolean) : this(result.code, result.err.joinToString("\n"), showReboot) constructor(result: Shell.Result, showReboot: Boolean) : this(result.code, result.err.joinToString("\n"), showReboot)
constructor(result: Shell.Result) : this(result, result.isSuccess) constructor(result: Shell.Result) : this(result, result.isSuccess)