From 80542bee12416ad16e3a6f513e8d3cde61b027f4 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 15 Jan 2020 22:51:00 -0800 Subject: [PATCH] Add missing calls to super.run() in FeedlyOperation subclasses. --- .../Account/AccountTests/Feedly/FeedlyOperationTests.swift | 1 + .../Account/Feedly/Operations/FeedlyCheckpointOperation.swift | 1 + .../FeedlyCreateFeedsForCollectionFoldersOperation.swift | 1 + .../Operations/FeedlyFetchIdsForMissingArticlesOperation.swift | 1 + .../Account/Feedly/Operations/FeedlyGetEntriesOperation.swift | 1 + .../Operations/FeedlyIngestStarredArticleIdsOperation.swift | 1 + .../Operations/FeedlyIngestStreamArticleIdsOperation.swift | 1 + .../Operations/FeedlyIngestUnreadArticleIdsOperation.swift | 1 + Frameworks/Account/Feedly/Operations/FeedlyLogoutOperation.swift | 1 + .../Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift | 1 + .../Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift | 1 + .../Feedly/Operations/FeedlySendArticleStatusesOperation.swift | 1 + .../Feedly/Operations/FeedlySyncStreamContentsOperation.swift | 1 + .../Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift | 1 + 14 files changed, 14 insertions(+) diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift index bdc98d949..ce0a6e6d9 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift @@ -23,6 +23,7 @@ class FeedlyOperationTests: XCTestCase { var mockError: Error? override func run() { + super.run() // Should always call on main thread. XCTAssertTrue(Thread.isMainThread) diff --git a/Frameworks/Account/Feedly/Operations/FeedlyCheckpointOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyCheckpointOperation.swift index 26d17da26..85c3b5733 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyCheckpointOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyCheckpointOperation.swift @@ -18,6 +18,7 @@ final class FeedlyCheckpointOperation: FeedlyOperation { weak var checkpointDelegate: FeedlyCheckpointOperationDelegate? override func run() { + super.run() defer { didFinish() } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift index 51eaced39..98895f204 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift @@ -23,6 +23,7 @@ final class FeedlyCreateFeedsForCollectionFoldersOperation: FeedlyOperation { } override func run() { + super.run() defer { didFinish() } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyFetchIdsForMissingArticlesOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyFetchIdsForMissingArticlesOperation.swift index b9c7929ba..4fb05e27f 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyFetchIdsForMissingArticlesOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyFetchIdsForMissingArticlesOperation.swift @@ -21,6 +21,7 @@ final class FeedlyFetchIdsForMissingArticlesOperation: FeedlyOperation, FeedlyEn } override func run() { + super.run() account.fetchArticleIDsForStatusesWithoutArticlesNewerThanCutoffDate { result in switch result { case .success(let articleIds): diff --git a/Frameworks/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift index 902079a6b..3293a93b4 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift @@ -55,6 +55,7 @@ final class FeedlyGetEntriesOperation: FeedlyOperation, FeedlyEntryProviding, Fe } override func run() { + super.run() service.getEntries(for: provider.entryIds) { result in switch result { diff --git a/Frameworks/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift index fad432c29..2bd7f867b 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift @@ -38,6 +38,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation { } override func run() { + super.run() getStreamIds(nil) } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift index 08f67d8be..adf36c3a5 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift @@ -33,6 +33,7 @@ class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation { } override func run() { + super.run() getStreamIds(nil) } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift index d77689210..a695cd8ee 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift @@ -39,6 +39,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation { } override func run() { + super.run() getStreamIds(nil) } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyLogoutOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyLogoutOperation.swift index 68f0149e2..6e83990db 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyLogoutOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyLogoutOperation.swift @@ -25,6 +25,7 @@ final class FeedlyLogoutOperation: FeedlyOperation { } override func run() { + super.run() os_log("Requesting logout of %{public}@ account.", "\(account.type)") service.logout(completion: didCompleteLogout(_:)) } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift index 381181e98..3e1727431 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift @@ -34,6 +34,7 @@ final class FeedlyMirrorCollectionsAsFoldersOperation: FeedlyOperation, FeedlyCo } override func run() { + super.run() defer { didFinish() } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift index 8d8dc53ff..45db1eb15 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyRefreshAccessTokenOperation.swift @@ -24,6 +24,7 @@ final class FeedlyRefreshAccessTokenOperation: FeedlyOperation { } override func run() { + super.run() let refreshToken: Credentials do { diff --git a/Frameworks/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift index bc1cd7bba..1a1a5850c 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift @@ -24,6 +24,7 @@ final class FeedlySendArticleStatusesOperation: FeedlyOperation { } override func run() { + super.run() os_log(.debug, log: log, "Sending article statuses...") database.selectForProcessing { result in diff --git a/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift index e156a7bd8..dd5e45030 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift @@ -49,6 +49,7 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD } override func run() { + super.run() operationQueue.resume() } diff --git a/Frameworks/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift index 67d18b870..76f423bb8 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift @@ -23,6 +23,7 @@ final class FeedlyUpdateAccountFeedsWithItemsOperation: FeedlyOperation { } override func run() { + super.run() let webFeedIDsAndItems = organisedItemsProvider.parsedItemsKeyedByFeedId account.update(webFeedIDsAndItems: webFeedIDsAndItems, defaultRead: true) { databaseError in