Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix: VM restart terminal session and notification

ExTvd7dc061fc09d
diff --git a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
index 856a437..f1a4fbc 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -354,6 +354,12 @@ class PodroidQemu @Inject constructor(
ioScope?.cancel()
ioScope = null
process = null
+ _terminalSession = null
+ _terminalSessionAttached = false
+ consoleBuilder.clear()
+ _consoleText.value = ""
+ File(serialSockPath).delete()
+ File(ctrlSockPath).delete()
_bootStage.value = ""
}
diff --git a/app/src/main/java/com/excp/podroid/service/PodroidService.kt b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
index 3f8adcb..255db65 100644
--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt
+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
@@ -106,14 +106,16 @@ class PodroidService : Service() {
notificationJob?.cancel()
notificationJob = serviceScope.launch {
launch {
- podroidQemu.bootStage.collect { stage ->
- val status = when {
- stage == "Ready" || podroidQemu.state.value is VmState.Running && stage.isEmpty() ->
- "VM is running"
- stage.isNotEmpty() -> stage
- else -> "Starting VM..."
+ podroidQemu.state.collect { state ->
+ when (state) {
+ is VmState.Running -> updateNotification("VM is running")
+ is VmState.Starting -> {
+ val stage = podroidQemu.bootStage.value
+ updateNotification(stage.ifEmpty { "Starting VM..." })
+ }
+ is VmState.Stopped, is VmState.Idle, is VmState.Error -> return@collect
+ else -> {}
}
- updateNotification(status)
}
}
launch {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
index c677dbe..48307f1 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
@@ -68,7 +68,6 @@ fun TerminalScreen(
) {
val context = LocalContext.current
val vmState by viewModel.vmState.collectAsState()
- val bootStage by viewModel.bootStage.collectAsState()
val fontSize by viewModel.terminalFontSize.collectAsState()
DisposableEffect(Unit) {
@@ -121,30 +120,6 @@ fun TerminalScreen(
}
}
- is VmState.Starting -> {
- Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
- Column(
- horizontalAlignment = Alignment.CenterHorizontally,
- modifier = Modifier.padding(32.dp),
- ) {
- CircularProgressIndicator(color = Color(0xFF4FC3F7), strokeWidth = 3.dp)
- Spacer(modifier = Modifier.height(24.dp))
- Text("Starting VM...", color = Color.White, fontSize = 18.sp, fontWeight = FontWeight.Bold)
- Spacer(modifier = Modifier.height(12.dp))
- Text(
- bootStage.ifEmpty { "Initializing..." },
- color = Color(0xFF4FC3F7), fontSize = 14.sp,
- )
- Spacer(modifier = Modifier.height(24.dp))
- LinearProgressIndicator(
- modifier = Modifier.fillMaxWidth(0.7f).height(4.dp).clip(RoundedCornerShape(2.dp)),
- color = Color(0xFF4FC3F7),
- trackColor = Color(0xFF333333),
- )
- }
- }
- }
-
is VmState.Error -> {
Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -169,7 +144,7 @@ fun TerminalScreen(
}
}
- is VmState.Paused, is VmState.Saving, is VmState.Resuming -> {
+ is VmState.Starting, is VmState.Paused, is VmState.Saving, is VmState.Resuming -> {
Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
CircularProgressIndicator(color = Color(0xFF4FC3F7), strokeWidth = 3.dp)
@@ -191,7 +166,8 @@ fun TerminalScreen(
Box(modifier = Modifier.weight(1f).fillMaxWidth()) {
val view = viewModel.getOrCreateTerminalView()
- DisposableEffect(view) {
+ DisposableEffect(vmState) {
+ viewModel.resetOnRestart()
viewModel.attachView(view)
viewModel.createSession()
view.setTerminalViewClient(viewModel.viewClient)
@@ -220,31 +196,6 @@ fun TerminalScreen(
update = { v -> v.setTextSize(fontSize) },
modifier = Modifier.fillMaxSize(),
)
-
- // Boot progress overlay while VM is still initializing
- if (bootStage.isNotEmpty() && bootStage != "Ready") {
- Box(
- modifier = Modifier
- .fillMaxWidth()
- .align(Alignment.BottomCenter)
- .background(Color(0xDD000000))
- .padding(12.dp),
- ) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.Center,
- modifier = Modifier.fillMaxWidth(),
- ) {
- CircularProgressIndicator(
- color = Color(0xFF4FC3F7),
- strokeWidth = 2.dp,
- modifier = Modifier.size(16.dp),
- )
- Spacer(modifier = Modifier.width(12.dp))
- Text(bootStage, color = Color(0xFF4FC3F7), fontSize = 13.sp)
- }
- }
- }
}
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
index f1c0915..097e669 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
@@ -278,6 +278,15 @@ class TerminalViewModel @Inject constructor(
attached = true
}
+ /**
+ * Force-create a new session. Called when the VM restarts to replace the
+ * stale session from the previous run with a fresh one.
+ */
+ fun resetOnRestart() {
+ attached = false
+ session = null
+ }
+
/**
* Triggered by the layout listener in TerminalScreen when the view dimensions
* change (initial layout, keyboard open/close, rotation).