appium-android-driver 8.1.8 → 8.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/build/lib/commands/device/common.d.ts +2 -2
  3. package/build/lib/commands/device/common.d.ts.map +1 -1
  4. package/build/lib/commands/device/common.js +29 -19
  5. package/build/lib/commands/device/common.js.map +1 -1
  6. package/lib/commands/device/common.js +31 -23
  7. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [8.2.0](https://github.com/appium/appium-android-driver/compare/v8.1.8...v8.2.0) (2024-02-01)
2
+
3
+
4
+ ### Features
5
+
6
+ * Perform device init steps in parallel ([#912](https://github.com/appium/appium-android-driver/issues/912)) ([3bdebbc](https://github.com/appium/appium-android-driver/commit/3bdebbcbce14c0fd8b3db2c3845120608155be91))
7
+
1
8
  ## [8.1.8](https://github.com/appium/appium-android-driver/compare/v8.1.7...v8.1.8) (2024-01-29)
2
9
 
3
10
 
package/build/lib/commands/device/common.d.ts CHANGED
@@ -15,8 +15,8 @@ export function createADB(this: import("../../driver").AndroidDriver): Promise<i
15
15
  export function getLaunchInfo(this: import("../../driver").AndroidDriver): Promise<import('../types').ADBLaunchInfo | undefined>;
16
16
  /**
17
17
  * @this {AndroidDriver}
18
- * @returns
18
+ * @returns {Promise<void>}
19
19
  */
20
- export function initDevice(this: import("../../driver").AndroidDriver): Promise<any>;
20
+ export function initDevice(this: import("../../driver").AndroidDriver): Promise<void>;
21
21
  export type AndroidDriver = import('../../driver').AndroidDriver;
22
22
  //# sourceMappingURL=common.d.ts.map
package/build/lib/commands/device/common.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,mFAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,CAAC,CA8GrD;AAED;;;GAGG;AACH,uEAFa,QAAQ,OAAO,YAAY,EAAE,GAAG,CAAC,CAW7C;AAED;;;GAGG;AACH,2EAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,CAgCjE;AAED;;;GAGG;AACH,qFA2EC;4BAGY,OAAO,cAAc,EAAE,aAAa"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAaA;;;GAGG;AACH,mFAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,CAAC,CA8GrD;AAED;;;GAGG;AACH,uEAFa,QAAQ,OAAO,YAAY,EAAE,GAAG,CAAC,CAW7C;AAED;;;GAGG;AACH,2EAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,CAgCjE;AAED;;;GAGG;AACH,wEAFa,QAAQ,IAAI,CAAC,CAoFzB;4BAGY,OAAO,cAAc,EAAE,aAAa"}
package/build/lib/commands/device/common.js CHANGED
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.initDevice = exports.getLaunchInfo = exports.createADB = exports.getDeviceInfoFromCaps = void 0;
7
7
  const semver_1 = __importDefault(require("semver"));
8
8
  const lodash_1 = __importDefault(require("lodash"));
9
+ const bluebird_1 = __importDefault(require("bluebird"));
9
10
  const geolocation_1 = require("../geolocation");
10
11
  const io_appium_settings_1 = require("io.appium.settings");
11
12
  const keyboard_1 = require("../keyboard");
@@ -162,7 +163,7 @@ async function getLaunchInfo() {
162
163
  exports.getLaunchInfo = getLaunchInfo;
163
164
  /**
164
165
  * @this {AndroidDriver}
165
- * @returns
166
+ * @returns {Promise<void>}
166
167
  */
167
168
  async function initDevice() {
168
169
  const { skipDeviceInitialization, locale, language, localeScript, unicodeKeyboard, hideKeyboard, disableWindowAnimation, skipUnlock, mockLocationApp, skipLogcatCapture, logcatFormat, logcatFilterSpecs, } = this.opts;
@@ -188,37 +189,46 @@ async function initDevice() {
188
189
  !skipUnlock);
189
190
  await utils_1.pushSettingsApp.bind(this)(shouldThrowError);
190
191
  }
192
+ /** @type {Promise[]} */
193
+ const promises = [];
191
194
  if (!this.isEmulator()) {
192
- if (mockLocationApp || lodash_1.default.isUndefined(mockLocationApp)) {
193
- await geolocation_1.setMockLocationApp.bind(this)(mockLocationApp || io_appium_settings_1.SETTINGS_HELPER_ID);
194
- }
195
- else {
196
- await geolocation_1.resetMockLocation.bind(this)();
197
- }
195
+ promises.push((async () => {
196
+ if (mockLocationApp || lodash_1.default.isUndefined(mockLocationApp)) {
197
+ await geolocation_1.setMockLocationApp.bind(this)(mockLocationApp || io_appium_settings_1.SETTINGS_HELPER_ID);
198
+ }
199
+ else {
200
+ await geolocation_1.resetMockLocation.bind(this)();
201
+ }
202
+ })());
198
203
  }
199
204
  if (language && locale) {
200
- await this.ensureDeviceLocale(language, locale, localeScript);
205
+ promises.push(this.ensureDeviceLocale(language, locale, localeScript));
201
206
  }
202
207
  if (skipLogcatCapture) {
203
208
  this.log.info(`'skipLogcatCapture' is set. Skipping starting logcat capture.`);
204
209
  }
205
210
  else {
206
- await this.adb.startLogcat({
211
+ promises.push(this.adb.startLogcat({
207
212
  format: logcatFormat,
208
213
  filterSpecs: logcatFilterSpecs,
209
- });
210
- }
211
- if (hideKeyboard) {
212
- await keyboard_1.hideKeyboardCompletely.bind(this)();
213
- }
214
- else if (hideKeyboard === false) {
215
- await this.adb.shell(['ime', 'reset']);
214
+ }));
216
215
  }
216
+ promises.push((async () => {
217
+ if (hideKeyboard) {
218
+ await keyboard_1.hideKeyboardCompletely.bind(this)();
219
+ }
220
+ else if (hideKeyboard === false) {
221
+ await this.adb.shell(['ime', 'reset']);
222
+ }
223
+ })());
217
224
  if (unicodeKeyboard) {
218
- this.log.warn(`The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
219
- `Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`);
220
- return await keyboard_1.initUnicodeKeyboard.bind(this)();
225
+ promises.push((async () => {
226
+ this.log.warn(`The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
227
+ `Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`);
228
+ await keyboard_1.initUnicodeKeyboard.bind(this)();
229
+ })());
221
230
  }
