appium-webdriveragent 16.1.7 → 16.2.0

package/WebDriverAgentLib/Utilities/FBImageProcessor.m

@@ -83,14 +83,14 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
         // We do not want this value to be too high because then we get images larger in size than original ones
         // Although, we also don't want to lose too much of the quality on recompression
         CGFloat recompressionQuality = MAX(0.9,
-                                           MIN(FBMaxCompressionQuality, (double)FBConfiguration.mjpegServerScreenshotQuality / 100.0));
+                                           MIN(FBMaxCompressionQuality, (double)FBConfiguration.sharedInstance.mjpegServerScreenshotQuality / 100.0));
         NSData *thumbnailData = [self.class fixedImageDataWithImageData:nextImageData
                                                           scalingFactor:scalingFactor
                                                                     uti:UTTypeJPEG
                                                      compressionQuality:recompressionQuality
         // iOS always returns screenshots in portrait orientation, but puts the real value into the metadata
         // Use it with care. See https://github.com/appium/WebDriverAgent/pull/812
-                                                         fixOrientation:FBConfiguration.mjpegShouldFixOrientation
+                                                         fixOrientation:FBConfiguration.sharedInstance.mjpegShouldFixOrientation
                                                      desiredOrientation:nil];
         NSData *processedImageData = thumbnailData ?: nextImageData;
         for (void (^handler)(NSData *) in handlers) {
@@ -168,13 +168,13 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
 {
   NSNumber *orientation = nil;
 #if !TARGET_OS_TV
-  if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationPortrait) {
+  if (FBConfiguration.sharedInstance.screenshotOrientation == UIInterfaceOrientationPortrait) {
     orientation = @(UIImageOrientationUp);
-  } else if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationPortraitUpsideDown) {
+  } else if (FBConfiguration.sharedInstance.screenshotOrientation == UIInterfaceOrientationPortraitUpsideDown) {
     orientation = @(UIImageOrientationDown);
-  } else if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationLandscapeLeft) {
+  } else if (FBConfiguration.sharedInstance.screenshotOrientation == UIInterfaceOrientationLandscapeLeft) {
     orientation = @(UIImageOrientationRight);
-  } else if (FBConfiguration.screenshotOrientation == UIInterfaceOrientationLandscapeRight) {
+  } else if (FBConfiguration.sharedInstance.screenshotOrientation == UIInterfaceOrientationLandscapeRight) {
     orientation = @(UIImageOrientationLeft);
   }
 #endif

package/WebDriverAgentLib/Utilities/FBLogger.m

