A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(home): show a shutting-down indicator while the VM stops
ExTv70e07586763b
diff --git a/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt b/app/src/main/java/com/excp/podroid/engine/EngineHolder.ktindex 5319ef4..d4749be 100644--- a/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt+++ b/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt@@ -330,6 +330,10 @@ class EngineHolder @Inject constructor(.flatMapLatest { it.consoleText }.stateIn(scope, SharingStarted.Eagerly, "")+ override val stopping: StateFlow<Boolean> = currentFlow+ .flatMapLatest { it.stopping }+ .stateIn(scope, SharingStarted.Eagerly, false)+// ── VmEngine: imperative members — pass through to current engine ──────override val terminalSession: TerminalSession? get() = current.terminalSessionoverride val backendId: String get() = current.backendIddiff --git a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt b/app/src/main/java/com/excp/podroid/engine/QemuEngine.ktindex 93ca7d2..6436f49 100644--- a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt+++ b/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt@@ -57,9 +57,14 @@ class QemuEngine @Inject constructor(private val _consoleText = MutableStateFlow("")override val consoleText: StateFlow<String> = _consoleText.asStateFlow()+ private val _stopping = MutableStateFlow(false)+ override val stopping: StateFlow<Boolean> = _stopping.asStateFlow()+private val _bootStage = MutableStateFlow("")- private var _terminalSession: TerminalSession? = null+ // @Volatile: written on the main thread (autoStartBridge/createTerminalSession)+ // and on Dispatchers.IO (cleanup), read from both — like the lifecycle fields below.+ @Volatile private var _terminalSession: TerminalSession? = nulloverride val terminalSession: TerminalSession? get() = _terminalSessionoverride val bootStage: StateFlow<String> = _bootStage.asStateFlow()@@ -266,6 +271,7 @@ class QemuEngine @Inject constructor(}cleanedUp.set(false)bootStartTime = System.currentTimeMillis()+ _stopping.value = false_state.value = VmState.Starting}@@ -451,6 +457,10 @@ class QemuEngine @Inject constructor(*/override fun stop() {val proc = process ?: return+ // Signal "shutting down" immediately so the UI reflects the stop while the+ // process tears down (state stays Running until cleanup() runs). Cleared in+ // cleanup() on the →Stopped/Error transition.+ _stopping.value = true// Issue the graceful SIGTERM immediately (non-blocking), then run the// graceful-wait → forceful-escalation off the caller's thread. stop() is// called from PodroidService on the main thread, so blocking up to ~5s@@ -497,6 +507,7 @@ class QemuEngine @Inject constructor(@Synchronizedprivate fun cleanup() {if (cleanedUp.getAndSet(true)) return+ _stopping.value = falsebootMonitor?.release()bootMonitor = nullioScope?.cancel()diff --git a/app/src/main/java/com/excp/podroid/engine/VmEngine.kt b/app/src/main/java/com/excp/podroid/engine/VmEngine.ktindex 7ce911a..b061625 100644--- a/app/src/main/java/com/excp/podroid/engine/VmEngine.kt+++ b/app/src/main/java/com/excp/podroid/engine/VmEngine.kt@@ -24,6 +24,16 @@ interface VmEngine {val state: StateFlow<VmState>val bootStage: StateFlow<String>val consoleText: StateFlow<String>++ /**+ * True from the moment a user-initiated stop begins tearing the VM down+ * until it reaches a terminal state. The underlying [state] stays+ * Running/Starting during teardown, so this is a separate signal the UI can+ * use to show a "shutting down" indicator. Additive: it changes no [state]+ * transitions.+ */+ val stopping: StateFlow<Boolean>+val terminalSession: TerminalSession?/** Identifier for logs + the diagnostic dialog. Stable, lowercase. */diff --git a/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt b/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.ktindex 39d8623..8dd16d1 100644--- a/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt+++ b/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt@@ -91,6 +91,13 @@ class AvfEngine @Inject constructor(private val _consoleText = MutableStateFlow("")override val consoleText: StateFlow<String> = _consoleText.asStateFlow()+ private val _stopping = MutableStateFlow(false)+ override val stopping: StateFlow<Boolean> = _stopping.asStateFlow()++ // @Volatile: written on the main thread (spawnBridge/createTerminalSession)+ // and on background threads (cleanup via onVmTerminal or the IO stop path),+ // read from both — mirrors the other lifecycle fields below.+ @Volatileoverride var terminalSession: TerminalSession? = nullprivate set@@ -280,6 +287,7 @@ class AvfEngine @Inject constructor(// Starting under the lock so a re-entrant start() is rejected.lastConfig = configsynchronized(lastPortForwards) { lastPortForwards.clear(); lastPortForwards.addAll(portForwards) }+ _stopping.value = false_state.value = VmState.Starting}launchAttempt(portForwards, config, bootMsg = "Initializing AVF...")@@ -606,6 +614,10 @@ class AvfEngine @Inject constructor(onVmTerminal(vmGeneration, VmState.Stopped)return}+ // A live VM will tear down asynchronously (sync flush + framework stop ++ // terminal callback). Signal "shutting down" now; cleared in cleanup() on+ // the →Stopped transition, or below if the framework rejects the stop.+ _stopping.value = trueval generation = vmGenerationscope.launch {// Best-effort guest flush so unwritten ext4 data hits storage before@@ -624,6 +636,9 @@ class AvfEngine @Inject constructor(// error and KEEP the handle so a later real callback, or a retry,// can still reach the VM. Don't run the watchdog on this path.if (generation == vmGeneration && !cleanedUp.get()) {+ // VM still alive (handle kept); clear "shutting down" so the UI+ // shows the error rather than a stuck spinner.+ _stopping.value = false_state.value = VmState.Error("AVF stop request rejected; VM may still be running")}return@launch@@ -778,6 +793,7 @@ class AvfEngine @Inject constructor(private fun cleanup() {if (cleanedUp.getAndSet(true)) return+ _stopping.value = false_runningSinceMs = nullbootTimeoutJob?.cancel()bootTimeoutJob = nulldiff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.ktindex 907b8b3..b4bc228 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt@@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height@@ -18,6 +20,7 @@ import androidx.compose.material.icons.filled.SystemUpdateimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.Cardimport androidx.compose.material3.CardDefaults+import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButton@@ -76,9 +79,15 @@ fun HomeScreen(val showAvfHint by viewModel.showAvfHint.collectAsStateWithLifecycle()val avfBootFailure by viewModel.avfBootFailure.collectAsStateWithLifecycle()val avfFailureAdvice by viewModel.avfFailureAdvice.collectAsStateWithLifecycle()+ val stopping by viewModel.stopping.collectAsStateWithLifecycle()val isRunning = vmState is VmState.Runningval isStarting = vmState is VmState.Starting+ // Stop is asynchronous: the engine stays Running/Starting until teardown+ // finishes, so gate the indicator on the engine's stopping signal while the+ // state is still active. The instant state goes terminal, this falls back to+ // normal Stopped/Error rendering regardless of signal/state flip ordering.+ val isStopping = stopping && (isRunning || isStarting)val uptimeLabel = viewModel.uptimeLabel(uptimeTick)// Cache the ConnectivityManager binder call so it doesn't re-run on every// 1 Hz tick or incidental recomposition, but refresh it on ON_RESUME so a@@ -162,14 +171,14 @@ fun HomeScreen(AvfHintBanner(onDismiss = { viewModel.dismissAvfHint() })}HomeStatusBlock(- isStarting, isRunning, vmState, bootStage, meta, uptimeLabel,+ isStarting, isRunning, isStopping, vmState, bootStage, meta, uptimeLabel,avfBootFailure = avfBootFailure,avfFailureAdvice = avfFailureAdvice,onUseOneCore = { viewModel.useOneCoreAndRetry() },onSwitchToQemu = { viewModel.switchToQemuAndRetry() },onRetry = { viewModel.restartVm() },)- HomeDataSection(isRunning, vmState, meta, phoneIp)+ HomeDataSection(isRunning, isStopping, vmState, meta, phoneIp)}Column(modifier = Modifier@@ -180,6 +189,7 @@ fun HomeScreen(HomeActionButtons(isRunning = isRunning,isStarting = isStarting,+ isStopping = isStopping,vmState = vmState,onStart = { viewModel.startPodroid() },onStop = { viewModel.stopVm() },@@ -203,6 +213,7 @@ fun HomeScreen(HomeStatusBlock(isStarting = isStarting,isRunning = isRunning,+ isStopping = isStopping,vmState = vmState,bootStage = bootStage,meta = meta,@@ -213,11 +224,12 @@ fun HomeScreen(onSwitchToQemu = { viewModel.switchToQemuAndRetry() },onRetry = { viewModel.restartVm() },)- HomeDataSection(isRunning, vmState, meta, phoneIp)+ HomeDataSection(isRunning, isStopping, vmState, meta, phoneIp)Spacer(Modifier.weight(1f))HomeActionButtons(isRunning = isRunning,isStarting = isStarting,+ isStopping = isStopping,vmState = vmState,onStart = { viewModel.startPodroid() },onStop = { viewModel.stopVm() },@@ -275,6 +287,7 @@ private fun AvfHintBanner(onDismiss: () -> Unit) {private fun HomeStatusBlock(isStarting: Boolean,isRunning: Boolean,+ isStopping: Boolean,vmState: VmState,bootStage: String,meta: HomeMeta,@@ -288,12 +301,14 @@ private fun HomeStatusBlock(PodroidSectionLabel(stringResource(R.string.vm_status))Text(text = when {+ isStopping -> stringResource(R.string.status_stopping)isStarting -> stringResource(R.string.status_starting)isRunning -> stringResource(R.string.status_running)else -> stringResource(R.string.status_stopped)},style = MaterialTheme.typography.displayLarge,color = when {+ isStopping -> MaterialTheme.colorScheme.tertiaryisRunning -> MaterialTheme.colorScheme.primaryisStarting -> MaterialTheme.colorScheme.tertiaryelse -> MaterialTheme.colorScheme.onSurface@@ -305,12 +320,28 @@ private fun HomeStatusBlock(horizontalArrangement = Arrangement.SpaceBetween,verticalAlignment = Alignment.CenterVertically,) {- val (dot, label) = when {- isRunning -> PodroidStatusColors.Running to (uptimeLabel ?: stringResource(R.string.up))- isStarting -> PodroidStatusColors.Starting to bootStage.ifEmpty { stringResource(R.string.status_starting) }- else -> PodroidStatusColors.Stopped to stringResource(R.string.status_idle)+ if (isStopping) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ CircularProgressIndicator(+ modifier = Modifier.size(16.dp),+ strokeWidth = 2.dp,+ color = MaterialTheme.colorScheme.tertiary,+ )+ Spacer(Modifier.width(PodroidTokens.Spacing.SM))+ Text(+ text = stringResource(R.string.stopping_vm),+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }+ } else {+ val (dot, label) = when {+ isRunning -> PodroidStatusColors.Running to (uptimeLabel ?: stringResource(R.string.up))+ isStarting -> PodroidStatusColors.Starting to bootStage.ifEmpty { stringResource(R.string.status_starting) }+ else -> PodroidStatusColors.Stopped to stringResource(R.string.status_idle)+ }+ PodroidStatus(label = label, dotColor = dot)}- PodroidStatus(label = label, dotColor = dot)Text(text = meta.resourcesLabel,style = MaterialTheme.typography.bodyMedium,@@ -366,13 +397,14 @@ private fun HomeStatusBlock(@Composableprivate fun HomeDataSection(isRunning: Boolean,+ isStopping: Boolean,vmState: VmState,meta: HomeMeta,phoneIp: String,) {val showStarting = vmState is VmState.Startingval showError = vmState is VmState.Error- if (showStarting || showError) return+ if (showStarting || showError || isStopping) returnSpacer(Modifier.height(PodroidTokens.Spacing.MD))if (isRunning) {PodroidSectionLabel(stringResource(R.string.network))@@ -419,13 +451,23 @@ private fun formatBootDuration(ms: Long): String {private fun HomeActionButtons(isRunning: Boolean,isStarting: Boolean,+ isStopping: Boolean,vmState: VmState,onStart: () -> Unit,onStop: () -> Unit,onRestart: () -> Unit,onOpenTerminal: () -> Unit,) {- if (isRunning) {+ if (isStopping) {+ // Teardown in progress: one disabled affordance so the user can't+ // double-stop or start over a stop that's already running. The spinner+ // lives in the status block above.+ PodroidPrimaryButton(+ text = stringResource(R.string.stopping_action),+ onClick = {},+ enabled = false,+ )+ } else if (isRunning) {PodroidPrimaryButton(text = stringResource(R.string.open_terminal), onClick = onOpenTerminal)Spacer(Modifier.height(PodroidTokens.Spacing.SM))Row(horizontalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM)) {diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.ktindex fe054d3..f5fc343 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt@@ -62,6 +62,10 @@ class HomeViewModel @Inject constructor(val vmState: StateFlow<VmState> = engine.state.stateIn(viewModelScope, SharingStarted.Eagerly, VmState.Idle)+ /** True while a stop is tearing the VM down (Running/Starting -> Stopped). */+ val stopping: StateFlow<Boolean> = engine.stopping+ .stateIn(viewModelScope, SharingStarted.Eagerly, false)+val bootStage: StateFlow<String> = engine.bootStage.stateIn(viewModelScope, SharingStarted.Eagerly, "")diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex 9fb01a5..41f1e65 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -12,6 +12,9 @@<string name="status_running">运行中</string><string name="status_stopped">已停止</string><string name="status_idle">空闲</string>+ <string name="status_stopping">正在关闭…</string>+ <string name="stopping_vm">正在停止虚拟机…</string>+ <string name="stopping_action">正在停止…</string><!-- Network --><string name="network">网络</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 5571ad6..f38fd7d 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -12,6 +12,9 @@<string name="status_running">Running</string><string name="status_stopped">Stopped</string><string name="status_idle">Idle</string>+ <string name="status_stopping">Shutting down…</string>+ <string name="stopping_vm">Stopping the VM…</string>+ <string name="stopping_action">Stopping…</string><!-- Network --><string name="network">Network</string>