231
+ await bluebird_1.default.all(promises);
222
232
  }
223
233
  exports.initDevice = initDevice;
224
234
  /**
package/build/lib/commands/device/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,oDAAuB;AACvB,wDAAyB;AACzB,gDAAqE;AACrE,2DAAsD;AACtD,0CAAwE;AACxE,mCAKiB;AAEjB;;;GAGG;AACI,KAAK,UAAU,qBAAqB;IACzC,yEAAyE;IACzE,+DAA+D;IAC/D,0EAA0E;IAC1E,oCAAoC;IACpC,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,IAAI,MAAM,CAAC;IAEX,6DAA6D;IAC7D,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;QAClB,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC;QACvB,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC;KAC3B;SAAM;QACL,iEAAiE;QACjE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAEhD,oDAAoD;QACpD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE;gBAC7C,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,IAAI,2CAA2C,CAAC,CAAC;aACzF;YACD,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;SAC9C;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC;YAElE,2EAA2E;YAC3E,MAAM,eAAe,GAAG,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,eAAe,GAAG,CAAC,CAAC;YAExE,yEAAyE;YACzE,iEAAiE;YACjE,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,IAAI,qBAAqB,CAAC;YAC1B,sCAAsC;YACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,0CAA0C;gBAC1C,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC7B,qBAAqB;gBACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBACnD,qDAAqD;gBACrD,+BAA+B;gBAC/B,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,WAAW,GAAG,CAAC,CAAC;gBACrD,MAAM,QAAQ,GAAG,gBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC;gBAC3D,IAAI,CAAC,QAAQ,EAAE;oBACb,SAAS;iBACV;gBAED,MAAM,QAAQ,GAAG,eAAe,CAAC;gBACjC,MAAM,QAAQ,GAAG,QAAQ,CAAC;gBAE1B,MAAM,wBAAwB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,gBAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACzF,MAAM,sBAAsB,GAAG,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACnF,IACE,CAAC,wBAAwB;oBACvB,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO;wBAC7C,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;oBACpD,CAAC,sBAAsB,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAC9E;oBACA,2CAA2C;oBAC3C,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;oBACnB,MAAM;iBACP;qBAAM,IAAI,CAAC,wBAAwB,EAAE;oBACpC,6FAA6F;oBAC7F,SAAS;iBACV;gBAED,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,IACE,CAAC,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,CAAC;oBACnE,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC;oBAC/C,8DAA8D;oBAC9D,8CAA8C;oBAC9C,CAAC,CAAC,qBAAqB,IAAI,gBAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACjF,CAAC,qBAAqB,CAAC,EACzB;oBACA,qBAAqB,GAAG,EAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAC,CAAC;iBACnD;aACF;YACD,IAAI,CAAC,IAAI,IAAI,qBAAqB,EAAE;gBAClC,IAAI,GAAG,gBAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACvB;YAED,IAAI,CAAC,IAAI,EAAE;gBACT,kCAAkC;gBAClC,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAC1B,8CAA8C;oBAC5C,WAAW,IAAI,CAAC,IAAI,CAAC,eAAe,iCAAiC;oBACrE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1B,CAAC;aACH;YAED,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;SAC9C;aAAM;YACL,qDAAqD;YACrD,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvB,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;SAC9C;KACF;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;IACvC,OAAO,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAC,CAAC;AACvD,CAAC;AA5GD,sDA4GC;AAED;;;GAGG;AACI,KAAK,UAAU,SAAS;IAC7B,2DAA2D;IAC3D,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC5B,IAAI,MAAM,EAAE;QACV,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;KAC7B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AATD,8BASC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;QAC9D,OAAO;KACR;IACD,IAAI,EAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAC3E,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAExB,oCAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAE1C,IAAI,UAAU,IAAI,WAAW,EAAE;QAC7B,OAAO;KACR;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACjE,MAAM,EAAC,UAAU,EAAE,WAAW,EAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAC;IAC3F,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE;QAC7B,UAAU,GAAG,UAAU,CAAC;KACzB;IACD,IAAI,CAAC,cAAc,EAAE;QACnB,cAAc,GAAG,UAAU,CAAC;KAC7B;IACD,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE;QAC/B,WAAW,GAAG,WAAW,CAAC;KAC3B;IACD,IAAI,CAAC,eAAe,EAAE;QACpB,eAAe,GAAG,WAAW,CAAC;KAC/B;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,UAAU,IAAI,WAAW,EAAE,CAAC,CAAC;IAChF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAC,CAAC;AACpE,CAAC;AA9BD,sCA8BC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU;IAC9B,MAAM,EACJ,wBAAwB,EACxB,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,GAClB,GAAG,IAAI,CAAC,IAAI,CAAC;IAEd,IAAI,wBAAwB,EAAE;QAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;KACrF;SAAM;QACL,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACrB,oDAAoD;YACpD,kFAAkF;YAClF,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;SAChC;QACD,+EAA+E;QAE/E,sEAAsE;QACtE,0EAA0E;QAC1E,0CAA0C;QAC1C,MAAM,gBAAgB,GAAG,OAAO,CAC9B,QAAQ;YACN,MAAM;YACN,YAAY;YACZ,eAAe;YACf,YAAY;YACZ,sBAAsB;YACtB,CAAC,UAAU,CACd,CAAC;QACF,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;KACpD;IAED,wBAAwB;IACxB,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;QACtB,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YACxB,IAAI,eAAe,IAAI,gBAAC,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE;gBACrD,MAAM,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,uCAAkB,CAAC,CAAC;aAC5E;iBAAM;gBACL,MAAM,+BAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aACtC;QACH,CAAC,CAAC,EAAE,CAAC,CAAC;KACP;IACD,IAAI,QAAQ,IAAI,MAAM,EAAE;QACtB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;KACxE;IACD,IAAI,iBAAiB,EAAE;QACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;KAChF;SAAM;QACL,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;YACjC,MAAM,EAAE,YAAY;YACpB,WAAW,EAAE,iBAAiB;SAC/B,CAAC,CAAC,CAAC;KACL;IACD,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;QACxB,IAAI,YAAY,EAAE;YAChB,MAAM,iCAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;SAC3C;aAAM,IAAI,YAAY,KAAK,KAAK,EAAE;YACjC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;SACxC;IACH,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,IAAI,eAAe,EAAE;QACnB,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,4EAA4E;gBAC1E,gGAAgG,CACnG,CAAC;YACF,MAAM,8BAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,CAAC,CAAC,EAAE,CAAC,CAAC;KACP;IAED,MAAM,kBAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC;AAlFD,gCAkFC;AAED;;GAEG"}
package/lib/commands/device/common.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import semver from 'semver';
2
2
  import _ from 'lodash';
3
+ import B from 'bluebird';
3
4
  import {resetMockLocation, setMockLocationApp} from '../geolocation';
4
5
  import {SETTINGS_HELPER_ID} from 'io.appium.settings';
5
6
  import {hideKeyboardCompletely, initUnicodeKeyboard} from '../keyboard';
@@ -177,7 +178,7 @@ export async function getLaunchInfo() {
177
178
 
178
179
  /**
179
180
  * @this {AndroidDriver}
180
- * @returns
181
+ * @returns {Promise<void>}
181
182
  */
