appium-android-driver 6.0.1 → 7.0.1

package/lib/commands/element.js

@@ -1,9 +1,8 @@
 // @ts-check
 
-import {AndroidHelpers as androidHelpers} from '../helpers';
 import {mixin} from './mixins';
 import {retryInterval} from 'asyncbox';
-import {util} from '@appium/support';
+import {errors} from 'appium/driver';
 
 /**
  * @type {import('./mixins').ElementMixin & ThisType<import('../driver').AndroidDriver>}
@@ -11,11 +10,7 @@ import {util} from '@appium/support';
  */
 const ElementMixin = {
   async getAttribute(attribute, elementId) {
-    let p = {attribute, elementId};
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:getAttribute',
-      p
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async getName(elementId) {
@@ -57,10 +52,7 @@ const ElementMixin = {
    * to facilitate setElementValue.
    */
   async doSetElementValue(params) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:setText',
-      params
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async setValue(keys, elementId) {
@@ -85,9 +77,7 @@ const ElementMixin = {
   },
 
   async getText(elementId) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('element:getText', {
-      elementId,
-    });
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async clear(elementId) {
@@ -115,16 +105,11 @@ const ElementMixin = {
   },
 
   async click(elementId) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('element:click', {
-      elementId,
-    });
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async getLocation(elementId) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:getLocation',
-      {elementId}
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async getLocationInView(elementId) {
@@ -132,73 +117,35 @@ const ElementMixin = {
   },
 
   async getSize(elementId) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('element:getSize', {
-      elementId,
-    });
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async getElementRect(elementId) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('element:getRect', {
-      elementId,
-    });
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async touchLongClick(elementId, x, y, duration) {
-    let params = {elementId, x, y, duration};
-    androidHelpers.removeNullProperties(params);
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:touchLongClick',
-      params
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async touchDown(elementId, x, y) {
-    let params = {elementId, x, y};
-    androidHelpers.removeNullProperties(params);
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:touchDown',
-      params
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async touchUp(elementId, x, y) {
-    let params = {elementId, x, y};
-    androidHelpers.removeNullProperties(params);
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:touchUp',
-      params
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async touchMove(elementId, x, y) {
-    let params = {elementId, x, y};
-    androidHelpers.removeNullProperties(params);
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-      'element:touchMove',
-      params
-    );
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async complexTap(tapCount, touchCount, duration, x, y) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('click', {x, y});
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async tap(elementId = null, x = null, y = null, count = 1) {
-    if (!util.hasValue(elementId) && !util.hasValue(x) && !util.hasValue(y)) {
-      throw new Error(`Either element to tap or both absolute coordinates should be defined`);
-    }
-    for (let i = 0; i < count; i++) {
-      if (util.hasValue(elementId)) {
-        // FIXME: bootstrap ignores relative coordinates
-        await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('element:click', {
-          elementId,
-          x,
-          y,
-        });
-      } else {
-        await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('click', {x, y});
-      }
-    }
+    throw new errors.NotImplementedError('Not implemented');
   },
 };
 
@@ -207,6 +154,5 @@ mixin(ElementMixin);
 export default ElementMixin;
 
 /**
- * @typedef {import('../bootstrap').AndroidBootstrap} AndroidBootstrap
  * @typedef {import('appium-adb').ADB} ADB
  */

package/lib/commands/execute.js

@@ -101,7 +101,6 @@ const ExecuteMixin = {
           `Only ${_.keys(mobileCommandsMapping)} commands are supported.`
       );
     }
-    // @ts-expect-error fine for now until we replace with execute methods
     return await this[mobileCommandsMapping[mobileCommand]](opts);
   },
 };

package/lib/commands/find.ts

@@ -9,7 +9,6 @@ import {errors, isErrorType} from 'appium/driver';
 import type {AndroidDriver} from '../driver';
 import type {Element} from '@appium/types';
 import type {FindElementOpts} from './types';
-import type AndroidBootstrap from '../bootstrap';
 
 async function findElOrEls(
   this: AndroidDriver,
@@ -92,7 +91,7 @@ async function findElOrEls(
 
 const FindMixin: FindMixin & ThisType<AndroidDriver> = {
   async doFindElementOrEls(params) {
-    return await (this.bootstrap as AndroidBootstrap).sendAction('find', params);
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   findElOrEls,

package/lib/commands/general.js

@@ -6,6 +6,7 @@ import moment from 'moment';
 import androidHelpers from '../helpers/android';
 import {requireArgs} from '../utils';
 import {mixin} from './mixins';
+import {errors} from 'appium/driver';
 
 const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
 
@@ -32,7 +33,7 @@ const GeneralMixin = {
   },
 
   async doSendKeys(params) {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('setText', params);
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async getDeviceTime(format = MOMENT_FORMAT_ISO8601) {
@@ -57,11 +58,11 @@ const GeneralMixin = {
   },
 
   async getPageSource() {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('source');
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async back() {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('pressBack');
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async openSettingsActivity(setting) {
@@ -72,7 +73,7 @@ const GeneralMixin = {
   },
 
   async getWindowSize() {
-    return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction('getDeviceSize');
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   // For W3C
@@ -195,17 +196,12 @@ const GeneralMixin = {
     }
 
     this.apkStrings[language] = await androidHelpers.pushStrings(language, adb, this.opts);
-    if (this.bootstrap) {
-      // TODO: This is mutating the current language, but it's how appium currently works
-      await this.bootstrap.sendAction('updateStrings');
-    }
 
     return preprocessStringsMap(this.apkStrings[language]);
   },
 
   async launchApp() {
-    await this.initAUT();
-    await this.startAUT();
+    throw new errors.NotImplementedError('Not implemented');
   },
 
   async startActivity(
@@ -343,7 +339,6 @@ mixin(GeneralMixin);
 export default GeneralMixin;
 
 /**
- * @typedef {import('../bootstrap').AndroidBootstrap} AndroidBootstrap
  * @typedef {import('appium-adb').ADB} ADB
  * @typedef {import('@appium/types').StringRecord} StringRecord
  */

package/lib/commands/mixins.ts

@@ -197,10 +197,6 @@ export interface ActionsMixin {
    */
   sensorSet(opts: types.SensorSetOpts): Promise<void>;
 
-  getScreenshotDataWithAdbShell(adb: ADB, opts: AndroidDriverOpts): Promise<Buffer>;
-
-  getScreenshotDataWithAdbExecOut(adb: ADB): Promise<Buffer>;
-
   getScreenshot(): Promise<string>;
 }
 
@@ -734,8 +730,6 @@ export interface NetworkMixin {
    * Toggles GPS state
    */
   toggleLocationServices(): Promise<void>;
-
-  wrapBootstrapDisconnect(fn: () => Promise<void>): Promise<void>;
 }
 
 export interface PerformanceMixin {

package/lib/commands/network.js

@@ -135,14 +135,10 @@ const NetworkMixin = {
 
     const adb = /** @type {ADB} */ (this.adb);
     if (shouldEnableAirplaneMode !== isAirplaneModeEnabled) {
-      await this.wrapBootstrapDisconnect(async () => {
-        await adb.setAirplaneMode(shouldEnableAirplaneMode);
-      });
-      await this.wrapBootstrapDisconnect(async () => {
-        if ((await adb.getApiLevel()) < 30) {
-          await adb.broadcastAirplaneMode(shouldEnableAirplaneMode);
-        }
-      });
+      await adb.setAirplaneMode(shouldEnableAirplaneMode);
+      if ((await adb.getApiLevel()) < 30) {
+        await adb.broadcastAirplaneMode(shouldEnableAirplaneMode);
+      }
     } else {
       this.log.info(
         `Not changing airplane mode, since it is already ${
@@ -161,27 +157,25 @@ const NetworkMixin = {
       return ~AIRPLANE_MODE_MASK & currentState;
     }
 
-    await this.wrapBootstrapDisconnect(async () => {
-      if (shouldEnableWifi !== isWiFiEnabled) {
-        await this.setWifiState(shouldEnableWifi);
-      } else {
-        this.log.info(
-          `Not changing Wi-Fi state, since it is already ` +
-            `${shouldEnableWifi ? 'enabled' : 'disabled'}`
-        );
-      }
+    if (shouldEnableWifi !== isWiFiEnabled) {
+      await this.setWifiState(shouldEnableWifi);
+    } else {
+      this.log.info(
+        `Not changing Wi-Fi state, since it is already ` +
+          `${shouldEnableWifi ? 'enabled' : 'disabled'}`
+      );
+    }
 
-      if (shouldEnableAirplaneMode) {
-        this.log.info('Not changing data connection state, because airplane mode is enabled');
-      } else if (shouldEnableDataConnection === isDataEnabled) {
-        this.log.info(
-          `Not changing data connection state, since it is already ` +
-            `${shouldEnableDataConnection ? 'enabled' : 'disabled'}`
-        );
-      } else {
-        await adb.setDataState(shouldEnableDataConnection, this.isEmulator());
-      }
-    });
+    if (shouldEnableAirplaneMode) {
+      this.log.info('Not changing data connection state, because airplane mode is enabled');
+    } else if (shouldEnableDataConnection === isDataEnabled) {
+      this.log.info(
+        `Not changing data connection state, since it is already ` +
+          `${shouldEnableDataConnection ? 'enabled' : 'disabled'}`
+      );
+    } else {
+      await adb.setDataState(shouldEnableDataConnection, this.isEmulator());
+    }
 
     return await this.getNetworkConnection();
   },
@@ -194,18 +188,14 @@ const NetworkMixin = {
     const adb = /** @type {ADB} */ (this.adb);
     let data = !(await adb.isDataOn());
     this.log.info(`Turning network data ${data ? 'on' : 'off'}`);
-    await this.wrapBootstrapDisconnect(async () => {
-      await adb.setWifiAndData({data}, this.isEmulator());
-    });
+    await adb.setWifiAndData({data}, this.isEmulator());
   },
 
   async toggleWiFi() {
     const adb = /** @type {ADB} */ (this.adb);
     let wifi = !(await adb.isWifiOn());
     this.log.info(`Turning WiFi ${wifi ? 'on' : 'off'}`);
-    await this.wrapBootstrapDisconnect(async () => {
-      await adb.setWifiAndData({wifi}, this.isEmulator());
-    });
+    await adb.setWifiAndData({wifi}, this.isEmulator());
   },
 
   async toggleFlightMode() {
@@ -216,14 +206,10 @@ const NetworkMixin = {
      */
     let flightMode = !(await adb.isAirplaneModeOn());
     this.log.info(`Turning flight mode ${flightMode ? 'on' : 'off'}`);
-    await this.wrapBootstrapDisconnect(async () => {
-      await adb.setAirplaneMode(flightMode);
-    });
-    await this.wrapBootstrapDisconnect(async () => {
-      if ((await adb.getApiLevel()) < 30) {
-        await adb.broadcastAirplaneMode(flightMode);
-      }
-    });
+    await adb.setAirplaneMode(flightMode);
+    if ((await adb.getApiLevel()) < 30) {
+      await adb.broadcastAirplaneMode(flightMode);
+    }
   },
 
   async setGeoLocation(location) {
@@ -270,25 +256,6 @@ const NetworkMixin = {
     );
     await /** @type {ADB} */ (this.adb).toggleGPSLocationProvider(!isGpsEnabled);
   },
-
-  async wrapBootstrapDisconnect(wrapped) {
-    if (!this.bootstrap) {
-      return await wrapped();
-    }
-
-    this.bootstrap.ignoreUnexpectedShutdown = true;
-    try {
-      await wrapped();
-      await /** @type {ADB} */ (this.adb).restart();
-      await this.bootstrap.start(
-        this.opts.appPackage,
-        this.opts.disableAndroidWatchers,
-        this.opts.acceptSslCerts
-      );
-    } finally {
-      this.bootstrap.ignoreUnexpectedShutdown = false;
-    }
-  },
 };
 
 mixin(NetworkMixin);

package/lib/commands/performance.js

@@ -63,7 +63,6 @@ const RETRY_PAUSE_MS = 1000;
  * except 'TOTAL', which skips the second type name
  * !!! valDict gets mutated
  */
-// @ts-expect-error FIXME: type this properly
 function parseMeminfoForApi19To29(entries, valDict) {
   const [type, subType] = entries;
   if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
@@ -93,7 +92,6 @@ function parseMeminfoForApi19To29(entries, valDict) {
  * ['<System Type', '<pps>', '<shared dirty>', '<private dirty>', '<heap size>', '<heap alloc>', '<heap free>']
  * !!! valDict gets mutated
  */
-// @ts-expect-error FIXME: type this properly
 function parseMeminfoForApiBelow19(entries, valDict) {
   const type = entries[0];
   if (type === MEMINFO_TITLES.NATIVE) {
@@ -121,7 +119,6 @@ function parseMeminfoForApiBelow19(entries, valDict) {
  * ['<System Type>', '<Memory Type>', <pss total>, <private dirty>, <private clean>, <swapPss dirty>, <rss total>, <heap size>, <heap alloc>, <heap free>]
  * !!! valDict gets mutated
  */
-// @ts-expect-error FIXME: type this properly
 function parseMeminfoForApiAbove29(entries, valDict) {
   const [type, subType] = entries;
   if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
@@ -184,7 +181,6 @@ async function getMemoryInfo(packageName, retries = 2) {
     }
     if (valDict.totalPrivateDirty && valDict.totalPrivateDirty !== 'nodex') {
       const headers = _.clone(MEMORY_KEYS);
-      // @ts-expect-error FIXME: don't want to deal w/ it
       const values = headers.map((header) => valDict[header]);
       return [headers, values];
     }

package/lib/commands/touch.js

@@ -398,25 +398,7 @@ const TouchMixin = {
   },
 
   async doPerformMultiAction(elementId, states) {
-    let opts;
-    if (elementId) {
-      opts = {
-        elementId,
-        actions: states,
-      };
-      return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-        'element:performMultiPointerGesture',
-        opts
-      );
-    } else {
-      opts = {
-        actions: states,
-      };
-      return await /** @type {AndroidBootstrap} */ (this.bootstrap).sendAction(
-        'performMultiPointerGesture',
-        opts
-      );
-    }
+    throw new errors.NotImplementedError('Not implemented');
   },
 };
 
@@ -428,5 +410,4 @@ export default TouchMixin;
  * @typedef {import('appium-adb').ADB} ADB
  * @typedef {import('./types').TouchAction} TouchAction
  * @typedef {import('./types').NonReleaseTouchAction} NonReleaseTouchAction
- * @typedef {import('../bootstrap').AndroidBootstrap} AndroidBootstrap
  */

package/lib/constraints.ts

@@ -278,21 +278,12 @@ export const ANDROID_DRIVER_CONSTRAINTS = {
   ignoreUnimportantViews: {
     isBoolean: true,
   },
-  disableAndroidWatchers: {
-    isBoolean: true,
-  },
   acceptSslCerts: {
     isBoolean: true,
   },
-  androidNaturalOrientation: {
-    isBoolean: true,
-  },
   disableWindowAnimation: {
     isBoolean: true,
   },
-  bootstrapPort: {
-    isNumber: true,
-  },
   appWaitForLaunch: {
     isBoolean: true,
   },