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

manager: Update to version 3.1.8 and rename the relevant version checking functions

Browse Source
This commit is contained in:
ShirkNeko
2025-07-21 21:22:07 +08:00
parent 139899d05d
commit 5ba4f73eeb
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/Makefile
View File

@@ -22,7 +22,7 @@ obj-$(CONFIG_KPM) += kpm/
REPO_OWNER := SukiSU-Ultra
REPO_NAME := SukiSU-Ultra
REPO_BRANCH := main
KSU_VERSION_API := 3.1.7
KSU_VERSION_API := 3.1.8
GIT_BIN := /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin git
CURL_BIN := /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin curl

8
manager/app/src/main/java/com/sukisu/ultra/ui/component/SuSFSConfigTabs.kt
View File

@@ -43,7 +43,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.sukisu.ultra.R
import com.sukisu.ultra.ui.util.SuSFSManager
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion_1_5_8
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion158
import com.sukisu.ultra.ui.viewmodel.SuperUserViewModel
/**
@@ -316,7 +316,7 @@ fun SusLoopPathsContent(
fun SusMountsContent(
susMounts: Set<String>,
hideSusMountsForAllProcs: Boolean,
isSusVersion_1_5_8: Boolean,
isSusVersion158: Boolean,
isLoading: Boolean,
onAddMount: () -> Unit,
onRemoveMount: (String) -> Unit,
@@ -328,7 +328,7 @@ fun SusMountsContent(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
if (isSusVersion_1_5_8) {
if (isSusVersion158) {
item {
SusMountHidingControlCard(
hideSusMountsForAllProcs = hideSusMountsForAllProcs,
@@ -404,7 +404,7 @@ fun TryUmountContent(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
if (isSusVersion_1_5_8()) {
if (isSusVersion158()) {
item {
Card(
modifier = Modifier.fillMaxWidth(),

16
manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuSFSConfig.kt
View File

@@ -82,8 +82,8 @@ import com.sukisu.ultra.ui.component.SusLoopPathsContent
import com.sukisu.ultra.ui.component.TryUmountContent
import com.sukisu.ultra.ui.theme.CardConfig
import com.sukisu.ultra.ui.util.SuSFSManager
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion_1_5_8
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion_1_5_9
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion158
import com.sukisu.ultra.ui.util.SuSFSManager.isSusVersion159
import com.sukisu.ultra.ui.util.isAbDevice
import kotlinx.coroutines.launch
import java.io.File
@@ -104,10 +104,10 @@ enum class SuSFSTab(val displayNameRes: Int) {
ENABLED_FEATURES(R.string.susfs_tab_enabled_features);
companion object {
fun getAllTabs(isSusVersion_1_5_8: Boolean, isSusVersion_1_5_9: Boolean): List<SuSFSTab> {
fun getAllTabs(isSusVersion158: Boolean, isSusVersion159: Boolean): List<SuSFSTab> {
return when {
isSusVersion_1_5_9 -> entries.toList()
isSusVersion_1_5_8 -> entries.filter { it != SUS_LOOP_PATHS }
isSusVersion159 -> entries.toList()
isSusVersion158 -> entries.filter { it != SUS_LOOP_PATHS }
else -> entries.filter { it != PATH_SETTINGS && it != SUS_LOOP_PATHS }
}
}
@@ -201,7 +201,7 @@ fun SuSFSConfigScreen(
var isNavigating by remember { mutableStateOf(false) }
val allTabs = SuSFSTab.getAllTabs(isSusVersion_1_5_8(), isSusVersion_1_5_9())
val allTabs = SuSFSTab.getAllTabs(isSusVersion158(), isSusVersion159())
// 实时判断是否可以启用开机自启动
val canEnableAutoStart by remember {
@@ -1283,12 +1283,12 @@ fun SuSFSConfigScreen(
)
}
SuSFSTab.SUS_MOUNTS -> {
val isSusVersion_1_5_8 = remember { isSusVersion_1_5_8() }
val isSusVersion158 = remember { isSusVersion158() }
SusMountsContent(
susMounts = susMounts,
hideSusMountsForAllProcs = hideSusMountsForAllProcs,
isSusVersion_1_5_8 = isSusVersion_1_5_8,
isSusVersion158 = isSusVersion158,
isLoading = isLoading,
onAddMount = { showAddMountDialog = true },
onRemoveMount = { mount ->

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

@@ -222,7 +222,7 @@ object SuSFSManager {
/**
* 检查是否支持设置sdcard路径等功能（1.5.8+）
*/
fun isSusVersion_1_5_8(): Boolean {
fun isSusVersion158(): Boolean {
return try {
val currentVersion = getSuSFSVersion()
compareVersions(currentVersion, MIN_VERSION_FOR_HIDE_MOUNT) >= 0
@@ -234,7 +234,7 @@ object SuSFSManager {
/**
* 检查是否支持循环路径功能（1.5.9+）
*/
fun isSusVersion_1_5_9(): Boolean {
fun isSusVersion159(): Boolean {
return try {
val currentVersion = getSuSFSVersion()
compareVersions(currentVersion, MIN_VERSION_FOR_LOOP_PATH) >= 0
@@ -262,7 +262,7 @@ object SuSFSManager {
kstatConfigs = getKstatConfigs(context),
addKstatPaths = getAddKstatPaths(context),
hideSusMountsForAllProcs = getHideSusMountsForAllProcs(context),
support158 = isSusVersion_1_5_8(),
support158 = isSusVersion158(),
enableHideBl = getEnableHideBl(context),
enableCleanupResidue = getEnableCleanupResidue(context),
umountForZygoteIsoService = getUmountForZygoteIsoService(context),
@@ -860,7 +860,7 @@ object SuSFSManager {
// SUS挂载隐藏控制
suspend fun setHideSusMountsForAllProcs(context: Context, hideForAll: Boolean): Boolean {
if (!isSusVersion_1_5_8()) {
if (!isSusVersion158()) {
return false
}
@@ -894,7 +894,7 @@ object SuSFSManager {
@SuppressLint("StringFormatInvalid")
suspend fun addSusPath(context: Context, path: String): Boolean {
// 如果是1.5.8版本，先设置路径配置
if (isSusVersion_1_5_8()) {
if (isSusVersion158()) {
// 获取当前配置的路径，如果没有配置则使用默认值
val androidDataPath = getAndroidDataPath(context)
val sdcardPath = getSdcardPath(context)
@@ -1083,7 +1083,7 @@ object SuSFSManager {
// Zygote隔离服务卸载控制
suspend fun setUmountForZygoteIsoService(context: Context, enabled: Boolean): Boolean {
if (!isSusVersion_1_5_8()) {
if (!isSusVersion158()) {
return false
}