@W-20978376: User Story - [Android] Remove supportWelcomeDiscovery flag in dev #2823

JohnsonEricAtSalesforce · 2026-01-20T23:36:18Z

🥁 Ready For Review 🎸

This catches 13.2.0 dev up with today's commits to 13.1.1 master

github-actions · 2026-01-20T23:41:21Z

Job Summary for Gradle

Pull Request :: test-android

Gradle Root Project	Requested Tasks	Gradle Version	Build Outcome
SalesforceMobileSDK-Android	libs:SalesforceSDK:convertCodeCoverage	8.14.3	✅
SalesforceMobileSDK-Android	libs:SalesforceSDK:lint	8.14.3	❌
SalesforceMobileSDK-Android	libs:SalesforceSDK:assembleAndroidTest	8.14.3	❌

github-actions · 2026-01-21T00:13:08Z

Job Summary for Gradle

Pull Request :: test-android

Gradle Root Project	Requested Tasks	Gradle Version	Build Outcome
SalesforceMobileSDK-Android	libs:SalesforceSDK:convertCodeCoverage	8.14.3	✅
SalesforceMobileSDK-Android	libs:SalesforceSDK:lint	8.14.3	❌
SalesforceMobileSDK-Android	libs:SalesforceSDK:assembleAndroidTest	8.14.3	❌

codecov · 2026-01-21T00:59:52Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 53.49%. Comparing base (47f5b94) to head (8d769b9).
⚠️ Report is 3 commits behind head on dev.

Additional details and impacted files

@@             Coverage Diff              @@
##                dev    #2823      +/-   ##
============================================
- Coverage     63.06%   53.49%   -9.58%     
+ Complexity     2831     2428     -403     
============================================
  Files           215      216       +1     
  Lines         17036    16980      -56     
  Branches       2465     2417      -48     
============================================
- Hits          10744     9083    -1661     
- Misses         5124     6870    +1746     
+ Partials       1168     1027     -141

Components	Coverage Δ
Analytics	`47.92% <ø> (ø)`
SalesforceSDK	`56.34% <50.00%> (+0.30%)`	⬆️
Hybrid	`44.91% <ø> (-14.15%)`	⬇️
SmartStore	`78.20% <ø> (ø)`
MobileSync	`36.95% <ø> (-44.73%)`	⬇️
React	`36.25% <ø> (-16.12%)`	⬇️

Files with missing lines	Coverage Δ
.../salesforce/androidsdk/app/SalesforceSDKManager.kt	`58.92% <ø> (-0.15%)`	⬇️
.../src/com/salesforce/androidsdk/ui/LoginActivity.kt	`42.99% <100.00%> (-0.78%)`	⬇️
...m/salesforce/androidsdk/ui/LoginOptionsActivity.kt	`87.62% <ø> (-0.61%)`	⬇️
...src/com/salesforce/androidsdk/ui/LoginViewModel.kt	`89.69% <100.00%> (+0.10%)`	⬆️

... and 46 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

brandonpage · 2026-01-21T02:35:47Z

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

-                val isNewServer = viewModel.loginUrl.value?.startsWith(value) != true
+                val valueUrl = value.toUri()
+                val loginUrl = viewModel.loginUrl.value?.toUri()
+                val isNewServer = loginUrl?.host != valueUrl.host || loginUrl?.path != valueUrl.path


This looks like an unrelated behavior change. Why is it here?

It's a fix for W-20935841 that we ran into when testing WSC and WSC/disco login. The fix was done in master in the same PR that removed supportWelcomeDiscovery.

Ah, thank you I wasn't aware of that fix. Having both welcome.salesforce.com and welcome.salesforce.com/discovery seems like a very niche issue. And I know for a fact that I explicitly used startsWith instead of directly comparing the path to prevent bugs where login would fail from running getAuthorizationUrl when we shouldn't have as that causes the PKCE code and verifier to be set with new values. Perhaps the scenario this was intended to prevent does not exist anymore but I'm not 100% sure.

Circling back:

The startsWith is not a carry over from the old OAuthWebviewHelper.

Looking at the current code, LoginUrlSource is only ever called when selectedServer changes and I do not see a scenario. If it does not happen mid authentication there should not be any issues with getting new code/verifier.

Seems like whatever issue this did avoid is no longer possible.

Wow! Thanks for the detailed analysis ⭐️⭐️⭐️⭐️⭐️

Unsure if issues raised is a bug or not.

brandonpage · 2026-01-21T20:32:34Z

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

