Skip to content

Fix singleServerCustomTabActivity loading while waiting for PKCE. #2761

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
brandonpage merged 1 commit into from
Sep 11, 2025
Merged

Fix singleServerCustomTabActivity loading while waiting for PKCE. #2761

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 @@ -278,7 +278,8 @@ open class LoginActivity : FragmentActivity() {
// Check if the user backed out of the custom tab.
if (result.resultCode == Activity.RESULT_CANCELED) {
if (viewModel.singleServerCustomTabActivity) {
finish()
// Show blank page and spinner until PKCE is done.
viewModel.loginUrl.value = ABOUT_BLANK
} else {
// Don't show server picker if we are re-authenticating with cookie.
clearWebView(showServerPicker = !sharedBrowserSession)
Expand Down Expand Up @@ -1192,7 +1193,7 @@ open class LoginActivity : FragmentActivity() {
val useLightIcons = titleTextColorLight ?: topAppBarDark ?: dynamicThemeIsDark
WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = useLightIcons
}.also {
if (!viewModel.authFinished.value) {
if (!viewModel.authFinished.value && url != ABOUT_BLANK) {
viewModel.loading.value = false
}
}
Expand Down
Loading