Dont use unknown secure content state for internal urls/reader mode

brave · Nov 17, 2023 · 58739f5 · 58739f5
1 parent b82c45d
commit 58739f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1771,6 +1771,9 @@ public class BrowserViewController: UIViewController {
       }
 
       if tab.secureContentState == .secure && !webView.hasOnlySecureContent {
+        if let url = tab.webView?.url, url.isReaderModeURL {
+          break
+        }
         tab.secureContentState = .mixedContent
       }
 
@@ -1813,9 +1816,9 @@ public class BrowserViewController: UIViewController {
           }
 
           if url.isReaderModeURL || InternalURL.isValid(url: url) {
-            tab.secureContentState = .unknown
+            tab.secureContentState = .localhost
             if tabManager.selectedTab === tab {
-              updateToolbarSecureContentState(.unknown)
+              updateToolbarSecureContentState(.localhost)
             }
             break
           }

diff --git a/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -67,8 +67,10 @@ extension BrowserViewController: WKNavigationDelegate {
     if let selectedTab = tabManager.selectedTab,
        selectedTab.url?.origin != webView.url?.origin {
       // reset secure content state to unknown until page can be evaluated
-      selectedTab.secureContentState = .unknown
-      updateToolbarSecureContentState(.unknown)
+      if let url = webView.url, !InternalURL.isValid(url: url) {
+        selectedTab.secureContentState = .unknown
+        updateToolbarSecureContentState(.unknown)
+      }
       // new site has a different origin, hide wallet icon.
       tabManager.selectedTab?.isWalletIconVisible = false
       // new site, reset connected addresses