Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.
TypeScript adeagent-ideai-agentsautomationbotclaude-codecodexghosttygrok-bothermes-agentmobile-appmuseopenclawopencodeorchestrationpiruntimeterminalworktreesyc-backed
fix(emulator): quote Android text for the device shell (#35561)
OrcaWin6c8baa3fc287
diff --git a/src/main/emulator/android/android-input-commands.test.ts b/src/main/emulator/android/android-input-commands.test.tsnew file mode 100644index 00000000000..0404738df5b--- /dev/null+++ b/src/main/emulator/android/android-input-commands.test.ts@@ -0,0 +1,45 @@+import { spawnSync } from 'node:child_process'+import { describe, expect, it } from 'vitest'+import { androidTypeText } from './android-input-commands'+import type { AndroidCommandRunner } from './android-command-runner'++describe.runIf(process.platform !== 'win32')('Android text shell boundary', () => {+ it.each([+ 'plain',+ 'hello world',+ "it's fine",+ 'hello&world',+ 'say "hello"',+ '$ORCA_ANDROID_TEXT_VALUE',+ '$(printf changed)',+ 'semi;printf changed',+ '`printf changed`',+ '*',+ 'back\\slash',+ ''+ ])('delivers literal text %j as one input argument', async (text) => {+ let output = ''+ const runner: AndroidCommandRunner = async (_binary, args) => {+ const result = spawnSync(+ '/bin/sh',+ ['-c', `input() { printf '%s\\n' "$#" "$@"; }; ${args.slice(3).join(' ')}`],+ {+ encoding: 'utf8',+ env: { ...process.env, ORCA_ANDROID_TEXT_VALUE: 'expanded' }+ }+ )+ if (result.error) {+ throw result.error+ }+ output = result.stdout+ return { code: result.status ?? 1, stdout: result.stdout, stderr: result.stderr }+ }+ await androidTypeText(+ runner,+ { sdkRoot: 'sdk', adb: 'adb', emulator: 'emulator', avdmanager: 'avdmanager' },+ 'emulator-5558',+ text+ )+ expect(output).toBe(`2\ntext\n${text.replace(/ /g, '%s')}\n`)+ })+})diff --git a/src/main/emulator/android/android-input-commands.ts b/src/main/emulator/android/android-input-commands.tsindex 68d3f76a672..e0160a502df 100644--- a/src/main/emulator/android/android-input-commands.ts+++ b/src/main/emulator/android/android-input-commands.ts@@ -7,6 +7,7 @@ import {type DeviceScreenSize} from './android-input-mapping'import type { EmulatorGesturePoint } from '../emulator-gesture-sender'+import { quotePosixShell } from '../../../shared/shell-argument-quoting'export function androidShellArgs(serial: string, command: readonly string[]): string[] {return ['-s', serial, 'shell', ...command]@@ -70,7 +71,10 @@ export async function androidTypeText(): Promise<void> {// adb input text uses %s for spaces and cannot carry newlines.ensureAdbOk(- await runner(sdk.adb, androidShellArgs(serial, ['input', 'text', text.replace(/ /g, '%s')])),+ await runner(+ sdk.adb,+ androidShellArgs(serial, ['input', 'text', quotePosixShell(text.replace(/ /g, '%s'))])+ ),'adb type')}diff --git a/src/main/emulator/backends/android-emulator-backend.test.ts b/src/main/emulator/backends/android-emulator-backend.test.tsindex 981270358cb..eae156af015 100644--- a/src/main/emulator/backends/android-emulator-backend.test.ts+++ b/src/main/emulator/backends/android-emulator-backend.test.ts@@ -138,7 +138,7 @@ describe('AndroidEmulatorBackend', () => {'shell','input','text',- 'hi%sthere'+ "'hi%sthere'"])expect(runner).toHaveBeenCalledWith(SDK.adb, ['-s',