appium-webdriveragent 5.15.6 → 5.15.7

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [5.15.7](https://github.com/appium/WebDriverAgent/compare/v5.15.6...v5.15.7) (2024-01-16)
+
+
+### Miscellaneous Chores
+
+* **deps-dev:** bump semantic-release from 22.0.12 to 23.0.0 ([#836](https://github.com/appium/WebDriverAgent/issues/836)) ([a3ac2c5](https://github.com/appium/WebDriverAgent/commit/a3ac2c58786955507a34d0adcc4a53cd30f55014))
+
+
+### Code Refactoring
+
+* Ditch FBApplication in favour of XCUIApplication extensions ([#834](https://github.com/appium/WebDriverAgent/issues/834)) ([70a8d98](https://github.com/appium/WebDriverAgent/commit/70a8d98bc15d8fc615455be07fad9c37ff8d430b))
+
 ## [5.15.6](https://github.com/appium/WebDriverAgent/compare/v5.15.5...v5.15.6) (2024-01-06)
 
 

package/PrivateHeaders/XCTest/XCUIApplication.h

@@ -39,7 +39,6 @@
 @property(readonly) id/*XCAccessibilityElement*/ accessibilityElement;
 
 + (instancetype)applicationWithPID:(pid_t)processID;
-/*! DO NOT USE DIRECTLY! Please use fb_activate instead */
 - (void)activate;
 
 - (void)dismissKeyboard;

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -109,7 +109,6 @@
 		641EE61E2240C5CA00173FCB /* FBExceptionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC088E71CB56DA400B65968 /* FBExceptionHandler.m */; };
 		641EE61F2240C5CA00173FCB /* FBXCodeCompatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = EE5A24411F136C8D0078B1D9 /* FBXCodeCompatibility.m */; };
 		641EE6212240C5CA00173FCB /* FBElementTypeTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7901CAEDF0C008C271F /* FBElementTypeTransformer.m */; };
-		641EE6222240C5CA00173FCB /* FBApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7671CAEDF0C008C271F /* FBApplication.m */; };
 		641EE6232240C5CA00173FCB /* FBScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 715AFAC01FFA29180053896D /* FBScreen.m */; };
 		641EE6242240C5CA00173FCB /* FBXCTestDaemonsProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = EE35AD7A1E3B80C000A02D78 /* FBXCTestDaemonsProxy.m */; };
 		641EE6262240C5CA00173FCB /* FBMathUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1888391DA661C400307AA8 /* FBMathUtils.m */; };
@@ -142,7 +141,6 @@
 		641EE64B2240C5CA00173FCB /* XCTAsyncActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACCB1E3B77D600A02D78 /* XCTAsyncActivity.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE64C2240C5CA00173FCB /* XCTestMisuseObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACDF1E3B77D600A02D78 /* XCTestMisuseObserver.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE64D2240C5CA00173FCB /* XCTRunnerDaemonSession.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACEF1E3B77D600A02D78 /* XCTRunnerDaemonSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		641EE64E2240C5CA00173FCB /* FBApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB7661CAEDF0C008C271F /* FBApplication.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE64F2240C5CA00173FCB /* XCTestExpectationWaiter.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACDA1E3B77D600A02D78 /* XCTestExpectationWaiter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE6502240C5CA00173FCB /* UIGestureRecognizer-RecordingAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACAD1E3B77D600A02D78 /* UIGestureRecognizer-RecordingAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE6512240C5CA00173FCB /* XCKeyboardKeyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACBF1E3B77D600A02D78 /* XCKeyboardKeyMap.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -619,8 +617,6 @@
 		EE158AE91CBD456F00A3E3F0 /* FBElementTypeTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7901CAEDF0C008C271F /* FBElementTypeTransformer.m */; };
 		EE158AEA1CBD456F00A3E3F0 /* FBRuntimeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB7911CAEDF0C008C271F /* FBRuntimeUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE158AEB1CBD456F00A3E3F0 /* FBRuntimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7921CAEDF0C008C271F /* FBRuntimeUtils.m */; };
