Simplify open external function

hotwired · Nov 30, 2023 · 875a4c2 · 875a4c2
1 parent c304e59
commit 875a4c2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/Source/Turbo Navigator/TurboNavigationHierarchyController.swift b/Source/Turbo Navigator/TurboNavigationHierarchyController.swift
@@ -52,10 +52,6 @@ class TurboNavigationHierarchyController {
         }
     }
 
-    func openExternal(url: URL, navigationType: NavigationStackType) {
-        delegate.visit(externalURL: url, on: navigationType)
-    }
-
     // MARK: Private
 
     @available(*, unavailable)

diff --git a/Source/Turbo Navigator/TurboNavigationHierarchyControllerDelegate.swift b/Source/Turbo Navigator/TurboNavigationHierarchyControllerDelegate.swift
@@ -5,6 +5,5 @@ import WebKit
 /// or to render a native controller instead of a Turbo web visit.
 protocol TurboNavigationHierarchyControllerDelegate: AnyObject {
     func visit(_ : Visitable, on: TurboNavigationHierarchyController.NavigationStackType, with: VisitOptions)
-    func visit(externalURL: URL, on: TurboNavigationHierarchyController.NavigationStackType)
     func refresh(navigationStack: TurboNavigationHierarchyController.NavigationStackType)
 }
diff --git a/Source/Turbo Navigator/TurboNavigator.swift b/Source/Turbo Navigator/TurboNavigator.swift
@@ -111,9 +111,25 @@ extension TurboNavigator: SessionDelegate {
         }
     }
 
-    public func session(_ session: Session, openExternalURL url: URL) {
-        let navigationType: TurboNavigationHierarchyController.NavigationStackType = session === modalSession ? .modal : .main
-        hierarchyController.openExternal(url: url, navigationType: navigationType)
+    public func session(_ session: Session, openExternalURL externalURL: URL) {
+
+        switch delegate.handle(externalURL: externalURL) {
+
+        case .openViaSystem:
+            UIApplication.shared.open(externalURL)
+
+        case .openViaSafariController:
+            let safariViewController = SFSafariViewController(url: externalURL)
+            safariViewController.modalPresentationStyle = .pageSheet
+            if #available(iOS 15.0, *) {
+                safariViewController.preferredControlTintColor = .tintColor
+            }
+
+            activeNavigationController.present(safariViewController, animated: true)
+
+        case .reject:
+            return
+        }
     }
 
     public func session(_ session: Session, didFailRequestForVisitable visitable: Visitable, error: Error) {
@@ -153,27 +169,6 @@ extension TurboNavigator: TurboNavigationHierarchyControllerDelegate {
         case .modal: modalSession.visit(controller, action: .advance)
         }
     }
-
-    func visit(externalURL: URL, on: TurboNavigationHierarchyController.NavigationStackType) {
-
-        switch delegate.handle(externalURL: externalURL) {
-
-        case .openViaSystem:
-            UIApplication.shared.open(externalURL)
-
-        case .openViaSafariController:
-            let safariViewController = SFSafariViewController(url: externalURL)
-            safariViewController.modalPresentationStyle = .pageSheet
-            if #available(iOS 15.0, *) {
-                safariViewController.preferredControlTintColor = .tintColor
-            }
-
-            activeNavigationController.present(safariViewController, animated: true)
-
-        case .reject:
-            return
-        }
-    }
 
     func refresh(navigationStack: TurboNavigationHierarchyController.NavigationStackType) {
         switch navigationStack {