@@ -27,7 +27,7 @@
 
 + (void)verboseLog:(NSString *)message
 {
-  if (!FBConfiguration.verboseLoggingEnabled) {
+  if (!FBConfiguration.sharedInstance.verboseLoggingEnabled) {
     return;
   }
   [self log:message];
@@ -35,7 +35,7 @@
 
 + (void)verboseLogFmt:(NSString *)format, ...
 {
-  if (!FBConfiguration.verboseLoggingEnabled) {
+  if (!FBConfiguration.sharedInstance.verboseLoggingEnabled) {
     return;
   }
   va_list args;

package/WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -94,7 +94,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
   if (!self.isStreaming) {
     return;
   }
-  NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.mjpegServerFramerate);
+  NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.sharedInstance.mjpegServerFramerate);
   uint64_t timerInterval = (uint64_t)(1.0 / (double)framerate * NSEC_PER_SEC);
   uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   @synchronized (self.listeningClients) {
@@ -106,7 +106,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
 
   NSError *error;
   CGFloat compressionQuality = MAX(FBMinCompressionQuality,
-                                   MIN(FBMaxCompressionQuality, (double)FBConfiguration.mjpegServerScreenshotQuality / 100.0));
+                                   MIN(FBMaxCompressionQuality, (double)FBConfiguration.sharedInstance.mjpegServerScreenshotQuality / 100.0));
   NSData *screenshotData = [FBScreenshot takeInOriginalResolutionWithScreenID:self.mainScreenID
                                                            compressionQuality:compressionQuality
                                                                           uti:UTTypeJPEG
@@ -124,7 +124,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
 
   self.consecutiveScreenshotFailures = 0;
 
-  CGFloat scalingFactor = FBConfiguration.mjpegScalingFactor / 100.0;
+  CGFloat scalingFactor = FBConfiguration.sharedInstance.mjpegScalingFactor / 100.0;
   __weak typeof(self) weakSelf = self;
   [self.imageProcessor submitImageData:screenshotData
                          scalingFactor:scalingFactor
@@ -154,7 +154,7 @@ static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
     }
     self.sentFramesCount++;
     self.sentBytesCount += chunk.length * clientCount;
-    NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.mjpegServerFramerate);
+    NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.sharedInstance.mjpegServerFramerate);
     if (0 == self.sentFramesCount % framerate) {
       [FBLogger verboseLog:[NSString stringWithFormat:@"MJPEG stats: clients=%@ sentFrames=%@ sentBytes=%@",
                             @(clientCount),

package/WebDriverAgentLib/Utilities/FBSettingsHandler.m

@@ -47,63 +47,67 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
   dispatch_once(&onceToken, ^{
     NSMutableDictionary<NSString *, FBSettingApplyBlock> *map = [NSMutableDictionary dictionary];
     map[FB_SETTING_USE_COMPACT_RESPONSES] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setShouldUseCompactResponses:[value boolValue]];
+      FBConfiguration.sharedInstance.shouldUseCompactResponses = [value boolValue];
       return nil;
     };
     map[FB_SETTING_ELEMENT_RESPONSE_ATTRIBUTES] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setElementResponseAttributes:(NSString *)value];
+      FBConfiguration.sharedInstance.elementResponseAttributes = (NSString *)value;
       return nil;
     };
     map[FB_SETTING_MJPEG_SERVER_SCREENSHOT_QUALITY] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setMjpegServerScreenshotQuality:[value unsignedIntegerValue]];
+      FBConfiguration.sharedInstance.mjpegServerScreenshotQuality = [value unsignedIntegerValue];
       return nil;
     };
     map[FB_SETTING_MJPEG_SERVER_FRAMERATE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setMjpegServerFramerate:[value unsignedIntegerValue]];
+      FBConfiguration.sharedInstance.mjpegServerFramerate = [value unsignedIntegerValue];
       return nil;
     };
     map[FB_SETTING_SCREENSHOT_QUALITY] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setScreenshotQuality:[value unsignedIntegerValue]];
+      FBConfiguration.sharedInstance.screenshotQuality = [value unsignedIntegerValue];
       return nil;
     };
     map[FB_SETTING_MJPEG_SCALING_FACTOR] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setMjpegScalingFactor:[value floatValue]];
+      FBConfiguration.sharedInstance.mjpegScalingFactor = [value floatValue];
       return nil;
     };
     map[FB_SETTING_MJPEG_FIX_ORIENTATION] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setMjpegShouldFixOrientation:[value boolValue]];
+      FBConfiguration.sharedInstance.mjpegShouldFixOrientation = [value boolValue];
       return nil;
     };
     map[FB_SETTING_KEYBOARD_AUTOCORRECTION] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setKeyboardAutocorrection:[value boolValue]];
+      FBConfiguration.sharedInstance.keyboardAutocorrection = [value boolValue]
+        ? FBConfigurationKeyboardPreferenceEnabled
+        : FBConfigurationKeyboardPreferenceDisabled;
       return nil;
     };
     map[FB_SETTING_KEYBOARD_PREDICTION] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setKeyboardPrediction:[value boolValue]];
+      FBConfiguration.sharedInstance.keyboardPrediction = [value boolValue]
+        ? FBConfigurationKeyboardPreferenceEnabled
+        : FBConfigurationKeyboardPreferenceDisabled;
       return nil;
     };
     map[FB_SETTING_RESPECT_SYSTEM_ALERTS] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setShouldRespectSystemAlerts:[value boolValue]];
+      FBConfiguration.sharedInstance.shouldRespectSystemAlerts = [value boolValue];
       return nil;
     };
     map[FB_SETTING_SNAPSHOT_MAX_DEPTH] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setSnapshotMaxDepth:[value intValue]];
+      FBConfiguration.sharedInstance.snapshotMaxDepth = [value intValue];
       return nil;
     };
     map[FB_SETTING_SNAPSHOT_MAX_CHILDREN] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setSnapshotMaxChildren:[value intValue]];
+      FBConfiguration.sharedInstance.snapshotMaxChildren = [value intValue];
       return nil;
     };
     map[FB_SETTING_USE_FIRST_MATCH] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setUseFirstMatch:[value boolValue]];
