appium-webdriveragent 8.12.2 → 9.0.1

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -35,6 +35,7 @@
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "XCUIElement+FBTVFocuse.h"
 #import "XCUIElement+FBResolve.h"
+#import "XCUIElement+FBUID.h"
 #import "FBElementTypeTransformer.h"
 #import "XCUIElement.h"
 #import "XCUIElementQuery.h"
@@ -126,38 +127,22 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  BOOL isEnabled = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDEnabled;
-  return FBResponseWithObject(isEnabled ? @YES : @NO);
+  return FBResponseWithObject(@(element.isWDEnabled));
 }
 
 + (id<FBResponsePayload>)handleGetRect:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdRect);
+  return FBResponseWithObject(element.wdRect);
 }
 
 + (id<FBResponsePayload>)handleGetAttribute:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   NSString *attributeName = request.parameters[@"name"];
-  NSString *wdAttributeName = [FBElementUtils wdAttributeNameForAttributeName:attributeName];
-  NSArray *additionalAttributes = nil;
-  NSNumber *maxDepth = nil;
-  if ([wdAttributeName isEqualToString:FBStringify(XCUIElement, isWDVisible)]) {
-    additionalAttributes = @[FB_XCAXAIsVisibleAttributeName];
-    maxDepth = @1;
-  } else if ([wdAttributeName isEqualToString:FBStringify(XCUIElement, isWDEnabled)]) {
-    additionalAttributes = @[FB_XCAXAIsElementAttributeName];
-    maxDepth = @1;
-  } else if ([wdAttributeName isEqualToString:FBStringify(XCUIElement, isWDAccessibilityContainer)]) {
-    additionalAttributes = @[FB_XCAXAIsElementAttributeName];
-  }
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
-                       resolveForAdditionalAttributes:additionalAttributes
-                                          andMaxDepth:maxDepth];
-  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
-  id attributeValue = [wrappedSnapshot fb_valueForWDAttributeName:attributeName];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  id attributeValue = [element fb_valueForWDAttributeName:attributeName];
   return FBResponseWithObject(attributeValue ?: [NSNull null]);
 }
 
@@ -165,7 +150,7 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:[element fb_takeSnapshot:NO]];
   id text = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel);
   return FBResponseWithObject(text ?: @"");
 }
@@ -173,48 +158,43 @@
 + (id<FBResponsePayload>)handleGetDisplayed:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
-                       resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
-                                          andMaxDepth:@1];
-  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDVisible));
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  return FBResponseWithObject(@(element.isWDVisible));
 }
 
 + (id<FBResponsePayload>)handleGetAccessible:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
-                       resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
-                                          andMaxDepth:@1];
-  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessible));
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  return FBResponseWithObject(@(element.isWDAccessible));
 }
 
 + (id<FBResponsePayload>)handleGetIsAccessibilityContainer:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
-                       resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
-                                          andMaxDepth:nil];
-  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessibilityContainer));
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  return FBResponseWithObject(@(element.isWDAccessibilityContainer));
 }
 
 + (id<FBResponsePayload>)handleGetName:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdType);
+  return FBResponseWithObject(element.wdType);
 }
 
 + (id<FBResponsePayload>)handleGetSelected:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdSelected));
+  return FBResponseWithObject(@(element.wdSelected));
 }
 
 + (id<FBResponsePayload>)handleSetValue:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                                       checkStaleness:YES];
   id value = request.arguments[@"value"] ?: request.arguments[@"text"];
   if (!value) {
     return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:@"Neither 'value' nor 'text' parameter is provided" traceback:nil]);
@@ -222,7 +202,7 @@
   NSString *textToType = [value isKindOfClass:NSArray.class]
     ? [value componentsJoinedByString:@""]
     : value;
