Skip to content

Commit 67a545e

Browse files
@W-20161958: [MSDK 13.1][Android] Cannot login GUS using Welcome endpoint (Post CodeCov isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin)
1 parent 5e191a1 commit 67a545e

1 file changed

Lines changed: 3 additions & 18 deletions

File tree

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ package com.salesforce.androidsdk.ui
2828

2929
import android.annotation.SuppressLint
3030
import android.net.Uri
31-
import android.util.Log
3231
import android.webkit.CookieManager
3332
import android.webkit.URLUtil
3433
import android.webkit.WebView
@@ -517,24 +516,10 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
517516
internal fun isSwitchFromSalesforceWelcomeDiscoveryToDefaultLogin(
518517
pendingLoginServerUri: Uri
519518
): Boolean {
520-
// TODO: Re-compress this logic after CodeCov P.O.C. ECJ20251210
521-
val pPLS = previousPendingServer
522-
if (pPLS == null) {
523-
Log.i("WSC", "0")
524-
return false
525-
}
526-
val a = isSalesforceWelcomeDiscoveryUrlPath(pPLS.toUri())
527-
val b = !isSalesforceWelcomeDiscoveryUrlPath(pendingLoginServerUri)
519+
val previousPendingLoginServerUri = previousPendingServer?.toUri() ?: return false
528520

529-
if ((!a).and(!b)) {
530-
Log.i("WSC", "1")
531-
} else if (a.and(!b)) {
532-
Log.i("WSC", "2")
533-
} else if (!a) {
534-
Log.i("WSC", "3")
535-
} else {
536-
Log.i("WSC", "4")
537-
}
521+
val a = isSalesforceWelcomeDiscoveryUrlPath(previousPendingLoginServerUri)
522+
val b = !isSalesforceWelcomeDiscoveryUrlPath(pendingLoginServerUri)
538523

539524
return a && b
540525
}

0 commit comments

Comments
 (0)