A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(ui): remove duplicate terminal button and refine status details
ExTve370990b00f2
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.ktindex eaa4638..8ea9141 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@@ -507,7 +507,7 @@ private fun HomeActionButtons(} else if (isRunning) {PodroidPrimaryButton(text = stringResource(R.string.open_terminal), onClick = onOpenTerminal)Spacer(Modifier.height(PodroidTokens.Spacing.SM))- HomeQuickActions(onBackup = onBackup, onStatus = onStatus, onTerminal = onOpenTerminal)+ HomeQuickActions(onBackup = onBackup, onStatus = onStatus)Spacer(Modifier.height(PodroidTokens.Spacing.SM))Row(horizontalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM)) {PodroidGhostButton(text = stringResource(R.string.restart), onClick = onRestart, modifier = Modifier.weight(1f))@@ -518,11 +518,11 @@ private fun HomeActionButtons(} else if (vmState is VmState.Error) {PodroidPrimaryButton(text = stringResource(R.string.try_again), onClick = onStart)Spacer(Modifier.height(PodroidTokens.Spacing.SM))- HomeQuickActions(onBackup = onBackup, onStatus = onStatus, onTerminal = onOpenTerminal)+ HomeQuickActions(onBackup = onBackup, onStatus = onStatus)} else {PodroidPrimaryButton(text = stringResource(R.string.start_vm), onClick = onStart)Spacer(Modifier.height(PodroidTokens.Spacing.SM))- HomeQuickActions(onBackup = onBackup, onStatus = onStatus, onTerminal = onOpenTerminal)+ HomeQuickActions(onBackup = onBackup, onStatus = onStatus)}}@@ -530,7 +530,6 @@ private fun HomeActionButtons(private fun HomeQuickActions(onBackup: () -> Unit,onStatus: () -> Unit,- onTerminal: () -> Unit,) {Row(modifier = Modifier.fillMaxWidth(),@@ -546,10 +545,5 @@ private fun HomeQuickActions(onClick = onStatus,modifier = Modifier.weight(1f),)- PodroidGhostButton(- text = stringResource(R.string.home_action_terminal),- onClick = onTerminal,- modifier = Modifier.weight(1f),- )}}diff --git a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.ktindex 4c87c26..febf79a 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt@@ -93,21 +93,21 @@ fun StatusScreen(label = stringResource(R.string.cpu_cores),value = "${metrics.phoneCpuCores}",)- val loadLabel = if (metrics.loadAvg1 != null) {- String.format(- "%.2f · %.2f · %.2f",- metrics.loadAvg1,- metrics.loadAvg5,- metrics.loadAvg15,+ // /proc/loadavg is SELinux-blocked for third-party apps on modern+ // Android, so this is usually absent; hide the row rather than+ // show a permanent placeholder.+ if (metrics.loadAvg1 != null) {+ PodroidListRow(+ label = stringResource(R.string.status_load_average),+ value = String.format(+ "%.2f · %.2f · %.2f",+ metrics.loadAvg1,+ metrics.loadAvg5,+ metrics.loadAvg15,+ ),+ mono = true,)- } else {- stringResource(R.string.status_unavailable)}- PodroidListRow(- label = stringResource(R.string.status_load_average),- value = loadLabel,- mono = true,- )Spacer(Modifier.height(PodroidTokens.Spacing.SM))PodroidSectionLabel(stringResource(R.string.status_vm_section))diff --git a/app/src/main/java/com/excp/podroid/util/HostMetrics.kt b/app/src/main/java/com/excp/podroid/util/HostMetrics.ktindex 1e17d41..977bd58 100644--- a/app/src/main/java/com/excp/podroid/util/HostMetrics.kt+++ b/app/src/main/java/com/excp/podroid/util/HostMetrics.kt@@ -9,6 +9,7 @@ package com.excp.podroid.utilimport android.app.ActivityManagerimport android.content.Contextimport android.os.StatFs+import android.system.Osimport java.io.Fileimport kotlin.math.roundToInt@@ -47,7 +48,7 @@ object HostMetrics {loadAvg15 = load?.third,phoneStorageTotalGb = stat.totalBytes / (1024.0 * 1024 * 1024),phoneStorageAvailGb = stat.availableBytes / (1024.0 * 1024 * 1024),- vmDiskImageBytes = if (storageImg.isFile) storageImg.length() else 0L,+ vmDiskImageBytes = if (storageImg.isFile) diskFootprintBytes(storageImg) else 0L,emulatorRssMb = emulatorRssMb,)}@@ -60,6 +61,19 @@ object HostMetrics {null}+ /**+ * Real on-disk footprint of a possibly sparse file: st_blocks * 512.+ * storage.img is created sparse via RandomAccessFile.setLength(), so+ * File.length() reports the full apparent capacity (a permanently 100%-full+ * bar); the allocated block count reflects how much the VM disk actually+ * occupies on the phone. Falls back to the apparent length if stat fails.+ */+ fun diskFootprintBytes(file: File): Long = try {+ Os.stat(file.absolutePath).st_blocks * 512L+ } catch (_: Exception) {+ file.length()+ }+fun processPid(process: Process): Int? = try {val m = Process::class.java.getMethod("pid")(m.invoke(process) as Int).takeIf { it > 0 }diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex 823c9e4..200ea1a 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -131,7 +131,6 @@<string name="status_vm_ram_allocated">虚拟机内存(已分配)</string><string name="status_emulator_rss">模拟器占用 %1$s</string><string name="status_vm_disk">虚拟机磁盘镜像</string>- <string name="status_unavailable">—</string><string name="status_error">错误</string><string name="status_refresh_hint">此页面打开时每 2 秒自动刷新。</string><string name="status_vm_load_graph_title">虚拟机 CPU 负载</string>@@ -152,7 +151,6 @@<string name="container_backup_phone_path">手机(下载目录)</string><string name="container_backup_phone_path_value">Download/Podroid/backups</string><string name="container_backup_downloads_hint">在设置中启用下载目录共享,备份文件会出现在手机上。</string>- <string name="container_backup_avf_hint">下载目录共享仅在 QEMU 后端可用。备份保留在虚拟机 /var/backups/podroid。</string><string name="container_backup_export">导出容器</string><string name="container_backup_vm_stopped">运行备份命令前请先启动虚拟机。</string><string name="container_backup_container_name">容器名称</string>@@ -176,7 +174,6 @@<string name="home_containers_unknown">—</string><string name="home_action_backup">备份</string><string name="home_action_status">状态</string>- <string name="home_action_terminal">终端</string><string name="up">运行中</string>@@ -290,7 +287,6 @@<string name="usb_passthrough_settings_label">USB 设备直通</string><string name="usb_passthrough_settings_description_available">在虚拟机中热插拔外部 USB 设备(Wi-Fi、存储、串口等)。设备连接时会询问许可。启动时添加 USB 控制器,因此需要重启虚拟机以应用更改。</string><string name="usb_passthrough_settings_description_unavailable">%1$s 后端不可用:USB 设备直通需要 QEMU 的 QMP 控制套接字,而 AVF 后端不提供此功能。</string>- <string name="downloads_sharing_unavailable">此 %1$s 构建不可用 - AVF 要求特权系统应用安装(Google 的终端应用通过这种方式绕过);第三方 APK 无法跨越 SELinux 域读取 /storage/emulated/Download。</string><string name="server_mode">服务器模式</string><string name="server_mode_desc">在屏幕变黑的情况下保持虚拟机运行以省电。应用会保持在前台,因此虚拟机不会被停止。要退出,请在任意位置长按 3 秒。</string><string name="server_mode_enable">启用服务器模式</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex a1130b1..3a32b50 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -131,7 +131,6 @@<string name="status_vm_ram_allocated">VM RAM (allocated)</string><string name="status_emulator_rss">Emulator using %1$s</string><string name="status_vm_disk">VM disk image</string>- <string name="status_unavailable">—</string><string name="status_error">Error</string><string name="status_refresh_hint">Refreshes every 2 seconds while this screen is open.</string><string name="status_vm_load_graph_title">VM CPU load</string>@@ -152,7 +151,6 @@<string name="container_backup_phone_path">On phone (Downloads)</string><string name="container_backup_phone_path_value">Download/Podroid/backups</string><string name="container_backup_downloads_hint">Enable Downloads sharing in Settings so backups appear on your phone.</string>- <string name="container_backup_avf_hint">Downloads sharing is only available on the QEMU backend. Backups stay inside the VM at /var/backups/podroid.</string><string name="container_backup_export">Export container</string><string name="container_backup_vm_stopped">Start the VM before running backup commands.</string><string name="container_backup_container_name">Container name</string>@@ -176,7 +174,6 @@<string name="home_containers_unknown">—</string><string name="home_action_backup">Backup</string><string name="home_action_status">Status</string>- <string name="home_action_terminal">Terminal</string><string name="up">Up</string>@@ -289,7 +286,6 @@<string name="usb_passthrough_settings_label">USB passthrough</string><string name="usb_passthrough_settings_description_available">Hot-plugs external USB devices (Wi-Fi, storage, serial, etc.) into the VM. Each device asks for permission when attached. Adds a USB controller at boot, so restart the VM to apply.</string><string name="usb_passthrough_settings_description_unavailable">Not available on the %1$s backend: USB passthrough rides QEMU\'s QMP control socket, which the AVF backend doesn\'t provide.</string>- <string name="downloads_sharing_unavailable">Not available on this %1$s build — AVF requires a privileged system-app install (Google\'s Terminal app cheats this way); third-party APKs can\'t cross SELinux domains to read /storage/emulated/Download.</string><string name="server_mode">Server mode</string><string name="server_mode_desc">Keeps the VM running with the screen blacked out to save power. The app stays in the foreground so the VM is never stopped. To exit, press and hold anywhere for 3 seconds.</string><string name="server_mode_enable">Enable server mode</string>diff --git a/build-rootfs/files/usr/local/bin/podroid-getty b/build-rootfs/files/usr/local/bin/podroid-gettyindex fea853c..61e6f5a 100644--- a/build-rootfs/files/usr/local/bin/podroid-getty+++ b/build-rootfs/files/usr/local/bin/podroid-getty@@ -9,17 +9,24 @@# the AVF console with an input side. (The ttyS0 inittab# line just parks via the wrong-tty sleep below.)#-# If the marker is absent, default to hvc0 — that's QEMU's historical setup+# If the marker is absent, default to hvc0 - that's QEMU's historical setup# so legacy boots without the marker still get a login.TTY="$1"WANT=$(sed -n 's/.*podroid\.tty=\([a-zA-Z0-9]*\).*/\1/p' /proc/cmdline)[ -z "$WANT" ] && WANT=hvc0if [ "$TTY" = "$WANT" ]; then+ # Clear the tty before the login prompt. On AVF the kernel console is this+ # same hvc0 (console=hvc0), so boot-stage markers written to /dev/console+ # (podroid-ready's "Almost ready..."/"Ready!", etc.) land in the interactive+ # terminal above the banner. The boot detector already consumed them from the+ # console stream, so wiping the visible screen + scrollback here just gives a+ # clean login. No-op-ish on QEMU, where the console is a separate serial tty.+ printf '\033[3J\033[2J\033[H' > "/dev/$TTY" 2>/dev/nullexec /sbin/getty -L -l /usr/local/bin/podroid-login 115200 "$TTY" xterm-256colorfi# Wrong tty for this backend. Sleep instead of exiting so busybox init-# doesn't throttle us with "respawning too fast" — the inittab line will+# doesn't throttle us with "respawning too fast" - the inittab line will# just stay parked until shutdown.exec sleep 2147483647