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

manager: Add support for automatic selection of corresponding SuSFS version and build time artifacts

Browse Source
This commit is contained in:
ShirkNeko
2025-06-14 22:04:40 +08:00
parent 97e367aa92
commit 85f5459c1d
6 changed files with 170 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
manager/app/src/main/assets/ksu_susfs_1.5.7 Normal file
View File

Binary file not shown.

0
manager/app/src/main/assets/ksu_susfs → manager/app/src/main/assets/ksu_susfs_1.5.8
View File

48
manager/app/src/main/java/com/sukisu/ultra/ui/component/SuSFSConfigDialog.kt
View File

@@ -84,10 +84,12 @@ fun SuSFSConfigDialog(
var selectedTabIndex by remember { mutableIntStateOf(0) }
var unameValue by remember { mutableStateOf("") }
var buildTimeValue by remember { mutableStateOf("") }
var isLoading by remember { mutableStateOf(false) }
var showConfirmReset by remember { mutableStateOf(false) }
var autoStartEnabled by remember { mutableStateOf(false) }
var lastAppliedValue by remember { mutableStateOf("") }
var lastAppliedBuildTime by remember { mutableStateOf("") }
// 路径管理相关状态
var susPaths by remember { mutableStateOf(emptySet<String>()) }
@@ -128,7 +130,8 @@ fun SuSFSConfigDialog(
// 实时判断是否可以启用开机自启动
val canEnableAutoStart by remember {
derivedStateOf {
unameValue.trim().isNotBlank() && unameValue.trim() != "default" ||
(unameValue.trim().isNotBlank() && unameValue.trim() != "default") ||
(buildTimeValue.trim().isNotBlank() && buildTimeValue.trim() != "default") ||
susPaths.isNotEmpty() || susMounts.isNotEmpty() || tryUmounts.isNotEmpty()
}
}
@@ -145,8 +148,10 @@ fun SuSFSConfigDialog(
// 加载当前配置
LaunchedEffect(Unit) {
unameValue = SuSFSManager.getUnameValue(context)
buildTimeValue = SuSFSManager.getBuildTimeValue(context)
autoStartEnabled = SuSFSManager.isAutoStartEnabled(context)
lastAppliedValue = SuSFSManager.getLastAppliedValue(context)
lastAppliedBuildTime = SuSFSManager.getLastAppliedBuildTime(context)
susPaths = SuSFSManager.getSusPaths(context)
susMounts = SuSFSManager.getSusMounts(context)
tryUmounts = SuSFSManager.getTryUmounts(context)
@@ -585,7 +590,9 @@ fun SuSFSConfigDialog(
isLoading = true
if (SuSFSManager.resetToDefault(context)) {
unameValue = "default"
buildTimeValue = "default"
lastAppliedValue = "default"
lastAppliedBuildTime = "default"
autoStartEnabled = false
}
isLoading = false
@@ -615,6 +622,7 @@ fun SuSFSConfigDialog(
onDismissRequest = onDismiss,
title = {
Row(
modifier = Modifier.fillMaxWidth(0.8f),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
@@ -635,7 +643,7 @@ fun SuSFSConfigDialog(
Column(
modifier = Modifier.fillMaxWidth()
) {
// 优化后的标签页 - 使用ScrollableTabRow
// 优化后的标签页
ScrollableTabRow(
selectedTabIndex = selectedTabIndex,
edgePadding = 16.dp,
@@ -667,7 +675,7 @@ fun SuSFSConfigDialog(
Box(
modifier = Modifier
.fillMaxWidth()
.height(380.dp)
.height(460.dp)
) {
when (selectedTabIndex) {
0 -> {
@@ -705,7 +713,7 @@ fun SuSFSConfigDialog(
}
}
// 输入框
// Uname输入框
OutlinedTextField(
value = unameValue,
onValueChange = { unameValue = it },
@@ -717,12 +725,33 @@ fun SuSFSConfigDialog(
shape = RoundedCornerShape(8.dp)
)
// 构建时间伪装输入框
OutlinedTextField(
value = buildTimeValue,
onValueChange = { buildTimeValue = it },
label = { Text(stringResource(R.string.susfs_build_time_label)) },
placeholder = { Text(stringResource(R.string.susfs_build_time_placeholder)) },
modifier = Modifier.fillMaxWidth(),
enabled = !isLoading,
singleLine = true,
shape = RoundedCornerShape(8.dp)
)
// 当前值显示
Column(
verticalArrangement = Arrangement.spacedBy(4.dp)
) {
Text(
text = stringResource(R.string.susfs_current_value, SuSFSManager.getUnameValue(context)),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Text(
text = stringResource(R.string.susfs_current_build_time, SuSFSManager.getBuildTimeValue(context)),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
// 开机自启动开关
Card(
@@ -1248,19 +1277,22 @@ fun SuSFSConfigDialog(
if (selectedTabIndex == 0) {
Button(
onClick = {
if (unameValue.isNotBlank()) {
if (unameValue.isNotBlank() || buildTimeValue.isNotBlank()) {
coroutineScope.launch {
isLoading = true
val success = SuSFSManager.setUname(context, unameValue.trim())
val finalUnameValue = unameValue.trim().ifBlank { "default" }
val finalBuildTimeValue = buildTimeValue.trim().ifBlank { "default" }
val success = SuSFSManager.setUname(context, finalUnameValue, finalBuildTimeValue)
if (success) {
lastAppliedValue = unameValue.trim()
lastAppliedValue = finalUnameValue
lastAppliedBuildTime = finalBuildTimeValue
onDismiss()
}
isLoading = false
}
}
},
enabled = !isLoading && unameValue.isNotBlank(),
enabled = !isLoading && (unameValue.isNotBlank() || buildTimeValue.isNotBlank()),
shape = RoundedCornerShape(8.dp)
) {
Text(stringResource(R.string.susfs_apply))

130
manager/app/src/main/java/com/sukisu/ultra/ui/util/SuSFSManager.kt
View File

@@ -19,18 +19,40 @@ import java.io.File
object SuSFSManager {
private const val PREFS_NAME = "susfs_config"
private const val KEY_UNAME_VALUE = "uname_value"
private const val KEY_BUILD_TIME_VALUE = "build_time_value"
private const val KEY_IS_ENABLED = "is_enabled"
private const val KEY_AUTO_START_ENABLED = "auto_start_enabled"
private const val KEY_LAST_APPLIED_VALUE = "last_applied_value"
private const val KEY_LAST_APPLIED_BUILD_TIME = "last_applied_build_time"
private const val KEY_SUS_PATHS = "sus_paths"
private const val KEY_SUS_MOUNTS = "sus_mounts"
private const val KEY_TRY_UMOUNTS = "try_umounts"
private const val KEY_ANDROID_DATA_PATH = "android_data_path"
private const val KEY_SDCARD_PATH = "sdcard_path"
private const val SUSFS_BINARY_NAME = "ksu_susfs"
private const val SUSFS_BINARY_BASE_NAME = "ksu_susfs"
private const val DEFAULT_UNAME = "default"
private const val DEFAULT_BUILD_TIME = "default"
private const val STARTUP_SCRIPT_PATH = "/data/adb/service.d/susfs_startup.sh"
private const val SUSFS_TARGET_PATH = "/data/adb/ksu/bin/$SUSFS_BINARY_NAME"
private fun getSuSFS(): String {
return try {
getSuSFSVersion()
} catch (_: Exception) {
"1.5.8"
}
}
private fun getSuSFSBinaryName(): String {
val variant = getSuSFS().removePrefix("v")
return "${SUSFS_BINARY_BASE_NAME}_${variant}"
}
/**
* 获取SuSFS二进制文件的完整路径
*/
private fun getSuSFSTargetPath(): String {
return "/data/adb/ksu/bin/${getSuSFSBinaryName()}"
}
/**
* 启用功能状态数据类
@@ -90,6 +112,23 @@ object SuSFSManager {
return getPrefs(context).getString(KEY_UNAME_VALUE, DEFAULT_UNAME) ?: DEFAULT_UNAME
}
/**
* 保存构建时间值
*/
fun saveBuildTimeValue(context: Context, value: String) {
getPrefs(context).edit().apply {
putString(KEY_BUILD_TIME_VALUE, value)
apply()
}
}
/**
* 获取保存的构建时间值
*/
fun getBuildTimeValue(context: Context): String {
return getPrefs(context).getString(KEY_BUILD_TIME_VALUE, DEFAULT_BUILD_TIME) ?: DEFAULT_BUILD_TIME
}
/**
* 保存最后应用的值
*/
@@ -107,6 +146,23 @@ object SuSFSManager {
return getPrefs(context).getString(KEY_LAST_APPLIED_VALUE, DEFAULT_UNAME) ?: DEFAULT_UNAME
}
/**
* 保存最后应用的构建时间值
*/
private fun saveLastAppliedBuildTime(context: Context, value: String) {
getPrefs(context).edit().apply {
putString(KEY_LAST_APPLIED_BUILD_TIME, value)
apply()
}
}
/**
* 获取最后应用的构建时间值
*/
fun getLastAppliedBuildTime(context: Context): String {
return getPrefs(context).getString(KEY_LAST_APPLIED_BUILD_TIME, DEFAULT_BUILD_TIME) ?: DEFAULT_BUILD_TIME
}
/**
* 保存SuSFS启用状态
*/
@@ -226,8 +282,10 @@ object SuSFSManager {
*/
private suspend fun copyBinaryFromAssets(context: Context): String? = withContext(Dispatchers.IO) {
try {
val inputStream = context.assets.open(SUSFS_BINARY_NAME)
val tempFile = File(context.cacheDir, SUSFS_BINARY_NAME)
val binaryName = getSuSFSBinaryName()
val targetPath = getSuSFSTargetPath()
val inputStream = context.assets.open(binaryName)
val tempFile = File(context.cacheDir, binaryName)
FileOutputStream(tempFile).use { outputStream ->
inputStream.copyTo(outputStream)
@@ -236,8 +294,8 @@ object SuSFSManager {
// 创建目标目录并复制文件到/data/adb/ksu/bin/
val shell = getRootShell()
val commands = arrayOf(
"cp '${tempFile.absolutePath}' '$SUSFS_TARGET_PATH'",
"chmod 755 '$SUSFS_TARGET_PATH'",
"cp '${tempFile.absolutePath}' '$targetPath'",
"chmod 755 '$targetPath'",
)
var success = true
@@ -253,9 +311,9 @@ object SuSFSManager {
tempFile.delete()
if (success) {
val verifyResult = shell.newJob().add("test -f '$SUSFS_TARGET_PATH'").exec()
val verifyResult = shell.newJob().add("test -f '$targetPath'").exec()
if (verifyResult.isSuccess) {
SUSFS_TARGET_PATH
targetPath
} else {
null
}
@@ -275,11 +333,13 @@ object SuSFSManager {
private suspend fun createStartupScript(context: Context): Boolean = withContext(Dispatchers.IO) {
try {
val unameValue = getUnameValue(context)
val buildTimeValue = getBuildTimeValue(context)
val susPaths = getSusPaths(context)
val susMounts = getSusMounts(context)
val tryUmounts = getTryUmounts(context)
val androidDataPath = getAndroidDataPath(context)
val sdcardPath = getSdcardPath(context)
val targetPath = getSuSFSTargetPath()
val scriptContent = buildString {
appendLine("#!/system/bin/sh")
@@ -290,7 +350,7 @@ object SuSFSManager {
appendLine("sleep 60")
appendLine()
appendLine("# 检查二进制文件是否存在")
appendLine("if [ -f \"$SUSFS_TARGET_PATH\" ]; then")
appendLine("if [ -f \"$targetPath\" ]; then")
appendLine(" # 创建日志目录")
appendLine(" mkdir -p /data/adb/ksu/log")
appendLine()
@@ -298,28 +358,28 @@ object SuSFSManager {
// 设置Android Data路径
if (androidDataPath != "/sdcard/Android/data") {
appendLine(" # 设置Android Data路径")
appendLine(" $SUSFS_TARGET_PATH set_android_data_root_path '$androidDataPath'")
appendLine(" $targetPath set_android_data_root_path '$androidDataPath'")
appendLine(" echo \"\\$(date): Android Data路径设置为: $androidDataPath\" >> /data/adb/ksu/log/susfs_startup.log")
}
// 设置SD卡路径
if (sdcardPath != "/sdcard") {
appendLine(" # 设置SD卡路径")
appendLine(" $SUSFS_TARGET_PATH set_sdcard_root_path '$sdcardPath'")
appendLine(" $targetPath set_sdcard_root_path '$sdcardPath'")
appendLine(" echo \"\\$(date): SD卡路径设置为: $sdcardPath\" >> /data/adb/ksu/log/susfs_startup.log")
}
// 添加SUS路径
susPaths.forEach { path ->
appendLine(" # 添加SUS路径: $path")
appendLine(" $SUSFS_TARGET_PATH add_sus_path '$path'")
appendLine(" $targetPath add_sus_path '$path'")
appendLine(" echo \"\\$(date): 添加SUS路径: $path\" >> /data/adb/ksu/log/susfs_startup.log")
}
// 添加SUS挂载
susMounts.forEach { mount ->
appendLine(" # 添加SUS挂载: $mount")
appendLine(" $SUSFS_TARGET_PATH add_sus_mount '$mount'")
appendLine(" $targetPath add_sus_mount '$mount'")
appendLine(" echo \"\\$(date): 添加SUS挂载: $mount\" >> /data/adb/ksu/log/susfs_startup.log")
}
@@ -330,20 +390,20 @@ object SuSFSManager {
val path = parts[0]
val mode = parts[1]
appendLine(" # 添加尝试卸载: $path (模式: $mode)")
appendLine(" $SUSFS_TARGET_PATH add_try_umount '$path' $mode")
appendLine(" $targetPath add_try_umount '$path' $mode")
appendLine(" echo \"\\$(date): 添加尝试卸载: $path (模式: $mode)\" >> /data/adb/ksu/log/susfs_startup.log")
}
}
// 设置uname
if (unameValue != DEFAULT_UNAME) {
appendLine(" # 设置uname")
appendLine(" $SUSFS_TARGET_PATH set_uname '$unameValue' '$DEFAULT_UNAME'")
appendLine(" echo \"\\$(date): 设置uname为: $unameValue\" >> /data/adb/ksu/log/susfs_startup.log")
// 设置uname和构建时间
if (unameValue != DEFAULT_UNAME || buildTimeValue != DEFAULT_BUILD_TIME) {
appendLine(" # 设置uname和构建时间")
appendLine(" $targetPath set_uname '$unameValue' '$buildTimeValue'")
appendLine(" echo \"\\$(date): 设置uname为: $unameValue, 构建时间为: $buildTimeValue\" >> /data/adb/ksu/log/susfs_startup.log")
}
appendLine("else")
appendLine(" echo \"\\$(date): SuSFS二进制文件未找到: $SUSFS_TARGET_PATH\" >> /data/adb/ksu/log/susfs_startup.log")
appendLine(" echo \"\\$(date): SuSFS二进制文件未找到: $targetPath\" >> /data/adb/ksu/log/susfs_startup.log")
appendLine("fi")
}
@@ -460,13 +520,14 @@ object SuSFSManager {
try {
// 每次都重新执行命令获取最新状态
val shell = getRootShell()
val targetPath = getSuSFSTargetPath()
// 首先检查二进制文件是否存在于目标位置
val checkResult = shell.newJob().add("test -f '$SUSFS_TARGET_PATH'").exec()
val checkResult = shell.newJob().add("test -f '$targetPath'").exec()
val binaryPath = if (checkResult.isSuccess) {
// 如果目标位置存在，直接使用
SUSFS_TARGET_PATH
targetPath
} else {
// 如果不存在，尝试从assets复制
copyBinaryFromAssets(context)
@@ -685,9 +746,9 @@ object SuSFSManager {
}
/**
* 执行SuSFS命令设置uname
* 执行SuSFS命令设置uname和构建时间
*/
suspend fun setUname(context: Context, unameValue: String): Boolean = withContext(Dispatchers.IO) {
suspend fun setUname(context: Context, unameValue: String, buildTimeValue: String): Boolean = withContext(Dispatchers.IO) {
try {
// 首先复制二进制文件到/data/adb/ksu/bin/
val binaryPath = copyBinaryFromAssets(context)
@@ -703,7 +764,7 @@ object SuSFSManager {
}
// 构建命令
val command = "$binaryPath set_uname '$unameValue' '$DEFAULT_UNAME'"
val command = "$binaryPath set_uname '$unameValue' '$buildTimeValue'"
// 执行命令
val result = getRootShell().newJob().add(command).exec()
@@ -711,7 +772,9 @@ object SuSFSManager {
if (result.isSuccess) {
// 保存配置
saveUnameValue(context, unameValue)
saveBuildTimeValue(context, buildTimeValue)
saveLastAppliedValue(context, unameValue)
saveLastAppliedBuildTime(context, buildTimeValue)
setEnabled(context, true)
// 如果开启了开机自启动，更新启动脚本
@@ -722,7 +785,7 @@ object SuSFSManager {
withContext(Dispatchers.Main) {
Toast.makeText(
context,
context.getString(R.string.susfs_uname_set_success, unameValue),
context.getString(R.string.susfs_uname_set_success, unameValue, buildTimeValue),
Toast.LENGTH_SHORT
).show()
}
@@ -759,8 +822,10 @@ object SuSFSManager {
if (enabled) {
// 启用开机自启动
val lastValue = getLastAppliedValue(context)
if (lastValue == DEFAULT_UNAME && getSusPaths(context).isEmpty() &&
getSusMounts(context).isEmpty() && getTryUmounts(context).isEmpty()) {
val lastBuildTime = getLastAppliedBuildTime(context)
if (lastValue == DEFAULT_UNAME && lastBuildTime == DEFAULT_BUILD_TIME &&
getSusPaths(context).isEmpty() && getSusMounts(context).isEmpty() &&
getTryUmounts(context).isEmpty()) {
withContext(Dispatchers.Main) {
Toast.makeText(
context,
@@ -773,7 +838,8 @@ object SuSFSManager {
// 确保二进制文件存在于目标位置
val shell = getRootShell()
val checkResult = shell.newJob().add("test -f '$SUSFS_TARGET_PATH'").exec()
val targetPath = getSuSFSTargetPath()
val checkResult = shell.newJob().add("test -f '$targetPath'").exec()
if (!checkResult.isSuccess) {
// 如果不存在，尝试复制
@@ -850,10 +916,11 @@ object SuSFSManager {
* 重置为默认值
*/
suspend fun resetToDefault(context: Context): Boolean {
val success = setUname(context, DEFAULT_UNAME)
val success = setUname(context, DEFAULT_UNAME, DEFAULT_BUILD_TIME)
if (success) {
// 重置时清除最后应用的值
saveLastAppliedValue(context, DEFAULT_UNAME)
saveLastAppliedBuildTime(context, DEFAULT_BUILD_TIME)
// 如果开启了开机自启动，需要禁用它
if (isAutoStartEnabled(context)) {
configureAutoStart(context, false)
@@ -867,7 +934,8 @@ object SuSFSManager {
*/
fun isBinaryAvailable(context: Context): Boolean {
return try {
context.assets.open(SUSFS_BINARY_NAME).use { true }
val binaryName = getSuSFSBinaryName()
context.assets.open(binaryName).use { true }
} catch (_: IOException) {
false
}

9
manager/app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -399,10 +399,13 @@
<!-- SuSFS Configuration -->
<string name="susfs_config_title">SuSFS 配置</string>
<string name="susfs_config_description">配置说明</string>
<string name="susfs_config_description_text">此功能允许您自定义 SuSFS 的 uname 值。输入您想要设置的值，点击应用即可生效</string>
<string name="susfs_config_description_text">此功能允许您自定义 SuSFS 的 uname 值和构建时间伪装。输入您想要设置的值，点击应用即可生效</string>
<string name="susfs_uname_label">Uname 值</string>
<string name="susfs_uname_placeholder">请输入自定义 uname 值</string>
<string name="susfs_build_time_label">构建时间伪装</string>
<string name="susfs_build_time_placeholder">请输入构建时间伪装值</string>
<string name="susfs_current_value">当前值: %s</string>
<string name="susfs_current_build_time">当前构建时间: %s</string>
<string name="susfs_reset_to_default">重置为默认值</string>
<string name="susfs_apply">应用</string>
<string name="susfs_done">完成</string>
@@ -413,10 +416,10 @@
<string name="susfs_binary_not_found">无法找到 ksu_susfs 文件</string>
<string name="susfs_command_failed">SuSFS 命令执行失败</string>
<string name="susfs_command_error">执行 SuSFS 命令时出错: %s</string>
<string name="susfs_uname_set_success">SuSFS uname 设置成功: %s</string>
<string name="susfs_uname_set_success">SuSFS uname 和构建时间设置成功: %s, %s</string>
<!-- SuSFS Settings Item -->
<string name="susfs_config_setting_title">SuSFS 配置</string>
<string name="susfs_config_setting_summary">配置 SuSFS 的 uname 值 (当前: %s)</string>
<string name="susfs_config_setting_summary">配置 SuSFS 的 uname 值和构建时间伪装 (当前: %s)</string>
<!-- 开机自启动相关 -->
<string name="susfs_autostart_title">开机自启动</string>
<string name="susfs_autostart_description">系统启动时自动应用 uname 配置</string>

9
manager/app/src/main/res/values/strings.xml
View File

@@ -401,10 +401,13 @@
<!-- SuSFS Configuration -->
<string name="susfs_config_title">SuSFS Configuration</string>
<string name="susfs_config_description">Configuration Description</string>
<string name="susfs_config_description_text">This feature allows you to customize the SuSFS uname value. Enter the value you want to set and click Apply to take effect.</string>
<string name="susfs_config_description_text">This feature allows you to customize the SuSFS uname value and build time spoofing. Enter the values you want to set and click Apply to take effect.</string>
<string name="susfs_uname_label">Uname Value</string>
<string name="susfs_uname_placeholder">Please enter custom uname value</string>
<string name="susfs_build_time_label">Build Time Spoofing</string>
<string name="susfs_build_time_placeholder">Please enter build time spoofing value</string>
<string name="susfs_current_value">Current value: %s</string>
<string name="susfs_current_build_time">Current build time: %s</string>
<string name="susfs_reset_to_default">Reset to Default</string>
<string name="susfs_apply">Apply</string>
<string name="susfs_done">Done</string>
@@ -415,10 +418,10 @@
<string name="susfs_binary_not_found">Cannot find ksu_susfs file</string>
<string name="susfs_command_failed">SuSFS command execution failed</string>
<string name="susfs_command_error">Error executing SuSFS command: %s</string>
<string name="susfs_uname_set_success">SuSFS uname set successfully: %s</string>
<string name="susfs_uname_set_success">SuSFS uname and build time set successfully: %s, %s</string>
<!-- SuSFS Settings Item -->
<string name="susfs_config_setting_title">SuSFS Configuration</string>
<string name="susfs_config_setting_summary">Configure SuSFS uname value (Current: %s)</string>
<string name="susfs_config_setting_summary">Configure SuSFS uname value and build time spoofing (Current: %s)</string>
<!-- 开机自启动相关 -->
<string name="susfs_autostart_title">Auto Start</string>
<string name="susfs_autostart_description">Automatically apply uname configuration at system startup</string>