appium-android-driver 9.0.5 → 9.1.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.
- package/CHANGELOG.md +7 -0
- package/build/lib/commands/device/common.d.ts.map +1 -1
- package/build/lib/commands/device/common.js +12 -8
- package/build/lib/commands/device/common.js.map +1 -1
- package/build/lib/commands/lock/exports.d.ts +3 -0
- package/build/lib/commands/lock/exports.d.ts.map +1 -1
- package/build/lib/commands/lock/helpers.d.ts +3 -0
- package/build/lib/commands/lock/helpers.d.ts.map +1 -1
- package/build/lib/commands/time.d.ts +9 -2
- package/build/lib/commands/time.d.ts.map +1 -1
- package/build/lib/commands/time.js +25 -5
- package/build/lib/commands/time.js.map +1 -1
- package/build/lib/constraints.d.ts +3 -0
- package/build/lib/constraints.d.ts.map +1 -1
- package/build/lib/constraints.js +3 -0
- package/build/lib/constraints.js.map +1 -1
- package/lib/commands/device/common.js +12 -8
- package/lib/commands/time.js +25 -3
- package/lib/constraints.ts +3 -0
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [9.1.0](https://github.com/appium/appium-android-driver/compare/v9.0.5...v9.1.0) (2024-04-09)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Add a possibility to set device timezone ([#930](https://github.com/appium/appium-android-driver/issues/930)) ([4c88cf0](https://github.com/appium/appium-android-driver/commit/4c88cf077a35f749e05c14c8835f614bdf244c50))
|
|
7
|
+
|
|
1
8
|
## [9.0.5](https://github.com/appium/appium-android-driver/compare/v9.0.4...v9.0.5) (2024-04-08)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAcA;;;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,CAuFzB;4BAGY,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -11,6 +11,7 @@ const geolocation_1 = require("../geolocation");
|
|
|
11
11
|
const io_appium_settings_1 = require("io.appium.settings");
|
|
12
12
|
const keyboard_1 = require("../keyboard");
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
|
+
const time_1 = require("../time");
|
|
14
15
|
/**
|
|
15
16
|
* @this {AndroidDriver}
|
|
16
17
|
* @returns {Promise<import('../types').ADBDeviceInfo>}
|
|
@@ -166,7 +167,7 @@ exports.getLaunchInfo = getLaunchInfo;
|
|
|
166
167
|
* @returns {Promise<void>}
|
|
167
168
|
*/
|
|
168
169
|
async function initDevice() {
|
|
169
|
-
const { skipDeviceInitialization, locale, language, localeScript, unicodeKeyboard, hideKeyboard, disableWindowAnimation, skipUnlock, mockLocationApp, skipLogcatCapture, logcatFormat, logcatFilterSpecs, } = this.opts;
|
|
170
|
+
const { skipDeviceInitialization, locale, language, localeScript, unicodeKeyboard, hideKeyboard, disableWindowAnimation, skipUnlock, mockLocationApp, skipLogcatCapture, logcatFormat, logcatFilterSpecs, timeZone, } = this.opts;
|
|
170
171
|
if (skipDeviceInitialization) {
|
|
171
172
|
this.log.info(`'skipDeviceInitialization' is set. Skipping device initialization.`);
|
|
172
173
|
}
|
|
@@ -190,9 +191,9 @@ async function initDevice() {
|
|
|
190
191
|
await utils_1.pushSettingsApp.bind(this)(shouldThrowError);
|
|
191
192
|
}
|
|
192
193
|
/** @type {Promise[]} */
|
|
193
|
-
const
|
|
194
|
+
const setupPromises = [];
|
|
194
195
|
if (!this.isEmulator()) {
|
|
195
|
-
|
|
196
|
+
setupPromises.push((async () => {
|
|
196
197
|
if (mockLocationApp || lodash_1.default.isUndefined(mockLocationApp)) {
|
|
197
198
|
await geolocation_1.setMockLocationApp.bind(this)(mockLocationApp || io_appium_settings_1.SETTINGS_HELPER_ID);
|
|
198
199
|
}
|
|
@@ -202,18 +203,18 @@ async function initDevice() {
|
|
|
202
203
|
})());
|
|
203
204
|
}
|
|
204
205
|
if (language && locale) {
|
|
205
|
-
|
|
206
|
+
setupPromises.push(this.ensureDeviceLocale(language, locale, localeScript));
|
|
206
207
|
}
|
|
207
208
|
if (skipLogcatCapture) {
|
|
208
209
|
this.log.info(`'skipLogcatCapture' is set. Skipping starting logcat capture.`);
|
|
209
210
|
}
|
|
210
211
|
else {
|
|
211
|
-
|
|
212
|
+
setupPromises.push(this.adb.startLogcat({
|
|
212
213
|
format: logcatFormat,
|
|
213
214
|
filterSpecs: logcatFilterSpecs,
|
|
214
215
|
}));
|
|
215
216
|
}
|
|
216
|
-
|
|
217
|
+
setupPromises.push((async () => {
|
|
217
218
|
if (hideKeyboard) {
|
|
218
219
|
await keyboard_1.hideKeyboardCompletely.bind(this)();
|
|
219
220
|
}
|
|
@@ -222,13 +223,16 @@ async function initDevice() {
|
|
|
222
223
|
}
|
|
223
224
|
})());
|
|
224
225
|
if (unicodeKeyboard) {
|
|
225
|
-
|
|
226
|
+
setupPromises.push((async () => {
|
|
226
227
|
this.log.warn(`The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
|
|
227
228
|
`Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`);
|
|
228
229
|
await keyboard_1.initUnicodeKeyboard.bind(this)();
|
|
229
230
|
})());
|
|
230
231
|
}
|
|
231
|
-
|
|
232
|
+
if (timeZone) {
|
|
233
|
+
setupPromises.push(time_1.adjustTimeZone.bind(this)(timeZone));
|
|
234
|
+
}
|
|
235
|
+
await bluebird_1.default.all(setupPromises);
|
|
232
236
|
}
|
|
233
237
|
exports.initDevice = initDevice;
|
|
234
238
|
/**
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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"}
|
|
@@ -295,6 +295,9 @@ export function unlockWithOptions(this: import("../../driver").AndroidDriver, ca
|
|
|
295
295
|
readonly appWaitForLaunch: {
|
|
296
296
|
readonly isBoolean: true;
|
|
297
297
|
};
|
|
298
|
+
readonly timeZone: {
|
|
299
|
+
readonly isString: true;
|
|
300
|
+
};
|
|
298
301
|
}> | null | undefined): Promise<void>;
|
|
299
302
|
export type AndroidDriverCaps = import('@appium/types').Capabilities<import('../../constraints').AndroidDriverConstraints>;
|
|
300
303
|
export type AndroidDriver = import('../../driver').AndroidDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/lock/exports.js"],"names":[],"mappings":"AAmBA;;;;GAIG;AACH,8EAHW,OAAO,UAAU,EAAE,QAAQ,GACzB,QAAQ,IAAI,CAAC,CAKzB;AAED;;;;GAIG;AACH,gGAFa,QAAQ,IAAI,CAAC,CAczB;AAED;;;GAGG;AACH,sEAFa,QAAQ,OAAO,CAAC,CAI5B;AAED;;;GAGG;AACH,oEAFa,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;GAIG;AACH,+HAFa,QAAQ,IAAI,CAAC,CAczB;AAID;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4CA;;;OAGG
|
|
1
|
+
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/lock/exports.js"],"names":[],"mappings":"AAmBA;;;;GAIG;AACH,8EAHW,OAAO,UAAU,EAAE,QAAQ,GACzB,QAAQ,IAAI,CAAC,CAKzB;AAED;;;;GAIG;AACH,gGAFa,QAAQ,IAAI,CAAC,CAczB;AAED;;;GAGG;AACH,sEAFa,QAAQ,OAAO,CAAC,CAI5B;AAED;;;GAGG;AACH,oEAFa,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;GAIG;AACH,+HAFa,QAAQ,IAAI,CAAC,CAczB;AAID;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4CA;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAjDU,QAAQ,IAAI,CAAC,CA0CzB;gCAKY,OAAO,eAAe,EAAE,YAAY,CAAC,OAAO,mBAAmB,EAAE,wBAAwB,CAAC;4BAC1F,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -277,6 +277,9 @@ export function validateUnlockCapabilities<T extends import("@appium/types").Con
|
|
|
277
277
|
readonly appWaitForLaunch: {
|
|
278
278
|
readonly isBoolean: true;
|
|
279
279
|
};
|
|
280
|
+
readonly timeZone: {
|
|
281
|
+
readonly isString: true;
|
|
282
|
+
};
|
|
280
283
|
}>>(caps: T): T;
|
|
281
284
|
/**
|
|
282
285
|
* @this {AndroidDriver}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/lock/helpers.js"],"names":[],"mappings":"AAmDA;;;;GAIG;AACH,6CAHW,OAAO,UAAU,EAAE,UAAU,GAC3B,MAAM,CAalB;AAED;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCApDA;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsFH;;;OAGG
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/lock/helpers.js"],"names":[],"mappings":"AAmDA;;;;GAIG;AACH,6CAHW,OAAO,UAAU,EAAE,UAAU,GAC3B,MAAM,CAalB;AAED;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCApDA;;;;WAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsFH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBALF;AAED;;;GAGG;AACH,6EAFW,OAAO,UAAU,EAAE,iBAAiB,iBAqB9C;AAED;;;;GAIG;AACH,oCAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,oCAHW,MAAM,GACJ,MAAM,EAAE,CAIpB;AAED;;;;GAIG;AACH,4FAHW,iBAAiB,GACf,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;GAIG;AACH,oFAHW,iBAAiB,GACf,QAAQ,IAAI,CAAC,CAiCzB;AAED;;;;GAIG;AACH,gGAHW,iBAAiB,GACf,QAAQ,IAAI,CAAC,CAezB;AAED;;;;GAIG;AACH,yFAHW,iBAAiB,GACf,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;GAMG;AACH,2CALW,MAAM,WACN,OAAO,eAAe,EAAE,QAAQ,SAChC,MAAM,GACJ,OAAO,eAAe,EAAE,QAAQ,CAkB5C;AAED;;;;;GAKG;AACH,wCALW,MAAM,EAAE,GAAC,MAAM,EAAE,WACjB,OAAO,eAAe,EAAE,QAAQ,SAChC,MAAM,GACJ,OAAO,eAAe,EAAE,YAAY,EAAE,CA8DlD;AAED;;;GAGG;AACH,+HAUC;AAED;;;GAGG;AACH,wFAFW,iBAAiB,iBA8B3B;AA/XD,+BAAgC;AAChC,qDAAsD;AACtD,yCAA0C;AAC1C,uCAAwC;AACxC,+CAAgD;AAQhD,sCAAuC;AACvC,mCAAoC;AACpC,uCAAwC;gCAoX3B,OAAO,eAAe,EAAE,YAAY,CAAC,OAAO,mBAAmB,EAAE,wBAAwB,CAAC;4BAC1F,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @this {
|
|
2
|
+
* @this {AndroidDriver}
|
|
3
3
|
* @param {string} [format=MOMENT_FORMAT_ISO8601]
|
|
4
4
|
* @returns {Promise<string>}
|
|
5
5
|
*/
|
|
6
6
|
export function getDeviceTime(this: import("../driver").AndroidDriver, format?: string | undefined): Promise<string>;
|
|
7
7
|
/**
|
|
8
|
-
* @this {
|
|
8
|
+
* @this {AndroidDriver}
|
|
9
9
|
* @param {import('./types').DeviceTimeOpts} [opts={}]
|
|
10
10
|
* @returns {Promise<string>}
|
|
11
11
|
*/
|
|
12
12
|
export function mobileGetDeviceTime(this: import("../driver").AndroidDriver, opts?: import("./types").DeviceTimeOpts | undefined): Promise<string>;
|
|
13
|
+
/**
|
|
14
|
+
* @this {AndroidDriver}
|
|
15
|
+
* @param {string} zoneName
|
|
16
|
+
* @returns {Promise<void>}
|
|
17
|
+
*/
|
|
18
|
+
export function adjustTimeZone(this: import("../driver").AndroidDriver, zoneName: string): Promise<void>;
|
|
13
19
|
export type ADB = import('appium-adb').ADB;
|
|
20
|
+
export type AndroidDriver = import('../driver').AndroidDriver;
|
|
14
21
|
//# sourceMappingURL=time.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,qGAFa,QAAQ,MAAM,CAAC,CAe3B;AAED;;;;GAIG;AACH,mIAFa,QAAQ,MAAM,CAAC,CAI3B;kBAGY,OAAO,YAAY,EAAE,GAAG"}
|
|
1
|
+
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,qGAFa,QAAQ,MAAM,CAAC,CAe3B;AAED;;;;GAIG;AACH,mIAFa,QAAQ,MAAM,CAAC,CAI3B;AAED;;;;GAIG;AACH,kFAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CAgBzB;kBAGY,OAAO,YAAY,EAAE,GAAG;4BACxB,OAAO,WAAW,EAAE,aAAa"}
|
|
@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.mobileGetDeviceTime = exports.getDeviceTime = void 0;
|
|
7
|
-
const
|
|
6
|
+
exports.adjustTimeZone = exports.mobileGetDeviceTime = exports.getDeviceTime = void 0;
|
|
7
|
+
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
8
8
|
const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
|
|
9
9
|
/**
|
|
10
|
-
* @this {
|
|
10
|
+
* @this {AndroidDriver}
|
|
11
11
|
* @param {string} [format=MOMENT_FORMAT_ISO8601]
|
|
12
12
|
* @returns {Promise<string>}
|
|
13
13
|
*/
|
|
@@ -15,7 +15,7 @@ async function getDeviceTime(format = MOMENT_FORMAT_ISO8601) {
|
|
|
15
15
|
this.log.debug('Attempting to capture android device date and time. ' + `The format specifier is '${format}'`);
|
|
16
16
|
const deviceTimestamp = (await this.adb.shell(['date', '+%Y-%m-%dT%T%z'])).trim();
|
|
17
17
|
this.log.debug(`Got device timestamp: ${deviceTimestamp}`);
|
|
18
|
-
const parsedTimestamp =
|
|
18
|
+
const parsedTimestamp = moment_timezone_1.default.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
|
|
19
19
|
if (!parsedTimestamp.isValid()) {
|
|
20
20
|
this.log.warn('Cannot parse the returned timestamp. Returning as is');
|
|
21
21
|
return deviceTimestamp;
|
|
@@ -25,7 +25,7 @@ async function getDeviceTime(format = MOMENT_FORMAT_ISO8601) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.getDeviceTime = getDeviceTime;
|
|
27
27
|
/**
|
|
28
|
-
* @this {
|
|
28
|
+
* @this {AndroidDriver}
|
|
29
29
|
* @param {import('./types').DeviceTimeOpts} [opts={}]
|
|
30
30
|
* @returns {Promise<string>}
|
|
31
31
|
*/
|
|
@@ -33,7 +33,27 @@ async function mobileGetDeviceTime(opts = {}) {
|
|
|
33
33
|
return await this.getDeviceTime(opts.format);
|
|
34
34
|
}
|
|
35
35
|
exports.mobileGetDeviceTime = mobileGetDeviceTime;
|
|
36
|
+
/**
|
|
37
|
+
* @this {AndroidDriver}
|
|
38
|
+
* @param {string} zoneName
|
|
39
|
+
* @returns {Promise<void>}
|
|
40
|
+
*/
|
|
41
|
+
async function adjustTimeZone(zoneName) {
|
|
42
|
+
if (!moment_timezone_1.default.tz.names().includes(zoneName)) {
|
|
43
|
+
throw new Error(`The provided time zone identifier '${zoneName}' is not known. ` +
|
|
44
|
+
`Please choose a valid TZ identifier from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones`);
|
|
45
|
+
}
|
|
46
|
+
this.log.info(`Setting the device time zone to '${zoneName}'`);
|
|
47
|
+
// The magic number '3' depends on the actual ordering of methods in
|
|
48
|
+
// the IAlarmManager interface and might be a subject of change between
|
|
49
|
+
// different Android API versions.
|
|
50
|
+
// See, for example,
|
|
51
|
+
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl;l=1?q=IAlarmManager
|
|
52
|
+
await this.adb.shell(['service', 'call', 'alarm', '3', 's16', zoneName]);
|
|
53
|
+
}
|
|
54
|
+
exports.adjustTimeZone = adjustTimeZone;
|
|
36
55
|
/**
|
|
37
56
|
* @typedef {import('appium-adb').ADB} ADB
|
|
57
|
+
* @typedef {import('../driver').AndroidDriver} AndroidDriver
|
|
38
58
|
*/
|
|
39
59
|
//# sourceMappingURL=time.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AAErC,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;AAErD;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,MAAM,GAAG,qBAAqB;IAChE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sDAAsD,GAAG,4BAA4B,MAAM,GAAG,CAC/F,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,yBAAM,CAAC,GAAG,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACtE,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,+BAA+B;IAC/B,OAAO,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAbD,sCAaC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CAAC,IAAI,GAAG,EAAE;IACjD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,kDAEC;AAED;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAAC,QAAQ;IAC3C,IAAI,CAAC,yBAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,sCAAsC,QAAQ,kBAAkB;YAChE,uGAAuG,CACxG,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,QAAQ,GAAG,CAAC,CAAC;IAC/D,oEAAoE;IACpE,uEAAuE;IACvE,kCAAkC;IAClC,oBAAoB;IACpB,oKAAoK;IACpK,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC3E,CAAC;AAdD,wCAcC;AAED;;;GAGG"}
|
|
@@ -259,6 +259,9 @@ export declare const ANDROID_DRIVER_CONSTRAINTS: {
|
|
|
259
259
|
readonly appWaitForLaunch: {
|
|
260
260
|
readonly isBoolean: true;
|
|
261
261
|
};
|
|
262
|
+
readonly timeZone: {
|
|
263
|
+
readonly isString: true;
|
|
264
|
+
};
|
|
262
265
|
};
|
|
263
266
|
export default ANDROID_DRIVER_CONSTRAINTS;
|
|
264
267
|
export type AndroidDriverConstraints = typeof ANDROID_DRIVER_CONSTRAINTS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoIrC,2CAA2C
|
|
1
|
+
{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoIrC,2CAA2C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsIb,CAAC;AAEjC,eAAe,0BAA0B,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,OAAO,0BAA0B,CAAC"}
|
package/build/lib/constraints.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
validatePackageActivityNames,
|
|
11
11
|
pushSettingsApp,
|
|
12
12
|
} from './utils';
|
|
13
|
+
import {adjustTimeZone} from '../time';
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* @this {AndroidDriver}
|
|
@@ -194,6 +195,7 @@ export async function initDevice() {
|
|
|
194
195
|
skipLogcatCapture,
|
|
195
196
|
logcatFormat,
|
|
196
197
|
logcatFilterSpecs,
|
|
198
|
+
timeZone,
|
|
197
199
|
} = this.opts;
|
|
198
200
|
|
|
199
201
|
if (skipDeviceInitialization) {
|
|
@@ -222,10 +224,9 @@ export async function initDevice() {
|
|
|
222
224
|
}
|
|
223
225
|
|
|
224
226
|
/** @type {Promise[]} */
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
+
const setupPromises = [];
|
|
227
228
|
if (!this.isEmulator()) {
|
|
228
|
-
|
|
229
|
+
setupPromises.push((async () => {
|
|
229
230
|
if (mockLocationApp || _.isUndefined(mockLocationApp)) {
|
|
230
231
|
await setMockLocationApp.bind(this)(mockLocationApp || SETTINGS_HELPER_ID);
|
|
231
232
|
} else {
|
|
@@ -234,17 +235,17 @@ export async function initDevice() {
|
|
|
234
235
|
})());
|
|
235
236
|
}
|
|
236
237
|
if (language && locale) {
|
|
237
|
-
|
|
238
|
+
setupPromises.push(this.ensureDeviceLocale(language, locale, localeScript));
|
|
238
239
|
}
|
|
239
240
|
if (skipLogcatCapture) {
|
|
240
241
|
this.log.info(`'skipLogcatCapture' is set. Skipping starting logcat capture.`);
|
|
241
242
|
} else {
|
|
242
|
-
|
|
243
|
+
setupPromises.push(this.adb.startLogcat({
|
|
243
244
|
format: logcatFormat,
|
|
244
245
|
filterSpecs: logcatFilterSpecs,
|
|
245
246
|
}));
|
|
246
247
|
}
|
|
247
|
-
|
|
248
|
+
setupPromises.push((async () => {
|
|
248
249
|
if (hideKeyboard) {
|
|
249
250
|
await hideKeyboardCompletely.bind(this)();
|
|
250
251
|
} else if (hideKeyboard === false) {
|
|
@@ -252,7 +253,7 @@ export async function initDevice() {
|
|
|
252
253
|
}
|
|
253
254
|
})());
|
|
254
255
|
if (unicodeKeyboard) {
|
|
255
|
-
|
|
256
|
+
setupPromises.push((async () => {
|
|
256
257
|
this.log.warn(
|
|
257
258
|
`The 'unicodeKeyboard' capability has been deprecated and will be removed. ` +
|
|
258
259
|
`Set the 'hideKeyboard' capability to 'true' in order to make the on-screen keyboard invisible.`,
|
|
@@ -260,8 +261,11 @@ export async function initDevice() {
|
|
|
260
261
|
await initUnicodeKeyboard.bind(this)();
|
|
261
262
|
})());
|
|
262
263
|
}
|
|
264
|
+
if (timeZone) {
|
|
265
|
+
setupPromises.push(adjustTimeZone.bind(this)(timeZone));
|
|
266
|
+
}
|
|
263
267
|
|
|
264
|
-
await B.all(
|
|
268
|
+
await B.all(setupPromises);
|
|
265
269
|
}
|
|
266
270
|
|
|
267
271
|
/**
|
package/lib/commands/time.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import moment from 'moment';
|
|
1
|
+
import moment from 'moment-timezone';
|
|
2
2
|
|
|
3
3
|
const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
|
-
* @this {
|
|
6
|
+
* @this {AndroidDriver}
|
|
7
7
|
* @param {string} [format=MOMENT_FORMAT_ISO8601]
|
|
8
8
|
* @returns {Promise<string>}
|
|
9
9
|
*/
|
|
@@ -23,7 +23,7 @@ export async function getDeviceTime(format = MOMENT_FORMAT_ISO8601) {
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
|
-
* @this {
|
|
26
|
+
* @this {AndroidDriver}
|
|
27
27
|
* @param {import('./types').DeviceTimeOpts} [opts={}]
|
|
28
28
|
* @returns {Promise<string>}
|
|
29
29
|
*/
|
|
@@ -31,6 +31,28 @@ export async function mobileGetDeviceTime(opts = {}) {
|
|
|
31
31
|
return await this.getDeviceTime(opts.format);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* @this {AndroidDriver}
|
|
36
|
+
* @param {string} zoneName
|
|
37
|
+
* @returns {Promise<void>}
|
|
38
|
+
*/
|
|
39
|
+
export async function adjustTimeZone(zoneName) {
|
|
40
|
+
if (!moment.tz.names().includes(zoneName)) {
|
|
41
|
+
throw new Error(
|
|
42
|
+
`The provided time zone identifier '${zoneName}' is not known. ` +
|
|
43
|
+
`Please choose a valid TZ identifier from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones`
|
|
44
|
+
);
|
|
45
|
+
}
|
|
46
|
+
this.log.info(`Setting the device time zone to '${zoneName}'`);
|
|
47
|
+
// The magic number '3' depends on the actual ordering of methods in
|
|
48
|
+
// the IAlarmManager interface and might be a subject of change between
|
|
49
|
+
// different Android API versions.
|
|
50
|
+
// See, for example,
|
|
51
|
+
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl;l=1?q=IAlarmManager
|
|
52
|
+
await this.adb.shell(['service', 'call', 'alarm', '3', 's16', zoneName]);
|
|
53
|
+
}
|
|
54
|
+
|
|
34
55
|
/**
|
|
35
56
|
* @typedef {import('appium-adb').ADB} ADB
|
|
57
|
+
* @typedef {import('../driver').AndroidDriver} AndroidDriver
|
|
36
58
|
*/
|
package/lib/constraints.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "9.0
|
|
3
|
+
"version": "9.1.0",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -87,8 +87,8 @@
|
|
|
87
87
|
"@types/source-map-support": "^0.5.6",
|
|
88
88
|
"@types/teen_process": "^2.0.0",
|
|
89
89
|
"@types/ws": "^8.5.4",
|
|
90
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
91
|
-
"@typescript-eslint/parser": "^
|
|
90
|
+
"@typescript-eslint/eslint-plugin": "^7.0.0",
|
|
91
|
+
"@typescript-eslint/parser": "^7.0.0",
|
|
92
92
|
"@xmldom/xmldom": "^0.x",
|
|
93
93
|
"android-apidemos": "^4.1.0",
|
|
94
94
|
"appium": "^2.0.0-rc.5",
|
|
@@ -111,7 +111,7 @@
|
|
|
111
111
|
"xpath": "^0.x"
|
|
112
112
|
},
|
|
113
113
|
"peerDependencies": {
|
|
114
|
-
"appium": "^2.0.0
|
|
114
|
+
"appium": "^2.0.0"
|
|
115
115
|
},
|
|
116
116
|
"engines": {
|
|
117
117
|
"node": ">=14",
|