diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 95c8dae7d..ccf0e0654 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -770,14 +770,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, return updatedArticles } - func ensureStatuses(_ articleIDs: Set, _ defaultRead: Bool, _ statusKey: ArticleStatus.Key, _ flag: Bool, completion: @escaping DatabaseCompletionBlock) { - guard !articleIDs.isEmpty else { - completion(nil) - return - } - database.ensureStatuses(articleIDs, defaultRead, statusKey, flag, completion: completion) - } - /// Mark articleIDs statuses based on statusKey and flag. /// Will create statuses in the database and in memory as needed. Sends a .StatusesDidChange notification. func mark(articleIDs: Set, statusKey: ArticleStatus.Key, flag: Bool, completion: DatabaseCompletionBlock? = nil) { diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.swift b/Frameworks/ArticlesDatabase/ArticlesDatabase.swift index b4c40f4c1..39ef87369 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.swift +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.swift @@ -164,10 +164,6 @@ public final class ArticlesDatabase { articlesTable.update(webFeedIDsAndItems, defaultRead, completion) } - public func ensureStatuses(_ articleIDs: Set, _ defaultRead: Bool, _ statusKey: ArticleStatus.Key, _ flag: Bool, completion: @escaping DatabaseCompletionBlock) { - articlesTable.ensureStatuses(articleIDs, defaultRead, statusKey, flag, completion: completion) - } - // MARK: - Status /// Fetch the articleIDs of unread articles in feeds specified by webFeedIDs. diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift index 307d5d526..1140125a5 100644 --- a/Frameworks/ArticlesDatabase/ArticlesTable.swift +++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift @@ -236,29 +236,6 @@ final class ArticlesTable: DatabaseTable { } } - func ensureStatuses(_ articleIDs: Set, _ defaultRead: Bool, _ statusKey: ArticleStatus.Key, _ flag: Bool, completion: @escaping DatabaseCompletionBlock) { - queue.runInTransaction { databaseResult in - - func makeDatabaseCalls(_ database: FMDatabase) { - let statusesDictionary = self.statusesTable.ensureStatusesForArticleIDs(articleIDs, defaultRead, database) - let statuses = Set(statusesDictionary.values) - self.statusesTable.mark(statuses, statusKey, flag, database) - DispatchQueue.main.async { - completion(nil) - } - } - - switch databaseResult { - case .success(let database): - makeDatabaseCalls(database) - case .failure(let databaseError): - DispatchQueue.main.async { - completion(databaseError) - } - } - } - } - func fetchStatuses(_ articleIDs: Set, _ createIfNeeded: Bool, _ completion: @escaping ArticleStatusesResultBlock) { queue.runInTransaction { databaseResult in