appium-android-driver 7.1.1 → 7.1.3

package/lib/commands/recordscreen.js

@@ -205,8 +205,7 @@ async function terminateBackgroundScreenRecording(adb, force = true) {
  */
 const RecordScreenMixin = {
   async startRecordingScreen(options = {}) {
-    const adb = /** @type {ADB} */ (this.adb);
-    await verifyScreenRecordIsSupported(adb, this.isEmulator());
+    await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
 
     let result = '';
     const {
@@ -220,7 +219,7 @@ const RecordScreenMixin = {
       result = await this.stopRecordingScreen(options);
     }
 
-    if (await terminateBackgroundScreenRecording(adb, true)) {
+    if (await terminateBackgroundScreenRecording(this.adb, true)) {
       this.log.warn(
         `There were some ${SCREENRECORD_BINARY} process leftovers running ` +
           `in the background. Make sure you stop screen recording each time after it is started, ` +
@@ -231,7 +230,7 @@ const RecordScreenMixin = {
     if (!_.isEmpty(this._screenRecordingProperties)) {
       // XXX: this doesn't need to be done in serial, does it?
       for (const record of this._screenRecordingProperties.records || []) {
-        await /** @type {ADB} */ (this.adb).rimraf(record);
+        await this.adb.rimraf(record);
       }
       this._screenRecordingProperties = undefined;
     }
@@ -255,20 +254,19 @@ const RecordScreenMixin = {
       recordingProcess: null,
       stopped: false,
     };
-    await scheduleScreenRecord(adb, this._screenRecordingProperties, this.log);
+    await scheduleScreenRecord(this.adb, this._screenRecordingProperties, this.log);
     return result;
   },
 
   async stopRecordingScreen(options = {}) {
-    const adb = /** @type {ADB} */ (this.adb);
-    await verifyScreenRecordIsSupported(adb, this.isEmulator());
+    await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
 
     if (!_.isEmpty(this._screenRecordingProperties)) {
       this._screenRecordingProperties.stopped = true;
     }
 
     try {
-      await terminateBackgroundScreenRecording(adb, false);
+      await terminateBackgroundScreenRecording(this.adb, false);
     } catch (err) {
       this.log.warn(/** @type {Error} */ (err).message);
       if (!_.isEmpty(this._screenRecordingProperties)) {
@@ -313,8 +311,8 @@ const RecordScreenMixin = {
       for (const pathOnDevice of this._screenRecordingProperties.records) {
         const relativePath = path.resolve(tmpRoot, path.posix.basename(pathOnDevice));
         localRecords.push(relativePath);
-        await adb.pull(pathOnDevice, relativePath);
-        await adb.rimraf(pathOnDevice);
+        await this.adb.pull(pathOnDevice, relativePath);
+        await this.adb.rimraf(pathOnDevice);
       }
       let resultFilePath = /** @type {string} */ (_.last(localRecords));
       if (localRecords.length > 1) {

package/lib/commands/shell.js

@@ -14,7 +14,6 @@ import {mixin} from './mixins';
 const ShellMixin = {
   async mobileShell(opts) {
     this.ensureFeatureEnabled(ADB_SHELL_FEATURE);
-    const adb = /** @type {ADB} */ (this.adb);
     const {
       command,
       args = /** @type {string[]} */ ([]),
@@ -26,10 +25,10 @@ const ShellMixin = {
       throw new errors.InvalidArgumentError(`The 'command' argument is mandatory`);
     }
 
-    const adbArgs = [...adb.executable.defaultArgs, 'shell', command, ..._.castArray(args)];
-    this.log.debug(`Running '${adb.executable.path} ${util.quote(adbArgs)}'`);
+    const adbArgs = [...this.adb.executable.defaultArgs, 'shell', command, ..._.castArray(args)];
+    this.log.debug(`Running '${this.adb.executable.path} ${util.quote(adbArgs)}'`);
     try {
-      const {stdout, stderr} = await exec(adb.executable.path, adbArgs, {timeout});
+      const {stdout, stderr} = await exec(this.adb.executable.path, adbArgs, {timeout});
       if (includeStderr) {
         return {
           stdout,

package/lib/commands/streamscreen.js

@@ -336,9 +336,8 @@ const StreamScreenMixin = {
       considerRotation = false,
       logPipelineDetails = false,
     } = options;
-    const adb = /** @type {ADB} */ (this.adb);
     if (_.isUndefined(this._screenStreamingProps)) {
-      await verifyStreamingRequirements(adb);
+      await verifyStreamingRequirements(this.adb);
     }
     if (!_.isEmpty(this._screenStreamingProps)) {
       this.log.info(
@@ -362,8 +361,8 @@ const StreamScreenMixin = {
     }
     this._screenStreamingProps = undefined;
 
-    const deviceInfo = await getDeviceInfo(adb, this.log);
-    const deviceStreamingProc = await initDeviceStreamingProc(adb, this.log, deviceInfo, {
+    const deviceInfo = await getDeviceInfo(this.adb, this.log);
+    const deviceStreamingProc = await initDeviceStreamingProc(this.adb, this.log, deviceInfo, {
       width,
       height,
       bitRate,

package/lib/commands/system-bars.js

@@ -121,7 +121,7 @@ const SystemBarsMixin = {
     /** @type {string} */
     let stdout;
     try {
-      stdout = await /** @type {ADB} */ (this.adb).shell(['dumpsys', 'window', 'windows']);
+      stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);
     } catch (e) {
       throw new Error(
         `Cannot retrieve system bars details. Original error: ${/** @type {Error} */ (e).message}`
@@ -140,7 +140,7 @@ const SystemBarsMixin = {
      * @returns
      */
     const toStatusBarCommandCallable = (cmd, argsCallable) => async () =>
-      await /** @type {ADB} */ (this.adb).shell([
+      await this.adb.shell([
         'cmd',
         'statusbar',
         cmd,

package/lib/commands/touch.js

@@ -98,7 +98,7 @@ const TouchMixin = {
       endY += y || 0;
     }
 
-    let apiLevel = await /** @type {ADB} */ (this.adb).getApiLevel();
+    let apiLevel = await this.adb.getApiLevel();
     // lollipop takes a little longer to get things rolling
     let duration = apiLevel >= 5 ? 2 : 1;
     // make sure that if the long press has a duration, we use it.

package/lib/driver.ts

@@ -29,7 +29,7 @@ class AndroidDriver
   static newMethodMap = newMethodMap;
   jwpProxyAvoid: RouteMatcher[];
 
-  adb?: ADB;
+  adb: ADB;
 
   unlocker: typeof helpers.unlocker;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-android-driver",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "Android UiAutomator and Chrome support for Appium",
   "keywords": [
     "appium",