renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduces Browsers to in-app and system default

Browse Source
This commit is contained in:
Stuart Breckenridge
2021-08-25 15:05:18 +08:00
parent 7a726e6d8a
commit 3bc18e2891
31 changed files with 39 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
iOS/Article/WebViewController.swift
View File

@@ -250,11 +250,11 @@ class WebViewController: UIViewController {
func openInAppBrowser() {
guard let url = article?.preferredURL else { return }
if BrowserManager.shared.currentBrowser() == .inApp {
if AppDefaults.shared.browserPreference == Browser.inApp.browserID {
let vc = SFSafariViewController(url: url)
present(vc, animated: true)
} else {
BrowserManager.shared.openURL(urlString: url.absoluteString)
UIApplication.shared.open(url, options: [:])
}
}
}
@@ -348,10 +348,11 @@ extension WebViewController: WKNavigationDelegate {
let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
if components?.scheme == "http" || components?.scheme == "https" {
decisionHandler(.cancel)
if BrowserManager.shared.currentBrowser() == .inApp {
openURL(url)
if AppDefaults.shared.browserPreference == Browser.inApp.browserID {
let vc = SFSafariViewController(url: url)
self.present(vc, animated: true, completion: nil)
} else {
BrowserManager.shared.openURL(urlString: url.absoluteString)
UIApplication.shared.open(url, options: [:])
}
} else if components?.scheme == "mailto" {