From fedba2870b0e526e63e7c9eef078513cfc7dd125 Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Fri, 13 Nov 2015 22:12:09 -0800 Subject: [PATCH] NewsBlur: tweaked #771 (mark all as read) --- clients/ios/Classes/FeedDetailViewController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/ios/Classes/FeedDetailViewController.m b/clients/ios/Classes/FeedDetailViewController.m index 5d1eedfe6..1e0cc90be 100644 --- a/clients/ios/Classes/FeedDetailViewController.m +++ b/clients/ios/Classes/FeedDetailViewController.m @@ -1811,9 +1811,9 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state [self.popoverController dismissPopoverAnimated:YES]; self.popoverController = nil; - NSString *folderTitle = storiesCollection.activeFolder; - NSArray *feedIds = [self.appDelegate feedIdsForFolderTitle:folderTitle]; - NSString *collectionTitle = [folderTitle isEqual:@"everything"] ? @"everything" : @"entire folder"; + [storiesCollection calculateStoryLocations]; + NSArray *feedIds = storiesCollection.isRiverView ? [self.appDelegate feedIdsForFolderTitle:storiesCollection.activeFolder] : @[storiesCollection.activeFeed[@"id"]]; + NSString *collectionTitle = storiesCollection.isRiverView ? [storiesCollection.activeFolder isEqualToString:@"everything"] ? @"everything" : @"entire folder" : @"this site"; NSInteger totalUnreadCount = [self.appDelegate unreadCount]; NSInteger visibleUnreadCount = storiesCollection.visibleUnreadCount;