Skip to content
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.

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

[iOS] Fallback to default value correctly for optional preferences #26610

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

kylehickinson
Copy link
Collaborator

For preferences with optional types, the container check was incorrectly casting to the full ValueType which itself was already optional instead of the optionally-erased V type which would cause a successful cast to an Optional<V>.some(nil) rather than to a proper nil value

Resolves brave/brave-browser#42320

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

For preferences with optional types, the container check was incorrectly casting to the full `ValueType` which itself was already optional instead of the optionally-erased `V` type which would cause a successful cast to an `Optional<V>.some(nil)` rather than to a proper `nil` value
@kylehickinson kylehickinson added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Nov 18, 2024
@kylehickinson kylehickinson self-assigned this Nov 18, 2024
@kylehickinson kylehickinson requested a review from a team as a code owner November 18, 2024 16:57
@kylehickinson kylehickinson merged commit 436618c into master Nov 18, 2024
18 checks passed
@kylehickinson kylehickinson deleted the ios-shortcut-button-migration-fix branch November 18, 2024 18:46
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 18, 2024
brave-builds added a commit that referenced this pull request Nov 18, 2024
brave-builds added a commit that referenced this pull request Nov 18, 2024
@brave-builds
Copy link
Collaborator

Released in v1.75.29

@kjozwiak
Copy link
Member

Verification PASSED on iPad Air (3rd Gen) running iOS 18.1 using the following build(s):

Brave | 1.75.29 Chromium: 131.0.6778.69 (Official Build) nightly (64-bit)
--- | ---
Revision | 5107c49b054e241d3dd2eac141c4246b180b4c94
OS | iOS

Using the STR/Cases outlined via brave/brave-browser#42320 (comment), reproduced the original issue by installing 1.71.82 and then upgrading to 1.75.23 as per the following:

ScreenRecording_11-18-2024.23-20-18_1.MP4

Using the same STR/Cases mentioned above, ensured that the issue wasn't occurring when installing 1.71.82 and then upgrading to 1.75.29 as per the following:

ScreenRecording_11-18-2024.23-25-15_1.MP4

kjozwiak pushed a commit that referenced this pull request Nov 19, 2024
kjozwiak pushed a commit that referenced this pull request Nov 19, 2024
…plift to 1.73.x) (#26616)

Uplift of #26610 (squashed) to release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-teamcity Do not run builds in TeamCity CI/skip-windows-x64 Do not run CI builds for Windows x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bookmarks shortcut not shown for existing users [iPad]
4 participants