fix: Use monitoredApplicationWithProcessIdentifier API to fetch appli…

…cation objects from PID
appium · Sep 22, 2023 · 5e7cb6a · 5e7cb6a
1 parent 2470883
commit 5e7cb6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/WebDriverAgentLib/FBApplication.m b/WebDriverAgentLib/FBApplication.m
@@ -44,7 +44,7 @@ + (instancetype)fb_activeApplication
   NSMutableArray<FBApplication *> *result = [NSMutableArray array];
   if (activeApplicationElements.count > 0) {
     for (id<FBXCAccessibilityElement> applicationElement in activeApplicationElements) {
-      FBApplication *app = [FBApplication fb_applicationWithPID:applicationElement.processIdentifier];
+      FBApplication *app = [FBApplication applicationWithPID:applicationElement.processIdentifier];
       if (nil != app) {
         [result addObject:app];
       }
@@ -107,7 +107,7 @@ + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bun
   }
 
   if (nil != activeApplicationElement) {
-    FBApplication *application = [FBApplication fb_applicationWithPID:activeApplicationElement.processIdentifier];
+    FBApplication *application = [FBApplication applicationWithPID:activeApplicationElement.processIdentifier];
     if (nil != application) {
       return application;
     }
@@ -117,7 +117,7 @@ + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bun
   if (activeApplicationElements.count > 0) {
     [FBLogger logFmt:@"Getting the most recent active application (out of %@ total items)", @(activeApplicationElements.count)];
     for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
-      FBApplication *application = [FBApplication fb_applicationWithPID:appElement.processIdentifier];
+      FBApplication *application = [FBApplication applicationWithPID:appElement.processIdentifier];
       if (nil != application) {
         return application;
       }
@@ -130,7 +130,7 @@ + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bun
 
 + (instancetype)fb_systemApplication
 {
-  return [self fb_applicationWithPID:
+  return [self applicationWithPID:
    [[FBXCAXClientProxy.sharedClient systemApplication] processIdentifier]];
 }
 

diff --git a/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h b/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h
@@ -36,8 +36,6 @@ extern NSString *const FBApplicationMethodNotSupportedException;
 
 @interface XCUIApplication (FBCompatibility)
 
-+ (nullable instancetype)fb_applicationWithPID:(pid_t)processID;
-
 /**
  Get the state of the application. This method only returns reliable results on Xcode SDK 9+
 

diff --git a/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m b/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m
@@ -23,15 +23,6 @@
 
 @implementation XCUIApplication (FBCompatibility)
 
-+ (instancetype)fb_applicationWithPID:(pid_t)processID
-{
-  if (0 == processID) {
-    return nil;
-  }
-
-  return [self applicationWithPID:processID];
-}
-
 - (void)fb_activate
 {
   [self activate];
-Original file line number
+Diff line change
@@ Expand Up @@
     @interface XCUIApplication (FBCompatibility)
-    + (nullable instancetype)fb_applicationWithPID:(pid_t)processID;
     /**
      Get the state of the application. This method only returns reliable results on Xcode SDK 9+
@@ Expand Down @@