diff --git a/Account/Sources/Account/Account.swift b/Account/Sources/Account/Account.swift index 0c52c714a..4b70bf4dd 100644 --- a/Account/Sources/Account/Account.swift +++ b/Account/Sources/Account/Account.swift @@ -919,12 +919,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, // MARK: - Debug - public func debugDropConditionalGetInfo() { - #if DEBUG - flattenedWebFeeds().forEach{ $0.dropConditionalGetInfo() } - #endif - } - public func debugRunSearch() { #if DEBUG let t1 = Date() diff --git a/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift index 12d7bad13..718dfbc2e 100644 --- a/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift @@ -782,7 +782,6 @@ private extension CloudKitAccountDelegate { return } self.articlesZone.deleteArticles(webFeedExternalID) { result in - feed.dropConditionalGetInfo() self.refreshProgress.completeTask() completion(result) } diff --git a/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift index bc1224836..4f859f8a7 100644 --- a/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift @@ -85,7 +85,6 @@ class CloudKitAcountZoneDelegate: CloudKitZoneDelegate { func removeWebFeed(_ externalID: String) { if let webFeed = account?.existingWebFeed(withExternalID: externalID), let containers = account?.existingContainers(withWebFeed: webFeed) { containers.forEach { - webFeed.dropConditionalGetInfo() $0.removeWebFeed(webFeed) } } diff --git a/Account/Sources/Account/DataExtensions.swift b/Account/Sources/Account/DataExtensions.swift index 61ddc93cd..12349740d 100644 --- a/Account/Sources/Account/DataExtensions.swift +++ b/Account/Sources/Account/DataExtensions.swift @@ -26,7 +26,6 @@ public extension WebFeed { public static let editedName = "editedName" public static let authors = "authors" public static let contentHash = "contentHash" - public static let conditionalGetInfo = "conditionalGetInfo" } } diff --git a/Account/Sources/Account/WebFeed.swift b/Account/Sources/Account/WebFeed.swift index 119010291..6dfed1063 100644 --- a/Account/Sources/Account/WebFeed.swift +++ b/Account/Sources/Account/WebFeed.swift @@ -123,15 +123,6 @@ public final class WebFeed: Feed, Renamable, Hashable { } } - public var conditionalGetInfo: HTTPConditionalGetInfo? { - get { - return metadata.conditionalGetInfo - } - set { - metadata.conditionalGetInfo = newValue - } - } - public var contentHash: String? { get { return metadata.contentHash @@ -253,14 +244,6 @@ public final class WebFeed: Feed, Renamable, Hashable { self.metadata = metadata } - // MARK: - API - - public func dropConditionalGetInfo() { - conditionalGetInfo = nil - contentHash = nil - sinceToken = nil - } - // MARK: - Hashable public func hash(into hasher: inout Hasher) { diff --git a/Account/Sources/Account/WebFeedMetadata.swift b/Account/Sources/Account/WebFeedMetadata.swift index aa381709f..3f2363e79 100644 --- a/Account/Sources/Account/WebFeedMetadata.swift +++ b/Account/Sources/Account/WebFeedMetadata.swift @@ -26,7 +26,6 @@ final class WebFeedMetadata: Codable { case contentHash case isNotifyAboutNewArticles case isArticleExtractorAlwaysOn - case conditionalGetInfo case sinceToken case externalID = "subscriptionID" case folderRelationship @@ -104,14 +103,6 @@ final class WebFeedMetadata: Codable { } } - var conditionalGetInfo: HTTPConditionalGetInfo? { - didSet { - if conditionalGetInfo != oldValue { - valueDidChange(.conditionalGetInfo) - } - } - } - var sinceToken: String? { didSet { if externalID != oldValue { diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index b32d49f9d..4b05e161d 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -704,12 +704,6 @@ extension AppDelegate { AccountManager.shared.defaultAccount.debugRunSearch() } - @IBAction func debugDropConditionalGetInfo(_ sender: Any?) { - #if DEBUG - AccountManager.shared.activeAccounts.forEach{ $0.debugDropConditionalGetInfo() } - #endif - } - @IBAction func debugTestCrashReporterWindow(_ sender: Any?) { #if DEBUG crashReportWindowController = CrashReportWindowController(crashLogText: "This is a test crash log.") diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard index 0f677c945..c2906ddec 100644 --- a/Mac/Base.lproj/Main.storyboard +++ b/Mac/Base.lproj/Main.storyboard @@ -509,13 +509,6 @@ - - - - - - -