+            val intent = activity.intent
+            val data = intent.data
+            if (data == null) {
+                Log.i("CodeCov", "1")
+            }
+            if (data?.host?.equals(pendingServerUri.host) == true) {
+                Log.i("CodeCov", "2.0")
+            }
+            if (data?.host?.equals(pendingServerUri.host) == false) {
+                Log.i("CodeCov", "2.1")
+            }
+            if (data?.path?.equals(pendingServerUri.path) == true) {
+                Log.i("CodeCov", "3.0")
+            }
+            if (data?.path?.equals(pendingServerUri.path) == false) {
+                Log.i("CodeCov", "3.1")
+            }
+            if (intent.getStringExtra(EXTRA_KEY_LOGIN_HOST).equals(pendingServerUri.host)) {
+                Log.i("CodeCov", "4.0")
+            }
+            if (!(intent.getStringExtra(EXTRA_KEY_LOGIN_HOST).equals(pendingServerUri.host))) {
+                Log.i("CodeCov", "4.1")
+            }
+            if (((data?.host?.equals(pendingServerUri.host) == true).and(data?.path?.equals(pendingServerUri.path) == true)).or(intent.getStringExtra(EXTRA_KEY_LOGIN_HOST).equals(pendingServerUri.host))) {


@JohnsonEricAtSalesforce Was this intended to be checked in?

Edit: I see the "(CodeCov Testing - Hold Reviewing Commit)" now.

Thanks for looking for that. This commit will be replaced with a much simpler commit once I get full coverage. Even with Windsurf helping, getting through all the logic branches and minimizing their count is still tedious.

@brandonpage - Here's the finalized commit for code coverage, assuming it still produces the coverage I was looking for. 16daac0

Most of the updates were suggested by or reviewed by Windsurf. I wrote the tests by hand, though, since the generated code was overly verbose it seemed.

…orcedotcom#2822)

…deCov Testing Finalized)

JohnsonEricAtSalesforce self-assigned this Jan 20, 2026

wmathurin approved these changes Jan 20, 2026

View reviewed changes

brandonpage previously requested changes Jan 21, 2026

View reviewed changes

wmathurin approved these changes Jan 21, 2026

View reviewed changes

brandonpage approved these changes Jan 21, 2026

View reviewed changes

brandonpage reviewed Jan 21, 2026

View reviewed changes

JohnsonEricAtSalesforce force-pushed the feature/merge-13.1.1-master-to-13.2.0-dev branch 4 times, most recently from 38701a9 to 29f14a8 Compare January 21, 2026 22:34

@W-20935841: Bug - P2 - [Android] Login Server Switching Misbehaving (f…

17eb379

…orcedotcom#2822)

JohnsonEricAtSalesforce force-pushed the feature/merge-13.1.1-master-to-13.2.0-dev branch 2 times, most recently from 81dc9a7 to 16daac0 Compare January 21, 2026 23:42

@W-20978376: [Android] Remove supportWelcomeDiscovery flag in dev (Co…

8d769b9

…deCov Testing Finalized)

JohnsonEricAtSalesforce force-pushed the feature/merge-13.1.1-master-to-13.2.0-dev branch from 16daac0 to 8d769b9 Compare January 21, 2026 23:57

brandonpage mentioned this pull request Jan 22, 2026

[DNM] Merge Master to Dev after showLoginPage Cherry-Pick #2828

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

@W-20978376: User Story - [Android] Remove supportWelcomeDiscovery flag in dev #2823

@W-20978376: User Story - [Android] Remove supportWelcomeDiscovery flag in dev #2823

JohnsonEricAtSalesforce commented Jan 20, 2026

Uh oh!

github-actions bot commented Jan 20, 2026

Pull Request :: test-android

Uh oh!

github-actions bot commented Jan 21, 2026

Pull Request :: test-android

Uh oh!

codecov bot commented Jan 21, 2026 •

edited

Loading

Uh oh!

brandonpage Jan 21, 2026

Uh oh!

wmathurin Jan 21, 2026

Uh oh!

brandonpage Jan 21, 2026

Uh oh!

brandonpage Jan 21, 2026

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Uh oh!

brandonpage Jan 21, 2026 •

edited

Loading

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

@W-20978376: User Story - [Android] Remove supportWelcomeDiscovery flag in dev #2823

Are you sure you want to change the base?

@W-20978376: User Story - [Android] Remove supportWelcomeDiscovery flag in dev #2823

Conversation

JohnsonEricAtSalesforce commented Jan 20, 2026

Uh oh!

github-actions bot commented Jan 20, 2026

Job Summary for Gradle

Pull Request :: test-android

Uh oh!

github-actions bot commented Jan 21, 2026

Job Summary for Gradle

Pull Request :: test-android

Uh oh!

codecov bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

brandonpage Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

wmathurin Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

brandonpage Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

brandonpage Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

brandonpage Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

JohnsonEricAtSalesforce Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Jan 21, 2026 •

edited

Loading

brandonpage Jan 21, 2026 •

edited

Loading