Fix going back from external pages in web view controller

openHPI · Oct 5, 2021 · 9425ccc · 9425ccc
1 parent 0b7a964
commit 9425ccc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/iOS/ViewControllers/Courses/WebViewController.swift b/iOS/ViewControllers/Courses/WebViewController.swift
@@ -45,7 +45,8 @@ class WebViewController: UIViewController {
     }
 
     private var webViewCanGoBack: Bool {
-        // WKWebView.canGoBack returns false values. So we check for the initial URL instead.
+        // WKWebView.canGoBack returns incorrect values as we have to set the headers for the request again.
+        // So we check for the initial URL instead.
         return self.webView.url != self.url
     }
 
@@ -172,6 +173,7 @@ class WebViewController: UIViewController {
 
     @objc private func goBack() {
         guard self.webViewCanGoBack else { return }
+        self.webView.stopLoading()
         self.webView.goBack()
         self.updateToolbarButtons()
     }
@@ -243,6 +245,10 @@ extension WebViewController: WKNavigationDelegate {
             return decisionHandler(.allow)
         }
 
+        if navigationAction.navigationType == .backForward {
+            return decisionHandler(.allow)
+        }
+
         let userIsLoggedIn = UserProfileHelper.shared.isLoggedIn
         let headerIsPresent = navigationAction.request.allHTTPHeaderFields?.keys.contains(Routes.Header.authKey) ?? false