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

Fix build errors.

Browse Source
This commit is contained in:
Brent Simmons
2024-12-04 18:43:47 -08:00
parent d4073b205f
commit 05ea769c12
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iOS/Add/AddFeedFolderViewController.swift
View File

@@ -17,7 +17,6 @@ protocol AddFeedFolderViewControllerDelegate {
class AddFeedFolderViewController: UITableViewController {
var delegate: AddFeedFolderViewControllerDelegate?
var addFeedType = AddFeedType.web
var initialContainer: Container?
var containers = [Container]()
@@ -25,13 +24,8 @@ class AddFeedFolderViewController: UITableViewController {
override func viewDidLoad() {
super.viewDidLoad()
var sortedActiveAccounts: [Account]
if addFeedType == .web {
sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts
} else {
sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts.filter { $0.type == .onMyMac || $0.type == .cloudKit }
}
let sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts
for account in sortedActiveAccounts {
containers.append(account)
if let sortedFolders = account.sortedFolders {

2
iOS/Add/AddFeedViewController.swift
View File

@@ -25,7 +25,6 @@ class AddFeedViewController: UITableViewController {
private var folderLabel = ""
private var userCancelled = false
var addFeedType = AddFeedType.web
var initialFeed: String?
var initialFeedName: String?
@@ -147,7 +146,6 @@ class AddFeedViewController: UITableViewController {
navController.modalPresentationStyle = .currentContext
let folderViewController = navController.topViewController as! AddFeedFolderViewController
folderViewController.delegate = self
folderViewController.addFeedType = addFeedType
folderViewController.initialContainer = container
present(navController, animated: true)
}

17
iOS/Article/PreloadedWebView.swift
View File

@@ -14,16 +14,6 @@ class PreloadedWebView: WKWebView {
private var isReady: Bool = false
private var readyCompletion: (() -> Void)?
static let userScripts: [WKUserScript] = {
var scripts = [WKUserScript]()
for fileName in ["main.js", "main_ios.js", "newsfoot.js"] {
let scriptSource = try! String(contentsOf: baseURL.appending(path: fileName, directoryHint: .notDirectory))
let script = WKUserScript(source: scriptSource, injectionTime: .atDocumentStart, forMainFrameOnly: true, in: appScriptsWorld)
scripts.append(script)
}
return scripts
}()
init(articleIconSchemeHandler: ArticleIconSchemeHandler) {
let preferences = WKPreferences()
preferences.javaScriptCanOpenWindowsAutomatically = false
@@ -36,13 +26,6 @@ class PreloadedWebView: WKWebView {
configuration.mediaTypesRequiringUserActionForPlayback = .audio
configuration.setURLSchemeHandler(articleIconSchemeHandler, forURLScheme: ArticleRenderer.imageIconScheme)
let userContentController = WKUserContentController()
let appScriptsWorld = WKContentWorld.world(name: "NetNewsWire")
for script in Self.userScripts {
userContentController.addUserScript(script)
}
configuration.userContentController = userContentController
super.init(frame: .zero, configuration: configuration)
}