Copy code from #26099 and handle data, about, file, wss, etc schemes.

brave · Oct 19, 2024 · a9889e4 · a9889e4
1 parent 5bae8b7
commit a9889e4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/CollapsedURLBarView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/CollapsedURLBarView.swift
@@ -108,7 +108,8 @@ class CollapsedURLBarView: UIView {
           Strings.PageSecurityView.signIntoWebsiteURLBarTitle
         } else {
           URLFormatter.formatURLOrigin(
-            forDisplayOmitSchemePathAndTrivialSubdomains: $0.scheme == "blob"
+            forDisplayOmitSchemePathAndTrivialSubdomains: $0.scheme != "http"
+              || $0.scheme != "https"
               ? URLOrigin(url: $0).url?.absoluteString ?? $0.absoluteString : $0.absoluteString
           )
         }

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/TabLocationView.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/TabLocationView.swift
@@ -452,24 +452,24 @@ class TabLocationView: UIView {
   }
 
   private func updateURLBarWithText() {
-    guard let url = url else {
-      urlDisplayLabel.text = ""
-      return
-    }
-
-    if let internalURL = InternalURL(url), internalURL.isBasicAuthURL {
-      urlDisplayLabel.text = Strings.PageSecurityView.signIntoWebsiteURLBarTitle
+    if let url = url {
+      if 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 != "http" || url.scheme != "https"
+            ? URLOrigin(url: url).url?.absoluteString ?? "" : url.absoluteString,
+          formatTypes: [
+            .trimAfterHost, .omitHTTP, .omitHTTPS, .omitTrivialSubdomains, .omitDefaults,
+          ],
+          unescapeOptions: .normal
+        )
+      }
     } 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
-      )
+      urlDisplayLabel.text = ""
     }
 
     reloadButton.isHidden = url == nil