icybear/sing-box-for-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lose enable perAppProxy status with shizuku

Browse Source
This commit is contained in:
xchacha20-poly1305
2026-02-09 13:56:37 +08:00
committed by GitHub
parent 02f9ec4d97
commit bfd6d480c4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/io/nekohasekai/sfa/compose/screen/settings/ProfileOverrideScreen.kt
View File

@@ -113,14 +113,19 @@ fun ProfileOverrideScreen(navController: NavController) {
val isShizukuBinderReady by PackageQueryManager.shizukuBinderReady.collectAsState() val isShizukuBinderReady by PackageQueryManager.shizukuBinderReady.collectAsState()
val isShizukuPermissionGranted by PackageQueryManager.shizukuPermissionGranted.collectAsState() val isShizukuPermissionGranted by PackageQueryManager.shizukuPermissionGranted.collectAsState()
val isShizukuAvailable = isShizukuBinderReady && isShizukuPermissionGranted val isShizukuAvailable = isShizukuBinderReady && isShizukuPermissionGranted
var isShizukuStateInitialized by remember(showModeSelector) { mutableStateOf(!showModeSelector) }
DisposableEffect(showModeSelector) { DisposableEffect(showModeSelector) {
if (showModeSelector) { if (showModeSelector) {
isShizukuStateInitialized = false
PackageQueryManager.registerListeners() PackageQueryManager.registerListeners()
PackageQueryManager.refreshShizukuState()
isShizukuStateInitialized = true
} }
onDispose { onDispose {
if (showModeSelector) { if (showModeSelector) {
PackageQueryManager.unregisterListeners() PackageQueryManager.unregisterListeners()
isShizukuStateInitialized = false
} }
} }
} }
@@ -140,8 +145,14 @@ fun ProfileOverrideScreen(navController: NavController) {
} }
// Auto-disable per-app proxy if Shizuku authorization is revoked (only when using Shizuku mode) // Auto-disable per-app proxy if Shizuku authorization is revoked (only when using Shizuku mode)
LaunchedEffect(isShizukuAvailable, useRootMode) { LaunchedEffect(isShizukuAvailable, useRootMode, isShizukuStateInitialized, perAppProxyEnabled, showModeSelector) {
if (showModeSelector && !useRootMode && !isShizukuAvailable && perAppProxyEnabled) { if (
showModeSelector &&
!useRootMode &&
isShizukuStateInitialized &&
perAppProxyEnabled &&
!PackageQueryManager.isShizukuAvailable()
) {
perAppProxyEnabled = false perAppProxyEnabled = false
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
Settings.perAppProxyEnabled = false Settings.perAppProxyEnabled = false