-  XCUIElementType elementType = [(id<FBXCElementSnapshot>)element.lastSnapshot elementType];
+  XCUIElementType elementType = [element elementType];
 #if !TARGET_OS_TV
   if (elementType == XCUIElementTypePickerWheel) {
     [element adjustToPickerWheelValue:textToType];
@@ -251,7 +231,7 @@
 + (id<FBResponsePayload>)handleClick:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"] checkStaleness:YES];
 #if TARGET_OS_IOS
   [element tap];
 #elif TARGET_OS_TV
@@ -285,7 +265,9 @@
   if (focusedElement != nil) {
     FBElementCache *elementCache = request.session.elementCache;
     BOOL useNativeCachingStrategy = request.session.useNativeCachingStrategy;
-    NSString *focusedUUID = [elementCache storeElement:(useNativeCachingStrategy ? focusedElement : focusedElement.fb_stableInstance)];
+    NSString *focusedUUID = [elementCache storeElement:(useNativeCachingStrategy
+                                                        ? focusedElement
+                                                        : [focusedElement fb_stableInstanceWithUid:focusedElement.fb_uid])];
     if (focusedUUID && [focusedUUID isEqualToString:(id)request.parameters[@"uuid"]]) {
       isFocused = YES;
     }
@@ -353,7 +335,7 @@
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [self targetFromRequest:request];
   [element pressForDuration:[request.arguments[@"pressDuration"] doubleValue]
-          thenDragToElement:[elementCache elementForUUID:(NSString *)request.arguments[@"toElement"]]
+          thenDragToElement:[elementCache elementForUUID:(NSString *)request.arguments[@"toElement"] checkStaleness:YES]
                withVelocity:[request.arguments[@"velocity"] doubleValue]
         thenHoldForDuration:[request.arguments[@"holdDuration"] doubleValue]];
   return FBResponseWithOK();
@@ -441,10 +423,7 @@
 
 + (id<FBResponsePayload>)handleDrag:(FBRouteRequest *)request
 {
-  NSString *elementUdid = (NSString *)request.parameters[@"uuid"];
-  XCUIElement *target = nil == elementUdid
-    ? request.session.activeApplication
-    : [request.session.elementCache elementForUUID:elementUdid];
+  XCUIElement *target = [self targetFromRequest:request];
   CGVector startOffset = CGVectorMake([request.arguments[@"fromX"] doubleValue],
                                       [request.arguments[@"fromY"] doubleValue]);
   XCUICoordinate *startCoordinate = [self.class gestureCoordinateWithOffset:startOffset element:target];
@@ -561,7 +540,8 @@
 + (id<FBResponsePayload>)handleElementScreenshot:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                                       checkStaleness:YES];
   NSData *screenshotData = [element.screenshot PNGRepresentation];
   if (nil == screenshotData) {
     NSString *errMsg = [NSString stringWithFormat:@"Cannot take a screenshot of %@", element.description];
@@ -581,8 +561,9 @@ static const NSInteger DEFAULT_MAX_PICKER_ATTEMPTS = 25;
 + (id<FBResponsePayload>)handleWheelSelect:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  if ([element.lastSnapshot elementType] != XCUIElementTypePickerWheel) {
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                                       checkStaleness:YES];
+  if ([element elementType] != XCUIElementTypePickerWheel) {
     NSString *errMsg = [NSString stringWithFormat:@"The element is expected to be a valid Picker Wheel control. '%@' was given instead", element.wdType];
     return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:errMsg
                                                                        traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
@@ -688,7 +669,7 @@ static const NSInteger DEFAULT_MAX_PICKER_ATTEMPTS = 25;
   NSString *elementUuid = (NSString *)request.parameters[@"uuid"];
   return nil == elementUuid
     ? request.session.activeApplication
-    : [elementCache elementForUUID:elementUuid];
+    : [elementCache elementForUUID:elementUuid checkStaleness:YES];
 }
 
 #endif

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -80,15 +80,13 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
 + (id<FBResponsePayload>)handleFindVisibleCells:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
-                       resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
-                                          andMaxDepth:nil];
-  NSArray<id<FBXCElementSnapshot>> *visibleCellSnapshots = [element.lastSnapshot descendantsByFilteringWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot) {
-    return snapshot.elementType == XCUIElementTypeCell
-      && [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdVisible;
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  id<FBXCElementSnapshot> snapshot = [element fb_takeSnapshot:YES];
+  NSArray<id<FBXCElementSnapshot>> *visibleCellSnapshots = [snapshot descendantsByFilteringWithBlock:^BOOL(id<FBXCElementSnapshot> shot) {
+    return shot.elementType == XCUIElementTypeCell
+      && [FBXCElementSnapshotWrapper ensureWrapped:shot].wdVisible;
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
-                                                      selfUID:[FBXCElementSnapshotWrapper wdUIDWithSnapshot:element.lastSnapshot]
                                                  onlyChildren:NO];
   return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
 }
@@ -96,7 +94,8 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
 + (id<FBResponsePayload>)handleFindSubElement:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                                       checkStaleness:YES];
   XCUIElement *foundElement = [self.class elementUsing:request.arguments[@"using"]
                                              withValue:request.arguments[@"value"]
                                                  under:element];
@@ -109,7 +108,8 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
 + (id<FBResponsePayload>)handleFindSubElements:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
+  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                                       checkStaleness:YES];
   NSArray *foundElements = [self.class elementsUsing:request.arguments[@"using"]
                                            withValue:request.arguments[@"value"]
                                                under:element

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -336,7 +336,6 @@
       FB_SETTING_SCREENSHOT_QUALITY: @([FBConfiguration screenshotQuality]),
       FB_SETTING_KEYBOARD_AUTOCORRECTION: @([FBConfiguration keyboardAutocorrection]),
       FB_SETTING_KEYBOARD_PREDICTION: @([FBConfiguration keyboardPrediction]),
-      FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT: @([FBConfiguration customSnapshotTimeout]),
       FB_SETTING_SNAPSHOT_MAX_DEPTH: @([FBConfiguration snapshotMaxDepth]),
       FB_SETTING_USE_FIRST_MATCH: @([FBConfiguration useFirstMatch]),
       FB_SETTING_WAIT_FOR_IDLE_TIMEOUT: @([FBConfiguration waitForIdleTimeout]),
@@ -395,13 +394,6 @@
   if (nil != [settings objectForKey:FB_SETTING_RESPECT_SYSTEM_ALERTS]) {
     [FBConfiguration setShouldRespectSystemAlerts:[[settings objectForKey:FB_SETTING_RESPECT_SYSTEM_ALERTS] boolValue]];
   }
-  // SNAPSHOT_TIMEOUT setting is deprecated. Please use CUSTOM_SNAPSHOT_TIMEOUT instead
-  if (nil != [settings objectForKey:FB_SETTING_SNAPSHOT_TIMEOUT]) {
-    [FBConfiguration setCustomSnapshotTimeout:[[settings objectForKey:FB_SETTING_SNAPSHOT_TIMEOUT] doubleValue]];
-  }
-  if (nil != [settings objectForKey:FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT]) {
-    [FBConfiguration setCustomSnapshotTimeout:[[settings objectForKey:FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT] doubleValue]];
-  }
   if (nil != [settings objectForKey:FB_SETTING_SNAPSHOT_MAX_DEPTH]) {
     [FBConfiguration setSnapshotMaxDepth:[[settings objectForKey:FB_SETTING_SNAPSHOT_MAX_DEPTH] intValue]];
   }

package/WebDriverAgentLib/FBAlert.m

@@ -50,7 +50,7 @@
     if (nil == self.alertElement) {
       return NO;
     }
-    [self.alertElement fb_takeSnapshot];
+    [self.alertElement fb_takeSnapshot:YES];
     return YES;
   } @catch (NSException *) {
     return NO;
@@ -82,7 +82,7 @@
   }
 
   NSMutableArray<NSString *> *resultText = [NSMutableArray array];
-  id<FBXCElementSnapshot> snapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> snapshot = self.alertElement.lastSnapshot ?: [self.alertElement fb_takeSnapshot:YES];
   BOOL isSafariAlert = [self.class isSafariWebAlertWithSnapshot:snapshot];
   [snapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
     XCUIElementType elementType = descendant.elementType;
@@ -145,7 +145,8 @@
   }
 
   NSMutableArray<NSString *> *labels = [NSMutableArray array];
-  [self.alertElement.lastSnapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
+  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot ?: [self.alertElement fb_takeSnapshot:YES];
+  [alertSnapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
     if (descendant.elementType != XCUIElementTypeButton) {
       return;
     }
@@ -163,7 +164,7 @@
     return [self notPresentWithError:error];
   }
 
-  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot ?: [self.alertElement fb_takeSnapshot:YES];
   XCUIElement *acceptButton = nil;
   if (FBConfiguration.acceptAlertButtonSelector.length) {
     NSString *errorReason = nil;
@@ -204,7 +205,7 @@
     return [self notPresentWithError:error];
   }
 
-  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot ?: [self.alertElement fb_takeSnapshot:YES];
   XCUIElement *dismissButton = nil;
   if (FBConfiguration.dismissAlertButtonSelector.length) {
     NSString *errorReason = nil;

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>8.12.2</string>
+    <string>9.0.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>8.12.2</string>
+    <string>9.0.1</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Routing/FBElementCache.h

@@ -35,26 +35,20 @@ extern const int ELEMENT_CACHE_SIZE;
 
  @param uuid uuid of element to fetch
  @return element
- @throws FBStaleElementException if the found element is not present in DOM anymore
  @throws FBInvalidArgumentException if uuid is nil
  */
 - (XCUIElement *)elementForUUID:(NSString *)uuid;
 
 /**
- Returns cached element
+ Returns cached element resolved with default snapshot attributes
 
  @param uuid uuid of element to fetch
- @param additionalAttributes Add additonal attribute names if the snapshot should contain
- them in `addtionalAttributes` section. nil value resolves the snapshot with standard attributes.
- @param maxDepth The maximum depth of the snapshot. Only works if additional attributes are provided.
- `nil` value means to use the default maximum depth value.
+ @param checkStaleness Whether to throw FBStaleElementException if the found element is not present in DOM anymore
  @return element
- @throws FBStaleElementException if the found element is not present in DOM anymore
+ @throws FBStaleElementException if `checkStaleness` is enabled
  @throws FBInvalidArgumentException if uuid is nil
  */
-- (XCUIElement *)elementForUUID:(NSString *)uuid
- resolveForAdditionalAttributes:(nullable NSArray <NSString *> *)additionalAttributes
-                    andMaxDepth:(nullable NSNumber *)maxDepth;
+- (XCUIElement *)elementForUUID:(NSString *)uuid checkStaleness:(BOOL)checkStaleness;
 
 /**
  Checks element existence in the cache

package/WebDriverAgentLib/Routing/FBElementCache.m

@@ -26,7 +26,6 @@ const int ELEMENT_CACHE_SIZE = 1024;
 
 @interface FBElementCache ()
 @property (nonatomic, strong) LRUCache *elementCache;
-@property (nonatomic) BOOL elementsNeedReset;
 @end
 
 @implementation FBElementCache
@@ -38,7 +37,6 @@ const int ELEMENT_CACHE_SIZE = 1024;
     return nil;
   }
   _elementCache = [[LRUCache alloc] initWithCapacity:ELEMENT_CACHE_SIZE];
-  _elementsNeedReset = NO;
   return self;
 }
 
@@ -50,19 +48,16 @@ const int ELEMENT_CACHE_SIZE = 1024;
   }
   @synchronized (self.elementCache) {
     [self.elementCache setObject:element forKey:uuid];
-    self.elementsNeedReset = YES;
   }
   return uuid;
 }
 
 - (XCUIElement *)elementForUUID:(NSString *)uuid
 {
-  return [self elementForUUID:uuid resolveForAdditionalAttributes:nil andMaxDepth:nil];
+  return [self elementForUUID:uuid checkStaleness:NO];
 }
 
-- (XCUIElement *)elementForUUID:(NSString *)uuid
- resolveForAdditionalAttributes:(NSArray <NSString *> *)additionalAttributes
-                    andMaxDepth:(NSNumber *)maxDepth
+- (XCUIElement *)elementForUUID:(NSString *)uuid checkStaleness:(BOOL)checkStaleness
 {
   if (!uuid) {
     NSString *reason = [NSString stringWithFormat:@"Cannot extract cached element for UUID: %@", uuid];
@@ -71,23 +66,15 @@ const int ELEMENT_CACHE_SIZE = 1024;
 
   XCUIElement *element;
   @synchronized (self.elementCache) {
-    [self resetElements];
     element = [self.elementCache objectForKey:uuid];
   }
   if (nil == element) {
     NSString *reason = [NSString stringWithFormat:@"The element identified by \"%@\" is either not present or it has expired from the internal cache. Try to find it again", uuid];
     @throw [NSException exceptionWithName:FBStaleElementException reason:reason userInfo:@{}];
   }
-  // This will throw FBStaleElementException exception if the element is stale
-  // or resolve the element and set lastSnapshot property
-  if (nil == additionalAttributes) {
-    [element fb_takeSnapshot];
-  } else {
-    NSMutableArray *attributes = [NSMutableArray arrayWithArray:FBStandardAttributeNames()];
-    [attributes addObjectsFromArray:additionalAttributes];
-    [element fb_snapshotWithAttributes:attributes.copy maxDepth:maxDepth];
+  if (checkStaleness) {
+    [element fb_takeSnapshot:NO];
   }
-  element.fb_isResolvedFromCache = @(YES);
   return element;
 }
 
@@ -101,20 +88,4 @@ const int ELEMENT_CACHE_SIZE = 1024;
   }
 }
 
-- (void)resetElements
-{
-  if (!self.elementsNeedReset) {
-    return;
-  }
-
-  for (XCUIElement *element in self.elementCache.allObjects) {
-    element.lastSnapshot = nil;
-    if (nil != element.query) {
-      element.query.rootElementSnapshot = nil;
-    }
-    element.fb_isResolvedFromCache = @(NO);
-  }
-  self.elementsNeedReset = NO;
-}
-
 @end

package/WebDriverAgentLib/Routing/FBResponsePayload.m

@@ -34,23 +34,35 @@ id<FBResponsePayload> FBResponseWithObject(id object)
   return FBResponseWithStatus([FBCommandStatus okWithValue:object]);
 }
 
-id<FBResponsePayload> FBResponseWithCachedElement(XCUIElement *element, FBElementCache *elementCache, BOOL compact)
+XCUIElement *maybeStable(XCUIElement *element)
 {
   BOOL useNativeCachingStrategy = nil == FBSession.activeSession
     ? YES
     : FBSession.activeSession.useNativeCachingStrategy;
-  [elementCache storeElement:(useNativeCachingStrategy ? element : element.fb_stableInstance)];
+  if (useNativeCachingStrategy) {
+    return element;
+  }
+
+  XCUIElement *result = element;
+  id<FBXCElementSnapshot> snapshot = element.lastSnapshot ?: [element fb_cachedSnapshot] ?: [element fb_takeSnapshot:NO];
+  NSString *uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
+  if (nil != uid) {
+    result = [element fb_stableInstanceWithUid:uid];
+  }
+  return result;
+}
+
+id<FBResponsePayload> FBResponseWithCachedElement(XCUIElement *element, FBElementCache *elementCache, BOOL compact)
+{
+  [elementCache storeElement:maybeStable(element)];
   return FBResponseWithStatus([FBCommandStatus okWithValue:FBDictionaryResponseWithElement(element, compact)]);
 }
 
 id<FBResponsePayload> FBResponseWithCachedElements(NSArray<XCUIElement *> *elements, FBElementCache *elementCache, BOOL compact)
 {
   NSMutableArray *elementsResponse = [NSMutableArray array];
-  BOOL useNativeCachingStrategy = nil == FBSession.activeSession
-    ? YES
-    : FBSession.activeSession.useNativeCachingStrategy;
   for (XCUIElement *element in elements) {
-    [elementCache storeElement:(useNativeCachingStrategy ? element : element.fb_stableInstance)];
+    [elementCache storeElement:maybeStable(element)];
     [elementsResponse addObject:FBDictionaryResponseWithElement(element, compact)];
   }
   return FBResponseWithStatus([FBCommandStatus okWithValue:elementsResponse]);
@@ -91,13 +103,7 @@ id<FBResponsePayload> FBResponseWithStatus(FBCommandStatus *status)
 
 inline NSDictionary *FBDictionaryResponseWithElement(XCUIElement *element, BOOL compact)
 {
-  id<FBXCElementSnapshot> snapshot = nil;
-  if (nil != element.query.rootElementSnapshot) {
-    snapshot = element.fb_cachedSnapshot;
-  }
-  if (nil == snapshot) {
-    snapshot = element.lastSnapshot ?: element.fb_takeSnapshot;
-  }
+  id<FBXCElementSnapshot> snapshot = element.lastSnapshot ?: element.fb_cachedSnapshot ?: [element fb_takeSnapshot:YES];
   NSDictionary *compactResult = FBToElementDict((NSString *)[FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot]);
   if (compact) {
     return compactResult;

package/WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -177,14 +177,6 @@ typedef NS_ENUM(NSInteger, FBConfigurationKeyboardPreference) {
 + (void)setKeyboardPrediction:(BOOL)isEnabled;
 + (FBConfigurationKeyboardPreference)keyboardPrediction;
 
-/**
- * The maximum time to wait until accessibility snapshot is taken
- *
- * @param timeout The number of float seconds to wait (15 seconds by default)
- */
-+ (void)setCustomSnapshotTimeout:(NSTimeInterval)timeout;
-+ (NSTimeInterval)customSnapshotTimeout;
-
 /**
  Sets maximum depth for traversing elements tree from parents to children while requesting XCElementSnapshot.
  Used to set maxDepth value in a dictionary provided by XCAXClient_iOS's method defaultParams.

package/WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -46,7 +46,6 @@ static NSUInteger FBMjpegServerFramerate = 10;
 static BOOL FBShouldTerminateApp;
 static NSNumber* FBMaxTypingFrequency;
 static NSUInteger FBScreenshotQuality;
-static NSTimeInterval FBCustomSnapshotTimeout;
 static BOOL FBShouldUseFirstMatch;
 static BOOL FBShouldBoundElementsByIndex;
 static BOOL FBIncludeNonModalElements;
@@ -359,16 +358,6 @@ static UIInterfaceOrientation FBScreenshotOrientation;
   [self configureKeyboardsPreference:isEnabled forPreferenceKey:FBKeyboardPredictionKey];
 }
 
-+ (void)setCustomSnapshotTimeout:(NSTimeInterval)timeout
-{
-  FBCustomSnapshotTimeout = timeout;
-}
-
-+ (NSTimeInterval)customSnapshotTimeout
-{
-  return FBCustomSnapshotTimeout;
-}
-
 + (void)setSnapshotMaxDepth:(int)maxDepth
 {
   FBSetCustomParameterForElementSnapshot(FBSnapshotMaxDepthKey, @(maxDepth));
@@ -502,7 +491,6 @@ static UIInterfaceOrientation FBScreenshotOrientation;
   FBElementResponseAttributes = @"type,label";
   FBMaxTypingFrequency = @([self defaultTypingFrequency]);
   FBScreenshotQuality = 3;
-  FBCustomSnapshotTimeout = 15.;
   FBShouldUseFirstMatch = NO;
   FBShouldBoundElementsByIndex = NO;
   // This is diabled by default because enabling it prevents the accessbility snapshot to be taken

package/WebDriverAgentLib/Utilities/FBSettings.h

@@ -22,9 +22,6 @@ extern NSString* const FB_SETTING_MJPEG_SCALING_FACTOR;
 extern NSString* const FB_SETTING_SCREENSHOT_QUALITY;
 extern NSString* const FB_SETTING_KEYBOARD_AUTOCORRECTION;
 extern NSString* const FB_SETTING_KEYBOARD_PREDICTION;
-// This setting is deprecated. Please use CUSTOM_SNAPSHOT_TIMEOUT instead
-extern NSString* const FB_SETTING_SNAPSHOT_TIMEOUT;
-extern NSString* const FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT;
 extern NSString* const FB_SETTING_SNAPSHOT_MAX_DEPTH;
 extern NSString* const FB_SETTING_USE_FIRST_MATCH;
 extern NSString* const FB_SETTING_BOUND_ELEMENTS_BY_INDEX;

package/WebDriverAgentLib/Utilities/FBSettings.m

@@ -18,8 +18,6 @@ NSString* const FB_SETTING_MJPEG_FIX_ORIENTATION = @"mjpegFixOrientation";
 NSString* const FB_SETTING_SCREENSHOT_QUALITY = @"screenshotQuality";
 NSString* const FB_SETTING_KEYBOARD_AUTOCORRECTION = @"keyboardAutocorrection";
 NSString* const FB_SETTING_KEYBOARD_PREDICTION = @"keyboardPrediction";
-NSString* const FB_SETTING_SNAPSHOT_TIMEOUT = @"snapshotTimeout";
-NSString* const FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT = @"customSnapshotTimeout";
 NSString* const FB_SETTING_SNAPSHOT_MAX_DEPTH = @"snapshotMaxDepth";
 NSString* const FB_SETTING_USE_FIRST_MATCH = @"useFirstMatch";
 NSString* const FB_SETTING_BOUND_ELEMENTS_BY_INDEX = @"boundElementsByIndex";

package/WebDriverAgentLib/Utilities/FBTVNavigationTracker.m

@@ -57,9 +57,7 @@
   self = [super init];
   if (self) {
     _targetElement = targetElement;
-    CGRect frame = targetElement.fb_isResolvedFromCache.boolValue
-      ? [FBXCElementSnapshotWrapper ensureWrapped:targetElement.lastSnapshot].wdFrame
-      : targetElement.wdFrame;
+    CGRect frame = targetElement.wdFrame;
     _targetCenter = FBRectGetCenter(frame);
     _navigationItems = [NSMutableDictionary dictionary];
   }

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -661,7 +661,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     if ([origin isKindOfClass:XCUIElement.class]) {
       instance = origin;
     } else if ([origin isKindOfClass:NSString.class]) {
-      instance = [self.elementCache elementForUUID:(NSString *)origin];
+      instance = [self.elementCache elementForUUID:(NSString *)origin checkStaleness:YES];
     } else {
       [result addObject:actionItem];
       continue;

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (nullable id<FBXCElementSnapshot>)snapshotForElement:(id<FBXCAccessibilityElement>)element
                                             attributes:(nullable NSArray<NSString *> *)attributes
-                                              maxDepth:(nullable NSNumber *)maxDepth
+                                               inDepth:(BOOL)inDepth
                                                  error:(NSError **)error;
 
 - (NSArray<id<FBXCAccessibilityElement>> *)activeApplications;
@@ -39,8 +39,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)notifyWhenNoAnimationsAreActiveForApplication:(XCUIApplication *)application
                                                 reply:(void (^)(void))reply;
 
-- (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
-                            attributes:(NSArray *)attributes;
+- (nullable NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
+                                     attributes:(NSArray *)attributes
+                                          error:(NSError**)error;
 
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;
 

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m

@@ -37,12 +37,12 @@ static id FBAXClient = nil;
 
 - (id<FBXCElementSnapshot>)snapshotForElement:(id<FBXCAccessibilityElement>)element
                                    attributes:(NSArray<NSString *> *)attributes
-                                     maxDepth:(nullable NSNumber *)maxDepth
+                                      inDepth:(BOOL)inDepth
                                         error:(NSError **)error
 {
   NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithDictionary:self.defaultParameters];
-  if (nil != maxDepth) {
-    parameters[FBSnapshotMaxDepthKey] = maxDepth;
+  if (!inDepth) {
+    parameters[FBSnapshotMaxDepthKey] = @1;
   }
 
   id result = [FBAXClient requestSnapshotForElement:element
@@ -76,15 +76,11 @@ static id FBAXClient = nil;
 
 - (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
                             attributes:(NSArray *)attributes
+                                 error:(NSError**)error;
 {
-  NSError *error = nil;
-  NSDictionary* result = [FBAXClient attributesForElement:element
-                                               attributes:attributes
-                                                    error:&error];
-  if (error) {
-    [FBLogger logFmt:@"Cannot retrieve element attribute(s) %@. Original error: %@", attributes, error.description];
-  }
-  return result;
+  return [FBAXClient attributesForElement:element
+                               attributes:attributes
+                                    error:error];
 }
 
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid