From 15fb5637ff20b772fbe03cf9332e91c604abd10f Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Sat, 24 Apr 2021 15:05:11 +0800 Subject: [PATCH] Fixes #3035 MarkAllAsReadAction will check for and handle SmartFeeds. --- iOS/MasterFeed/MasterFeedViewController.swift | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index c933c3b43..eeaf0974a 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -1211,9 +1211,20 @@ private extension MasterFeedViewController { guard let identifier = dataSource.itemIdentifier(for: indexPath), identifier.unreadCount > 0 else { return nil } - + + var smartFeed: Feed? + if identifier.isPsuedoFeed { + if SmartFeedsController.shared.todayFeed.feedID == identifier.feedID { + smartFeed = SmartFeedsController.shared.todayFeed + } else if SmartFeedsController.shared.unreadFeed.feedID == identifier.feedID { + smartFeed = SmartFeedsController.shared.unreadFeed + } else if SmartFeedsController.shared.starredFeed.feedID == identifier.feedID { + smartFeed = SmartFeedsController.shared.starredFeed + } + } + guard let feedID = identifier.feedID, - let feed = AccountManager.shared.existingFeed(with: feedID), + let feed = smartFeed ?? AccountManager.shared.existingFeed(with: feedID), feed.unreadCount > 0, let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else { return nil