A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(setup): recheck storage access on resume and correct its hint
ExTvf8ecb56449a3
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.ktindex 4d48f57..655704c 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt@@ -87,6 +87,17 @@ fun SetupScreen(var loadBalanceEnabled by rememberSaveable { mutableStateOf(true) }var sshEnabled by rememberSaveable { mutableStateOf(true) }var storageAccessEnabled by rememberSaveable { mutableStateOf(false) }+ var hasStoragePermission by remember {+ mutableStateOf(+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {+ Environment.isExternalStorageManager()+ } else {+ ContextCompat.checkSelfPermission(+ context, Manifest.permission.WRITE_EXTERNAL_STORAGE+ ) == PackageManager.PERMISSION_GRANTED+ }+ )+ }var usbPassthroughEnabled by rememberSaveable { mutableStateOf(false) }val usbPassthroughAvailable = remember { viewModel.usbPassthroughAvailable() }val setupComplete by viewModel.setupComplete.collectAsStateWithLifecycle()@@ -134,8 +145,9 @@ fun SetupScreen(scope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) }}- // Re-sync storageAccessEnabled against the actual OS grant on every- // resume (the user may have denied the all-files-access screen we sent them to).+ // Re-sync storageAccessEnabled and hasStoragePermission against the actual OS+ // grant on every resume (the user may have granted or denied the+ // all-files-access screen we sent them to).val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {val observer = LifecycleEventObserver { _, event ->@@ -143,6 +155,7 @@ fun SetupScreen(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {storageAccessEnabled = storageAccessEnabled && Environment.isExternalStorageManager()+ hasStoragePermission = Environment.isExternalStorageManager()}}lifecycleOwner.lifecycle.addObserver(observer)@@ -198,6 +211,8 @@ fun SetupScreen(2 -> StorageAccessPage(windowSizeClass = windowSizeClass,storageAccessEnabled = storageAccessEnabled,+ hasStoragePermission = hasStoragePermission,+ onStoragePermissionChanged = { hasStoragePermission = it },onStorageAccessToggle = { enabled ->storageAccessEnabled = enabledif (enabled &&@@ -485,25 +500,16 @@ private fun VmConfigPage(private fun StorageAccessPage(windowSizeClass: WindowSizeClass,storageAccessEnabled: Boolean,+ hasStoragePermission: Boolean,+ onStoragePermissionChanged: (Boolean) -> Unit,onStorageAccessToggle: (Boolean) -> Unit,onOpenStorageAccessSettings: () -> Unit,onBack: () -> Unit,onNext: () -> Unit,) {- val context = LocalContext.currentval canManageAllFiles = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R- var hasStoragePermission by remember {- mutableStateOf(- when {- canManageAllFiles -> Environment.isExternalStorageManager()- else -> ContextCompat.checkSelfPermission(- context, Manifest.permission.WRITE_EXTERNAL_STORAGE- ) == PackageManager.PERMISSION_GRANTED- }- )- }val writeStoragePermLauncher = rememberLauncherForActivityResult(RequestPermission()) { granted ->- hasStoragePermission = granted+ onStoragePermissionChanged(granted)}SetupPageLayout(diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex 866ce6d..ef69c4a 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -67,7 +67,7 @@<string name="storage_access_description">可选。通过 virtio-9p 将 Android 下载文件夹挂载到虚拟机。</string><string name="enable_downloads_sharing">启用下载文件夹共享</string><string name="grant_storage_access">授予存储权限</string>- <string name="requires_android_11">需要 Android 11+。在此设备上,此开关仅用于未来系统升级。</string>+ <string name="requires_android_11">在此设备上,共享需要授予下方的存储权限(Android 11 及以上使用完整文件访问权限)。</string><string name="storage_access_warning">警告:某些设备上这可能导致虚拟机崩溃。如果启动失败,请禁用。</string><!-- Settings Sections -->diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex ba87d3d..1489fe3 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -67,7 +67,7 @@<string name="storage_access_description">Optional. Mount your Android Downloads folder into the VM over virtio-9p.</string><string name="enable_downloads_sharing">Enable Downloads sharing</string><string name="grant_storage_access">Grant storage access</string>- <string name="requires_android_11">Requires Android 11+. On this device the toggle is for future-OS upgrades only.</string>+ <string name="requires_android_11">On this device, sharing needs the storage permission granted below (Android 11+ uses all-files access instead).</string><string name="storage_access_warning">Warning: on some devices this can crash the VM. Disable it if start fails.</string><!-- Settings Sections -->