FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the remove feed process manage the progress indicator better.

Browse Source
This commit is contained in:
Maurice Parker 2020-04-05 11:49:29 -05:00
parent 449085b84a
commit 116a346b87
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -302,14 +302,22 @@ final class CloudKitAccountDelegate: AccountDelegate {
} }
func removeWebFeed(for account: Account, with feed: WebFeed, from container: Container, completion: @escaping (Result<Void, Error>) -> Void) { func removeWebFeed(for account: Account, with feed: WebFeed, from container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
refreshProgress.addToNumberOfTasksAndRemaining(1) refreshProgress.addToNumberOfTasksAndRemaining(2)
accountZone.removeWebFeed(feed, from: container) { result in accountZone.removeWebFeed(feed, from: container) { result in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
switch result { switch result {
case .success(let deleted): case .success(let deleted):
container.removeWebFeed(feed) container.removeWebFeed(feed)
if deleted { if deleted {
self.publicZone.manageSubscriptions(account.flattenedWebFeedURLs, completion: completion) self.publicZone.manageSubscriptions(account.flattenedWebFeedURLs) { result in
self.refreshProgress.completeTask()
switch result {
case .success:
completion(.success(()))
case .failure(let error):
completion(.failure(error))
}
}
} else { } else {
completion(.success(())) completion(.success(()))
} }