Skip to content

@W-19974750: [MSDK Android] Login View Progress Spinner Becomes Permanent After Allow Access Prompt When Code Exchange Endpoint Fails #2793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2025
Merged

@W-19974750: [MSDK Android] Login View Progress Spinner Becomes Permanent After Allow Access Prompt When Code Exchange Endpoint Fails #2793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import android.accounts.AccountAuthenticatorResponse
import android.accounts.AccountManager.ERROR_CODE_CANCELED
import android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
import android.annotation.SuppressLint
import android.app.Activity
import android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD
import android.content.Context
import android.content.Intent
Expand Down Expand Up @@ -276,7 +275,7 @@ open class LoginActivity : FragmentActivity() {
ActivityResultContracts.StartActivityForResult()
) { result: ActivityResult ->
// Check if the user backed out of the custom tab.
if (result.resultCode == Activity.RESULT_CANCELED) {
if (result.resultCode == RESULT_CANCELED) {
if (viewModel.singleServerCustomTabActivity) {
// Show blank page and spinner until PKCE is done.
viewModel.loginUrl.value = ABOUT_BLANK
Expand Down Expand Up @@ -560,6 +559,8 @@ open class LoginActivity : FragmentActivity() {
e: Throwable? = null,
) {
// Reset state from previous log in attempt.
// - Reset the auth-finished property which keeps the progress spinner displayed even when the web view finishing would normally hide it.
viewModel.authFinished.value = false
// - Salesforce Identity UI Bridge API log in, such as QR code login.
viewModel.resetFrontDoorBridgeUrl()
e(TAG, "$error: $errorDesc", e)
Expand Down
Loading