appium-adb 16.1.2 → 16.3.0

package/lib/tools/app-commands.ts

@@ -80,7 +80,7 @@ export async function resolveLaunchableActivity(
 ): Promise<string> {
   const {preferCmd = true} = opts;
   if (!preferCmd || (await this.getApiLevel()) < 24) {
-    const stdout = await this.shell(['dumpsys', 'package', pkg]);
+    const stdout = await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true});
     const names = parseLaunchableActivityNames(stdout);
     if (util.isEmpty(names)) {
       log.debug(stdout);
@@ -110,6 +110,7 @@ export async function resolveLaunchableActivity(
   }
   const {stdout, stderr} = await this.shell(['cmd', 'package', 'resolve-activity', '--brief', pkg], {
     outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
+    quoteArgs: true,
   });
   for (const line of (stdout || '').split('\n').map((x) => x.trim())) {
     if (this.isValidClass(line)) {
@@ -132,7 +133,7 @@ export async function resolveLaunchableActivity(
  */
 export async function forceStop(this: ADB, pkg: string): Promise<string> {
   assertSafeComponentName(pkg, 'application package name');
-  return await this.shell(['am', 'force-stop', util.quote(pkg)]);
+  return await this.shell(['am', 'force-stop', pkg], {quoteArgs: true});
 }
 
 /**
@@ -147,7 +148,7 @@ export async function forceStop(this: ADB, pkg: string): Promise<string> {
  * @returns The output of the corresponding adb command.
  */
 export async function killPackage(this: ADB, pkg: string): Promise<string> {
-  return await this.shell(['am', 'kill', pkg]);
+  return await this.shell(['am', 'kill', pkg], {quoteArgs: true});
 }
 
 /**
@@ -158,7 +159,7 @@ export async function killPackage(this: ADB, pkg: string): Promise<string> {
  * @returns The output of the corresponding adb command.
  */
 export async function clear(this: ADB, pkg: string): Promise<string> {
-  return await this.shell(['pm', 'clear', pkg]);
+  return await this.shell(['pm', 'clear', pkg], {quoteArgs: true});
 }
 
 /**
@@ -180,7 +181,7 @@ export async function grantAllPermissions(this: ADB, pkg: string, apk?: string):
        * If apk not provided, considering apk already installed on the device
        * and fetching targetSdk using package name.
        */
-      dumpsysOutput = await this.shell(['dumpsys', 'package', pkg]);
+      dumpsysOutput = await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true});
       targetSdk = await this.targetSdkVersionUsingPKG(pkg, dumpsysOutput);
     } else {
       targetSdk = await this.targetSdkVersionFromManifest(apk);
@@ -195,7 +196,7 @@ export async function grantAllPermissions(this: ADB, pkg: string, apk?: string):
      * The app has to list the permissions in the manifest.
      * refer: https://developer.android.com/training/permissions/requesting.html
      */
-    dumpsysOutput = dumpsysOutput || (await this.shell(['dumpsys', 'package', pkg]));
+    dumpsysOutput = dumpsysOutput || (await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true}));
     const requestedPermissions = await this.getReqPermissions(pkg, dumpsysOutput);
     const grantedPermissions = await this.getGrantedPermissions(pkg, dumpsysOutput);
     const permissionsToGrant = requestedPermissions.filter((x) => !grantedPermissions.includes(x));
