refactor: extract LoginServerManager.isPoolServer() helper (W-23406836)

Consolidates the repeated three-way pool-server check
(PRODUCTION / SANDBOX / WELCOME) into a single static method on
LoginServerManager, and updates all three call sites:
- LoginViewModel.addDpopJktIfNeeded
- SalesforceSDKManager.fetchAndUpdateAuthConfigIfNeeded
- SalesforceDroidGapActivity.fetchAuthConfig

Author: wmathurin

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/ui/SalesforceDroidGapActivity.kt

@@ -41,9 +41,7 @@ import com.salesforce.androidsdk.config.BootConfig
 import com.salesforce.androidsdk.config.BootConfig.getBootConfig
 import com.salesforce.androidsdk.config.BootConfig.isAbsoluteUrl
 import com.salesforce.androidsdk.config.BootConfig.validateBootConfig
-import com.salesforce.androidsdk.config.LoginServerManager.PRODUCTION_LOGIN_URL
-import com.salesforce.androidsdk.config.LoginServerManager.SANDBOX_LOGIN_URL
-import com.salesforce.androidsdk.config.LoginServerManager.WELCOME_LOGIN_URL
+import com.salesforce.androidsdk.config.LoginServerManager
 import com.salesforce.androidsdk.phonegap.app.SalesforceHybridSDKManager
 import com.salesforce.androidsdk.phonegap.ui.SalesforceWebViewClientHelper.getAppHomeUrl
 import com.salesforce.androidsdk.phonegap.ui.SalesforceWebViewClientHelper.hasCachedAppHome
@@ -574,7 +572,7 @@ open class SalesforceDroidGapActivity : CordovaActivity(), SalesforceActivityInt
                         ?.url
                         ?.trim { it <= ' ' } ?: return@withTimeout
 
-                    if (loginServer == PRODUCTION_LOGIN_URL || loginServer == WELCOME_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL || !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null) {
+                    if (LoginServerManager.isPoolServer(loginServer) || !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null) {
                         return@withTimeout
                     }
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -104,8 +104,6 @@ import com.salesforce.androidsdk.config.AdminPermsManager
 import com.salesforce.androidsdk.config.AdminSettingsManager
 import com.salesforce.androidsdk.config.BootConfig.getBootConfig
 import com.salesforce.androidsdk.config.LoginServerManager
-import com.salesforce.androidsdk.config.LoginServerManager.PRODUCTION_LOGIN_URL
-import com.salesforce.androidsdk.config.LoginServerManager.SANDBOX_LOGIN_URL
 import com.salesforce.androidsdk.config.LoginServerManager.WELCOME_LOGIN_URL
 import com.salesforce.androidsdk.config.OAuthConfig
 import com.salesforce.androidsdk.config.RuntimeConfig.ConfigKey.IDPAppPackageName
@@ -2177,7 +2175,6 @@ open class SalesforceSDKManager protected constructor(
         // If this takes more than five seconds it can cause Android's application not responding report.
         withTimeoutOrNull(5000L.milliseconds) {
             val loginServer = (loginServerUrl ?: loginServerManager.selectedLoginServer.url).trim()
-            val isStandardLoginServer = loginServer == PRODUCTION_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL
             val isInvalidServer = !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null
 
             when {
@@ -2191,7 +2188,7 @@ open class SalesforceSDKManager protected constructor(
                     // Disable Salesforce App Attestation for login servers that are not My Domain servers.
                     appAttestationClient?.apiHostName = null
                 }
-                isStandardLoginServer -> {
+                LoginServerManager.isPoolServer(loginServer) -> {
                     // Standard login servers have no auth-config to source a shared-session value from, so
                     // browser login is gated solely on the force flag and shared session stays false.
                     setBrowserLoginEnabled(

libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java

@@ -73,6 +73,13 @@ public class LoginServerManager {
 	public static final String WELCOME_LOGIN_URL = "https://welcome.salesforce.com/discovery";
 	public static final String SANDBOX_LOGIN_URL = "https://test.salesforce.com";
 
+	/** Returns true when {@code serverUrl} is one of the three Salesforce pool (non-my-domain) servers. */
+	public static boolean isPoolServer(@NonNull String serverUrl) {
+		return PRODUCTION_LOGIN_URL.equals(serverUrl)
+			|| SANDBOX_LOGIN_URL.equals(serverUrl)
+			|| WELCOME_LOGIN_URL.equals(serverUrl);
+	}
+
 	/**
 	 * Shared preferences when non-custom login servers are provided by resources servers.xml
 	 */

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginViewModel.kt

@@ -65,10 +65,8 @@ import com.salesforce.androidsdk.auth.dpop.DPoPKeyManager
 import com.salesforce.androidsdk.auth.dpop.DPoPProofBuilder
 import com.salesforce.androidsdk.auth.onAuthFlowComplete
 import com.salesforce.androidsdk.config.BootConfig
+import com.salesforce.androidsdk.config.LoginServerManager
 import com.salesforce.androidsdk.config.LoginServerManager.LoginServer
-import com.salesforce.androidsdk.config.LoginServerManager.PRODUCTION_LOGIN_URL
-import com.salesforce.androidsdk.config.LoginServerManager.SANDBOX_LOGIN_URL
-import com.salesforce.androidsdk.config.LoginServerManager.WELCOME_LOGIN_URL
 import com.salesforce.androidsdk.config.OAuthConfig
 import com.salesforce.androidsdk.config.RuntimeConfig.ConfigKey.OnlyShowAuthorizedHosts
 import com.salesforce.androidsdk.config.RuntimeConfig.getRuntimeConfig
@@ -733,9 +731,7 @@ open class LoginViewModel(
         sdkManager: SalesforceSDKManager,
         params: MutableMap<String, String>,
     ) {
-        val isMyDomainServer = server != PRODUCTION_LOGIN_URL
-            && server != SANDBOX_LOGIN_URL
-            && server != WELCOME_LOGIN_URL
+        val isMyDomainServer = !LoginServerManager.isPoolServer(server)
         if (!sdkManager.useDPoP || !isMyDomainServer) {
             // Clear any stale dpop_jkt and its key from a previous server-picker entry.
             params.remove("dpop_jkt")