Skip to content

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

fix: move TerminalSession to PodroidQemu singleton to survive ViewModel recreation

ExTv2acb03143038
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 d65c17f..856a437 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -24,6 +24,8 @@ import android.net.LocalSocket
import android.net.LocalSocketAddress
import android.util.Log
import com.excp.podroid.data.repository.PortForwardRule
+import com.termux.terminal.TerminalSession
+import com.termux.terminal.TerminalSessionClient
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.MutableStateFlow
@@ -48,6 +50,12 @@ class PodroidQemu @Inject constructor(
val consoleText: StateFlow<String> = _consoleText.asStateFlow()
private val _bootStage = MutableStateFlow("")
+
+ private var _terminalSession: TerminalSession? = null
+ private var _terminalSessionAttached = false
+
+ val terminalSession: TerminalSession? get() = _terminalSession
+ val terminalSessionAttached: Boolean get() = _terminalSessionAttached
val bootStage: StateFlow<String> = _bootStage.asStateFlow()
@Volatile
@@ -86,6 +94,40 @@ class PodroidQemu @Inject constructor(
}
}
+ fun createTerminalSession(client: TerminalSessionClient): TerminalSession {
+ if (_terminalSession != null && _terminalSessionAttached) {
+ return _terminalSession!!
+ }
+
+ releaseSerial()
+ Thread.sleep(500)
+
+ val bridgeExe = File(context.applicationInfo.nativeLibraryDir, "libpodroid-bridge.so")
+ if (!bridgeExe.exists()) {
+ throw IllegalStateException("podroid-bridge not found at ${bridgeExe.absolutePath}")
+ }
+
+ val sess = TerminalSession(
+ bridgeExe.absolutePath,
+ context.filesDir.absolutePath,
+ arrayOf(bridgeExe.absolutePath, serialSockPath, ctrlSockPath),
+ null,
+ 2000,
+ client,
+ )
+
+ sess.updateSize(80, 24)
+
+ _terminalSession = sess
+ _terminalSessionAttached = true
+ Log.d(TAG, "Terminal session created in Qemu singleton")
+ return sess
+ }
+
+ fun attachTerminalView() {
+ _terminalSessionAttached = true
+ }
+
fun start() = start(emptyList())
fun start(
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 d633f93..b23f402 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
@@ -207,32 +207,10 @@ class TerminalViewModel @Inject constructor(
fun createSession() {
if (attached) return
- attached = true
-
- qemu.releaseSerial()
- Thread.sleep(500)
-
- val bridgeExe = File(context.applicationInfo.nativeLibraryDir, "libpodroid-bridge.so")
- if (!bridgeExe.exists()) {
- Log.e(TAG, "podroid-bridge not found at ${bridgeExe.absolutePath}")
- return
- }
-
- val sess = TerminalSession(
- bridgeExe.absolutePath,
- context.filesDir.absolutePath,
- arrayOf(bridgeExe.absolutePath, qemu.serialSockPath, qemu.ctrlSockPath),
- null,
- 2000,
- sessionClient,
- )
- // TerminalSession defers subprocess creation until the first updateSize()
- // call triggers initializeEmulator(). Force it now so the bridge process
- // starts and the PTY file descriptor is allocated.
- sess.updateSize(80, 24)
+ val sess = qemu.createTerminalSession(sessionClient)
session = sess
- Log.d(TAG, "Bridge session created — PTY connected to ${qemu.serialSockPath}")
+ attached = true
}
/**