Fix #5798 for handling no network (#6173)

* webview.url was nil which prevents what’s new page from also having the error page
mozilla-mobile · Apr 20, 2020 · d975952 · d975952
1 parent 0f1624f
commit d975952
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -999,7 +999,6 @@ class BrowserViewController: UIViewController {
         } else {
             request = nil
         }
-
         switchToPrivacyMode(isPrivate: isPrivate)
         tabManager.selectTab(tabManager.addTab(request, isPrivate: isPrivate))
     }

diff --git a/Client/Frontend/Browser/TabTrayController.swift b/Client/Frontend/Browser/TabTrayController.swift
@@ -365,7 +365,6 @@ class TabTrayController: UIViewController {
         }
         // We dismiss the tab tray once we are done. So no need to re-enable the toolbar
         toolbar.isUserInteractionEnabled = false
-
         tabManager.selectTab(tabManager.addTab(request, isPrivate: tabDisplayManager.isPrivate))
     }
 }

diff --git a/Client/Frontend/InternalSchemeHandler/ErrorPageHelper.swift b/Client/Frontend/InternalSchemeHandler/ErrorPageHelper.swift
@@ -230,7 +230,9 @@ class ErrorPageHelper {
     }
 
     func loadPage(_ error: NSError, forUrl url: URL, inWebView webView: WKWebView) {
-        guard var components = URLComponents(string: "\(InternalURL.baseUrl)/\(ErrorPageHandler.path)"), let webViewUrl = webView.url else {
+        let destinationUrl: URL? = (webView.url != nil) ? webView.url : url
+
+        guard var components = URLComponents(string: "\(InternalURL.baseUrl)/\(ErrorPageHandler.path)"), let webViewUrl = destinationUrl else {
             return
         }