From b8546d8e8b9e47b8cd09cfe3adb2f762e38d496f Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 14 Sep 2018 13:12:55 -0700 Subject: [PATCH] =?UTF-8?q?Don't=20store=20account.unreadCount=20in=20Sett?= =?UTF-8?q?ings.odb.=20Don=E2=80=99t=20rewrite=20AccountData.plist=20when?= =?UTF-8?q?=20feed.contentHash=20changes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/Account/Account.swift | 1 - Frameworks/Account/Feed.swift | 4 ---- Frameworks/Account/LocalAccount/LocalAccountRefresher.swift | 1 - 3 files changed, 6 deletions(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 7aa3f7c4c..c8c826ef4 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -78,7 +78,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, didSet { if unreadCount != oldValue { postUnreadCountDidChangeNotification() - settingsTable.set(unreadCount, name: SettingsKey.unreadCount) } } } diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift index 78194e085..33741421d 100644 --- a/Frameworks/Account/Feed.swift +++ b/Frameworks/Account/Feed.swift @@ -116,7 +116,6 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable { self.faviconURL = dictionary[Key.faviconURL] as? String self.name = dictionary[Key.name] as? String self.editedName = dictionary[Key.editedName] as? String -// self.contentHash = dictionary[Key.contentHash] as? String if let conditionalGetInfoDictionary = dictionary[Key.conditionalGetInfo] as? [String: String] { self.conditionalGetInfo = HTTPConditionalGetInfo(dictionary: conditionalGetInfoDictionary) @@ -160,9 +159,6 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable { if let authorsArray = authors?.diskArray() { d[Key.authors] = authorsArray } -// if let contentHash = contentHash { -// d[Key.contentHash] = contentHash -// } if let conditionalGetInfo = conditionalGetInfo { d[Key.conditionalGetInfo] = conditionalGetInfo.dictionary } diff --git a/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift b/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift index 618093110..fbdf1d1e6 100644 --- a/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift +++ b/Frameworks/Account/LocalAccount/LocalAccountRefresher.swift @@ -80,7 +80,6 @@ extension LocalAccountRefresher: DownloadSessionDelegate { } feed.contentHash = dataHash - feed.account?.dirty = true } } }