@W-19130548: [MSDK Android] Using External Link With Login_Hint And Login_Host Duplicates Login Servers In Server Picker (#2738)

Author: JohnsonEricAtSalesforce

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

@@ -192,7 +192,7 @@ public void useSandbox() {
 	public void addCustomLoginServer(String name, String url) {
 		// Prevent duplicate servers.
 		for (LoginServer existingServer : getLoginServers()) {
-			if (name.equals(existingServer.name) && url.equals(existingServer.url)) {
+			if (url.equals(existingServer.url)) {
 				setSelectedLoginServer(existingServer);
 				return;
 			}

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

@@ -1456,6 +1456,7 @@ open class LoginActivity : FragmentActivity() {
             context: Context,
             uri: Uri,
         ): Boolean {
+            if (!uri.isHierarchical) return false
             val clientIdParameter = uri.getQueryParameter(SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_ID)
             return isSalesforceWelcomeDiscoveryUrlPath(uri) && uri.queryParameterNames?.contains(
                 SALESFORCE_WELCOME_DISCOVERY_MOBILE_URL_QUERY_PARAMETER_KEY_CLIENT_ID

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/PickerBottomSheet.kt

@@ -151,8 +151,10 @@ fun PickerBottomSheet(pickerStyle: PickerStyle) {
     val onNewLoginServerSelected = { newSelectedServer: Any?, closePicker: Boolean ->
         if (newSelectedServer != null && newSelectedServer is LoginServer) {
             viewModel.showServerPicker.value = !closePicker
-            viewModel.loading.value = true
-            SalesforceSDKManager.getInstance().loginServerManager.selectedLoginServer = newSelectedServer
+            if (newSelectedServer != SalesforceSDKManager.getInstance().loginServerManager.selectedLoginServer) {
+                viewModel.loading.value = true
+                SalesforceSDKManager.getInstance().loginServerManager.selectedLoginServer = newSelectedServer
+            }
         }
     }
     val onLoginServerCancel = { viewModel.showServerPicker.value = false }