Skip to content
New issue

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

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

Already on GitHub? # to your account

[iOS] - Fix Session Restore URL Display #26099

Merged
merged 1 commit into from
Oct 19, 2024
Merged

Conversation

Brandon-T
Copy link
Contributor

@Brandon-T Brandon-T commented Oct 18, 2024

Summary

  • When restoring a blob URL, the URL-Bar can be blank. This fixes it as a follow up to the Blob URL bar security fix.

Resolves brave/brave-browser#41716
Resolves https://github.com/brave/internal/issues/1210

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:

@Brandon-T Brandon-T 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 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Oct 18, 2024
@Brandon-T Brandon-T self-assigned this Oct 18, 2024
@Brandon-T Brandon-T requested a review from a team as a code owner October 18, 2024 16:40
unescapeOptions: .normal
)
} else {
urlDisplayLabel.text = ""
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this part? It wasn't part of the original function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original function does: URLFormatter.formatURL(url?.absoluteString ?? "", ....) which will return empty string if passed an empty string.

So instead of calling the function with an empty string, I just assigned it here.

@kylehickinson
Copy link
Collaborator

Please remember to cherry-pick these changes into the uplifts

@Brandon-T Brandon-T enabled auto-merge (squash) October 18, 2024 20:02
@Brandon-T Brandon-T merged commit a20ec2c into master Oct 19, 2024
18 checks passed
@Brandon-T Brandon-T deleted the bugfix/URL-Bar-Eliding-iOS branch October 19, 2024 00:01
@github-actions github-actions bot added this to the 1.73.x - Nightly milestone Oct 19, 2024
Brandon-T added a commit that referenced this pull request Oct 19, 2024
Copy code from #26099 and handle data, about, file, wss, etc schemes.
Brandon-T added a commit that referenced this pull request Oct 19, 2024
Copy code from #26099 and handle data, about, file, wss, etc schemes.
Brandon-T added a commit that referenced this pull request Oct 19, 2024
Copy code from #26099 and handle data, about, file, wss, etc schemes.
@brave-builds
Copy link
Collaborator

Released in v1.73.28

@kjozwiak
Copy link
Member

Verified PASSED on iPhone 12 running iOS 18 using version 1.73 (33).

Verification was completed via https://github.com/brave/internal/issues/1210#issuecomment-2429631900.

kjozwiak pushed a commit that referenced this pull request Oct 22, 2024
kjozwiak pushed a commit that referenced this pull request Oct 22, 2024
kjozwiak pushed a commit that referenced this pull request Oct 22, 2024
@bsclifton bsclifton modified the milestones: 1.73.x - Nightly, 1.74.x - Nightly Nov 6, 2024
# for free to join this conversation on GitHub. Already have an account? # 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 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[iOS][hackerone] Fix url formatting
5 participants