Add showServerPicker property

Author: bbirman

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.h

@@ -91,9 +91,12 @@ NS_SWIFT_NAME(SalesforceLoginViewController)
 /** Specify visibility of nav bar. This property will be used to hide/show the nav bar*/
 @property (nonatomic) BOOL showNavbar NS_SWIFT_NAME(showsNavigationBar);
 
-/** Specifiy the visibility of the settings icon. This property will be used to hide/show the settings icon*/
+/** Specify the visibility of the settings icon. This property will be used to hide/show the settings icon*/
 @property (nonatomic) BOOL showSettingsIcon NS_SWIFT_NAME(showsSettingsIcon);
 
+/// Specify the visibility of the server picker option in the settings menu.
+@property (nonatomic) BOOL showServerPicker NS_SWIFT_NAME(showsServerPicker);
+
 /** Specify all display properties in a config. All the above properties are backed by
  a config object */
 @property (nonatomic, strong, nonnull) SFSDKLoginViewControllerConfig *config;

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m

@@ -184,6 +184,14 @@ - (void)setShowSettingsIcon:(BOOL)showSettingsIcon {
     self.config.showSettingsIcon = showSettingsIcon;
 }
 
+- (BOOL)showServerPicker {
+    return self.config.showServerPicker;
+}
+
+- (void)setShowServerPicker:(BOOL)showServerPicker {
+    self.config.showServerPicker = showServerPicker;
+}
+
 - (SFSDKLoginViewControllerConfig *)config {
     return _config;
 }
@@ -260,7 +268,11 @@ - (UIBarButtonItem *)createSettingsButton {
 
     // Don't show the change server option if there are no hosts to switch to.
     SFManagedPreferences *managedPreferences = [SFManagedPreferences sharedPreferences];
-    if (!managedPreferences.onlyShowAuthorizedHosts || managedPreferences.loginHosts.count != 0) {
+    if (managedPreferences.onlyShowAuthorizedHosts && managedPreferences.loginHosts.count == 0) {
+        self.showServerPicker = NO;
+    }
+    
+    if (self.showServerPicker) {
         [menuActions addObject:[UIAction actionWithTitle:[SFSDKResourceUtils localizedString:@"LOGIN_CHOOSE_SERVER"]
                                                    image:nil
                                               identifier:nil

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFSDKLoginViewControllerConfig.h

@@ -43,14 +43,17 @@ NS_SWIFT_NAME(SalesforceLoginViewControllerConfig)
 /** Specify visibility of nav bar. This property will be used to hide/show the nav bar*/
 @property (nonatomic) BOOL showNavbar NS_SWIFT_NAME(showsNavigationBar);
 
-/** Specifiy the visibility of the settings icon. This property will be used to hide/show the settings icon*/
+/** Specify the visibility of the settings icon. This property will be used to hide/show the settings icon*/
 @property (nonatomic) BOOL showSettingsIcon NS_SWIFT_NAME(showsSettingsIcon);
 
-/** Specifiy the visibility of the back icon. This property value can be changed by changing the value of shouldAuthenticate in bootconfig or by subclasssing SFLoginViewController.
+/// Specify the visibility of the server picker option in the settings menu.
+@property (nonatomic) BOOL showServerPicker NS_SWIFT_NAME(showsServerPicker);
+
+/** Specify the visibility of the back icon. This property value can be changed by changing the value of shouldAuthenticate in bootconfig or by subclasssing SFLoginViewController.
  */
 @property (nonatomic,readonly) BOOL shouldDisplayBackButton NS_SWIFT_NAME(showsBackButton);
 
-/** Specifiy a delegate for LoginViewController. */
+/** Specify a delegate for LoginViewController. */
 @property (nonatomic, weak, nullable) id<SFLoginViewControllerDelegate> delegate;
 
 @property (nonatomic, copy, nullable) SFLoginViewControllerCreationBlock loginViewControllerCreationBlock;

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFSDKLoginViewControllerConfig.m

@@ -45,6 +45,7 @@ - (instancetype)init {
         self.navBarFont = nil;
         _showNavbar = YES;
         _showSettingsIcon = YES;
+        _showServerPicker = YES;
     }
     return self;
 }