Fix brave/brave-ios#8667: Fix webcompat url for internal links (brave…

…/brave-ios#8672)
brave · Feb 5, 2024 · 59c4397 · 59c4397
1 parent 00105e4
commit 59c4397
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift
@@ -446,8 +446,11 @@ extension BrowserViewController: TopToolbarDelegate {
 
     shields.showSubmitReportView = { [weak self] shieldsViewController in
       shieldsViewController.dismiss(animated: true) {
-        guard let url = shieldsViewController.tab.url else { return }
-        self?.showSubmitReportView(for: url)
+        if let internalURL = InternalURL(url), let displayURL = internalURL.displayURL {
+          self?.showSubmitReportView(for: displayURL)
+        } else {
+          self?.showSubmitReportView(for: url)
+        }
       }
     }
 

diff --git a/Sources/Shared/Extensions/URLExtensions.swift b/Sources/Shared/Extensions/URLExtensions.swift
@@ -638,4 +638,13 @@ public struct InternalURL {
     }
     return nil
   }
+
+  public var displayURL: URL? {
+    if isErrorPage {
+      return originalURLFromErrorPage
+    } else if isReaderModePage {
+      return extractedUrlParam
+    }
+    return nil
+  }
 }