Skip to content

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

feat(hostbridge): wire transports into engines and add notification poster

ExTv7e66878f0069
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 a80a186..db5c6c7 100644
--- a/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt
+++ b/app/src/main/java/com/excp/podroid/engine/EngineHolder.kt
@@ -365,6 +365,8 @@ class EngineHolder @Inject constructor(
current.createTerminalSession(client)
override suspend fun addPortForward(rule: PortForwardRule) = current.addPortForward(rule)
override suspend fun removePortForward(rule: PortForwardRule) = current.removePortForward(rule)
+ override fun openHostTransport(): com.excp.podroid.engine.hostbridge.HostTransport? =
+ current.openHostTransport()
override fun diagnosticsReport(): String = current.diagnosticsReport()
/**
diff --git a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt b/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt
index cf61c9c..f6a9541 100644
--- a/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt
+++ b/app/src/main/java/com/excp/podroid/engine/QemuEngine.kt
@@ -84,6 +84,7 @@ class QemuEngine @Inject constructor(
val serialSockPath: String get() = "${context.filesDir.absolutePath}/serial.sock"
val terminalSockPath: String get() = "${context.filesDir.absolutePath}/terminal.sock"
val ctrlSockPath: String get() = "${context.filesDir.absolutePath}/ctrl.sock"
+ val hostSockPath: String get() = "${context.filesDir.absolutePath}/host.sock"
/**
* Last QEMU process exit code (null until it exits) + a bounded tail of
@@ -279,6 +280,7 @@ class QemuEngine @Inject constructor(
File(terminalSockPath).delete()
File(ctrlSockPath).delete()
File(qmpSocketPath).delete()
+ File(hostSockPath).delete()
try {
val cmd = buildCommand(qemuExe, portForwards, config)
@@ -438,6 +440,9 @@ class QemuEngine @Inject constructor(
}, "podroid-qemu-stop").apply { isDaemon = true }.start()
}
+ override fun openHostTransport(): com.excp.podroid.engine.hostbridge.HostTransport? =
+ com.excp.podroid.engine.hostbridge.QemuHostTransport.open(hostSockPath)
+
override suspend fun addPortForward(rule: PortForwardRule) {
if (_state.value !is VmState.Running) return
val qmp = qmpClient ?: return
@@ -592,6 +597,10 @@ class QemuEngine @Inject constructor(
args += "-chardev"; args += "socket,id=ctrl0,path=$ctrlSockPath,server=on,wait=off"
args += "-device"; args += "virtconsole,chardev=ctrl0,name=org.podroid.ctrl"
+ // hvc2 = host bridge (guest podroid-hostd <-> Android host.sock)
+ args += "-chardev"; args += "socket,id=host0,path=$hostSockPath,server=on,wait=off"
+ args += "-device"; args += "virtconsole,chardev=host0,name=org.podroid.host"
+
args += "-display"; args += "none"
args += "-qmp"; args += "unix:$qmpSocketPath,server,nowait"
diff --git a/app/src/main/java/com/excp/podroid/engine/VmEngine.kt b/app/src/main/java/com/excp/podroid/engine/VmEngine.kt
index 818081c..7ce911a 100644
--- a/app/src/main/java/com/excp/podroid/engine/VmEngine.kt
+++ b/app/src/main/java/com/excp/podroid/engine/VmEngine.kt
@@ -39,6 +39,13 @@ interface VmEngine {
/** QEMU-specific. Null on backends that don't use QMP (e.g. AVF). */
val qmpClient: QmpClient?
+ /**
+ * Open a guest -> Android host-bridge connection for the current session, or
+ * null if this backend/build can't (default). Called repeatedly by
+ * HostRequestServer with retry, so a null here just means "not ready yet".
+ */
+ fun openHostTransport(): com.excp.podroid.engine.hostbridge.HostTransport? = null
+
/**
* Proxy delegate forwarded to the terminal session client. Set by the
* terminal UI layer so the engine can relay events before the UI attaches.
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 a1aa126..cc2ac03 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
@@ -464,6 +464,11 @@ class AvfEngine @Inject constructor(
}
}
+ override fun openHostTransport(): com.excp.podroid.engine.hostbridge.HostTransport? {
+ val vm = vmHandle ?: return null
+ return com.excp.podroid.engine.hostbridge.AvfHostTransport.open(vm)
+ }
+
override suspend fun addPortForward(rule: com.excp.podroid.data.repository.PortForwardRule) {
if (_state.value !is VmState.Running) return
val vm = vmHandle ?: return
diff --git a/app/src/main/java/com/excp/podroid/engine/hostbridge/NotificationPoster.kt b/app/src/main/java/com/excp/podroid/engine/hostbridge/NotificationPoster.kt
index 5cda7e0..6f7d34e 100644
--- a/app/src/main/java/com/excp/podroid/engine/hostbridge/NotificationPoster.kt
+++ b/app/src/main/java/com/excp/podroid/engine/hostbridge/NotificationPoster.kt
@@ -7,6 +7,24 @@
*/
package com.excp.podroid.engine.hostbridge
+import android.Manifest
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.excp.podroid.MainActivity
+import com.excp.podroid.R
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Inject
+import javax.inject.Singleton
+
interface NotificationPoster {
/** True when the app may post notifications (Android 13+ runtime grant). */
fun notificationsPermitted(): Boolean
@@ -18,3 +36,56 @@ interface NotificationPoster {
*/
fun post(title: String?, body: String, priority: String, id: Int?): Int
}
+
+@Singleton
+class AndroidNotificationPoster @Inject constructor(
+ @ApplicationContext private val context: Context,
+) : NotificationPoster {
+
+ companion object {
+ private const val CHANNEL_ID = "podroid_guest"
+ // Guest notification ids live well above PodroidService.NOTIFICATION_ID (1001)
+ // so a guest --id can never replace the foreground-service notification.
+ private const val ID_BASE = 0x7000_0000
+ private const val ID_SPAN = 0x0000_FFFF
+ }
+
+ private val autoId = AtomicInteger(0)
+
+ init {
+ val channel = NotificationChannel(
+ CHANNEL_ID, "VM notifications", NotificationManager.IMPORTANCE_DEFAULT,
+ ).apply { description = "Notifications sent from inside the VM (podroid-notify)" }
+ context.getSystemService(NotificationManager::class.java).createNotificationChannel(channel)
+ }
+
+ override fun notificationsPermitted(): Boolean =
+ Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
+ ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) ==
+ PackageManager.PERMISSION_GRANTED
+
+ override fun post(title: String?, body: String, priority: String, id: Int?): Int {
+ val notifId = if (id != null) ID_BASE + (id and ID_SPAN)
+ else ID_BASE + ID_SPAN + 1 + (autoId.incrementAndGet() and ID_SPAN)
+ val open = PendingIntent.getActivity(
+ context, 0, Intent(context, MainActivity::class.java),
+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+ )
+ val prio = when (priority) {
+ HostProtocol.PRIO_HIGH -> NotificationCompat.PRIORITY_HIGH
+ HostProtocol.PRIO_LOW -> NotificationCompat.PRIORITY_LOW
+ else -> NotificationCompat.PRIORITY_DEFAULT
+ }
+ val n = NotificationCompat.Builder(context, CHANNEL_ID)
+ .setContentTitle(title ?: "Podroid")
+ .setContentText(body)
+ .setStyle(NotificationCompat.BigTextStyle().bigText(body))
+ .setSmallIcon(R.drawable.ic_vm_notification)
+ .setContentIntent(open)
+ .setAutoCancel(true)
+ .setPriority(prio)
+ .build()
+ NotificationManagerCompat.from(context).notify(notifId, n)
+ return notifId
+ }
+}