Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

android: keep the probe login in a local debug asset

RoversX99bebfc7bdcd
diff --git a/android/.gitignore b/android/.gitignore
index 5d022135..ab77d403 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,6 +3,7 @@ app/src/main/java/com/roversx/thinkterm/core/
app/src/main/jniLibs/
app/src/main/assets/*.ttf
app/src/debug/assets/probe_key
+app/src/debug/assets/probe_user
app/src/main/assets/schemes.json
app/src/main/assets/strings.json
.gradle/
diff --git a/android/app/src/main/java/com/roversx/thinkterm/HostStore.kt b/android/app/src/main/java/com/roversx/thinkterm/HostStore.kt
index b8a9f7fa..34e1b895 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/HostStore.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/HostStore.kt
@@ -45,12 +45,15 @@ data class Host(
companion object {
const val PROBE_ID = "probe"
- val probe = Host(
+ fun probe(context: Context) = Host(
id = PROBE_ID,
name = "This Mac (probe)",
hostname = "10.0.2.2",
port = 2299,
- user = "",
+ // Generated locally for debug builds; no account name lives in Git.
+ user = runCatching {
+ context.assets.open("probe_user").bufferedReader().use { it.readText().trim() }
+ }.getOrDefault(""),
auth = "key",
remoteCommand = "/tmp/ttp-ssh/thinkterm-remote cli --prefer-mux proxy",
)
diff --git a/android/app/src/main/java/com/roversx/thinkterm/HostsScreen.kt b/android/app/src/main/java/com/roversx/thinkterm/HostsScreen.kt
index b9b9198f..700d4082 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/HostsScreen.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/HostsScreen.kt
@@ -60,6 +60,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
@@ -72,6 +73,10 @@ import androidx.compose.ui.unit.dp
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HostsScreen(store: HostStore, showProbe: Boolean, onOpen: (Host) -> Unit) {
+ val context = LocalContext.current
+ val probe = remember(context, showProbe) {
+ if (showProbe) Host.probe(context).takeIf { it.user.isNotEmpty() } else null
+ }
var editing by remember { mutableStateOf<Host?>(null) }
var search by remember { mutableStateOf("") }
var pendingDelete by remember { mutableStateOf<Host?>(null) }
@@ -157,11 +162,11 @@ fun HostsScreen(store: HostStore, showProbe: Boolean, onOpen: (Host) -> Unit) {
}
}
- if (showProbe) {
+ if (probe != null) {
item(key = "dev-header") { HostGroupHeader(tr("dev")) }
item(key = Host.PROBE_ID) {
ListItem(
- modifier = Modifier.clickable { onOpen(Host.probe) },
+ modifier = Modifier.clickable { onOpen(probe) },
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
leadingContent = { HostDisc(Icons.Filled.Hardware, Color(0xFF8E8E93)) },
headlineContent = {
@@ -173,7 +178,7 @@ fun HostsScreen(store: HostStore, showProbe: Boolean, onOpen: (Host) -> Unit) {
}
},
supportingContent = {
- Text("probe sshd on ${Host.probe.hostname}:${Host.probe.port}")
+ Text("probe sshd on ${probe.hostname}:${probe.port}")
},
)
}
diff --git a/android/build.sh b/android/build.sh
index 53f9b082..4ef74cbe 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -38,6 +38,9 @@ cp thinkterm-web/www/schemes.json ios/Resources/strings.json android/app/src/mai
# a debug asset, so no release build carries it.
mkdir -p android/app/src/debug/assets
[ -f /tmp/ttp-ssh/userkey ] && cp /tmp/ttp-ssh/userkey android/app/src/debug/assets/probe_key || true
+# The app reads the probe's login at runtime. Override it when the SSH
+# account differs from the local account; this asset is debug-only.
+printf '%s\n' "${THINKTERM_PROBE_USER:-$(id -un)}" > android/app/src/debug/assets/probe_user
echo "== gradle"
build_log=$(mktemp "${TMPDIR:-/tmp}/thinkterm-android-build.XXXXXX")