appium-webdriveragent 5.15.7 → 5.15.9

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.h

@@ -122,44 +122,6 @@ 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,14 +9,13 @@
 
 #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 "FBRunLoopSpinner.h"
+#import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXPath.h"
 #import "FBXCAccessibilityElement.h"
@@ -24,19 +23,14 @@
 #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 "XCUIElementQuery.h"
+#import "XCTestManager_ManagerInterface-Protocol.h"
+#import "XCTestPrivateSymbols.h"
+#import "XCTRunnerDaemonSession.h"
 
 static NSString* const FBUnknownBundleId = @"unknown";
 
@@ -147,7 +141,7 @@ NSDictionary<NSNumber *, NSString *> *auditTypeValuesToNames(void) {
     return NO;
   }
   [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:MAX(duration, .0)]];
-  [self activate];
+  [self fb_activate];
   return YES;
 }
 
@@ -399,141 +393,4 @@ 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 [XCUIApplication fb_switchToSystemApplicationWithError:error];
+  return [FBApplication fb_switchToSystemApplicationWithError:error];
 }
 
 - (BOOL)fb_lockScreen:(NSError **)error

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.h

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

package/WebDriverAgentLib/Categories/XCUIDevice+FBRotation.m

@@ -10,8 +10,6 @@
 #import "XCUIDevice+FBRotation.h"
 
 #import "FBConfiguration.h"
-#import "XCUIApplication.h"
-#import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBUtilities.h"
 
 # if !TARGET_OS_TV
@@ -20,7 +18,7 @@
 
 - (BOOL)fb_setDeviceInterfaceOrientation:(UIDeviceOrientation)orientation
 {
-  XCUIApplication *application = XCUIApplication.fb_activeApplication;
+  FBApplication *application = FBApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
   return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
@@ -32,12 +30,12 @@
     return NO;
   }
   NSInteger orientation = keysForRotationObj.firstObject.integerValue;
-  XCUIApplication *application = XCUIApplication.fb_activeApplication;
+  FBApplication *application = FBApplication.fb_activeApplication;
   [XCUIDevice sharedDevice].orientation = orientation;
   return [self waitUntilInterfaceIsAtOrientation:orientation application:application];
 }
 
