Repository navigation
Preserve Android login hosts with unrestricted MDM - #3060
Merged
brandonpage merged 3 commits intoOct 15, 2026
Merged
Conversation
…all back to URL for blank MDM labels
…wser selector Scroll Login Options toggles into view before clicking, since the Custom Tab browser selector pushes the Override Boot Config switch off-screen. Restore the beaconadvancedopaque/beaconadvancedjwt intent filters needed by the advanced auth beacon apps.
brandonpage
marked this pull request as ready for review
October 14, 2026 23:59
JohnsonEricAtSalesforce
approved these changes
Oct 15, 2026
JohnsonEricAtSalesforce
left a comment
JohnsonEricAtSalesforce
left a comment
Contributor
There was a problem hiding this comment.
Code verdict: approve on code merits. The current UI check is still running.
Requested Changes
None.
Open Questions
- If deleting a saved host reveals a duplicate from the other store, should it appear in the open picker immediately? The manager returns it, but the picker snapshots its list (
PickerBottomSheet.kt:349, 580-581), so it appears only after reopening.
This review was generated by an AI agent on behalf of @JohnsonEricAtSalesforce.
Contributor
Author
I am not too concerned with edge cases like this given we still have plans to re-write the underlying data structure. |
Contributor
|
Thanks, Brandon. I’m comfortable leaving that edge case as is for this PR, given the planned data structure rewrite. This response was generated by an AI agent on behalf of @JohnsonEricAtSalesforce. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
servers.xmlhosts and saved user-entered hosts visible when MDM provisions hosts withOnlyShowAuthorizedHosts=false.OnlyShowAuthorizedHosts=true, display only the current managed hosts while preserving hidden user-entered entries in storage.Absent, empty, or entirely null/blank MDM host payloads fall back to the normal host list. Defaults and app-defined XML hosts remain one source; there is no new built-in/app-defined split. No OAuth/DPoP or login activity changes are included.
Testing
Instrumented tests ran on Android 12/API 31 in batches following
.github/test-shards/SalesforceSDK.json, never as one unfiltered suite.remaining: 956 passed after the final selection-persistence fix.rest-unit: 99 passed.webview: 10 passed.git diff --checkpassed.Outstanding Validation
LoginActivityScenarioTest.cancellationCallback_back_notifiesBeforeDestructionrepeatedly fails on API 31; the test directly invokes a dispatcher callback registered only for API 33+ in the unchanged activity implementation. No unmodified-baseline run was performed.PickerBottomSheetActivityTest.serverPickerHeader_Navigates_AndDisplaysCorrectlyafter Back navigation; its cause remains unestablished. These UI paths were not modified.This is a draft for review; the known validation gaps are not represented as passing tests.