Filter out system app when there are multiple active apps

appium · Aug 26, 2019 · b9caf24 · b9caf24
1 parent 26e8790
commit b9caf24
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/WebDriverAgentLib/FBApplication.m b/WebDriverAgentLib/FBApplication.m
@@ -36,7 +36,19 @@ + (instancetype)fb_activeApplication
      return [FBXCAXClientProxy.sharedClient activeApplications].count == 1;
    }];
 
-  XCAccessibilityElement *activeApplicationElement = [[FBXCAXClientProxy.sharedClient activeApplications] firstObject];
+  NSArray<XCAccessibilityElement *> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
+  XCAccessibilityElement *activeApplicationElement;
+
+  if (activeApplicationElements.count > 1) {
+    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;
   }