Make network requests in viewWillAppear instead of viewDidLoad

Tusker/Screens/Bookmarks/BookmarksTableViewController.swift

@@ -15,6 +15,8 @@ class BookmarksTableViewController: EnhancedTableViewController {
 
     let mastodonController: MastodonController
     
+    private var loaded = false
+    
     var statuses: [(id: String, state: StatusState)] = []
     
     var newer: RequestRange?
@@ -42,21 +44,29 @@ class BookmarksTableViewController: EnhancedTableViewController {
         
         tableView.prefetchDataSource = self
 
-        let request = Client.getBookmarks()
+        userActivity = UserActivityManager.bookmarksActivity()
-        mastodonController.run(request) { (response) in
+    }
-            guard case let .success(statuses, pagination) = response else { fatalError() }
-            self.mastodonController.persistentContainer.addAll(statuses: statuses) {
-                self.statuses.append(contentsOf: statuses.map { ($0.id, .unknown) })
-                self.newer = pagination?.newer
-                self.older = pagination?.older
     
-                DispatchQueue.main.async {
+    override func viewWillAppear(_ animated: Bool) {
-                    self.tableView.reloadData()
+        super.viewWillAppear(animated)
+        
+        if !loaded {
+            loaded = true
+        
+            let request = Client.getBookmarks()
+            mastodonController.run(request) { (response) in
+                guard case let .success(statuses, pagination) = response else { fatalError() }
+                self.mastodonController.persistentContainer.addAll(statuses: statuses) {
+                    self.statuses.append(contentsOf: statuses.map { ($0.id, .unknown) })
+                    self.newer = pagination?.newer
+                    self.older = pagination?.older
+    
+                    DispatchQueue.main.async {
+                        self.tableView.reloadData()
+                    }
                 }
             }
         }
-        
-        userActivity = UserActivityManager.bookmarksActivity()
     }
 
     // MARK: - Table view data source

Tusker/Screens/Notifications/NotificationsTableViewController.swift

@@ -22,6 +22,8 @@ class NotificationsTableViewController: EnhancedTableViewController {
     let excludedTypes: [Pachyderm.Notification.Kind]
     let groupTypes = [Notification.Kind.favourite, .reblog, .follow]
     
+    private var loaded = false
+
     var groups: [NotificationGroup] = []
     
     var newer: RequestRange?
@@ -54,21 +56,29 @@ class NotificationsTableViewController: EnhancedTableViewController {
         tableView.register(UINib(nibName: "BasicTableViewCell", bundle: .main), forCellReuseIdentifier: unknownCell)
         
         tableView.prefetchDataSource = self
+    }
     
-        let request = Client.getNotifications(excludeTypes: excludedTypes)
+    override func viewWillAppear(_ animated: Bool) {
-        mastodonController.run(request) { result in
+        super.viewWillAppear(animated)
-            guard case let .success(notifications, pagination) = result else { fatalError() }
         
-            let groups = NotificationGroup.createGroups(notifications: notifications, only: self.groupTypes)
+        if !loaded {
+            loaded = true
             
-            self.groups.append(contentsOf: groups)
+            let request = Client.getNotifications(excludeTypes: excludedTypes)
+            mastodonController.run(request) { result in
+                guard case let .success(notifications, pagination) = result else { fatalError() }
                 
-            self.newer = pagination?.newer
+                let groups = NotificationGroup.createGroups(notifications: notifications, only: self.groupTypes)
-            self.older = pagination?.older
                 
-            self.mastodonController.persistentContainer.addAll(notifications: notifications) {
+                self.groups.append(contentsOf: groups)
-                DispatchQueue.main.async {
+                
-                    self.tableView.reloadData()
+                self.newer = pagination?.newer
+                self.older = pagination?.older
+                
+                self.mastodonController.persistentContainer.addAll(notifications: notifications) {
+                    DispatchQueue.main.async {
+                        self.tableView.reloadData()
+                    }
                 }
             }
         }

Tusker/Screens/Profile/ProfileTableViewController.swift

@@ -14,15 +14,7 @@ class ProfileTableViewController: EnhancedTableViewController {
     
     weak var mastodonController: MastodonController!
     
-    var accountID: String! {
+    var accountID: String!
-        didSet {
-            if shouldLoadOnAccountIDSet {
-                DispatchQueue.main.async {
-                    self.updateAccountUI()
-                }
-            }
-        }
-    }
     
     var pinnedStatuses: [(id: String, state: StatusState)] = [] {
         didSet {
@@ -42,8 +34,8 @@ class ProfileTableViewController: EnhancedTableViewController {
     var older: RequestRange?
     var newer: RequestRange?
     
-    var shouldLoadOnAccountIDSet = false
+    private var loadingVC: LoadingViewController? = nil
-    var loadingVC: LoadingViewController? = nil
+    private var loaded = false
     
     init(accountID: String?, mastodonController: MastodonController) {
         self.mastodonController = mastodonController
@@ -80,7 +72,22 @@ class ProfileTableViewController: EnhancedTableViewController {
         
         tableView.prefetchDataSource = self
         
-        if let accountID = accountID {
+        if accountID == nil {
+            loadingVC = LoadingViewController()
+            embedChild(loadingVC!)
+        }
+
+        NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPreferences), name: .preferencesChanged, object: nil)
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        if !loaded, let accountID = accountID {
+            loaded = true
+            loadingVC?.removeViewAndController()
+            loadingVC = nil
+
             if mastodonController.persistentContainer.account(for: accountID) != nil {
                 updateAccountUI()
             } else {
@@ -106,18 +113,10 @@ class ProfileTableViewController: EnhancedTableViewController {
                     }
                 }
             }
-        } else {
-            loadingVC = LoadingViewController()
-            embedChild(loadingVC!)
-            shouldLoadOnAccountIDSet = true
         }
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPreferences), name: .preferencesChanged, object: nil)
     }
 
     func updateAccountUI() {
-        loadingVC?.removeViewAndController()
-        
         updateUIForPreferences()
         
         getStatuses(onlyPinned: true) { (response) in

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -14,6 +14,8 @@ class TimelineTableViewController: EnhancedTableViewController {
     var timeline: Timeline!
     weak var mastodonController: MastodonController!
     
+    private var loaded = false
+    
     var timelineSegments: [[(id: String, state: StatusState)]] = []
     
     var newer: RequestRange?
@@ -63,11 +65,18 @@ class TimelineTableViewController: EnhancedTableViewController {
         tableView.register(UINib(nibName: "TimelineStatusTableViewCell", bundle: nil), forCellReuseIdentifier: "statusCell")
         
         tableView.prefetchDataSource = self
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         
         loadInitialStatuses()
     }
     
     func loadInitialStatuses() {
+        guard !loaded else { return }
+        loaded = true
+        
         let request = Client.getStatuses(timeline: timeline)
         mastodonController.run(request) { response in
             guard case let .success(statuses, pagination) = response else { fatalError() }