Skip to content

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

fix: address review findings across engines, host bridge, and UI

ExTvaded231a99a5
diff --git a/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt b/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt
index be856ed..5319ef4 100644
--- a/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt
+++ b/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt
@@ -120,7 +120,10 @@ class EngineHolder @Inject constructor(
// awaits firstPick directly, so an early Start beats no race here.
// runCatching: start() consumes firstPick's result, so an await() throw here
// would otherwise be an uncaught exception on the scope thread.
- scope.launch { runCatching { publishFirstPick(firstPick.await()) } }
+ scope.launch {
+ runCatching { publishFirstPick(firstPick.await()) }
+ .onFailure { android.util.Log.w(TAG, "init first-pick failed; start() will retry", it) }
+ }
// 1. Backend swap observer — drops the first emit so we don't re-pick
// on cold start. Waits for Stopped/Idle/Error so we never kill a
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.kt
index 26ecc47..39d8623 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
@@ -480,14 +480,26 @@ class AvfEngine @Inject constructor(
// promoting a VM that already stopped in the delay window.
bootTimeoutJob = scope.launch {
kotlinx.coroutines.delay(BOOT_TIMEOUT_MS)
- if (generation == vmGeneration && !cleanedUp.get() &&
- _state.value is VmState.Starting) {
- Log.w(TAG, "AVF boot timeout — forcing Running state")
- _bootStage.value = "Ready"
- _runningSinceMs = System.currentTimeMillis()
- _state.value = VmState.Running
- bringUpControlChannel()
+ // Re-check the guard AND flip state under the same monitor that
+ // onVmTerminal/cleanup hold (@Synchronized -> this). Otherwise a
+ // terminal callback running cleanup() during the delay window
+ // (which nulls vmHandle and sets cleanedUp) could be overwritten
+ // back to Running here, orphaning the engine with null handles.
+ // bringUpControlChannel() runs outside the lock — it only reads
+ // vmHandle and bails if null.
+ val promoted = synchronized(this@AvfEngine) {
+ if (generation == vmGeneration && !cleanedUp.get() &&
+ _state.value is VmState.Starting) {
+ Log.w(TAG, "AVF boot timeout — forcing Running state")
+ _bootStage.value = "Ready"
+ _runningSinceMs = System.currentTimeMillis()
+ _state.value = VmState.Running
+ true
+ } else {
+ false
+ }
}
+ if (promoted) bringUpControlChannel()
}
} catch (e: CancellationException) {
// The start coroutine runs in PodroidService.serviceScope, cancelled
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/VsockControlChannel.kt b/app/src/main/java/com/excp/podroid/engine/avf/VsockControlChannel.kt
index b35c730..7e20368 100644
--- a/app/src/main/java/com/excp/podroid/engine/avf/VsockControlChannel.kt
+++ b/app/src/main/java/com/excp/podroid/engine/avf/VsockControlChannel.kt
@@ -47,7 +47,9 @@ class VsockControlChannel(
private var pfd: ParcelFileDescriptor? = null
private var writer: PrintWriter? = null
- private var connectJob: Job? = null
+ // @Volatile: assigned in open()/reconnect() off one thread, cancelled in the
+ // @Synchronized close() on another — without it a stale null could skip the cancel.
+ @Volatile private var connectJob: Job? = null
@Volatile private var closed = false
/** Set once the retry loop exhausts; further sends are dropped, not queued. */
private var gaveUp = false
diff --git a/app/src/main/java/com/excp/podroid/engine/hostbridge/HostRequestDispatcher.kt b/app/src/main/java/com/excp/podroid/engine/hostbridge/HostRequestDispatcher.kt
index 36e937f..b8848ef 100644
--- a/app/src/main/java/com/excp/podroid/engine/hostbridge/HostRequestDispatcher.kt
+++ b/app/src/main/java/com/excp/podroid/engine/hostbridge/HostRequestDispatcher.kt
@@ -9,6 +9,7 @@
package com.excp.podroid.engine.hostbridge
import com.excp.podroid.data.repository.PortForwardRule
+import kotlinx.coroutines.CancellationException
class HostRequestDispatcher(
private val notifications: NotificationPoster,
@@ -21,11 +22,15 @@ class HostRequestDispatcher(
) {
private val validProtocols = setOf("tcp", "udp")
+ private companion object {
+ private val WHITESPACE = Regex("\\s+")
+ }
+
suspend fun handle(line: String): String {
// Split on runs of whitespace and drop empties so a double space (or a
// tab) between tokens doesn't shift the field count and fail an otherwise
// valid request.
- val parts = line.trim().split(Regex("\\s+")).filter { it.isNotEmpty() }
+ val parts = line.trim().split(WHITESPACE).filter { it.isNotEmpty() }
if (parts.isEmpty()) return HostProtocol.err("bad request")
return try {
when (parts[0]) {
@@ -39,8 +44,14 @@ class HostRequestDispatcher(
"PING" -> "PONG"
else -> HostProtocol.err("bad request")
}
+ } catch (e: CancellationException) {
+ // Don't turn a coroutine cancellation into an error response — rethrow
+ // so structured concurrency can unwind (QmpClient.exec does the same).
+ throw e
} catch (e: Exception) {
- HostProtocol.err(e.message ?: e.javaClass.simpleName)
+ // No javaClass.simpleName fallback: R8 obfuscates it to noise like
+ // "wc2" in release, which would surface to the guest as the error text.
+ HostProtocol.err(e.message ?: "internal error")
}
}
diff --git a/app/src/main/java/com/excp/podroid/engine/hostbridge/HostTransport.kt b/app/src/main/java/com/excp/podroid/engine/hostbridge/HostTransport.kt
index 9af9e15..d6291dd 100644
--- a/app/src/main/java/com/excp/podroid/engine/hostbridge/HostTransport.kt
+++ b/app/src/main/java/com/excp/podroid/engine/hostbridge/HostTransport.kt
@@ -49,8 +49,15 @@ class QemuHostTransport private constructor(
/** Returns null if QEMU has not created the socket yet (caller retries). */
fun open(socketPath: String): QemuHostTransport? = runCatching {
val s = LocalSocket()
- s.connect(LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM))
- QemuHostTransport(s, BufferedReader(InputStreamReader(s.inputStream)), s.outputStream)
+ try {
+ s.connect(LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM))
+ QemuHostTransport(s, BufferedReader(InputStreamReader(s.inputStream)), s.outputStream)
+ } catch (t: Throwable) {
+ // connect()/stream access failed after the socket was created —
+ // close it so a retry loop doesn't leak one fd per attempt.
+ runCatching { s.close() }
+ throw t
+ }
}.getOrNull()
}
}
@@ -77,12 +84,22 @@ class AvfHostTransport private constructor(
companion object {
/** Returns null if the guest daemon is not listening yet (caller retries). */
fun open(vm: Any): AvfHostTransport? = runCatching {
- val p = AvfReflect.connectVsock(vm, HostTransport.AVF_VSOCK_PORT)
// Read side owns p; write side owns a dup (each AutoClose closes one fd).
- val pOut = p.dup()
- val r = BufferedReader(InputStreamReader(FileInputStream(p.fileDescriptor)))
- val o = ParcelFileDescriptor.AutoCloseOutputStream(pOut)
- AvfHostTransport(p, pOut, r, o)
+ var p: ParcelFileDescriptor? = null
+ var pOut: ParcelFileDescriptor? = null
+ try {
+ p = AvfReflect.connectVsock(vm, HostTransport.AVF_VSOCK_PORT)
+ pOut = p.dup()
+ val r = BufferedReader(InputStreamReader(FileInputStream(p.fileDescriptor)))
+ val o = ParcelFileDescriptor.AutoCloseOutputStream(pOut)
+ AvfHostTransport(p, pOut, r, o)
+ } catch (t: Throwable) {
+ // dup()/stream construction failed after connectVsock — close the
+ // fds already opened so a retry loop doesn't leak them.
+ runCatching { pOut?.close() }
+ runCatching { p?.close() }
+ throw t
+ }
}.getOrNull()
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
index c060373..50ea1f1 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
@@ -9,6 +9,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import com.excp.podroid.ui.theme.PodroidTokens
@@ -32,7 +33,7 @@ fun PodroidInlineAction(
modifier = modifier
.clip(RoundedCornerShape(PodroidTokens.Radius.Chip))
.background(MaterialTheme.colorScheme.primary)
- .clickable(onClick = onClick)
+ .clickable(role = Role.Button, onClick = onClick)
.padding(horizontal = 12.dp, vertical = 6.dp),
)
}
diff --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.kt
index c9fd8f9..907b8b3 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
@@ -97,7 +97,7 @@ fun HomeScreen(
updateInfo?.let { info ->
AlertDialog(
onDismissRequest = { viewModel.dismissUpdate() },
- icon = { Icon(Icons.Default.SystemUpdate, contentDescription = null) },
+ icon = { Icon(Icons.Default.SystemUpdate, contentDescription = stringResource(R.string.update_available)) },
title = { Text(stringResource(R.string.update_available)) },
text = { Text(stringResource(R.string.version_available, info.latestVersion, BuildConfig.VERSION_NAME)) },
confirmButton = {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
index 924185a..1340f11 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
@@ -369,7 +369,7 @@ fun SettingsScreen(
onClick = {
if (avfRunning) return@PodroidGhostButton
avfRunning = true
- avfReportText = "Probing…"
+ avfReportText = ctx.getString(R.string.probing_avf)
avfScope.launch {
val probe = AvfDiagnostics.probe(ctx)
val smoke = if (probe.featureSupported && probe.managePermissionGranted) {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
index c9dccd2..3eaffc3 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
@@ -14,6 +14,7 @@ import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.excp.podroid.BuildConfig
+import com.excp.podroid.R
import com.excp.podroid.data.repository.LanguageManager
import com.excp.podroid.data.repository.PortForwardRepository
import com.excp.podroid.data.repository.PortForwardRule
@@ -166,8 +167,11 @@ class SettingsViewModel @Inject constructor(
val portForwardRules: StateFlow<List<PortForwardRule>> = portForwardRepository.rules
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+ // Eagerly (like HomeViewModel): WhileSubscribed replays the initial Idle on
+ // re-subscription, flashing a "stopped" indicator for a frame when the screen
+ // is reopened within the stop-timeout window.
val vmState: StateFlow<VmState> = engine.state
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), VmState.Idle)
+ .stateIn(viewModelScope, SharingStarted.Eagerly, VmState.Idle)
fun setDarkTheme(value: Boolean) {
viewModelScope.launch { settingsRepository.setDarkTheme(value) }
@@ -319,16 +323,19 @@ class SettingsViewModel @Inject constructor(
val intent = Intent(Intent.ACTION_SEND).apply {
type = "text/plain"
putExtra(Intent.EXTRA_STREAM, uri)
- putExtra(Intent.EXTRA_SUBJECT, "Podroid Diagnostic Log")
+ putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.export_diagnostic_subject))
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
- context.startActivity(Intent.createChooser(intent, "Share diagnostic log").apply {
+ context.startActivity(Intent.createChooser(intent, context.getString(R.string.export_diagnostic_chooser)).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
})
} catch (e: Exception) {
Log.w(TAG, "Export failed", e)
- _exportError.value = "Export failed: ${e.message ?: "unknown error"}"
+ _exportError.value = context.getString(
+ R.string.export_diagnostic_failed,
+ e.message ?: context.getString(R.string.unknown_error),
+ )
}
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
index cb09235..2cb2945 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
@@ -851,29 +851,42 @@ private fun X11KeyButton(
}
/**
- * Compares old vs new IME buffer content, fires synthetic X11 key events
- * for the diff. ASCII 0x20-0x7E maps to the same keysym value; non-ASCII
- * Unicode codepoints map to 0x01000000 | codepoint (X11 protocol extension).
- * Counts by codepoints (not UTF-16 chars) so surrogate pairs count as one.
+ * Diffs old vs new IME buffer content and fires synthetic X11 key events for
+ * the change. ASCII 0x20-0x7E maps to the same keysym value; non-ASCII Unicode
+ * codepoints map to 0x01000000 | codepoint (X11 protocol extension).
+ *
+ * Works off the longest common prefix (by codepoint), not a raw length
+ * difference: a CJK IME REPLACES composing text on commit (pinyin "nihao" ->
+ * "你好"), so the new buffer shares no prefix with the old. Emitting only
+ * (oldCp - newCp) backspaces — the old behaviour — left the composing text in
+ * the guest and never sent the commit. Backspacing the whole divergent suffix
+ * and re-typing the new one keeps the guest buffer in sync with the IME.
*/
private fun forwardImeDiff(old: String, new: String, vm: X11ViewModel) {
+ // Length (in chars) and codepoint count of the shared leading run.
+ var common = 0
+ var commonCp = 0
+ while (common < old.length && common < new.length) {
+ val cp = old.codePointAt(common)
+ if (cp != new.codePointAt(common)) break
+ common += Character.charCount(cp)
+ commonCp++
+ }
+ // Delete everything in old past the shared prefix.
val oldCp = old.codePointCount(0, old.length)
- val newCp = new.codePointCount(0, new.length)
- if (newCp > oldCp) {
- // Iterate added codepoints (not chars) for correct surrogate handling.
- var i = old.length
- while (i < new.length) {
- val cp = new.codePointAt(i)
- val keysym = if (cp in 0x20..0x7E) cp else 0x01000000 or cp
- vm.sendKey(keysym, down = true)
- vm.sendKey(keysym, down = false)
- i += Character.charCount(cp)
- }
- } else if (newCp < oldCp) {
- repeat(oldCp - newCp) {
- vm.sendKey(XK_BackSpace, down = true)
- vm.sendKey(XK_BackSpace, down = false)
- }
+ repeat(oldCp - commonCp) {
+ vm.sendKey(XK_BackSpace, down = true)
+ vm.sendKey(XK_BackSpace, down = false)
+ }
+ // Type everything in new past the shared prefix (codepoint-wise so a
+ // surrogate pair is sent as a single keysym).
+ var i = common
+ while (i < new.length) {
+ val cp = new.codePointAt(i)
+ val keysym = if (cp in 0x20..0x7E) cp else 0x01000000 or cp
+ vm.sendKey(keysym, down = true)
+ vm.sendKey(keysym, down = false)
+ i += Character.charCount(cp)
}
}
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9b456c3..9fb01a5 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -89,6 +89,11 @@
<string name="export_diagnostic_log">导出诊断日志</string>
<string name="avf_diagnostic">AVF (pKVM) 诊断</string>
<string name="running_avf_diagnostic">运行 AVF 诊断…</string>
+ <string name="probing_avf">正在探测…</string>
+ <string name="export_diagnostic_subject">Podroid 诊断日志</string>
+ <string name="export_diagnostic_chooser">分享诊断日志</string>
+ <string name="export_diagnostic_failed">导出失败:%1$s</string>
+ <string name="unknown_error">未知错误</string>
<string name="verbose_avf_logging">详细 AVF 日志</string>
<string name="close">关闭</string>
<string name="add_port_forward">添加端口转发</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33aa75e..5571ad6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,11 @@
<string name="export_diagnostic_log">Export diagnostic log</string>
<string name="avf_diagnostic">AVF (pKVM) diagnostic</string>
<string name="running_avf_diagnostic">Running AVF diagnostic…</string>
+ <string name="probing_avf">Probing…</string>
+ <string name="export_diagnostic_subject">Podroid Diagnostic Log</string>
+ <string name="export_diagnostic_chooser">Share diagnostic log</string>
+ <string name="export_diagnostic_failed">Export failed: %1$s</string>
+ <string name="unknown_error">unknown error</string>
<string name="verbose_avf_logging">Verbose AVF logging</string>
<string name="close">Close</string>
<string name="add_port_forward">Add port forward</string>