From 17c04b2aef2f5b268b1629c5be1b2ec952bf6e8a Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 10 Jun 2019 16:17:54 -0500 Subject: [PATCH] Show the refresh progress bar when an OPML import starts. Issue #732 --- Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift index f6711fc8a..8cc07456b 100644 --- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift +++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift @@ -208,12 +208,14 @@ final class FeedbinAccountDelegate: AccountDelegate { os_log(.debug, log: log, "Begin importing OPML...") opmlImportInProgress = true + refreshProgress.addToNumberOfTasksAndRemaining(1) caller.importOPML(opmlData: opmlData) { result in switch result { case .success(let importResult): if importResult.complete { os_log(.debug, log: self.log, "Import OPML done.") + self.refreshProgress.completeTask() self.opmlImportInProgress = false DispatchQueue.main.async { completion(.success(())) @@ -223,6 +225,7 @@ final class FeedbinAccountDelegate: AccountDelegate { } case .failure(let error): os_log(.debug, log: self.log, "Import OPML failed.") + self.refreshProgress.completeTask() self.opmlImportInProgress = false DispatchQueue.main.async { let wrappedError = AccountError.wrappedError(error: error, account: account) @@ -553,6 +556,7 @@ private extension FeedbinAccountDelegate { if let result = importResult, result.complete { os_log(.debug, log: self.log, "Checking status of OPML import successfully completed.") timer.invalidate() + self.refreshProgress.completeTask() self.opmlImportInProgress = false DispatchQueue.main.async { completion(.success(())) @@ -561,6 +565,7 @@ private extension FeedbinAccountDelegate { case .failure(let error): os_log(.debug, log: self.log, "Import OPML check failed.") timer.invalidate() + self.refreshProgress.completeTask() self.opmlImportInProgress = false DispatchQueue.main.async { completion(.failure(error))