diff --git a/iOS/Add/AddFeedFolderViewController.swift b/iOS/Add/AddFeedFolderViewController.swift index 42b560fe3..5c75bbb94 100644 --- a/iOS/Add/AddFeedFolderViewController.swift +++ b/iOS/Add/AddFeedFolderViewController.swift @@ -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 { diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index 2ecd326ea..fbaafb39e 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -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) } diff --git a/iOS/Article/PreloadedWebView.swift b/iOS/Article/PreloadedWebView.swift index 32eec3fe5..ea8722e02 100644 --- a/iOS/Article/PreloadedWebView.swift +++ b/iOS/Article/PreloadedWebView.swift @@ -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) }