Merge pull request #2620 from quanganhdo/NetNewsWire-2617

Changes to NewsBlur refreshAll process
This commit is contained in:
Maurice Parker 2020-12-03 09:49:45 -06:00 committed by GitHub
commit 8d362cc0c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 19 deletions

View File

@ -63,7 +63,7 @@ final class NewsBlurAccountDelegate: AccountDelegate {
}
func refreshAll(for account: Account, completion: @escaping (Result<Void, Error>) -> ()) {
self.refreshProgress.addToNumberOfTasksAndRemaining(5)
self.refreshProgress.addToNumberOfTasksAndRemaining(4)
refreshFeeds(for: account) { result in
self.refreshProgress.completeTask()
@ -80,31 +80,21 @@ final class NewsBlurAccountDelegate: AccountDelegate {
switch result {
case .success:
self.refreshStories(for: account) { result in
self.refreshMissingStories(for: account) { result in
self.refreshProgress.completeTask()
switch result {
case .success:
self.refreshMissingStories(for: account) { result in
self.refreshProgress.completeTask()
switch result {
case .success:
DispatchQueue.main.async {
completion(.success(()))
}
case .failure(let error):
DispatchQueue.main.async {
self.refreshProgress.clear()
let wrappedError = AccountError.wrappedError(error: error, account: account)
completion(.failure(wrappedError))
}
}
DispatchQueue.main.async {
completion(.success(()))
}
case .failure(let error):
completion(.failure(error))
DispatchQueue.main.async {
self.refreshProgress.clear()
let wrappedError = AccountError.wrappedError(error: error, account: account)
completion(.failure(wrappedError))
}
}
}