-		EE158AF51CBD456F00A3E3F0 /* FBApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB7661CAEDF0C008C271F /* FBApplication.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE158AF61CBD456F00A3E3F0 /* FBApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7671CAEDF0C008C271F /* FBApplication.m */; };
 		EE158B5A1CBD462100A3E3F0 /* WebDriverAgentLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE158A991CBD452B00A3E3F0 /* WebDriverAgentLib.framework */; };
 		EE158B5F1CBD47A000A3E3F0 /* WebDriverAgentLib.h in Headers */ = {isa = PBXBuildFile; fileRef = EE158B5E1CBD47A000A3E3F0 /* WebDriverAgentLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE18883A1DA661C400307AA8 /* FBMathUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EE1888381DA661C400307AA8 /* FBMathUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -756,7 +752,7 @@
 		EE55B3271D1D54CF003AAAEC /* FBScrollingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE55B3261D1D54CF003AAAEC /* FBScrollingTests.m */; };
 		EE5A24421F136D360078B1D9 /* FBXCodeCompatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = EE5A24411F136C8D0078B1D9 /* FBXCodeCompatibility.m */; };
 		EE6A89261D0B19E60083E92B /* FBSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6A89251D0B19E60083E92B /* FBSessionTests.m */; };
-		EE6A892B1D0B25820083E92B /* FBApplicationDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6A89281D0B257B0083E92B /* FBApplicationDouble.m */; };
+		EE6A892B1D0B25820083E92B /* XCUIApplicationDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6A89281D0B257B0083E92B /* XCUIApplicationDouble.m */; };
 		EE6A892D1D0B2AF40083E92B /* FBErrorBuilderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6A892C1D0B2AF40083E92B /* FBErrorBuilderTests.m */; };
 		EE6A89371D0B35920083E92B /* FBFailureProofTestCaseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE6A89361D0B35920083E92B /* FBFailureProofTestCaseTests.m */; };
 		EE6A893A1D0B38640083E92B /* FBFailureProofTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = EE6A89381D0B38640083E92B /* FBFailureProofTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1254,8 +1250,8 @@
 		EE5A24401F136C8D0078B1D9 /* FBXCodeCompatibility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBXCodeCompatibility.h; sourceTree = "<group>"; };
 		EE5A24411F136C8D0078B1D9 /* FBXCodeCompatibility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBXCodeCompatibility.m; sourceTree = "<group>"; };
 		EE6A89251D0B19E60083E92B /* FBSessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBSessionTests.m; sourceTree = "<group>"; };
-		EE6A89271D0B257B0083E92B /* FBApplicationDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBApplicationDouble.h; sourceTree = "<group>"; };
-		EE6A89281D0B257B0083E92B /* FBApplicationDouble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBApplicationDouble.m; sourceTree = "<group>"; };
+		EE6A89271D0B257B0083E92B /* XCUIApplicationDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCUIApplicationDouble.h; sourceTree = "<group>"; };
+		EE6A89281D0B257B0083E92B /* XCUIApplicationDouble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XCUIApplicationDouble.m; sourceTree = "<group>"; };
 		EE6A892C1D0B2AF40083E92B /* FBErrorBuilderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBErrorBuilderTests.m; sourceTree = "<group>"; };
 		EE6A89361D0B35920083E92B /* FBFailureProofTestCaseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBFailureProofTestCaseTests.m; sourceTree = "<group>"; };
 		EE6A89381D0B38640083E92B /* FBFailureProofTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBFailureProofTestCase.h; sourceTree = "<group>"; };
@@ -1296,8 +1292,6 @@
 		EE9AB7631CAEDF0C008C271F /* FBTouchIDCommands.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBTouchIDCommands.m; sourceTree = "<group>"; };
 		EE9AB7641CAEDF0C008C271F /* FBUnknownCommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBUnknownCommands.h; sourceTree = "<group>"; };
 		EE9AB7651CAEDF0C008C271F /* FBUnknownCommands.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBUnknownCommands.m; sourceTree = "<group>"; };
-		EE9AB7661CAEDF0C008C271F /* FBApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBApplication.h; path = WebDriverAgentLib/FBApplication.h; sourceTree = SOURCE_ROOT; };
-		EE9AB7671CAEDF0C008C271F /* FBApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBApplication.m; path = WebDriverAgentLib/FBApplication.m; sourceTree = SOURCE_ROOT; };
 		EE9AB7731CAEDF0C008C271F /* WebDriverAgent.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WebDriverAgent.bundle; sourceTree = "<group>"; };
 		EE9AB7751CAEDF0C008C271F /* FBCommandHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBCommandHandler.h; sourceTree = "<group>"; };
 		EE9AB7761CAEDF0C008C271F /* FBCommandStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBCommandStatus.h; sourceTree = "<group>"; };
@@ -1615,8 +1609,8 @@
 				13FFF2F1287DBEE600E561E4 /* XCElementSnapshotDouble.m */,
 				ADBC39961D07842800327304 /* XCUIElementDouble.h */,
 				ADBC39971D07842800327304 /* XCUIElementDouble.m */,