+      FBConfiguration.sharedInstance.useFirstMatch = [value boolValue];
       return nil;
     };
     map[FB_SETTING_BOUND_ELEMENTS_BY_INDEX] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setBoundElementsByIndex:[value boolValue]];
+      FBConfiguration.sharedInstance.boundElementsByIndex = [value boolValue];
       return nil;
     };
     map[FB_SETTING_REDUCE_MOTION] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setReduceMotionEnabled:[value boolValue]];
+      FBConfiguration.sharedInstance.reduceMotionEnabled = [value boolValue];
       return nil;
     };
     map[FB_SETTING_DEFAULT_ACTIVE_APPLICATION] = ^FBCommandStatus *(FBSession *session, id value) {
@@ -120,22 +124,22 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
       return nil;
     };
     map[FB_SETTING_ACCEPT_ALERT_BUTTON_SELECTOR] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setAcceptAlertButtonSelector:(NSString *)value];
+      FBConfiguration.sharedInstance.acceptAlertButtonSelector = (NSString *)value;
       return nil;
     };
     map[FB_SETTING_DISMISS_ALERT_BUTTON_SELECTOR] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setDismissAlertButtonSelector:(NSString *)value];
+      FBConfiguration.sharedInstance.dismissAlertButtonSelector = (NSString *)value;
       return nil;
     };
     map[FB_SETTING_AUTO_CLICK_ALERT_SELECTOR] = ^FBCommandStatus *(FBSession *session, id value) {
       return [self configureAutoClickAlertWithSelector:(NSString *)value forSession:session];
     };
     map[FB_SETTING_WAIT_FOR_IDLE_TIMEOUT] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setWaitForIdleTimeout:[value doubleValue]];
+      FBConfiguration.sharedInstance.waitForIdleTimeout = [value doubleValue];
       return nil;
     };
     map[FB_SETTING_ANIMATION_COOL_OFF_TIMEOUT] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setAnimationCoolOffTimeout:[value doubleValue]];
+      FBConfiguration.sharedInstance.animationCoolOffTimeout = [value doubleValue];
       return nil;
     };
     map[FB_SETTING_DEFAULT_ALERT_ACTION] = ^FBCommandStatus *(FBSession *session, id value) {
@@ -147,45 +151,45 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
       return nil;
     };
     map[FB_SETTING_MAX_TYPING_FREQUENCY] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setMaxTypingFrequency:[value unsignedIntegerValue]];
+      FBConfiguration.sharedInstance.maxTypingFrequency = [value unsignedIntegerValue];
       return nil;
     };
     map[FB_SETTING_USE_CLEAR_TEXT_SHORTCUT] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setUseClearTextShortcut:[value boolValue]];
+      FBConfiguration.sharedInstance.useClearTextShortcut = [value boolValue];
       return nil;
     };
     map[FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setIncludeHittableInPageSource:[value boolValue]];
+      FBConfiguration.sharedInstance.includeHittableInPageSource = [value boolValue];
       return nil;
     };
     map[FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setIncludeNativeFrameInPageSource:[value boolValue]];
+      FBConfiguration.sharedInstance.includeNativeFrameInPageSource = [value boolValue];
       return nil;
     };
     map[FB_SETTING_INCLUDE_NATIVE_ACCESSIBILITY_ELEMENT_IN_PAGE_SOURCE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setIncludeNativeAccessibilityElementInPageSource:[value boolValue]];
+      FBConfiguration.sharedInstance.includeNativeAccessibilityElementInPageSource = [value boolValue];
       return nil;
     };
     map[FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setIncludeMinMaxValueInPageSource:[value boolValue]];
+      FBConfiguration.sharedInstance.includeMinMaxValueInPageSource = [value boolValue];
       return nil;
     };
     map[FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setIncludeCustomActionsInPageSource:[value boolValue]];
+      FBConfiguration.sharedInstance.includeCustomActionsInPageSource = [value boolValue];
       return nil;
     };
     map[FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setEnforceCustomSnapshots:[value boolValue]];
