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: the keyboard is asked not to learn secrets

RoversX73372683f31f
diff --git a/android/app/src/main/java/com/roversx/thinkterm/AppSettings.kt b/android/app/src/main/java/com/roversx/thinkterm/AppSettings.kt
index 2044283a..591397fc 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/AppSettings.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/AppSettings.kt
@@ -54,6 +54,9 @@ class AppSettings private constructor(private val prefs: SharedPreferences) {
var cursorBlink by pref("cursor.blink", true)
/// A pane's bell buzzes the phone.
var bell by pref("bell", false)
+ /// The terminal's keyboard is asked not to learn from what is typed
+ /// (Gboard shows its incognito look). Password fields always are.
+ var incognitoKeyboard by pref("keyboard.incognito", true)
/// "auto" or "live": the server's panes follow a divider drag as it
/// goes; "release": once, when the finger lifts.
var resizeMode by pref("resize.mode", "auto")
diff --git a/android/app/src/main/java/com/roversx/thinkterm/HostEditScreen.kt b/android/app/src/main/java/com/roversx/thinkterm/HostEditScreen.kt
index f63b3fd7..24b2cf78 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/HostEditScreen.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/HostEditScreen.kt
@@ -68,7 +68,11 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.platform.InterceptPlatformTextInput
+import androidx.compose.ui.platform.PlatformTextInputMethodRequest
import androidx.compose.ui.text.input.PasswordVisualTransformation
+import android.view.inputmethod.EditorInfo
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -261,25 +265,29 @@ fun HostEditScreen(
modifier = Modifier.fillMaxWidth(),
)
}
- OutlinedTextField(
- value = passphrase,
- onValueChange = { passphrase = it },
- label = { Text(tr("key.passphrase")) },
- singleLine = true,
- visualTransformation = PasswordVisualTransformation(),
- keyboardOptions = plainKeyboard(KeyboardType.Password),
- modifier = Modifier.fillMaxWidth(),
- )
+ IncognitoKeyboard {
+ OutlinedTextField(
+ value = passphrase,
+ onValueChange = { passphrase = it },
+ label = { Text(tr("key.passphrase")) },
+ singleLine = true,
+ visualTransformation = PasswordVisualTransformation(),
+ keyboardOptions = plainKeyboard(KeyboardType.Password),
+ modifier = Modifier.fillMaxWidth(),
+ )
+ }
} else {
- OutlinedTextField(
- value = secret,
- onValueChange = { secret = it },
- label = { Text(tr("f.password")) },
- singleLine = true,
- visualTransformation = PasswordVisualTransformation(),
- keyboardOptions = plainKeyboard(KeyboardType.Password),
- modifier = Modifier.fillMaxWidth(),
- )
+ IncognitoKeyboard {
+ OutlinedTextField(
+ value = secret,
+ onValueChange = { secret = it },
+ label = { Text(tr("f.password")) },
+ singleLine = true,
+ visualTransformation = PasswordVisualTransformation(),
+ keyboardOptions = plainKeyboard(KeyboardType.Password),
+ modifier = Modifier.fillMaxWidth(),
+ )
+ }
}
}
@@ -381,6 +389,27 @@ private fun EditField(
}
/// Nothing here is prose: no capitals of its own, no autocorrect.
+/// A secret is typed with the keyboard asked not to learn from it
+/// (`IME_FLAG_NO_PERSONALIZED_LEARNING`; Gboard shows its incognito
+/// look). Compose has no option for the flag, so it is set on the
+/// editor info as the field's input session starts.
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun IncognitoKeyboard(content: @Composable () -> Unit) {
+ InterceptPlatformTextInput(
+ interceptor = { request, next ->
+ next.startInputMethod(
+ PlatformTextInputMethodRequest { attrs ->
+ request.createInputConnection(attrs).also {
+ attrs.imeOptions = attrs.imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+ }
+ }
+ )
+ },
+ content = content,
+ )
+}
+
private fun plainKeyboard(keyboard: KeyboardType) = KeyboardOptions(
keyboardType = keyboard,
capitalization = KeyboardCapitalization.None,
diff --git a/android/app/src/main/java/com/roversx/thinkterm/SettingsScreen.kt b/android/app/src/main/java/com/roversx/thinkterm/SettingsScreen.kt
index 273eaed5..0009d2c1 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/SettingsScreen.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/SettingsScreen.kt
@@ -128,6 +128,7 @@ private fun SettingsList(
PushRow(tr("cursor"), label(cursors(), settings.cursorStyle)) { onPush("cursor") }
SwitchRow(tr("cursor.blink"), settings.cursorBlink) { settings.cursorBlink = it }
SwitchRow(tr("bell"), settings.bell) { settings.bell = it }
+ SwitchRow(tr("keyboard.incognito"), settings.incognitoKeyboard) { settings.incognitoKeyboard = it }
PushRow(tr("resize.mode"), label(resizes(), settings.resizeMode)) { onPush("resize.mode") }
Section(tr("sec.interface"))
diff --git a/android/app/src/main/java/com/roversx/thinkterm/TerminalModel.kt b/android/app/src/main/java/com/roversx/thinkterm/TerminalModel.kt
index 494041d4..0b7a82cb 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/TerminalModel.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/TerminalModel.kt
@@ -116,6 +116,10 @@ class TerminalModel(
/// The connection changed under an open IME composition: the view
/// lets it go, so it does not land in whatever comes next.
var onDropComposition: (() -> Unit)? = null
+ /// The keyboard's options changed: the view starts its input over so
+ /// the IME reads them again.
+ var onImeOptionsChanged: (() -> Unit)? = null
+ private var appliedIncognito = settings.incognitoKeyboard
var onScreenChanged: (() -> Unit)? = null
var onHideKeyboard: (() -> Unit)? = null
/// A selection stands: where its copy chip goes, in dp from the
@@ -170,6 +174,10 @@ class TerminalModel(
applyScheme()
applyScrollMode()
applyTerminalPrefs()
+ if (settings.incognitoKeyboard != appliedIncognito) {
+ appliedIncognito = settings.incognitoKeyboard
+ onImeOptionsChanged?.invoke()
+ }
// A face is shaped at connect time: the connection is made again.
if (settings.fontFamily != appliedFamily) {
appliedFamily = settings.fontFamily
diff --git a/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt b/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
index 277a4e04..49651329 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/TerminalScreen.kt
@@ -157,6 +157,7 @@ fun TerminalScreen(host: Host, store: HostStore, onBack: () -> Unit) {
listOf(
settings.schemeName, settings.smoothScroll, settings.cursorStyle, settings.cursorBlink,
settings.contrast, settings.resizeMode, settings.autoReconnect, settings.paneBars, settings.fontFamily,
+ settings.incognitoKeyboard,
)
}.drop(1).collect { model.settingsChanged() }
}
diff --git a/android/app/src/main/java/com/roversx/thinkterm/TerminalView.kt b/android/app/src/main/java/com/roversx/thinkterm/TerminalView.kt
index b87a941a..ea309392 100644
--- a/android/app/src/main/java/com/roversx/thinkterm/TerminalView.kt
+++ b/android/app/src/main/java/com/roversx/thinkterm/TerminalView.kt
@@ -192,6 +192,10 @@ class TerminalInputView(context: Context, private val model: TerminalModel) : Vi
isClickable = true
model.onScreenChanged = { if (anchor != null) screen = null }
model.onDropComposition = { dropComposition() }
+ model.onImeOptionsChanged = {
+ val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.restartInput(this)
+ }
}
fun keyboardShown(): Boolean =
@@ -521,6 +525,11 @@ class TerminalInputView(context: Context, private val model: TerminalModel) : Vi
EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS or
EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
outAttrs.imeOptions = EditorInfo.IME_ACTION_NONE or EditorInfo.IME_FLAG_NO_EXTRACT_UI
+ if (settings.incognitoKeyboard) {
+ // What is typed into a shell is not the keyboard's to learn;
+ // Gboard shows its incognito look for this flag.
+ outAttrs.imeOptions = outAttrs.imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+ }
return Connection(this)
}
diff --git a/ios/Resources/strings.json b/ios/Resources/strings.json
index 2f1cba2c..09d5bfed 100644
--- a/ios/Resources/strings.json
+++ b/ios/Resources/strings.json
@@ -115,6 +115,7 @@
"key.paste": "Aus der Zwischenablage einsetzen",
"key.pastetext": "Schlüsseltext einsetzen",
"key.stored": "Schlüssel gesichert",
+ "keyboard.incognito": "Inkognito-Tastatur",
"language": "Sprache",
"m.overview": "Übersicht…",
"m.settings": "Einstellungen…",
@@ -323,6 +324,7 @@
"key.paste": "Paste from clipboard",
"key.pastetext": "Paste key text",
"key.stored": "Key stored",
+ "keyboard.incognito": "Incognito keyboard",
"language": "Language",
"m.overview": "Overview…",
"m.settings": "Settings…",
@@ -531,6 +533,7 @@
"key.paste": "Coller depuis le presse-papiers",
"key.pastetext": "Coller le texte de la clé",
"key.stored": "Clé enregistrée",
+ "keyboard.incognito": "Clavier incognito",
"language": "Langue",
"m.overview": "Vue d’ensemble…",
"m.settings": "Réglages…",
@@ -739,6 +742,7 @@
"key.paste": "クリップボードから貼り付け",
"key.pastetext": "鍵のテキストを貼り付け",
"key.stored": "鍵は保存済み",
+ "keyboard.incognito": "シークレット キーボード",
"language": "言語",
"m.overview": "概要…",
"m.settings": "設定…",
@@ -947,6 +951,7 @@
"key.paste": "从剪贴板粘贴",
"key.pastetext": "粘贴密钥文本",
"key.stored": "密钥已保存",
+ "keyboard.incognito": "无痕键盘",
"language": "语言",
"m.overview": "总览…",
"m.settings": "设置…",
diff --git a/ios/tools/gen-strings.py b/ios/tools/gen-strings.py
index 6f59fcd1..f1c50c8d 100644
--- a/ios/tools/gen-strings.py
+++ b/ios/tools/gen-strings.py
@@ -30,6 +30,7 @@ EXTRA = {
"p.layout": ["Layout", "布局", "レイアウト", "Disposition", "Layout"],
"project.new": ["New project", "新建项目", "新規プロジェクト", "Nouveau projet", "Neues Projekt"],
"sidebar": ["Sidebar", "侧栏", "サイドバー", "Barre latérale", "Seitenleiste"],
+ "keyboard.incognito": ["Incognito keyboard", "无痕键盘", "シークレット キーボード", "Clavier incognito", "Inkognito-Tastatur"],
"thread.delete.title": ["Delete “%@”?", "删除“%@”?", "「%@」を削除しますか?", "Supprimer « %@ » ?", "„%@“ löschen?"],
"thread.delete.body": [
"Its tabs close and the programs in them end.",