From 343f705cd71c53cea70f714ba8ba47203ae99870 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 12 Mar 2020 12:07:01 -0500
Subject: [PATCH] Fix article read filter which wasn't persisting correctly.

---
 Mac/AppDefaults.swift                         |  2 +-
 .../Timeline/TimelineViewController.swift     | 46 ++++++++++---------
 Shared/UserInfoKey.swift                      |  2 +
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/Mac/AppDefaults.swift b/Mac/AppDefaults.swift
index a74afc140..a61ca84d0 100644
--- a/Mac/AppDefaults.swift
+++ b/Mac/AppDefaults.swift
@@ -58,7 +58,7 @@ struct AppDefaults {
 	
 	static var windowState: [AnyHashable : Any]? {
 		get {
-			UserDefaults.standard.object(forKey: Key.windowState) as? [AnyHashable : Any]
+			return UserDefaults.standard.object(forKey: Key.windowState) as? [AnyHashable : Any]
 		}
 		set {
 			UserDefaults.standard.set(newValue, forKey: Key.windowState)
diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
index b3d637f51..2c8bdd75d 100644
--- a/Mac/MainWindow/Timeline/TimelineViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -248,11 +248,8 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 	// MARK: State Restoration
 	
 	func saveState(to state: inout [AnyHashable : Any]) {
-		var readArticlesFilterState = [[AnyHashable: AnyHashable]: Bool]()
-		for key in readFilterEnabledTable.keys {
-			readArticlesFilterState[key.userInfo] = readFilterEnabledTable[key]
-		}
-		state[UserInfoKey.readArticlesFilterState] = readArticlesFilterState
+		state[UserInfoKey.readArticlesFilterStateKeys] = readFilterEnabledTable.keys.compactMap { $0.userInfo }
+		state[UserInfoKey.readArticlesFilterStateValues] = readFilterEnabledTable.values.compactMap( { $0 })
 		
 		if selectedArticles.count == 1 {
 			state[UserInfoKey.articlePath] = selectedArticles.first!.pathUserInfo
@@ -260,32 +257,37 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 	}
 	
 	func restoreState(from state: [AnyHashable : Any]) {
-		if let readArticlesFilterState = state[UserInfoKey.readArticlesFilterState] as? [[AnyHashable: AnyHashable]: Bool] {
-			for key in readArticlesFilterState.keys {
-				if let feedIdentifier = FeedIdentifier(userInfo: key) {
-					readFilterEnabledTable[feedIdentifier] = readArticlesFilterState[key]
-				}
+		guard let readArticlesFilterStateKeys = state[UserInfoKey.readArticlesFilterStateKeys] as? [[AnyHashable: AnyHashable]],
+			let readArticlesFilterStateValues = state[UserInfoKey.readArticlesFilterStateValues] as? [Bool] else {
+			return
+		}
+
+		for i in 0..<readArticlesFilterStateKeys.count {
+			if let feedIdentifier = FeedIdentifier(userInfo: readArticlesFilterStateKeys[i]) {
+				readFilterEnabledTable[feedIdentifier] = readArticlesFilterStateValues[i]
 			}
 		}
 		
-		guard let articlePathUserInfo = state[UserInfoKey.articlePath] as? [AnyHashable : Any],
+		if let articlePathUserInfo = state[UserInfoKey.articlePath] as? [AnyHashable : Any],
 			let accountID = articlePathUserInfo[ArticlePathKey.accountID] as? String,
 			let account = AccountManager.shared.existingAccount(with: accountID),
-			let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String else {
-				return
-		}
-		
-		if isReadFiltered ?? true {
+			let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String {
+			
 			exceptionArticleFetcher = SingleArticleFetcher(account: account, articleID: articleID)
 			fetchAndReplaceArticlesSync()
+			
+			if let selectedIndex = articles.firstIndex(where: { $0.articleID == articleID }) {
+				tableView.selectRow(selectedIndex)
+				tableView.scrollTo(row: selectedIndex)
+				focus()
+			}
+
+		} else {
+			
+			fetchAndReplaceArticlesSync()
+
 		}
 		
-		if let selectedIndex = articles.firstIndex(where: { $0.articleID == articleID }) {
-			tableView.selectRow(selectedIndex)
-			tableView.scrollTo(row: selectedIndex)
-			focus()
-		}
-
 	}
 	
 	// MARK: - Actions
diff --git a/Shared/UserInfoKey.swift b/Shared/UserInfoKey.swift
index 4caccd6d6..31455b63e 100644
--- a/Shared/UserInfoKey.swift
+++ b/Shared/UserInfoKey.swift
@@ -19,6 +19,8 @@ struct UserInfoKey {
 	static let containerExpandedWindowState = "containerExpandedWindowState"
 	static let readFeedsFilterState = "readFeedsFilterState"
 	static let readArticlesFilterState = "readArticlesFilterState"
+	static let readArticlesFilterStateKeys = "readArticlesFilterStateKey"
+	static let readArticlesFilterStateValues = "readArticlesFilterStateValue"
 	static let selectedFeedsState = "selectedFeedsState"
 	
 }