-				EE6A89271D0B257B0083E92B /* FBApplicationDouble.h */,
-				EE6A89281D0B257B0083E92B /* FBApplicationDouble.m */,
+				EE6A89271D0B257B0083E92B /* XCUIApplicationDouble.h */,
+				EE6A89281D0B257B0083E92B /* XCUIApplicationDouble.m */,
 			);
 			path = Doubles;
 			sourceTree = "<group>";
@@ -2096,8 +2090,6 @@
 				EE158B5E1CBD47A000A3E3F0 /* WebDriverAgentLib.h */,
 				AD6C26921CF2379700F8B5FF /* FBAlert.h */,
 				AD6C26931CF2379700F8B5FF /* FBAlert.m */,
-				EE9AB7661CAEDF0C008C271F /* FBApplication.h */,
-				EE9AB7671CAEDF0C008C271F /* FBApplication.m */,
 				EE3A18641CDE734B00DE4205 /* FBKeyboard.h */,
 				EE3A18651CDE734B00DE4205 /* FBKeyboard.m */,
 				EE158B5D1CBD479000A3E3F0 /* Info.plist */,
@@ -2283,7 +2275,6 @@
 				641EE64D2240C5CA00173FCB /* XCTRunnerDaemonSession.h in Headers */,
 				714E14B929805CAE00375DD7 /* XCAXClient_iOS+FBSnapshotReqParams.h in Headers */,
 				64B2650B228CE4FF002A5025 /* FBTVNavigationTracker-Private.h in Headers */,
-				641EE64E2240C5CA00173FCB /* FBApplication.h in Headers */,
 				641EE64F2240C5CA00173FCB /* XCTestExpectationWaiter.h in Headers */,
 				13DE7A5C287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h in Headers */,
 				641EE6502240C5CA00173FCB /* UIGestureRecognizer-RecordingAdditions.h in Headers */,
@@ -2515,7 +2506,6 @@
 				EE35AD601E3B77D600A02D78 /* XCTRunnerDaemonSession.h in Headers */,
 				71414ED62670A1EE003A8C5D /* LRUCacheNode.h in Headers */,
 				64B2650A228CE4FF002A5025 /* FBTVNavigationTracker-Private.h in Headers */,
-				EE158AF51CBD456F00A3E3F0 /* FBApplication.h in Headers */,
 				71B155DF23080CA600646AFB /* FBProtocolHelpers.h in Headers */,
 				EE35AD4B1E3B77D600A02D78 /* XCTestExpectationWaiter.h in Headers */,
 				EE35AD1E1E3B77D600A02D78 /* UIGestureRecognizer-RecordingAdditions.h in Headers */,
@@ -3158,7 +3148,6 @@
 				641EE61F2240C5CA00173FCB /* FBXCodeCompatibility.m in Sources */,
 				71E75E70254824230099FC87 /* XCUIElementQuery+FBHelpers.m in Sources */,
 				641EE6212240C5CA00173FCB /* FBElementTypeTransformer.m in Sources */,
-				641EE6222240C5CA00173FCB /* FBApplication.m in Sources */,
 				13DE7A5E287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.m in Sources */,
 				641EE6232240C5CA00173FCB /* FBScreen.m in Sources */,
 				71D04DCB25356C43008A052C /* XCUIElement+FBCaching.m in Sources */,
@@ -3292,7 +3281,6 @@
 				E444DC9D249131D40060D7EB /* HTTPMessage.m in Sources */,
 				E444DCB024913C220060D7EB /* RouteResponse.m in Sources */,
 				71D3B3D7267FC7260076473D /* XCUIElement+FBResolve.m in Sources */,
-				EE158AF61CBD456F00A3E3F0 /* FBApplication.m in Sources */,
 				715AFAC21FFA29180053896D /* FBScreen.m in Sources */,
 				71B155DC230711E900646AFB /* FBCommandStatus.m in Sources */,
 				EE35AD7C1E3B80C000A02D78 /* FBXCTestDaemonsProxy.m in Sources */,
