Fixes for settings menu

bbirman · bbirman · commit da61c3dbd15a · 2025-11-04T11:27:42.000-08:00
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.m
@@ -107,7 +107,7 @@ - (id)init {
              */
             if (![self loginHostForHostAddress:customHost]) {
                 [self.loginHostList removeAllObjects];
-                if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon) {
+                if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon && [SFUserAccountManager sharedInstance].loginViewControllerConfig.showServerPicker) {
                     [self.loginHostList addObject:production];
                     [self.loginHostList addObject:sandbox];
                 }
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.m
@@ -1048,13 +1048,15 @@ - (void)loginViewController:(SFLoginViewController *)loginViewController didChan
 }
 
 - (void)loginViewControllerDidClearCache:(SFLoginViewController *)loginViewController {
-    [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{}];
-    [self restartAuthenticationForViewController:loginViewController];
+    [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{
+        [self restartAuthenticationForViewController:loginViewController];
+    }];
 }
 
 - (void)loginViewControllerDidClearCookies:(SFLoginViewController *)loginViewController {
-    [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{}];
-    [self restartAuthenticationForViewController:loginViewController];
+    [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{
+        [self restartAuthenticationForViewController:loginViewController];
+    }];
 }
 
 - (void)loginViewControllerDidReload:(SFLoginViewController *)loginViewController {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ - (id)init {`
`107`	`107`	`*/`
`108`	`108`	`if (![self loginHostForHostAddress:customHost]) {`
`109`	`109`	`[self.loginHostList removeAllObjects];`
`110`		`- if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon) {`
	`110`	`+ if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon && [SFUserAccountManager sharedInstance].loginViewControllerConfig.showServerPicker) {`
`111`	`111`	`[self.loginHostList addObject:production];`
`112`	`112`	`[self.loginHostList addObject:sandbox];`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1048,13 +1048,15 @@ - (void)loginViewController:(SFLoginViewController *)loginViewController didChan`
`1048`	`1048`	`}`
`1049`	`1049`
`1050`	`1050`	`- (void)loginViewControllerDidClearCache:(SFLoginViewController *)loginViewController {`
`1051`		`- [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{}];`
`1052`		`- [self restartAuthenticationForViewController:loginViewController];`
	`1051`	`+ [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{`
	`1052`	`+ [self restartAuthenticationForViewController:loginViewController];`
	`1053`	`+ }];`
`1053`	`1054`	`}`
`1054`	`1055`
`1055`	`1056`	`- (void)loginViewControllerDidClearCookies:(SFLoginViewController *)loginViewController {`
`1056`		`- [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{}];`
`1057`		`- [self restartAuthenticationForViewController:loginViewController];`
	`1057`	`+ [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{`
	`1058`	`+ [self restartAuthenticationForViewController:loginViewController];`
	`1059`	`+ }];`
`1058`	`1060`	`}`
`1059`	`1061`
`1060`	`1062`	`- (void)loginViewControllerDidReload:(SFLoginViewController *)loginViewController {`