+      FBConfiguration.sharedInstance.enforceCustomSnapshots = [value boolValue];
       return nil;
     };
     map[FB_SETTING_LIMIT_XPATH_CONTEXT_SCOPE] = ^FBCommandStatus *(FBSession *session, id value) {
-      [FBConfiguration setLimitXpathContextScope:[value boolValue]];
+      FBConfiguration.sharedInstance.limitXpathContextScope = [value boolValue];
       return nil;
     };
 #if !TARGET_OS_TV
     map[FB_SETTING_SCREENSHOT_ORIENTATION] = ^FBCommandStatus *(FBSession *session, id value) {
       NSError *error;
-      if (![FBConfiguration setScreenshotOrientation:(NSString *)value error:&error]) {
+      if (![FBConfiguration.sharedInstance setScreenshotOrientation:(NSString *)value error:&error]) {
         return [FBCommandStatus invalidArgumentErrorWithMessage:error.localizedDescription
                                                       traceback:nil];
       }
@@ -204,52 +208,52 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
   dispatch_once(&onceToken, ^{
     NSMutableDictionary<NSString *, FBSettingGetBlock> *map = [NSMutableDictionary dictionary];
     map[FB_SETTING_USE_COMPACT_RESPONSES] = ^id(FBSession *session) {
-      return @([FBConfiguration shouldUseCompactResponses]);
+      return @(FBConfiguration.sharedInstance.shouldUseCompactResponses);
     };
     map[FB_SETTING_ELEMENT_RESPONSE_ATTRIBUTES] = ^id(FBSession *session) {
-      return [FBConfiguration elementResponseAttributes];
+      return FBConfiguration.sharedInstance.elementResponseAttributes;
     };
     map[FB_SETTING_MJPEG_SERVER_SCREENSHOT_QUALITY] = ^id(FBSession *session) {
-      return @([FBConfiguration mjpegServerScreenshotQuality]);
+      return @(FBConfiguration.sharedInstance.mjpegServerScreenshotQuality);
     };
     map[FB_SETTING_MJPEG_SERVER_FRAMERATE] = ^id(FBSession *session) {
-      return @([FBConfiguration mjpegServerFramerate]);
+      return @(FBConfiguration.sharedInstance.mjpegServerFramerate);
     };
     map[FB_SETTING_MJPEG_SCALING_FACTOR] = ^id(FBSession *session) {
-      return @([FBConfiguration mjpegScalingFactor]);
+      return @(FBConfiguration.sharedInstance.mjpegScalingFactor);
     };
     map[FB_SETTING_MJPEG_FIX_ORIENTATION] = ^id(FBSession *session) {
-      return @([FBConfiguration mjpegShouldFixOrientation]);
+      return @(FBConfiguration.sharedInstance.mjpegShouldFixOrientation);
     };
     map[FB_SETTING_SCREENSHOT_QUALITY] = ^id(FBSession *session) {
-      return @([FBConfiguration screenshotQuality]);
+      return @(FBConfiguration.sharedInstance.screenshotQuality);
     };
     map[FB_SETTING_KEYBOARD_AUTOCORRECTION] = ^id(FBSession *session) {
-      return @([FBConfiguration keyboardAutocorrection]);
+      return @(FBConfiguration.sharedInstance.keyboardAutocorrection);
     };
     map[FB_SETTING_KEYBOARD_PREDICTION] = ^id(FBSession *session) {
-      return @([FBConfiguration keyboardPrediction]);
+      return @(FBConfiguration.sharedInstance.keyboardPrediction);
     };
     map[FB_SETTING_SNAPSHOT_MAX_DEPTH] = ^id(FBSession *session) {
-      return @([FBConfiguration snapshotMaxDepth]);
+      return @(FBConfiguration.sharedInstance.snapshotMaxDepth);
     };
     map[FB_SETTING_SNAPSHOT_MAX_CHILDREN] = ^id(FBSession *session) {
-      return @([FBConfiguration snapshotMaxChildren]);
+      return @(FBConfiguration.sharedInstance.snapshotMaxChildren);
     };
     map[FB_SETTING_USE_FIRST_MATCH] = ^id(FBSession *session) {
-      return @([FBConfiguration useFirstMatch]);
+      return @(FBConfiguration.sharedInstance.useFirstMatch);
     };
     map[FB_SETTING_WAIT_FOR_IDLE_TIMEOUT] = ^id(FBSession *session) {
-      return @([FBConfiguration waitForIdleTimeout]);
+      return @(FBConfiguration.sharedInstance.waitForIdleTimeout);
     };
     map[FB_SETTING_ANIMATION_COOL_OFF_TIMEOUT] = ^id(FBSession *session) {
-      return @([FBConfiguration animationCoolOffTimeout]);
+      return @(FBConfiguration.sharedInstance.animationCoolOffTimeout);
     };
     map[FB_SETTING_BOUND_ELEMENTS_BY_INDEX] = ^id(FBSession *session) {
-      return @([FBConfiguration boundElementsByIndex]);
+      return @(FBConfiguration.sharedInstance.boundElementsByIndex);
     };
     map[FB_SETTING_REDUCE_MOTION] = ^id(FBSession *session) {
-      return @([FBConfiguration reduceMotionEnabled]);
+      return @(FBConfiguration.sharedInstance.reduceMotionEnabled);
     };
     map[FB_SETTING_DEFAULT_ACTIVE_APPLICATION] = ^id(FBSession *session) {
       return session.defaultActiveApplication;
@@ -258,50 +262,50 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
       return FBActiveAppDetectionPoint.sharedInstance.stringCoordinates;
     };
     map[FB_SETTING_ACCEPT_ALERT_BUTTON_SELECTOR] = ^id(FBSession *session) {
-      return FBConfiguration.acceptAlertButtonSelector;
+      return FBConfiguration.sharedInstance.acceptAlertButtonSelector;
     };
     map[FB_SETTING_DISMISS_ALERT_BUTTON_SELECTOR] = ^id(FBSession *session) {
-      return FBConfiguration.dismissAlertButtonSelector;
+      return FBConfiguration.sharedInstance.dismissAlertButtonSelector;
     };
     map[FB_SETTING_AUTO_CLICK_ALERT_SELECTOR] = ^id(FBSession *session) {
-      return FBConfiguration.autoClickAlertSelector;
+      return FBConfiguration.sharedInstance.autoClickAlertSelector;
     };
     map[FB_SETTING_DEFAULT_ALERT_ACTION] = ^id(FBSession *session) {
       return session.defaultAlertAction ?: @"";
     };
     map[FB_SETTING_MAX_TYPING_FREQUENCY] = ^id(FBSession *session) {
-      return @([FBConfiguration maxTypingFrequency]);
+      return @(FBConfiguration.sharedInstance.maxTypingFrequency);
     };
     map[FB_SETTING_RESPECT_SYSTEM_ALERTS] = ^id(FBSession *session) {
-      return @([FBConfiguration shouldRespectSystemAlerts]);
+      return @(FBConfiguration.sharedInstance.shouldRespectSystemAlerts);
     };
     map[FB_SETTING_USE_CLEAR_TEXT_SHORTCUT] = ^id(FBSession *session) {
-      return @([FBConfiguration useClearTextShortcut]);
+      return @(FBConfiguration.sharedInstance.useClearTextShortcut);
     };
     map[FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE] = ^id(FBSession *session) {
-      return @([FBConfiguration includeHittableInPageSource]);
+      return @(FBConfiguration.sharedInstance.includeHittableInPageSource);
     };
     map[FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE] = ^id(FBSession *session) {
-      return @([FBConfiguration includeNativeFrameInPageSource]);
+      return @(FBConfiguration.sharedInstance.includeNativeFrameInPageSource);
     };
     map[FB_SETTING_INCLUDE_NATIVE_ACCESSIBILITY_ELEMENT_IN_PAGE_SOURCE] = ^id(FBSession *session) {
-      return @([FBConfiguration includeNativeAccessibilityElementInPageSource]);
+      return @(FBConfiguration.sharedInstance.includeNativeAccessibilityElementInPageSource);
     };
     map[FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE] = ^id(FBSession *session) {
-      return @([FBConfiguration includeMinMaxValueInPageSource]);
+      return @(FBConfiguration.sharedInstance.includeMinMaxValueInPageSource);
     };
     map[FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE] = ^id(FBSession *session) {
-      return @([FBConfiguration includeCustomActionsInPageSource]);
+      return @(FBConfiguration.sharedInstance.includeCustomActionsInPageSource);
     };
     map[FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS] = ^id(FBSession *session) {
-      return @([FBConfiguration enforceCustomSnapshots]);
+      return @(FBConfiguration.sharedInstance.enforceCustomSnapshots);
     };
     map[FB_SETTING_LIMIT_XPATH_CONTEXT_SCOPE] = ^id(FBSession *session) {
-      return @([FBConfiguration limitXpathContextScope]);
+      return @(FBConfiguration.sharedInstance.limitXpathContextScope);
     };
 #if !TARGET_OS_TV
     map[FB_SETTING_SCREENSHOT_ORIENTATION] = ^id(FBSession *session) {
-      return [FBConfiguration humanReadableScreenshotOrientation];
+      return FBConfiguration.sharedInstance.humanReadableScreenshotOrientation;
     };
 #endif
     gettersMap = map.copy;
@@ -344,7 +348,7 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
                                               forSession:(FBSession *)session
 {
   if (0 == [selector length]) {
-    [FBConfiguration setAutoClickAlertSelector:selector];
+    FBConfiguration.sharedInstance.autoClickAlertSelector = selector;
     [session disableAlertsMonitor];
     return [FBCommandStatus ok];
   }
@@ -355,7 +359,7 @@ static NSSet<NSString *> *FBNilClearableSettingKeys(void)
     return [FBCommandStatus invalidSelectorErrorWithMessage:error.localizedDescription
                                                   traceback:nil];
   }
-  [FBConfiguration setAutoClickAlertSelector:selector];
+  FBConfiguration.sharedInstance.autoClickAlertSelector = selector;
   [session enableAlertsMonitor];
   return [FBCommandStatus ok];
 }

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -472,7 +472,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
   XCPointerEventPath *resultPath = [[XCPointerEventPath alloc] initForTextInput];
   [resultPath typeText:text
               atOffset:offset
-           typingSpeed:FBConfiguration.maxTypingFrequency
+           typingSpeed:FBConfiguration.sharedInstance.maxTypingFrequency
           shouldRedact:YES];
   return @[resultPath];
 }

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -83,7 +83,7 @@ static void swizzledLaunchApp(id self, SEL _cmd, NSString *path, NSString *bundl
 + (id<XCTMessagingChannel_RunnerToDaemon>)testRunnerProxy
 {
   static id<XCTMessagingChannel_RunnerToDaemon> proxy = nil;
-  if ([FBConfiguration shouldUseSingletonTestManager]) {
+  if (FBConfiguration.sharedInstance.shouldUseSingletonTestManager) {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
       [FBLogger logFmt:@"Using singleton test manager"];

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -37,7 +37,7 @@
 
 - (XCUIElement *)fb_firstMatch
 {
-  if (FBConfiguration.useFirstMatch) {
+  if (FBConfiguration.sharedInstance.useFirstMatch) {
     XCUIElement* match = self.firstMatch;
     return [match exists] ? match : nil;
   }
@@ -46,7 +46,7 @@
 
 - (NSArray<XCUIElement *> *)fb_allMatches
 {
-  return FBConfiguration.boundElementsByIndex
+  return FBConfiguration.sharedInstance.boundElementsByIndex
     ? self.allElementsBoundByIndex
     : self.allElementsBoundByAccessibilityElement;
 }

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -195,7 +195,7 @@ static NSString *const topNodeIndexPath = @"top";
       // If 'includeHittableInPageSource' setting is enabled, then use native snapshots
       // to calculate a more accurate value for the 'hittable' attribute.
       rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root
-                                                        useNative:FBConfiguration.includeHittableInPageSource]
+                                                        useNative:FBConfiguration.sharedInstance.includeHittableInPageSource]
                                            writer:writer
                                      elementStore:nil
                                             query:nil
@@ -252,7 +252,7 @@ static NSString *const topNodeIndexPath = @"top";
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
   } else {
     [self waitUntilStableWithElement:root];
-    if (FBConfiguration.limitXpathContextScope) {
+    if (FBConfiguration.sharedInstance.limitXpathContextScope) {
       lookupScopeSnapshot = [self snapshotWithRoot:root useNative:useNativeSnapshot];
     } else {
       if ([root isKindOfClass:XCUIElement.class]) {
@@ -404,25 +404,25 @@ static NSString *const topNodeIndexPath = @"top";
   NSMutableSet<Class> *includedAttributes;
   if (nil == query) {
     includedAttributes = [NSMutableSet setWithArray:FBElementAttribute.supportedAttributes];
-    if (!FBConfiguration.includeHittableInPageSource) {
+    if (!FBConfiguration.sharedInstance.includeHittableInPageSource) {
       // The hittable attribute is expensive to calculate for each snapshot item
       // thus we only include it when requested explicitly
       [includedAttributes removeObject:FBHittableAttribute.class];
     }
-    if (!FBConfiguration.includeNativeFrameInPageSource) {
+    if (!FBConfiguration.sharedInstance.includeNativeFrameInPageSource) {
       // Include nativeFrame only when requested
       [includedAttributes removeObject:FBNativeFrameAttribute.class];
     }
-    if (!FBConfiguration.includeNativeAccessibilityElementInPageSource) {
+    if (!FBConfiguration.sharedInstance.includeNativeAccessibilityElementInPageSource) {
       // Include the raw native accessibility flag only when requested
       [includedAttributes removeObject:FBNativeAccessibilityElementAttribute.class];
     }
-    if (!FBConfiguration.includeMinMaxValueInPageSource) {
+    if (!FBConfiguration.sharedInstance.includeMinMaxValueInPageSource) {
       // minValue/maxValue are retrieved from private APIs and may be slow on deep trees
       [includedAttributes removeObject:FBMinValueAttribute.class];
       [includedAttributes removeObject:FBMaxValueAttribute.class];
     }
-    if (!FBConfiguration.includeCustomActionsInPageSource) {
+    if (!FBConfiguration.sharedInstance.includeCustomActionsInPageSource) {
       // customActions are retrieved from accessibility attributes and may be slow on deep trees
       [includedAttributes removeObject:FBCustomActionsAttribute.class];
     }
@@ -620,7 +620,7 @@ static NSString *const topNodeIndexPath = @"top";
     return [(XCUIElement *)root fb_nativeSnapshot];
   }
   // https://github.com/appium/WebDriverAgent/issues/1085
-  return [root isKindOfClass:XCUIApplication.class] && !FBConfiguration.enforceCustomSnapshots
+  return [root isKindOfClass:XCUIApplication.class] && !FBConfiguration.sharedInstance.enforceCustomSnapshots
     ? [(XCUIElement *)root fb_standardSnapshot]
     : [(XCUIElement *)root fb_customSnapshot];
 }
@@ -630,7 +630,7 @@ static NSString *const topNodeIndexPath = @"top";
   if ([root isKindOfClass:XCUIElement.class]) {
     // If the app is not idle state while we retrieve the visiblity state
     // then the snapshot retrieval operation might freeze and time out
-    [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+    [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.sharedInstance.animationCoolOffTimeout];
   }
 }
 

package/WebDriverAgentRunner/UITestingUITests.m

@@ -22,18 +22,18 @@
 + (void)setUp
 {
   [FBDebugLogDelegateDecorator decorateXCTestLogger];
-  [FBConfiguration disableRemoteQueryEvaluation];
-  [FBConfiguration configureDefaultKeyboardPreferences];
-  [FBConfiguration disableApplicationUIInterruptionsHandling];
+  [FBConfiguration.sharedInstance disableRemoteQueryEvaluation];
+  [FBConfiguration.sharedInstance configureDefaultKeyboardPreferences];
+  [FBConfiguration.sharedInstance disableApplicationUIInterruptionsHandling];
   if (NSProcessInfo.processInfo.environment[@"ENABLE_AUTOMATIC_SCREEN_RECORDINGS"]) {
-    [FBConfiguration enableScreenRecordings];
+    [FBConfiguration.sharedInstance enableScreenRecordings];
   } else {
-    [FBConfiguration disableScreenRecordings];
+    [FBConfiguration.sharedInstance disableScreenRecordings];
   }
   if (NSProcessInfo.processInfo.environment[@"ENABLE_AUTOMATIC_SCREENSHOTS"]) {
-    [FBConfiguration enableScreenshots];
+    [FBConfiguration.sharedInstance enableScreenshots];
   } else {
-    [FBConfiguration disableScreenshots];
+    [FBConfiguration.sharedInstance disableScreenshots];
   }
   [super setUp];
 }

package/WebDriverAgentTests/IntegrationTests/FBAlertTests.m

@@ -27,7 +27,7 @@
   [self resetPermissions];
   [self launchApplication];
   [self goToAlertsPage];
-  [FBConfiguration disableApplicationUIInterruptionsHandling];
+  [FBConfiguration.sharedInstance disableApplicationUIInterruptionsHandling];
 }
 
 - (void)resetPermissions
@@ -113,12 +113,12 @@
 - (void)testAcceptingAlertWithCustomLocator
 {
   [self showApplicationAlert];
-  [FBConfiguration setAcceptAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
+  FBConfiguration.sharedInstance.acceptAlertButtonSelector = @"**/XCUIElementTypeButton[-1]";
   @try {
     XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
   } @finally {
-    [FBConfiguration setAcceptAlertButtonSelector:@""];
+    FBConfiguration.sharedInstance.acceptAlertButtonSelector = @"";
   }
 }
 
@@ -132,12 +132,12 @@
 - (void)testDismissingAlertWithCustomLocator
 {
   [self showApplicationAlert];
-  [FBConfiguration setDismissAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
+  FBConfiguration.sharedInstance.dismissAlertButtonSelector = @"**/XCUIElementTypeButton[-1]";
   @try {
     XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
   } @finally {
-    [FBConfiguration setDismissAlertButtonSelector:@""];
+    FBConfiguration.sharedInstance.dismissAlertButtonSelector = @"";
   }
 }
 

package/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m

@@ -26,13 +26,13 @@
 
 - (void)testReduceMotion
 {
-  BOOL defaultReduceMotionEnabled = [FBConfiguration reduceMotionEnabled];
+  BOOL defaultReduceMotionEnabled = FBConfiguration.sharedInstance.reduceMotionEnabled;
 
-  [FBConfiguration setReduceMotionEnabled:YES];
-  XCTAssertTrue([FBConfiguration reduceMotionEnabled]);
+  FBConfiguration.sharedInstance.reduceMotionEnabled = YES;
+  XCTAssertTrue(FBConfiguration.sharedInstance.reduceMotionEnabled);
 
-  [FBConfiguration setReduceMotionEnabled:defaultReduceMotionEnabled];
-  XCTAssertEqual([FBConfiguration reduceMotionEnabled], defaultReduceMotionEnabled);
+  FBConfiguration.sharedInstance.reduceMotionEnabled = defaultReduceMotionEnabled;
+  XCTAssertEqual(FBConfiguration.sharedInstance.reduceMotionEnabled, defaultReduceMotionEnabled);
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -46,13 +46,13 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
 - (void)setUp
 {
   // Enable it to get extended XCTest logs printed into the console
-  // [FBConfiguration enableXcTestDebugLogs];
+  // [FBConfiguration.sharedInstance enableXcTestDebugLogs];
   [super setUp];
-  [FBConfiguration disableRemoteQueryEvaluation];
-  [FBConfiguration disableAttributeKeyPathAnalysis];
-  [FBConfiguration configureDefaultKeyboardPreferences];
-  [FBConfiguration disableApplicationUIInterruptionsHandling];
-  [FBConfiguration disableScreenshots];
+  [FBConfiguration.sharedInstance disableRemoteQueryEvaluation];
+  [FBConfiguration.sharedInstance disableAttributeKeyPathAnalysis];
+  [FBConfiguration.sharedInstance configureDefaultKeyboardPreferences];
+  [FBConfiguration.sharedInstance disableApplicationUIInterruptionsHandling];
+  [FBConfiguration.sharedInstance disableScreenshots];
   self.continueAfterFailure = NO;
   self.springboard = XCUIApplication.fb_systemApplication;
   self.testedApplication = [XCUIApplication new];

package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m

@@ -139,8 +139,8 @@
 - (void)testFindMatchesWithoutContextScopeLimit
 {
   XCUIElement *button = self.testedApplication.buttons.firstMatch;
-  BOOL previousValue = FBConfiguration.limitXpathContextScope;
-  FBConfiguration.limitXpathContextScope = NO;
+  BOOL previousValue = FBConfiguration.sharedInstance.limitXpathContextScope;
+  FBConfiguration.sharedInstance.limitXpathContextScope = NO;
   @try {
     NSArray *parentSnapshots = [FBXPath matchesWithRootElement:button forQuery:@".."];
     XCTAssertEqual(parentSnapshots.count, 1);
@@ -167,7 +167,7 @@
                           @"XCUIElementTypeButton"
                           );
   } @finally {
-    FBConfiguration.limitXpathContextScope = previousValue;
+    FBConfiguration.sharedInstance.limitXpathContextScope = previousValue;
   }
 }