@@ -234,7 +235,7 @@ export async function grantPermissions(this: ADB, pkg: string, permissions: stri
   // adb shell buffer is limited
   log.debug(`Granting permissions ${JSON.stringify(permissions)} to '${pkg}'`);
   try {
-    await this.shellChunks((perm) => ['pm', 'grant', pkg, perm], permissions);
+    await this.shellChunks((perm) => ['pm', 'grant', pkg, perm], permissions, {quoteArgs: true});
   } catch (e) {
     const err = e as ExecError;
     if (!IGNORED_PERM_ERRORS.some((pattern) => pattern.test(err.stderr || err.message))) {
@@ -252,7 +253,7 @@ export async function grantPermissions(this: ADB, pkg: string, permissions: stri
  */
 export async function grantPermission(this: ADB, pkg: string, permission: string): Promise<void> {
   try {
-    await this.shell(['pm', 'grant', pkg, permission]);
+    await this.shell(['pm', 'grant', pkg, permission], {quoteArgs: true});
   } catch (e) {
     const err = e as ExecError;
     if (!NOT_CHANGEABLE_PERM_ERROR.test(err.stderr || err.message)) {
@@ -270,7 +271,7 @@ export async function grantPermission(this: ADB, pkg: string, permission: string
  */
 export async function revokePermission(this: ADB, pkg: string, permission: string): Promise<void> {
   try {
-    await this.shell(['pm', 'revoke', pkg, permission]);
+    await this.shell(['pm', 'revoke', pkg, permission], {quoteArgs: true});
   } catch (e) {
     const err = e as ExecError;
     if (!NOT_CHANGEABLE_PERM_ERROR.test(err.stderr || err.message)) {
@@ -294,7 +295,7 @@ export async function getGrantedPermissions(
   cmdOutput: string | null = null,
 ): Promise<string[]> {
   log.debug('Retrieving granted permissions');
-  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
+  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true}));
   return extractMatchingPermissions(stdout, ['install', 'runtime'], true);
 }
 
@@ -308,7 +309,7 @@ export async function getGrantedPermissions(
  */
 export async function getDeniedPermissions(this: ADB, pkg: string, cmdOutput: string | null = null): Promise<string[]> {
   log.debug('Retrieving denied permissions');
-  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
+  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true}));
   return extractMatchingPermissions(stdout, ['install', 'runtime'], false);
 }
 
@@ -322,7 +323,7 @@ export async function getDeniedPermissions(this: ADB, pkg: string, cmdOutput: st
  */
 export async function getReqPermissions(this: ADB, pkg: string, cmdOutput: string | null = null): Promise<string[]> {
   log.debug('Retrieving requested permissions');
-  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
+  const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true}));
   return extractMatchingPermissions(stdout, ['requested']);
 }
 
@@ -352,7 +353,7 @@ export async function getPackageInfo(this: ADB, pkg: string): Promise<AppInfo> {
   const result: AppInfo = {name: pkg};
   let stdout: string;
   try {
-    stdout = await this.shell(['dumpsys', 'package', pkg]);
+    stdout = await this.shell(['dumpsys', 'package', pkg], {quoteArgs: true});
   } catch (err) {
     const error = err as Error;
     log.debug(error.stack);
@@ -386,7 +387,7 @@ export async function getPackageInfo(this: ADB, pkg: string): Promise<AppInfo> {
  * @throws {Error} If there was an error while fetching the .apk
  */
 export async function pullApk(this: ADB, pkg: string, tmpDir: string): Promise<string> {
-  const stdout = (await this.shell(['pm', 'path', pkg])).trim();
+  const stdout = (await this.shell(['pm', 'path', pkg], {quoteArgs: true})).trim();
   const packageMarker = 'package:';
   if (!stdout.startsWith(packageMarker)) {
     throw new Error(`Cannot pull the .apk package for '${pkg}'. Original error: ${stdout}`);
@@ -417,7 +418,7 @@ export async function activateApp(this: ADB, appId: string): Promise<void> {
     const cmd = ['monkey', '-p', appId, '-c', 'android.intent.category.LAUNCHER', '1'];
     let output: string;
     try {
-      output = await this.shell(cmd);
+      output = await this.shell(cmd, {quoteArgs: true});
       log.debug(`Command stdout: ${output}`);
     } catch (e) {
       const error = e as Error;
@@ -439,21 +440,24 @@ export async function activateApp(this: ADB, appId: string): Promise<void> {
     activityName = await this.resolveLaunchableActivity(appId, {preferCmd: false});
   }
 
-  const stdout = await this.shell([
-    'am',
-    apiLevel < 26 ? 'start' : 'start-activity',
-    '-a',
-    'android.intent.action.MAIN',
-    '-c',
-    'android.intent.category.LAUNCHER',
-    // FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-    // https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_NEW_TASK
-    // https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-    '-f',
-    '0x10200000',
-    '-n',
-    activityName,
-  ]);
+  const stdout = await this.shell(
+    [
+      'am',
+      apiLevel < 26 ? 'start' : 'start-activity',
+      '-a',
+      'android.intent.action.MAIN',
+      '-c',
+      'android.intent.category.LAUNCHER',
+      // FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
+      // https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_NEW_TASK
+      // https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
+      '-f',
+      '0x10200000',
+      '-n',
+      activityName,
+    ],
+    {quoteArgs: true},
+  );
   log.debug(stdout);
   if (/^error:/im.test(stdout)) {
     throw new Error(`Cannot activate '${appId}'. Original error: ${stdout}`);
@@ -479,7 +483,7 @@ export async function isAppInstalled(this: ADB, pkg: string, opts: IsAppInstalle
         cmd.push('--user', user);
       }
       cmd.push(pkg);
-      const stdout = await this.shell(cmd);
+      const stdout = await this.shell(cmd, {quoteArgs: true});
       isInstalled = /^package:/m.test(stdout);
     } catch {
       isInstalled = false;
@@ -519,12 +523,12 @@ export async function listInstalledPackages(
 
   let stdout: string;
   try {
-    stdout = await this.shell(cmd);
+    stdout = await this.shell(cmd, {quoteArgs: true});
   } catch (e) {
     const error = e as ExecError;
     // https://github.com/appium/appium-uiautomator2-driver/issues/810
     if ((error.stderr || error.stdout || error.message)?.includes('access user') && util.isEmpty(user)) {
-      stdout = await this.shell([...cmd, '--user', '0']);
+      stdout = await this.shell([...cmd, '--user', '0'], {quoteArgs: true});
     } else {
       throw e;
     }
@@ -561,16 +565,14 @@ export async function startUri(
   if (waitForLaunch) {
     args.push('-W');
   }
-  // adb joins these arguments into a command parsed by the device's shell,
-  // regardless of the host operating system.
-  args.push('-a', 'android.intent.action.VIEW', '-d', util.quote(uri));
+  args.push('-a', 'android.intent.action.VIEW', '-d', uri);
   if (pkg) {
     assertSafeComponentName(pkg, 'application package name');
-    args.push(util.quote(pkg));
+    args.push(pkg);
   }
 
   try {
-    const res = await this.shell(args);
+    const res = await this.shell(args, {quoteArgs: true});
     if (res.toLowerCase().includes('unable to resolve intent')) {
       throw new Error(res);
     }
@@ -616,7 +618,7 @@ export async function startApp(this: ADB, startAppOptions: StartAppOptions): Pro
     if (options.waitDuration !== undefined && Number.isInteger(options.waitDuration) && options.waitDuration >= 0) {
       shellOpts.timeout = options.waitDuration;
     }
-    const stdout = await this.shell(cmd, shellOpts);
+    const stdout = await this.shell(cmd, {...shellOpts, quoteArgs: true});
     if (stdout.includes('Error: Activity class') && stdout.includes('does not exist')) {
       if (options.retry && options.activity && !options.activity.startsWith('.')) {
         log.debug(
@@ -886,41 +888,41 @@ export async function waitForNotActivity(this: ADB, pkg: string, act: string, wa
 }
 
 /**
- * Builds command line representation for the given
- * application startup options
+ * Builds literal arguments for the given application startup options.
+ * Execute the result with `shell` with `quoteArgs: true`, not `shell`.
  *
  * @param startAppOptions - Application options mapping
  * @param apiLevel - The actual OS API level
- * @returns The actual command line array
+ * @returns Unquoted command arguments
  */
 export function buildStartCmd(startAppOptions: StartCmdOptions, apiLevel: number): string[] {
   const {user, waitForLaunch, pkg, activity, action, category, stopApp, flags, optionalIntentArguments} =
     startAppOptions;
   const cmd = ['am', apiLevel < 26 ? 'start' : 'start-activity'];
   if (util.hasValue(user)) {
-    cmd.push('--user', util.quote(`${user}`));
+    cmd.push('--user', `${user}`);
   }
   if (waitForLaunch) {
     cmd.push('-W');
   }
   if (activity && pkg) {
     const component = activity.startsWith(`${pkg}/`) ? activity : `${pkg}/${activity}`;
-    cmd.push('-n', util.quote(component));
+    cmd.push('-n', component);
   }
   if (stopApp && apiLevel >= 15) {
     cmd.push('-S');
   }
   if (action) {
-    cmd.push('-a', util.quote(action));
+    cmd.push('-a', action);
   }
   if (category) {
-    cmd.push('-c', util.quote(category));
+    cmd.push('-c', category);
   }
   if (flags) {
-    cmd.push('-f', util.quote(flags));
+    cmd.push('-f', flags);
   }
   if (optionalIntentArguments) {
-    cmd.push(...parseOptionalIntentArguments(optionalIntentArguments).map((arg) => util.quote(arg)));
+    cmd.push(...parseOptionalIntentArguments(optionalIntentArguments));
   }
   return cmd;
 }
@@ -1023,7 +1025,7 @@ export function matchComponentName(classString: string): RegExpExecArray | null
 /**
  * Asserts a package/activity name has only legal component characters, rejecting shell
  * metacharacters to prevent command injection. The permitted `$` and `*` are still
- * shell-expansion characters and are escaped separately in `buildStartCmd`.
+ * shell-expansion characters and are quoted at execution time by `shell` with `quoteArgs: true`.
  *
  * @param value - The package or activity name to verify
  * @param kind - A human-readable label for the value used in the error message
@@ -1112,7 +1114,7 @@ export async function broadcast(this: ADB, intent: string): Promise<void> {
     throw new Error(`Invalid intent ${intent}`);
   }
   log.debug(`Broadcasting: ${intent}`);
-  await this.shell(['am', 'broadcast', '-a', intent]);
+  await this.shell(['am', 'broadcast', '-a', intent], {quoteArgs: true});
 }
 
 /**

package/lib/tools/device-settings.ts

@@ -195,7 +195,7 @@ export async function setSetting(
   setting: string,
   value: string | number,
 ): Promise<string> {
-  return await this.shell(['settings', 'put', util.quote(namespace), util.quote(setting), util.quote(`${value}`)]);
+  return await this.shell(['settings', 'put', namespace, setting, `${value}`], {quoteArgs: true});
 }
 
 /**
@@ -514,7 +514,7 @@ export async function addToDeviceIdleWhitelist(this: ADB, ...packages: string[])
   }
 
   log.info(`Adding ${util.pluralize('package', packages.length)} ${JSON.stringify(packages)} to Doze whitelist`);
-  await this.shellChunks((pkg) => ['dumpsys', 'deviceidle', 'whitelist', `+${pkg}`], packages);
+  await this.shellChunks((pkg) => ['dumpsys', 'deviceidle', 'whitelist', `+${pkg}`], packages, {quoteArgs: true});
   return true;
 }
 

package/lib/tools/fs-commands.ts

@@ -32,7 +32,7 @@ export async function fileExists(this: ADB, remotePath: string): Promise<boolean
 export async function ls(this: ADB, remotePath: string, opts: string[] = []): Promise<string[]> {
   try {
     const args = ['ls', ...opts, remotePath];
-    const stdout = await this.shell(args);
+    const stdout = await this.shell(args, {quoteArgs: true});
     const lines = stdout.split('\n');
     return lines
       .map((l) => l.trim())
@@ -79,7 +79,7 @@ export async function fileSize(this: ADB, remotePath: string): Promise<number> {
  * @param path - The path to be removed recursively.
  */
 export async function rimraf(this: ADB, path: string): Promise<void> {
-  await this.shell(['rm', '-rf', path]);
+  await this.shell(['rm', '-rf', path], {quoteArgs: true});
 }
 
 /**

package/lib/tools/lockmgmt.ts

@@ -41,6 +41,7 @@ export async function verifyLockCredential(this: ADB, credential: string | null
   try {
     const {stdout, stderr} = await this.shell(buildCommand('verify', credential), {
       outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
+      quoteArgs: true,
     });
     if (stdout?.includes('verified successfully')) {
       return true;
@@ -78,6 +79,7 @@ export async function clearLockCredential(this: ADB, credential: string | null =
   try {
     const {stdout, stderr} = await this.shell(buildCommand('clear', credential), {
       outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
+      quoteArgs: true,
     });
     if (!['user has no password', 'Lock credential cleared'].some((x) => (stderr || stdout)?.includes(x))) {
       throw new Error(stderr || stdout);
@@ -106,6 +108,7 @@ export async function isLockEnabled(this: ADB): Promise<boolean> {
   try {
     const {stdout, stderr} = await this.shell(buildCommand('get-disabled'), {
       outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
+      quoteArgs: true,
     });
     if (
       /\bfalse\b/.test(stdout) ||
@@ -160,6 +163,7 @@ export async function setLockCredential(
   try {
     const {stdout, stderr} = await this.shell(cmd, {
       outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
+      quoteArgs: true,
     });
     if (!stdout?.includes('set to')) {
       throw new Error(stderr || stdout);
@@ -318,10 +322,10 @@ export function isScreenOnFully(dumpsys: string): boolean {
 function buildCommand(verb: string, oldCredential: string | null = null, ...args: string[]): string[] {
   const cmd = ['locksettings', verb];
   if (oldCredential && !util.isEmpty(oldCredential)) {
-    cmd.push('--old', util.quote(`${oldCredential}`));
+    cmd.push('--old', `${oldCredential}`);
   }
   if (args.length > 0) {
-    cmd.push(...args.map((arg) => util.quote(`${arg}`)));
+    cmd.push(...args.map((arg) => `${arg}`));
   }
   return cmd;
 }

package/lib/tools/system-calls.ts

@@ -465,7 +465,12 @@ export const EXEC_OUTPUT_FORMAT = {
 } as const;
 
 /**
- * Execute the given adb command.
+ * Execute the given adb command without automatically quoting its arguments.
+ *
+ * When invoking `adb shell`, the device shell interprets the command.
+ * Unquoted values may be expanded or interpreted as shell syntax.
+ * For literal shell arguments, prefer `shell(args, {quoteArgs: true})`
+ * and pass unquoted argument values. `adbExec` itself does not apply `quoteArgs`.
  *
  * @param cmd - Command string or array of command arguments
  * @param opts - Execution options with `outputFormat: 'full'`
@@ -478,7 +483,12 @@ export async function adbExec(
   opts: AdbExecOptions & {outputFormat: 'full'},
 ): Promise<ExecResult>;
 /**
- * Execute the given adb command.
+ * Execute the given adb command without automatically quoting its arguments.
+ *
+ * When invoking `adb shell`, the device shell interprets the command.
+ * Unquoted values may be expanded or interpreted as shell syntax.
+ * For literal shell arguments, prefer `shell(args, {quoteArgs: true})`
+ * and pass unquoted argument values. `adbExec` itself does not apply `quoteArgs`.
  *
  * @param cmd - Command string or array of command arguments
  * @param opts - Execution options
@@ -593,9 +603,10 @@ export async function shell(
  */
 export async function shell(this: ADB, cmd: string | string[], opts?: ShellExecOptions): Promise<string>;
 export async function shell(this: ADB, cmd: string | string[], opts?: ShellExecOptions): Promise<string | ExecResult> {
-  const {privileged} = opts ?? {};
-
-  const cmdArr = Array.isArray(cmd) ? cmd : [cmd];
+  const {quoteArgs = false, ...execOpts} = opts ?? {};
+  const {privileged} = execOpts;
+  const args = Array.isArray(cmd) ? cmd : [cmd];
+  const cmdArr = quoteArgs ? args.map((arg) => util.quote(arg)) : args;
   const fullCmd: string[] = ['shell'];
   if (privileged) {
     log.info(`'adb shell ${util.quote(redactSecrets(cmdArr))}' requires root access`);
@@ -608,7 +619,7 @@ export async function shell(this: ADB, cmd: string | string[], opts?: ShellExecO
   } else {
     fullCmd.push(...cmdArr);
   }
-  return await this.adbExec(fullCmd, opts);
+  return await this.adbExec(fullCmd, opts === undefined ? undefined : execOpts);
 }
 
 /**
@@ -1368,16 +1379,25 @@ export async function isMitmCertificateInstalled(this: ADB, cert: Buffer | strin
  *
  * @param argTransformer - Function to transform each argument into command array
  * @param args - Array of arguments to process
+ * @param opts - Set quoteArgs to true for unquoted literal command arguments (default false)
  * @throws {Error} If argument transformer returns invalid result or command execution fails
  */
-export async function shellChunks(this: ADB, argTransformer: (x: string) => string[], args: string[]): Promise<void> {
+export async function shellChunks(
+  this: ADB,
+  argTransformer: (x: string) => string[],
+  args: string[],
+  opts: Pick<ShellExecOptions, 'quoteArgs'> = {},
+): Promise<void> {
   const commands: string[][] = [];
   let cmdChunk: string[] = [];
   for (const arg of args) {
-    const nextCmd = argTransformer(arg);
-    if (!Array.isArray(nextCmd)) {
+    const command = argTransformer(arg);
+    if (!Array.isArray(command)) {
       throw new Error('Argument transformer must result in an array');
     }
+    // Quote before measuring chunks and adding separators. A caller-supplied
+    // semicolon is literal data when quoting is enabled.
+    const nextCmd = opts.quoteArgs ? command.map((value) => util.quote(value)) : command;
     if (nextCmd.at(-1) !== ';') {
       nextCmd.push(';');
     }

package/lib/tools/types.ts

@@ -637,6 +637,14 @@ export interface SpecialAdbExecOptions {
 }
 
 export interface ShellExecOptions {
+  /**
+   * Quote each command argument as literal data for the device shell.
+   * Pass unquoted arguments when enabled. A string command is treated as one
+   * literal argument; use an array for an executable and its arguments.
+   * Defaults to false for compatibility with existing shell expressions.
+   * TODO: Enable by default in the next breaking release.
+   */
+  quoteArgs?: boolean;
   /**
    * The name of the corresponding Appium's timeout capability
    * (used in the error messages).

package/lib/types.ts

@@ -1,3 +1,5 @@
+import type {AppiumLoggerLevel} from '@appium/types';
+
 import type {Logcat} from './logcat.js';
 import type {StringRecord} from './tools/types.js';
 
@@ -27,6 +29,7 @@ export interface ADBOptions {
   remoteAdbPort?: number;
   clearDeviceLogsOnStart?: boolean;
   listenAllNetwork?: boolean;
+  logLevel?: AppiumLoggerLevel;
 }
 
 export interface ADBExecutable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-adb",
-  "version": "16.1.2",
+  "version": "16.3.0",
   "description": "Android Debug Bridge interface",
   "homepage": "https://appium.io",
   "bugs": {
@@ -57,12 +57,12 @@
     "@types/ini": "^4.1.0",
     "@types/node": "^26.6.5",
     "@types/semver": "^7.5.0",
-    "@types/sinon": "^22.0.0",
+    "@types/sinon": "^22.0.2",
     "sinon": "^22.0.0"
   },
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": ">=10"
   },
-  "gitHead": "dd7fac6576be570d54de8ff2874b88426b4446dd"
+  "gitHead": "0cfdd5ff3c91b690c3f07a9efc400415c7bd24bb"
 }