diff --git a/Account/Sources/Account/LocalAccount/LocalAccountDelegate.swift b/Account/Sources/Account/LocalAccount/LocalAccountDelegate.swift index 0accce9dd..74b2fd6f8 100644 --- a/Account/Sources/Account/LocalAccount/LocalAccountDelegate.swift +++ b/Account/Sources/Account/LocalAccount/LocalAccountDelegate.swift @@ -123,7 +123,7 @@ final class LocalAccountDelegate: AccountDelegate { } func createWebFeed(for account: Account, url urlString: String, name: String?, container: Container, validateFeed: Bool, completion: @escaping (Result) -> Void) { - guard let url = URL(string: urlString), let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false) else { + guard let url = URL(string: urlString) else { completion(.failure(LocalAccountDelegateError.invalidParameter)) return } diff --git a/Account/Sources/Account/WebFeed.swift b/Account/Sources/Account/WebFeed.swift index 3e94b7509..119010291 100644 --- a/Account/Sources/Account/WebFeed.swift +++ b/Account/Sources/Account/WebFeed.swift @@ -221,18 +221,6 @@ public final class WebFeed: Feed, Renamable, Hashable { } } - // MARK: - Feed Provider - public var isFeedProvider: Bool { - get { - guard let webfeedURL = URL(string: url), - let components = URLComponents(url: webfeedURL, resolvingAgainstBaseURL: false) else { - return false - } - - return false - } - } - // MARK: - NotificationDisplayName public var notificationDisplayName: String { #if os(macOS) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 002e975bc..633a713d7 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -455,7 +455,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } let isDisplayingSheet = mainWindowController?.isDisplayingSheet ?? false - let isSpecialAccountAvailable = AccountManager.shared.activeAccounts.contains(where: { $0.type == .onMyMac || $0.type == .cloudKit }) if item.action == #selector(refreshAll(_:)) { return !AccountManager.shared.refreshInProgress && !AccountManager.shared.activeAccounts.isEmpty diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index 81e537dc3..4fbdec7df 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -191,11 +191,7 @@ class ArticleViewController: UIViewController { starBarButtonItem.isEnabled = true let permalinkPresent = article.preferredLink != nil - var isFeedProvider = false - if let webfeed = article.webFeed { - isFeedProvider = webfeed.isFeedProvider - } - articleExtractorButton.isEnabled = permalinkPresent && !AppDefaults.shared.isDeveloperBuild && !isFeedProvider + articleExtractorButton.isEnabled = permalinkPresent && !AppDefaults.shared.isDeveloperBuild actionBarButtonItem.isEnabled = permalinkPresent if article.status.read { diff --git a/iOS/Inspector/WebFeedInspectorViewController.swift b/iOS/Inspector/WebFeedInspectorViewController.swift index 3a96b70df..33ef8ecad 100644 --- a/iOS/Inspector/WebFeedInspectorViewController.swift +++ b/iOS/Inspector/WebFeedInspectorViewController.swift @@ -43,13 +43,7 @@ class WebFeedInspectorViewController: UITableViewController { notifyAboutNewArticlesSwitch.setOn(webFeed.isNotifyAboutNewArticles ?? false, animated: false) - if webFeed.isFeedProvider { - alwaysShowReaderViewSwitch.isOn = false - alwaysShowReaderViewSwitch.isEnabled = false - } else { - alwaysShowReaderViewSwitch.setOn(webFeed.isArticleExtractorAlwaysOn ?? false, animated: false) - } - + alwaysShowReaderViewSwitch.setOn(webFeed.isArticleExtractorAlwaysOn ?? false, animated: false) homePageLabel.text = webFeed.homePageURL?.decodedURLString feedURLLabel.text = webFeed.url.decodedURLString