FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-04 12:57:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression where marking all as unread wouldn't take you back to the sidebar

Browse Source
This commit is contained in:
Maurice Parker 2021-04-12 21:09:34 -05:00
parent f2bbacc871
commit 8f0519ca47
7 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -398,8 +398,9 @@ final class CloudKitAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, showProgress: false, completion: completion) self.sendArticleStatus(for: account, showProgress: false) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

3
Account/Sources/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
View File

@ -465,8 +465,9 @@ final class FeedWranglerAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, completion: completion) self.sendArticleStatus(for: account) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

3
Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -547,8 +547,9 @@ final class FeedbinAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, completion: completion) self.sendArticleStatus(for: account) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

3
Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift
View File

@ -498,8 +498,9 @@ final class FeedlyAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, completion: completion) self.sendArticleStatus(for: account) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

3
Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift
View File

@ -575,8 +575,9 @@ final class NewsBlurAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, completion: completion) self.sendArticleStatus(for: account) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

3
Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
View File

@ -540,8 +540,9 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
self.database.insertStatuses(syncStatuses) { _ in self.database.insertStatuses(syncStatuses) { _ in
self.database.selectPendingCount { result in self.database.selectPendingCount { result in
if let count = try? result.get(), count > 100 { if let count = try? result.get(), count > 100 {
self.sendArticleStatus(for: account, completion: completion) self.sendArticleStatus(for: account) { _ in }
} }
completion(.success(()))
} }
} }
case .failure(let error): case .failure(let error):

1
iOS/SceneCoordinator.swift
View File

@ -1377,6 +1377,7 @@ private extension SceneCoordinator {
func markArticlesWithUndo(_ articles: [Article], statusKey: ArticleStatus.Key, flag: Bool, completion: (() -> Void)? = nil) { func markArticlesWithUndo(_ articles: [Article], statusKey: ArticleStatus.Key, flag: Bool, completion: (() -> Void)? = nil) {
guard let undoManager = undoManager, guard let undoManager = undoManager,
let markReadCommand = MarkStatusCommand(initialArticles: articles, statusKey: statusKey, flag: flag, undoManager: undoManager, completion: completion) else { let markReadCommand = MarkStatusCommand(initialArticles: articles, statusKey: statusKey, flag: flag, undoManager: undoManager, completion: completion) else {
completion?()
return return
} }
runCommand(markReadCommand) runCommand(markReadCommand)