@@ -3360,7 +3348,7 @@
 				EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */,
 				7139145C1DF01A12005896C2 /* NSExpressionFBFormatTests.m in Sources */,
 				71A224E81DE326C500844D55 /* NSPredicateFBFormatTests.m in Sources */,
-				EE6A892B1D0B25820083E92B /* FBApplicationDouble.m in Sources */,
+				EE6A892B1D0B25820083E92B /* XCUIApplicationDouble.m in Sources */,
 				716F0DA62A17323300CDD977 /* NSDictionaryFBUtf8SafeTests.m in Sources */,
 				EE6A892D1D0B2AF40083E92B /* FBErrorBuilderTests.m in Sources */,
 				712A0C851DA3E459007D02E5 /* FBXPathTests.m in Sources */,

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.h

@@ -122,6 +122,44 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable NSArray<NSDictionary<NSString *, NSString*> *> *)fb_performAccessibilityAuditWithAuditTypes:(uint64_t)auditTypes
                                                                                                   error:(NSError **)error;
+/**
+ Constructor used to get current active application
+ */
++ (instancetype)fb_activeApplication;
+
+/**
+ Constructor used to get current active application
+
+ @param bundleId The bundle identifier of an app, which should be selected as active by default
+ if it is present in the list of active applications
+ */
++ (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bundleId;
+
+/**
+ Constructor used to get the system application (e.g. Springboard on iOS)
+ */
++ (instancetype)fb_systemApplication;
+
+/**
+ Retrieves the list of all currently active applications
+ */
++ (NSArray<XCUIApplication *> *)fb_activeApplications;
+
+/**
+ Switch to system app (called Springboard on iOS)
+
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES if the operation succeeds, otherwise NO.
+ */
++ (BOOL)fb_switchToSystemApplicationWithError:(NSError **)error;
+
+/**
+ Determines whether the other app is the same as the current one
+
+ @param otherApp  Other app instance
+ @return YES if the other app has the same identifier
+ */
+- (BOOL)fb_isSameAppAs:(nullable XCUIApplication *)otherApp;
 
 @end
 

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -9,13 +9,14 @@
 
 #import "XCUIApplication+FBHelpers.h"
 
+#import "FBActiveAppDetectionPoint.h"
 #import "FBElementTypeTransformer.h"
 #import "FBKeyboard.h"
 #import "FBLogger.h"
 #import "FBExceptions.h"
 #import "FBMacros.h"
 #import "FBMathUtils.h"
-#import "FBActiveAppDetectionPoint.h"
+#import "FBRunLoopSpinner.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXPath.h"
 #import "FBXCAccessibilityElement.h"
@@ -23,14 +24,19 @@
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCAXClientProxy.h"
 #import "FBXMLGenerationOptions.h"
+#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTestPrivateSymbols.h"
+#import "XCTRunnerDaemonSession.h"
+#import "XCUIApplication.h"
+#import "XCUIApplicationImpl.h"
+#import "XCUIApplicationProcess.h"
 #import "XCUIDevice+FBHelpers.h"
+#import "XCUIElement.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
-#import "XCTestManager_ManagerInterface-Protocol.h"
-#import "XCTestPrivateSymbols.h"
-#import "XCTRunnerDaemonSession.h"
+#import "XCUIElementQuery.h"
 
 static NSString* const FBUnknownBundleId = @"unknown";
 
@@ -141,7 +147,7 @@ NSDictionary<NSNumber *, NSString *> *auditTypeValuesToNames(void) {
     return NO;
   }
   [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:MAX(duration, .0)]];
-  [self fb_activate];
+  [self activate];
   return YES;
 }
 
@@ -393,4 +399,141 @@ NSDictionary<NSNumber *, NSString *> *auditTypeValuesToNames(void) {
   return isSuccessful ? resultArray.copy : nil;
 }
 
