From 03fbdbbe66e97e51716fb95daea33bfc13482b80 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 29 Jan 2020 11:18:17 -0700 Subject: [PATCH] Exempt folders from the read filter if they have a child selected. Issue #1735 --- iOS/SceneCoordinator.swift | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index aa126fe9f..4b65f0a0f 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1278,11 +1278,22 @@ private extension SceneCoordinator { } else if let webFeed = timelineFeed as? WebFeed { if webFeed.account?.existingWebFeed(withWebFeedID: webFeed.webFeedID) != nil { treeControllerDelegate.addFilterException(feedID) + addParentFolderToFilterExceptions(webFeed) } } } } + func addParentFolderToFilterExceptions(_ feed: Feed) { + guard let node = treeController.rootNode.descendantNodeRepresentingObject(feed as AnyObject), + let folder = node.parent?.representedObject as? Folder, + let folderFeedID = folder.feedID else { + return + } + + treeControllerDelegate.addFilterException(folderFeedID) + } + func rebuildShadowTable() { shadowTable = [[Node]]()