From 361ca8576257ab8e446e824ee61b25635d633f9e Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Thu, 19 Nov 2020 12:17:29 +0800
Subject: [PATCH] Removes need for dispatchAsync delay

---
 iOS/SceneCoordinator.swift |  9 +++------
 iOS/SceneDelegate.swift    | 18 ++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index f7f5eb4f6..12b8d27c5 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -807,27 +807,24 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		}
 	}
 	
-	func selectTodayFeed(completion: @escaping () -> () = {}) {
+	func selectTodayFeed() {
 		markExpanded(SmartFeedsController.shared)
 		self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.todayFeed) {
 			self.selectFeed(SmartFeedsController.shared.todayFeed, animations: [.navigation, .scroll])
-			completion()
 		}
 	}
 
-	func selectAllUnreadFeed(completion: @escaping () -> () = {}) {
+	func selectAllUnreadFeed() {
 		markExpanded(SmartFeedsController.shared)
 		self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.unreadFeed) {
 			self.selectFeed(SmartFeedsController.shared.unreadFeed, animations: [.navigation, .scroll])
-			completion()
 		}
 	}
 
-	func selectStarredFeed(completion: @escaping () -> () = {}) {
+	func selectStarredFeed() {
 		markExpanded(SmartFeedsController.shared)
 		self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.starredFeed) {
 			self.selectFeed(SmartFeedsController.shared.starredFeed, animations: [.navigation, .scroll])
-			completion()
 		}
 	}
 
diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift
index bb2a5eae0..4a5c40cd3 100644
--- a/iOS/SceneDelegate.swift
+++ b/iOS/SceneDelegate.swift
@@ -105,10 +105,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 						if AccountManager.shared.isSuspended {
 							AccountManager.shared.resumeAll()
 						}
-						self.coordinator.selectAllUnreadFeed(completion: {
-							DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
-								self.coordinator.selectArticleInCurrentFeed(id!)
-							})
+						self.coordinator.selectFeed(SmartFeedsController.shared.unreadFeed, completion: {
+							self.coordinator.selectArticleInCurrentFeed(id!)
 						})
 					} else {
 						self.coordinator.selectAllUnreadFeed()
@@ -123,10 +121,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 						if AccountManager.shared.isSuspended {
 							AccountManager.shared.resumeAll()
 						}
-						self.coordinator.selectTodayFeed(completion: {
-							DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
-								self.coordinator.selectArticleInCurrentFeed(id!)
-							})
+						self.coordinator.selectFeed(SmartFeedsController.shared.todayFeed, completion: {
+							self.coordinator.selectArticleInCurrentFeed(id!)
 						})
 					} else {
 						self.coordinator.selectTodayFeed()
@@ -141,10 +137,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 						if AccountManager.shared.isSuspended {
 							AccountManager.shared.resumeAll()
 						}
-						self.coordinator.selectStarredFeed(completion: {
-							DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
-								self.coordinator.selectArticleInCurrentFeed(id!)
-							})
+						self.coordinator.selectFeed(SmartFeedsController.shared.starredFeed, completion: {
+							self.coordinator.selectArticleInCurrentFeed(id!)
 						})
 					} else {
 						self.coordinator.selectStarredFeed()