Skip to content

Commit

Permalink
Fix blank URL bar
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon-T committed Oct 18, 2024
1 parent a0cca7c commit 6871339
Showing 1 changed file with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -450,24 +450,23 @@ class TabLocationView: UIView {
}

private func updateURLBarWithText() {
guard let url = url else {
urlDisplayLabel.text = ""
return
}

if let internalURL = InternalURL(url), internalURL.isBasicAuthURL {
if let url = url, let internalURL = InternalURL(url), internalURL.isBasicAuthURL {
urlDisplayLabel.text = Strings.PageSecurityView.signIntoWebsiteURLBarTitle
} else {
// Matches LocationBarModelImpl::GetFormattedURL in Chromium (except for omitHTTP)
// components/omnibox/browser/location_bar_model_impl.cc
// TODO: Export omnibox related APIs and use directly
urlDisplayLabel.text = URLFormatter.formatURL(
url.scheme == "blob" ? URLOrigin(url: url).url?.absoluteString ?? "" : url.absoluteString,
formatTypes: [
.trimAfterHost, .omitHTTP, .omitHTTPS, .omitTrivialSubdomains, .omitDefaults,
],
unescapeOptions: .normal
)
if let url = url {
urlDisplayLabel.text = URLFormatter.formatURL(
url.scheme == "blob" ? URLOrigin(url: url).url?.absoluteString ?? "" : url.absoluteString,
formatTypes: [
.trimAfterHost, .omitHTTP, .omitHTTPS, .omitTrivialSubdomains, .omitDefaults,
],
unescapeOptions: .normal
)
} else {
urlDisplayLabel.text = ""
}
}

reloadButton.isHidden = url == nil
Expand Down

0 comments on commit 6871339

Please sign in to comment.