diff --git a/iOS/MainTimeline/MainTimelineViewController.swift b/iOS/MainTimeline/MainTimelineViewController.swift index 19193cd48..ec29cf558 100644 --- a/iOS/MainTimeline/MainTimelineViewController.swift +++ b/iOS/MainTimeline/MainTimelineViewController.swift @@ -840,25 +840,8 @@ private extension MainTimelineViewController { return action } - private func canGoToFeed() -> Bool { - // This is temporary — since we haven’t figured out - // - // on compact size classes, just don’t display this option - // when on compact. - - var viewController: UIViewController? = self - while viewController != nil { - if let splitViewController = viewController?.splitViewController { - return splitViewController.traitCollection.horizontalSizeClass == .regular - } - viewController = parent - } - - return false - } - func discloseFeedAction(_ article: Article) -> UIAction? { - guard canGoToFeed(), let webFeed = article.webFeed, + guard let webFeed = article.webFeed, !coordinator.timelineFeedIsEqualTo(webFeed) else { return nil } let title = NSLocalizedString("Go to Feed", comment: "Go to Feed") @@ -869,7 +852,7 @@ private extension MainTimelineViewController { } func discloseFeedAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? { - guard canGoToFeed(), let webFeed = article.webFeed, + guard let webFeed = article.webFeed, !coordinator.timelineFeedIsEqualTo(webFeed) else { return nil } let title = NSLocalizedString("Go to Feed", comment: "Go to Feed") diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index fb8b71b70..9ca722cf6 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1089,12 +1089,18 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { self.treeControllerDelegate.addFilterException(parentFolderFeedID) } - rebuildBackingStores(initialLoad: initialLoad, completion: { + rebuildBackingStores(initialLoad: initialLoad) { self.treeControllerDelegate.resetFilterExceptions() self.selectFeed(nil) { - self.selectFeed(webFeed, animations: animations, completion: completion) + if self.rootSplitViewController.traitCollection.horizontalSizeClass == .compact { + DispatchQueue.main.asyncAfter(deadline: .now() + 1) { + self.selectFeed(webFeed, animations: animations, completion: completion) + } + } else { + self.selectFeed(webFeed, animations: animations, completion: completion) + } } - }) + } } func showStatusBar() {