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

Filter out system app when there are multiple active apps #204

Merged
merged 1 commit into from
Aug 27, 2019
Merged

Filter out system app when there are multiple active apps #204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion WebDriverAgentLib/FBApplication.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,20 @@ + (instancetype)fb_activeApplication
return [FBXCAXClientProxy.sharedClient activeApplications].count == 1;
}];

XCAccessibilityElement *activeApplicationElement = [[FBXCAXClientProxy.sharedClient activeApplications] firstObject];
NSArray<XCAccessibilityElement *> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
mykola-mokhnach marked this conversation as resolved.
Show resolved Hide resolved
XCAccessibilityElement *activeApplicationElement;

if (activeApplicationElements.count > 1) {
// Might be situations when firstObject is a system application — i.e. SpringBoard
XCAccessibilityElement *systemApplicationElement = [FBXCAXClientProxy.sharedClient systemApplication];
NSPredicate *nonSystemApplicationPredicate = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary<NSString *,id> *bindings) {
return systemApplicationElement.processIdentifier != ((XCAccessibilityElement *)evaluatedObject).processIdentifier;
}];
activeApplicationElement = [[activeApplicationElements filteredArrayUsingPredicate:nonSystemApplicationPredicate] firstObject];
} else {
activeApplicationElement = [activeApplicationElements firstObject];
}

if (!activeApplicationElement) {
return nil;
}
Expand Down