-- (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(XCUIApplication *)application
+- (BOOL)waitUntilInterfaceIsAtOrientation:(NSInteger)orientation application:(FBApplication *)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
 {
-  [XCUIApplication.fb_activeApplication fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  [FBApplication.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
 {
-  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *alertText = [FBAlert alertWithApplication:application].text;
   if (!alertText) {
     return FBResponseWithStatus([FBCommandStatus noAlertOpenErrorWithMessage:nil
@@ -73,7 +73,7 @@
 
 + (id<FBResponsePayload>)handleAlertAcceptCommand:(FBRouteRequest *)request
 {
-  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
   FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;
@@ -96,7 +96,7 @@
 
 + (id<FBResponsePayload>)handleAlertDismissCommand:(FBRouteRequest *)request
 {
-  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
+  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   NSString *name = request.arguments[@"name"];
   FBAlert *alert = [FBAlert alertWithApplication:application];
   NSError *error;

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -12,6 +12,7 @@
 #import <XCTest/XCUIDevice.h>
 #import <CoreLocation/CoreLocation.h>
 
+#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBNotificationsHelper.h"
@@ -23,7 +24,6 @@
 #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 ?: XCUIApplication.fb_activeApplication;
+  XCUIApplication *app = request.session.activeApplication ?: FBApplication.fb_activeApplication;
   return FBResponseWithObject(@{
     @"pid": @(app.processID),
     @"bundleId": app.bundleID,

package/WebDriverAgentLib/Commands/FBDebugCommands.m

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

package/WebDriverAgentLib/Commands/FBElementCommands.m

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

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

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

package/WebDriverAgentLib/Commands/FBOrientationCommands.m

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

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -9,6 +9,7 @@
 
 #import "FBSessionCommands.h"
 
+#import "FBApplication.h"
 #import "FBCapabilities.h"
 #import "FBConfiguration.h"
 #import "FBLogger.h"
@@ -16,6 +17,7 @@
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "FBSettings.h"
+#import "FBApplication.h"
 #import "FBRuntimeUtils.h"
 #import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
@@ -136,15 +138,15 @@
   }
 
   NSString *bundleID = capabilities[FB_CAP_BUNDLE_ID];
-  XCUIApplication *app = nil;
+  FBApplication *app = nil;
   if (bundleID != nil) {
-    app = [[XCUIApplication alloc] initWithBundleIdentifier:bundleID];
+    app = [[FBApplication alloc] initWithBundleIdentifier:bundleID];
     BOOL forceAppLaunch = YES;
     if (nil != capabilities[FB_CAP_FORCE_APP_LAUNCH]) {
       forceAppLaunch = [capabilities[FB_CAP_FORCE_APP_LAUNCH] boolValue];
     }
-    XCUIApplicationState appState = app.state;
-    BOOL isAppRunning = appState >= XCUIApplicationStateRunningBackground;
+    NSUInteger appState = [app fb_state];
+    BOOL isAppRunning = appState >= 2;
     if (!isAppRunning || (isAppRunning && forceAppLaunch)) {
       app.fb_shouldWaitForQuiescence = nil == capabilities[FB_CAP_SHOULD_WAIT_FOR_QUIESCENCE]
         || [capabilities[FB_CAP_SHOULD_WAIT_FOR_QUIESCENCE] boolValue];
@@ -156,8 +158,8 @@
         return FBResponseWithStatus([FBCommandStatus sessionNotCreatedError:errorMsg
                                                                   traceback:nil]);
       }
-    } else if (appState == XCUIApplicationStateRunningBackground && !forceAppLaunch) {
-      [app activate];
+    } else if (appState < 4 && !forceAppLaunch) {
+      [app fb_activate];
     }
   }
 
@@ -263,7 +265,7 @@
 
 + (id<FBResponsePayload>)handleGetHealthCheck:(FBRouteRequest *)request
 {
-  if (![[XCUIDevice sharedDevice] fb_healthCheckWithApplication:[XCUIApplication fb_activeApplication]]) {
+  if (![[XCUIDevice sharedDevice] fb_healthCheckWithApplication:[FBApplication fb_activeApplication]]) {
     return FBResponseWithUnknownErrorFormat(@"Health check failed");
   }
   return FBResponseWithOK();

package/WebDriverAgentLib/Commands/FBTouchActionCommands.m

@@ -9,6 +9,7 @@
 
 #import "FBTouchActionCommands.h"
 
+#import "FBApplication.h"
 #import "FBRoute.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"

package/WebDriverAgentLib/FBAlert.m

@@ -9,12 +9,12 @@
 
 #import "FBAlert.h"
 
+#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import "FBLogger.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
-#import "XCUIApplication.h"
 #import "XCUIApplication+FBAlert.h"
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBTyping.h"
@@ -263,8 +263,8 @@
   if (nil == self.element) {
     self.element = self.application.fb_alertElement;
     if (nil == self.element) {
-      XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
-      for (XCUIApplication *activeApp in XCUIApplication.fb_activeApplications) {
+      FBApplication *systemApp = FBApplication.fb_systemApplication;
+      for (FBApplication *activeApp in FBApplication.fb_activeApplications) {
         if (systemApp.processID == activeApp.processID) {
           self.element = activeApp.fb_alertElement;
           break;

package/WebDriverAgentLib/FBApplication.h

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <WebDriverAgentLib/XCUIApplication.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FBApplication : XCUIApplication
+
+/**
+ 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<FBApplication *> *)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;
+
+@end
+
+NS_ASSUME_NONNULL_END