diff --git a/Shared/Resources/GlobalKeyboardShortcuts.plist b/Shared/Resources/GlobalKeyboardShortcuts.plist
index 4471354f7..88e4eac90 100644
--- a/Shared/Resources/GlobalKeyboardShortcuts.plist
+++ b/Shared/Resources/GlobalKeyboardShortcuts.plist
@@ -106,11 +106,11 @@
title
- Open in Safari
+ Open in App Browser
key
[return]
action
- openInSafari:
+ openFeedInAppBrowser:
key
diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift
index 9bd609774..b43783b64 100644
--- a/iOS/Article/ArticleViewController.swift
+++ b/iOS/Article/ArticleViewController.swift
@@ -256,6 +256,7 @@ class ArticleViewController: UIViewController {
}
// MARK: Keyboard Shortcuts
+
@objc func navigateToTimeline(_ sender: Any?) {
coordinator.navigateToTimeline()
}
@@ -277,7 +278,10 @@ class ArticleViewController: UIViewController {
func stopArticleExtractorIfProcessing() {
currentWebViewController?.stopArticleExtractorIfProcessing()
}
-
+
+ func openInAppBrowser() {
+ currentWebViewController?.openInAppBrowser()
+ }
}
// MARK: WebViewControllerDelegate
diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift
index 3483c2079..c08c38ecf 100644
--- a/iOS/Article/WebViewController.swift
+++ b/iOS/Article/WebViewController.swift
@@ -226,7 +226,15 @@ class WebViewController: UIViewController {
activityViewController.popoverPresentationController?.barButtonItem = popOverBarButtonItem
present(activityViewController, animated: true)
}
-
+
+ func openInAppBrowser() {
+ guard let preferredLink = article?.preferredLink, let url = URL(string: preferredLink) else {
+ return
+ }
+
+ let vc = SFSafariViewController(url: url)
+ present(vc, animated: true)
+ }
}
// MARK: ArticleExtractorDelegate
diff --git a/iOS/KeyboardManager.swift b/iOS/KeyboardManager.swift
index bf0a4c465..9129a4032 100644
--- a/iOS/KeyboardManager.swift
+++ b/iOS/KeyboardManager.swift
@@ -177,8 +177,8 @@ private extension KeyboardManager {
let openInBrowserTitle = NSLocalizedString("Open In Browser", comment: "Open In Browser")
keys.append(KeyboardManager.createKeyCommand(title: openInBrowserTitle, action: "openInBrowser:", input: UIKeyCommand.inputRightArrow, modifiers: [.command]))
- let openInSafariTitle = NSLocalizedString("Open In Safari", comment: "Open In Safari")
- keys.append(KeyboardManager.createKeyCommand(title: openInSafariTitle, action: "openInSafari:", input: "\r", modifiers: []))
+ let openInAppBrowserTitle = NSLocalizedString("Open In App Browser", comment: "Open In App Browser")
+ keys.append(KeyboardManager.createKeyCommand(title: openInAppBrowserTitle, action: "openInAppBrowser:", input: "\r", modifiers: []))
let toggleReadTitle = NSLocalizedString("Toggle Read Status", comment: "Toggle Read Status")
keys.append(KeyboardManager.createKeyCommand(title: toggleReadTitle, action: "toggleRead:", input: "u", modifiers: [.command, .shift]))
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 1ca161c31..27aa0c9cc 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -11,6 +11,7 @@ import Account
import Articles
import RSCore
import RSTree
+import SafariServices
class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
@@ -420,10 +421,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
@objc func openInBrowser(_ sender: Any?) {
coordinator.showBrowserForCurrentFeed()
}
-
- @objc func openInSafari(_ sender: Any?) {
- coordinator.showSafariForCurrentFeed()
- }
@objc override func delete(_ sender: Any?) {
if let indexPath = coordinator.currentFeedIndexPath {
@@ -507,7 +504,14 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
func focus() {
becomeFirstResponder()
}
-
+
+ func openInAppBrowser() {
+ if let indexPath = coordinator.currentFeedIndexPath,
+ let url = coordinator.homePageURLForFeed(indexPath) {
+ let vc = SFSafariViewController(url: url)
+ present(vc, animated: true)
+ }
+ }
}
// MARK: UIContextMenuInteractionDelegate
diff --git a/iOS/RootSplitViewController.swift b/iOS/RootSplitViewController.swift
index 1089dbe26..4117a0ee7 100644
--- a/iOS/RootSplitViewController.swift
+++ b/iOS/RootSplitViewController.swift
@@ -82,8 +82,12 @@ class RootSplitViewController: UISplitViewController {
coordinator.showBrowserForCurrentArticle()
}
- @objc func openInSafari(_ sender: Any?) {
- coordinator.showSafariForCurrentArticle()
+ @objc func openInAppBrowser(_ sender: Any?) {
+ coordinator.showInAppBrowserForCurrentArticle()
+ }
+
+ @objc func openFeedInAppBrowser(_ sender: Any?) {
+ coordinator.showInAppBrowserForCurrentFeed()
}
@objc func articleSearch(_ sender: Any?) {
diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index 93a73fd5c..22d1f30a3 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -1185,19 +1185,12 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
UIApplication.shared.open(url, options: [:])
}
- func showSafariForCurrentFeed() {
- if let ip = currentFeedIndexPath, let url = homePageURLForFeed(ip) {
- let vc = SFSafariViewController(url: url)
- rootSplitViewController.viewControllers.last?.present(vc, animated: true)
- }
+ func showInAppBrowserForCurrentArticle() {
+ articleViewController?.openInAppBrowser()
}
- func showSafariForCurrentArticle() {
- guard let preferredLink = currentArticle?.preferredLink, let url = URL(string: preferredLink) else {
- return
- }
- let vc = SFSafariViewController(url: url)
- rootSplitViewController.viewControllers.last?.present(vc, animated: true)
+ func showInAppBrowserForCurrentFeed() {
+ masterFeedViewController.openInAppBrowser()
}
func navigateToFeeds() {