++ (instancetype)fb_activeApplication
+{
+  return [self fb_activeApplicationWithDefaultBundleId:nil];
+}
+
++ (NSArray<XCUIApplication *> *)fb_activeApplications
+{
+  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
+  NSMutableArray<XCUIApplication *> *result = [NSMutableArray array];
+  if (activeApplicationElements.count > 0) {
+    for (id<FBXCAccessibilityElement> applicationElement in activeApplicationElements) {
+      XCUIApplication *app = [XCUIApplication fb_applicationWithPID:applicationElement.processIdentifier];
+      if (nil != app) {
+        [result addObject:app];
+      }
+    }
+  }
+  return result.count > 0 ? result.copy : @[self.class.fb_systemApplication];
+}
+
++ (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bundleId
+{
+  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
+  id<FBXCAccessibilityElement> activeApplicationElement = nil;
+  id<FBXCAccessibilityElement> currentElement = nil;
+  if (nil != bundleId) {
+    currentElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
+    if (nil != currentElement) {
+      NSArray<NSDictionary *> *appInfos = [self fb_appsInfoWithAxElements:@[currentElement]];
+      [FBLogger logFmt:@"Detected on-screen application: %@", appInfos.firstObject[@"bundleId"]];
+      if ([[appInfos.firstObject objectForKey:@"bundleId"] isEqualToString:(id)bundleId]) {
+        activeApplicationElement = currentElement;
+      }
+    }
+  }
+  if (nil == activeApplicationElement && activeApplicationElements.count > 1) {
+    if (nil != bundleId) {
+      NSArray<NSDictionary *> *appInfos = [self fb_appsInfoWithAxElements:activeApplicationElements];
+      NSMutableArray<NSString *> *bundleIds = [NSMutableArray array];
+      for (NSDictionary *appInfo in appInfos) {
+        [bundleIds addObject:(NSString *)appInfo[@"bundleId"]];
+      }
+      [FBLogger logFmt:@"Detected system active application(s): %@", bundleIds];
+      // Try to select the desired application first
+      for (NSUInteger appIdx = 0; appIdx < appInfos.count; appIdx++) {
+        if ([[[appInfos objectAtIndex:appIdx] objectForKey:@"bundleId"] isEqualToString:(id)bundleId]) {
+          activeApplicationElement = [activeApplicationElements objectAtIndex:appIdx];
+          break;
+        }
+      }
+    }
+    // Fall back to the "normal" algorithm if the desired application is either
+    // not set or is not active
+    if (nil == activeApplicationElement) {
+      if (nil == currentElement) {
+        currentElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
+      }
+      if (nil == currentElement) {
+        [FBLogger log:@"Cannot precisely detect the current application. Will use the system's recently active one"];
+        if (nil == bundleId) {
+          [FBLogger log:@"Consider changing the 'defaultActiveApplication' setting to the bundle identifier of the desired application under test"];
+        }
+      } else {
+        for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
+          if (appElement.processIdentifier == currentElement.processIdentifier) {
+            activeApplicationElement = appElement;
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  if (nil != activeApplicationElement) {
+    XCUIApplication *application = [XCUIApplication fb_applicationWithPID:activeApplicationElement.processIdentifier];
+    if (nil != application) {
+      return application;
+    }
+    [FBLogger log:@"Cannot translate the active process identifier into an application object"];
+  }
+
+  if (activeApplicationElements.count > 0) {
+    [FBLogger logFmt:@"Getting the most recent active application (out of %@ total items)", @(activeApplicationElements.count)];
+    for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
+      XCUIApplication *application = [XCUIApplication fb_applicationWithPID:appElement.processIdentifier];
+      if (nil != application) {
+        return application;
+      }
+    }
+  }
+
+  [FBLogger log:@"Cannot retrieve any active applications. Assuming the system application is the active one"];
+  return [self fb_systemApplication];
+}
+
++ (instancetype)fb_systemApplication
+{
+  return [self fb_applicationWithPID:
+                           [[FBXCAXClientProxy.sharedClient systemApplication] processIdentifier]];
+}
+
++ (instancetype)fb_applicationWithPID:(pid_t)processID
+{
+  return [FBXCAXClientProxy.sharedClient monitoredApplicationWithProcessIdentifier:processID];
+}
+
++ (BOOL)fb_switchToSystemApplicationWithError:(NSError **)error
+{
+  XCUIApplication *systemApp = self.fb_systemApplication;
+  @try {
+    if (!systemApp.running) {
+      [systemApp launch];
+    } else {
+      [systemApp activate];
+    }
+  } @catch (NSException *e) {
+    return [[[FBErrorBuilder alloc]
+             withDescription:nil == e ? @"Cannot open the home screen" : e.reason]
+            buildError:error];
+  }
+  return [[[[FBRunLoopSpinner new]
+            timeout:5]
+           timeoutErrorMessage:@"Timeout waiting until the home screen is visible"]
+          spinUntilTrue:^BOOL{
+    return [systemApp fb_isSameAppAs:self.fb_activeApplication];
+  }
+          error:error];
+}
+
+- (BOOL)fb_isSameAppAs:(nullable XCUIApplication *)otherApp
+{
+  if (nil == otherApp) {
+    return NO;
+  }
+  return [self.bundleID isEqualToString:(NSString *)otherApp.bundleID];
+}
+
 @end

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -56,7 +56,7 @@ static bool fb_isLocked;
 
 - (BOOL)fb_goToHomescreenWithError:(NSError **)error
 {
-  return [FBApplication fb_switchToSystemApplicationWithError:error];
+  return [XCUIApplication fb_switchToSystemApplicationWithError:error];
 }
 
 - (BOOL)fb_lockScreen:(NSError **)error

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.h

@@ -8,7 +8,6 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <WebDriverAgentLib/FBApplication.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m

@@ -10,6 +10,8 @@
 #import "XCUIDevice+FBRotation.h"
 
 #import "FBConfiguration.h"
+#import "XCUIApplication.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBUtilities.h"
 
 # if !TARGET_OS_TV
@@ -18,7 +20,7 @@
 
 - (BOOL)fb_setDeviceInterfaceOrientation:(UIDeviceOrientation)orientation
 {
-  FBApplication *application = FBApplication.fb_activeApplication;
+  XCUIApplication *application = XCUIApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
   return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
@@ -30,12 +32,12 @@
     return NO;
   }
   NSInteger orientation = keysForRotationObj.firstObject.integerValue;
-  FBApplication *application = FBApplication.fb_activeApplication;
+  XCUIApplication *application = XCUIApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
   return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
 
-- (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(FBApplication *)application
+- (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(XCUIApplication *)application
 {
   // Tapping elements immediately after rotation may fail due to way UIKit is handling touches.
   // We should wait till UI cools off, before continuing

package/WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.m

@@ -10,10 +10,10 @@
 #import "XCUIElement+FBTVFocuse.h"
 
 #import <XCTest/XCUIRemote.h>
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import <FBTVNavigationTracker.h>
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 
@@ -25,7 +25,7 @@ int const MAX_ITERATIONS_COUNT = 100;
 
 - (BOOL)fb_setFocusWithError:(NSError**) error
 {
-  [FBApplication.fb_activeApplication fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  [XCUIApplication.fb_activeApplication fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
 
   if (!self.wdEnabled) {
     if (error) {

package/WebDriverAgentLib/Commands/FBAlertViewCommands.m

@@ -10,9 +10,9 @@
 #import "FBAlertViewCommands.h"
 
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
+#import "XCUIApplication+FBHelpers.h"
 
 @implementation FBAlertViewCommands
 
@@ -38,7 +38,7 @@
 
 + (id<FBResponsePayload>)handleAlertGetTextCommand:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *alertText = [FBAlert alertWithApplication:application].text;
   if (!alertText) {
     return FBResponseWithStatus([FBCommandStatus noAlertOpenErrorWithMessage:nil
@@ -73,7 +73,7 @@
 
 + (id<FBResponsePayload>)handleAlertAcceptCommand:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
   FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;
@@ -96,7 +96,7 @@
 
 + (id<FBResponsePayload>)handleAlertDismissCommand:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
   FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -12,7 +12,6 @@
 #import <XCTest/XCUIDevice.h>
 #import <CoreLocation/CoreLocation.h>
 
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBNotificationsHelper.h"
@@ -24,6 +23,7 @@
 #import "FBScreen.h"
 #import "FBSession.h"
 #import "FBXCodeCompatibility.h"
+#import "XCUIApplication.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIElement.h"
@@ -171,7 +171,7 @@
 
 + (id<FBResponsePayload>)handleActiveAppInfo:(FBRouteRequest *)request
 {
-  XCUIApplication *app = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *app = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   return FBResponseWithObject(@{
     @"pid": @(app.processID),
     @"bundleId": app.bundleID,

package/WebDriverAgentLib/Commands/FBDebugCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBDebugCommands.h"
 
-#import "FBApplication.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "FBXMLGenerationOptions.h"
@@ -42,7 +41,7 @@ static NSString *const SOURCE_FORMAT_DESCRIPTION = @"description";
 + (id<FBResponsePayload>)handleGetSourceCommand:(FBRouteRequest *)request
 {
   // This method might be called without session
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *sourceType = request.parameters[@"format"] ?: SOURCE_FORMAT_XML;
   NSString *sourceScope = request.parameters[@"scope"];
   id result;
@@ -71,7 +70,7 @@ static NSString *const SOURCE_FORMAT_DESCRIPTION = @"description";
 + (id<FBResponsePayload>)handleGetAccessibleSourceCommand:(FBRouteRequest *)request
 {
   // This method might be called without session
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   return FBResponseWithObject(application.fb_accessibilityTree ?: @{});
 }
 

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBElementCommands.h"
 
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBRoute.h"
@@ -18,7 +17,6 @@
 #import "FBElementCache.h"
 #import "FBErrorBuilder.h"
 #import "FBSession.h"
-#import "FBApplication.h"
 #import "FBElementUtils.h"
 #import "FBMacros.h"
 #import "FBMathUtils.h"
@@ -529,7 +527,7 @@
 {
   XCUIElement *element = nil;
   if (nil == request.parameters[@"uuid"]) {
-    element = [FBApplication fb_activeApplication];
+    element = XCUIApplication.fb_activeApplication;
   } else {
     FBElementCache *elementCache = request.session.elementCache;
     element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
@@ -567,7 +565,7 @@
 
 + (id<FBResponsePayload>)handleGetWindowSize:(FBRouteRequest *)request
 {
-  XCUIApplication *app = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *app = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
 
 #if TARGET_OS_TV
   CGSize screenSize = app.frame.size;

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -10,7 +10,6 @@
 #import "FBFindElementCommands.h"
 
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBElementCache.h"
 #import "FBExceptions.h"

package/WebDriverAgentLib/Commands/FBOrientationCommands.m

@@ -12,7 +12,8 @@
 #import "FBRouteRequest.h"
 #import "FBMacros.h"
 #import "FBSession.h"
-#import "FBApplication.h"
+#import "XCUIApplication.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice.h"
 
 extern const struct FBWDOrientationValues {
@@ -55,14 +56,14 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 
 + (id<FBResponsePayload>)handleGetOrientation:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *orientation = [self.class interfaceOrientationForApplication:application];
   return FBResponseWithObject([[self _wdOrientationsMapping] objectForKey:orientation]);
 }
 
 + (id<FBResponsePayload>)handleSetOrientation:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   if ([self.class setDeviceOrientation:request.arguments[@"orientation"] forApplication:application]) {
     return FBResponseWithOK();
   }
@@ -73,7 +74,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 + (id<FBResponsePayload>)handleGetRotation:(FBRouteRequest *)request
 {
   XCUIDevice *device = [XCUIDevice sharedDevice];
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   UIInterfaceOrientation orientation = application.interfaceOrientation;
   return FBResponseWithObject(device.fb_rotationMapping[@(orientation)]);
 }
@@ -101,7 +102,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
                                                                        traceback:nil]);
   }
 
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   if (![self.class setDeviceRotation:request.arguments forApplication:application]) {
     NSString *errMessage = [
       NSString stringWithFormat:@"The current rotation cannot be set to %@. Make sure the %@ application supports it",
@@ -116,7 +117,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 
 #pragma mark - Helpers
 
-+ (NSString *)interfaceOrientationForApplication:(FBApplication *)application
++ (NSString *)interfaceOrientationForApplication:(XCUIApplication *)application
 {
   NSNumber *orientation = @(application.interfaceOrientation);
   NSSet *keys = [[self _orientationsMapping] keysOfEntriesPassingTest:^BOOL(id key, NSNumber *obj, BOOL *stop) {
@@ -128,12 +129,12 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
   return keys.anyObject;
 }
 
-+ (BOOL)setDeviceRotation:(NSDictionary *)rotationObj forApplication:(FBApplication *)application
++ (BOOL)setDeviceRotation:(NSDictionary *)rotationObj forApplication:(XCUIApplication *)application
 {
   return [[XCUIDevice sharedDevice] fb_setDeviceRotation:rotationObj];
 }
 
-+ (BOOL)setDeviceOrientation:(NSString *)orientation forApplication:(FBApplication *)application
++ (BOOL)setDeviceOrientation:(NSString *)orientation forApplication:(XCUIApplication *)application
 {
   NSNumber *orientationValue = [[self _orientationsMapping] objectForKey:[orientation uppercaseString]];
   if (orientationValue == nil) {