TypeScript
fix(mobile): Android secret requests no longer offer password manager logins (#29825)
voida635bda281170f
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.ktnew file mode 100644index 00000000000..1df8c646d48--- /dev/null+++ b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt@@ -0,0 +1,145 @@+package expo.modules.t3nativecontrols++import android.content.Context+import android.graphics.Color+import android.graphics.Typeface+import android.os.Build+import android.text.Editable+import android.text.InputType+import android.text.TextWatcher+import android.util.TypedValue+import android.view.Gravity+import android.view.KeyEvent+import android.view.View+import android.view.ViewGroup+import android.view.inputmethod.EditorInfo+import android.widget.EditText+import expo.modules.kotlin.AppContext+import expo.modules.kotlin.modules.Module+import expo.modules.kotlin.modules.ModuleDefinition+import expo.modules.kotlin.viewevent.EventDispatcher+import expo.modules.kotlin.views.ExpoView++class T3SecretInputModule : Module() {+ override fun definition() = ModuleDefinition {+ Name("T3SecretInput")++ View(T3SecretInputView::class) {+ Prop("value") { view: T3SecretInputView, value: String -> view.setValue(value) }+ Prop("placeholder") { view: T3SecretInputView, value: String ->+ view.input.hint = value+ }+ // Not "accessibilityLabel": React Native applies that to the outer view, not the EditText.+ Prop("inputLabel") { view: T3SecretInputView, value: String ->+ view.input.contentDescription = value+ }+ Prop("textColor") { view: T3SecretInputView, value: Int -> view.input.setTextColor(value) }+ Prop("placeholderColor") { view: T3SecretInputView, value: Int ->+ view.input.setHintTextColor(value)+ }+ Prop("cursorColor") { view: T3SecretInputView, value: Int -> view.setCursorColor(value) }+ Prop("fontSize") { view: T3SecretInputView, value: Float ->+ view.input.setTextSize(TypedValue.COMPLEX_UNIT_DIP, value)+ }+ Prop("editable") { view: T3SecretInputView, value: Boolean -> view.input.isEnabled = value }+ Events("onChangeText", "onSubmit")+ }+ }+}++/**+ * Masked single-line input for secret requests. React Native's own TextInput cannot opt out of+ * credential autofill, so password managers offer logins above the keyboard; this view owns the+ * EditText so it can.+ */+class T3SecretInputView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {+ // Yoga sizes this view; the EditText inside is laid out by Android.+ override val shouldUseAndroidLayout = true++ // Newer Android can request autofill even with importantForAutofill=no.+ // Reporting no autofill type keeps this input out of credential autofill.+ val input = object : EditText(context) {+ override fun getAutofillType(): Int = View.AUTOFILL_TYPE_NONE+ }+ private val onChangeText by EventDispatcher()+ private val onSubmit by EventDispatcher()+ private var applyingValue = false++ // Values sent to JS that its state has not echoed back yet. An echo of an older value would+ // otherwise overwrite characters typed in the meantime.+ private val unechoed = ArrayDeque<String>()++ init {+ input.background = null+ input.setPadding(0, 0, 0, 0)+ input.gravity = Gravity.CENTER_VERTICAL or Gravity.START+ // The autofill APIs arrive with API 26; minSdk is 24.+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {+ input.importantForAutofill = IMPORTANT_FOR_AUTOFILL_NO+ }+ input.imeOptions = EditorInfo.IME_ACTION_DONE+ // Not setSingleLine(): that swaps out the password transformation. The password variation is+ // already single line, and the keyboard keeps typed text out of suggestions.+ input.inputType =+ InputType.TYPE_CLASS_TEXT or+ InputType.TYPE_TEXT_VARIATION_PASSWORD or+ InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS+ // The password variation switches the typeface to monospace.+ input.typeface = Typeface.DEFAULT+ input.setTextColor(Color.BLACK)+ input.setHintTextColor(Color.GRAY)+ input.addTextChangedListener(+ object : TextWatcher {+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit+ override fun afterTextChanged(s: Editable?) {+ if (applyingValue) return+ val value = s?.toString() ?: ""+ unechoed.addLast(value)+ onChangeText(mapOf("value" to value))+ }+ }+ )+ input.setOnEditorActionListener { _, actionId, event ->+ if (actionId == EditorInfo.IME_ACTION_DONE || event?.keyCode == KeyEvent.KEYCODE_ENTER) {+ // Hardware Enter reports IME_NULL on Android 13 and earlier, and both key down and key up.+ if (event == null || event.action == KeyEvent.ACTION_DOWN) {+ onSubmit(mapOf("value" to input.text.toString()))+ }+ true+ } else {+ false+ }+ }+ addView(+ input,+ LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)+ )+ }++ /** Applies JS state without echoing it back, and without moving the caret on equal values. */+ fun setValue(value: String) {+ val echoed = unechoed.indexOf(value)+ if (echoed >= 0) {+ repeat(echoed + 1) { unechoed.removeFirst() }+ return+ }+ // A value JS chose itself, such as clearing after a save.+ unechoed.clear()+ if (input.text.toString() == value) return+ applyingValue = true+ input.setText(value)+ input.setSelection(input.text.length)+ applyingValue = false+ }++ fun setCursorColor(color: Int) {+ input.highlightColor = Color.argb(0x52, Color.red(color), Color.green(color), Color.blue(color))+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return++ input.textCursorDrawable = input.textCursorDrawable?.mutate()?.apply { setTint(color) }+ input.textSelectHandle?.mutate()?.setTint(color)+ input.textSelectHandleLeft?.mutate()?.setTint(color)+ input.textSelectHandleRight?.mutate()?.setTint(color)+ }+}diff --git a/apps/mobile/modules/t3-native-controls/expo-module.config.json b/apps/mobile/modules/t3-native-controls/expo-module.config.jsonindex 5ff3009ef4d..d405bf41cc3 100644--- a/apps/mobile/modules/t3-native-controls/expo-module.config.json+++ b/apps/mobile/modules/t3-native-controls/expo-module.config.json@@ -13,7 +13,8 @@"expo.modules.t3nativecontrols.T3NativeControlsModule","expo.modules.t3nativecontrols.T3WorkspaceNavigationModule","expo.modules.t3nativecontrols.T3KeyboardCommandsModule",- "expo.modules.t3nativecontrols.T3FoldPostureModule"+ "expo.modules.t3nativecontrols.T3FoldPostureModule",+ "expo.modules.t3nativecontrols.T3SecretInputModule"]}}diff --git a/apps/mobile/src/components/ui/SecretTextInput.android.tsx b/apps/mobile/src/components/ui/SecretTextInput.android.tsxnew file mode 100644index 00000000000..f93b091cf9b--- /dev/null+++ b/apps/mobile/src/components/ui/SecretTextInput.android.tsx@@ -0,0 +1,56 @@+import { requireNativeView } from "expo";+import { processColor, View, type NativeSyntheticEvent, type ViewProps } from "react-native";++import { flattenThemeColor } from "../../lib/mobileTheme";+import { useUniwindTheme } from "../../lib/useUniwindTheme";+import type { SecretTextInputProps } from "./SecretTextInput.types";++interface NativeSecretInputProps extends ViewProps {+ readonly inputLabel: string;+ readonly value: string;+ readonly placeholder: string;+ readonly textColor: number;+ readonly placeholderColor: number;+ readonly cursorColor: number;+ readonly fontSize: number;+ readonly editable: boolean;+ readonly onChangeText: (event: NativeSyntheticEvent<{ readonly value: string }>) => void;+ readonly onSubmit: (event: NativeSyntheticEvent<{ readonly value: string }>) => void;+}++const NativeSecretInput = requireNativeView<NativeSecretInputProps>("T3SecretInput");++const FONT_SIZE = 16;+const LINE_HEIGHT = 24;++function nativeColor(value: string) {+ const color = processColor(value);+ return typeof color === "number" ? color : 0;+}++/**+ * Android's React Native TextInput cannot opt out of credential autofill, so password managers+ * offer logins above the keyboard. This field is a native EditText that reports no autofill type.+ * The frame matches AppTextInput's.+ */+export function SecretTextInput(props: SecretTextInputProps) {+ const theme = useUniwindTheme();+ const surface = theme["--color-input"];+ return (+ <View className="min-h-13.5 justify-center rounded-2xl border border-input-border bg-input px-3.5">+ <NativeSecretInput+ inputLabel={props.accessibilityLabel}+ value={props.value}+ placeholder={props.placeholder}+ textColor={nativeColor(flattenThemeColor(theme["--color-foreground"], surface))}+ placeholderColor={nativeColor(flattenThemeColor(theme["--color-placeholder"], surface))}+ cursorColor={nativeColor(flattenThemeColor(theme["--color-focus"], surface))}+ fontSize={FONT_SIZE}+ editable={props.editable}+ onChangeText={(event) => props.onChangeText(event.nativeEvent.value)}+ onSubmit={(event) => props.onSubmitEditing(event.nativeEvent.value)}+ style={{ height: LINE_HEIGHT }}+ />+ </View>+ );+}diff --git a/apps/mobile/src/components/ui/SecretTextInput.tsx b/apps/mobile/src/components/ui/SecretTextInput.tsxnew file mode 100644index 00000000000..ed8bba58daa--- /dev/null+++ b/apps/mobile/src/components/ui/SecretTextInput.tsx@@ -0,0 +1,24 @@+import { AppTextInput } from "./AppText";+import type { SecretTextInputProps } from "./SecretTextInput.types";++/** Masked field for a value that must stay out of password managers and suggestions. */+export function SecretTextInput(props: SecretTextInputProps) {+ return (+ <AppTextInput+ accessibilityLabel={props.accessibilityLabel}+ placeholder={props.placeholder}+ value={props.value}+ onChangeText={props.onChangeText}+ editable={props.editable}+ secureTextEntry+ autoCorrect={false}+ autoCapitalize="none"+ autoComplete="off"+ textContentType="none"+ importantForAutofill="no"+ spellCheck={false}+ returnKeyType="done"+ onSubmitEditing={(event) => props.onSubmitEditing(event.nativeEvent.text)}+ />+ );+}diff --git a/apps/mobile/src/components/ui/SecretTextInput.types.ts b/apps/mobile/src/components/ui/SecretTextInput.types.tsnew file mode 100644index 00000000000..37db8e458d2--- /dev/null+++ b/apps/mobile/src/components/ui/SecretTextInput.types.ts@@ -0,0 +1,9 @@+export interface SecretTextInputProps {+ readonly accessibilityLabel: string;+ readonly placeholder: string;+ readonly value: string;+ readonly onChangeText: (value: string) => void;+ /** Receives the field's current text, so a submit never uses a stale render of it. */+ readonly onSubmitEditing: (value: string) => void;+ readonly editable: boolean;+}diff --git a/apps/mobile/src/features/threads/SecretRequestCard.tsx b/apps/mobile/src/features/threads/SecretRequestCard.tsxindex bc1272d6847..4d4234075a5 100644--- a/apps/mobile/src/features/threads/SecretRequestCard.tsx+++ b/apps/mobile/src/features/threads/SecretRequestCard.tsx@@ -25,6 +25,7 @@ import { View, type ColorValue } from "react-native";import { SymbolView, type AppSymbolName } from "../../components/ui/AppSymbol";import { AppText as Text, AppTextInput as TextInput } from "../../components/ui/AppText";+import { SecretTextInput } from "../../components/ui/SecretTextInput";import { serverEnvironment } from "../../state/server";import { useAtomCommand } from "../../state/use-atom-command";import { Button } from "../../components/ui/Button";@@ -157,21 +158,13 @@ function PendingSecretRequestForm(props: {</View>) : null}{source === null ? (- <TextInput+ <SecretTextInputaccessibilityLabel={item.label}placeholder={item.placeholder ?? SECRET_REQUEST_DEFAULT_PLACEHOLDER}value={secret}onChangeText={setSecret}editable={!submitting}- secureTextEntry- autoCorrect={false}- autoCapitalize="none"- autoComplete="off"- textContentType="none"- importantForAutofill="no"- spellCheck={false}- returnKeyType="done"- onSubmitEditing={save}+ onSubmitEditing={(value) => void send({ type: "save", secret: value })}/>) : (<TextInputdiff --git a/vite.config.ts b/vite.config.tsindex 70c6f16f16e..a5273a84429 100644--- a/vite.config.ts+++ b/vite.config.ts@@ -641,6 +641,7 @@ export default defineConfig({"apps/mobile/src/features/threads/ThreadQueueControl.tsx","apps/mobile/src/features/review/ReviewCommentCard.tsx","apps/mobile/src/features/threads/thread-list-v2-items.tsx",+ "apps/mobile/src/components/ui/SecretTextInput.android.tsx","apps/mobile/src/lib/useMobileNavigationTheme.ts","apps/mobile/src/native/T3ComposerEditor.ios.tsx","apps/mobile/src/native/T3ComposerEditor.native.tsx",