Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add isSettingsAppServiceRunningInForeground to check the settings' service existence better #715

Merged
merged 10 commits into from
Jan 9, 2024
Merged

feat: add isSettingsAppServiceRunningInForeground to check the settings' service existence better #715

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d005d9
feat: add forceStartSettingsApp in requireRunningSettingsApp
KazuCocoa Jan 8, 2024
95130c9
use foreground app existing check instead of process check
KazuCocoa Jan 8, 2024
1e71fd0
fix lint
KazuCocoa Jan 8, 2024
f0ad0bf
test: add test, add description
KazuCocoa Jan 8, 2024
75308aa
chore: add ,
KazuCocoa Jan 8, 2024
45b3bf1
change the behavior depending on api level
KazuCocoa Jan 8, 2024
ddf5635
fix reviews
KazuCocoa Jan 9, 2024
af495b1
calls shell directly
KazuCocoa Jan 9, 2024
e86a15a
add comment
KazuCocoa Jan 9, 2024
6a780ef
fix indentation...
KazuCocoa Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/tools/settings-client-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ const commands = {};
* to wait until the app has started
* @property {boolean} [shouldRestoreCurrentApp=false] Whether to restore
* the activity which was the current one before Settings startup
* @property {boolean} [forceStartSettingsApp=false] Whether to start
* the Settings app forcefully regardless of the current app process status.
*/

/**
Expand All @@ -59,15 +61,17 @@ const commands = {};
* @returns {Promise<import('../adb.js').ADB>} self instance for chaining
*/
commands.requireRunningSettingsApp = async function requireRunningSettingsApp (opts = {}) {
if (await this.processExists(SETTINGS_HELPER_ID)) {
return this;
}

log.debug('Starting Appium Settings app');
const {
timeout = 5000,
shouldRestoreCurrentApp = false,
forceStartSettingsApp = false
} = opts;

if (forceStartSettingsApp === false && await this.processExists(SETTINGS_HELPER_ID)) {
KazuCocoa marked this conversation as resolved.
Show resolved Hide resolved
return this;
}

log.debug('Starting Appium Settings app');
KazuCocoa marked this conversation as resolved.
Show resolved Hide resolved
let appPackage;
if (shouldRestoreCurrentApp) {
try {
Expand Down