renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish changes mandated by DatabaseQueue changes.

Browse Source
This commit is contained in:
Brent Simmons
2019-12-16 22:45:59 -08:00
parent 3c8097404f
commit 15184aa3f1
28 changed files with 291 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -340,12 +340,12 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
}
@objc func statusesDidChange(_ note: Notification) {
guard let updatedArticles = note.userInfo?[Account.UserInfoKey.articles] as? Set<Article> else {
guard let articleIDs = note.userInfo?[Account.UserInfoKey.articleIDs] as? Set<String>, !articleIDs.isEmpty else {
return
}
let visibleArticles = tableView.indexPathsForVisibleRows!.compactMap { return dataSource.itemIdentifier(for: $0) }
let visibleUpdatedArticles = visibleArticles.filter { updatedArticles.contains($0) }
let visibleUpdatedArticles = visibleArticles.filter { articleIDs.contains($0.articleID) }
for article in visibleUpdatedArticles {
if let indexPath = dataSource.indexPath(for: article) {
@@ -675,8 +675,11 @@ private extension MasterTimelineViewController {
func markAllInFeedAsReadAction(_ article: Article) -> UIAction? {
guard let webFeed = article.webFeed else { return nil }
guard let fetchedArticles = try? webFeed.fetchArticles() else {
return nil
}
let articles = Array(webFeed.fetchArticles())
let articles = Array(fetchedArticles)
guard articles.canMarkAllAsRead() else {
return nil
}
@@ -692,8 +695,11 @@ private extension MasterTimelineViewController {
func markAllInFeedAsReadAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
guard let webFeed = article.webFeed else { return nil }
let articles = Array(webFeed.fetchArticles())
guard let fetchedArticles = try? webFeed.fetchArticles() else {
return nil
}
let articles = Array(fetchedArticles)
guard articles.canMarkAllAsRead() else {
return nil
}