182
183
  export async function initDevice() {
183
184
  const {
@@ -220,40 +221,47 @@ export async function initDevice() {
220
221
  await pushSettingsApp.bind(this)(shouldThrowError);
221
222
  }
222
223
 
224
+ /** @type {Promise[]} */
225
+ const promises = [];
226
+
223
227
  if (!this.isEmulator()) {
224
- if (mockLocationApp || _.isUndefined(mockLocationApp)) {
225
- await setMockLocationApp.bind(this)(mockLocationApp || SETTINGS_HELPER_ID);
226
- } else {
227
- await resetMockLocation.bind(this)();
228
- }
228
+ promises.push((async () => {
229
+ if (mockLocationApp || _.isUndefined(mockLocationApp)) {
230
+ await setMockLocationApp.bind(this)(mockLocationApp || SETTINGS_HELPER_ID);
231
+ } else {
232
+ await resetMockLocation.bind(this)();
233
+ }
234
+ })());
229
235
  }
230
-
231
236
  if (language && locale) {
232
- await this.ensureDeviceLocale(language, locale, localeScript);
237
+ promises.push(this.ensureDeviceLocale(language, locale, localeScript));
233
238
  }
234
-
235
239
  if (skipLogcatCapture) {
236
240
  this.log.info(`'skipLogcatCapture' is set. Skipping starting logcat capture.`);
237
241
  } else {
238
- await this.adb.startLogcat({
242
+ promises.push(this.adb.startLogcat({
239
243
  format: logcatFormat,
240
244
  filterSpecs: logcatFilterSpecs,
241
- });
245
+ }));
242
246
  }
243
-
244
- if (hideKeyboard) {
245
- await hideKeyboardCompletely.bind(this)();
246
- } else if (hideKeyboard === false) {
247
- await this.adb.shell(['ime', 'reset']);
248
- }
249
-
247
+ promises.push((async () => {
248
+ if (hideKeyboard) {
249
+ await hideKeyboardCompletely.bind(this)();
250
+ } else if (hideKeyboard === false) {
251
+ await this.adb.shell(['ime', 'reset']);
252
+ }
253
+ })());
250
254
  if (unicodeKeyboard) {
251
- this.log.warn(
252
- `The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
253
- `Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`,
254
- );
255
- return await initUnicodeKeyboard.bind(this)();
255
+ promises.push((async () => {
256
+ this.log.warn(
257
+ `The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
258
+ `Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`,
259
+ );
260
+ await initUnicodeKeyboard.bind(this)();
261
+ })());
256
262
  }
263
+
264
+ await B.all(promises);
257
265
  }
258
266
 
259
267
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "8.1.8",
3
+ "version": "8.2.0",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",