Merge pull request #444 from woocommerce/issue/437-reloading-results-controller

NotificationsViewController: Reload Failsafe

Author: jleandroperez

WooCommerce/Classes/Extensions/NSNotificationName+Woo.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+
+// MARK: - WooCommerce Notifications
+//
+extension NSNotification.Name {
+    static let StoresManagerDidUpdateDefaultSite = NSNotification.Name(rawValue: "StoresManagerDidUpdateDefaultSite")
+}

WooCommerce/Classes/ViewRelated/Notifications/NotificationsViewController.swift

@@ -83,6 +83,10 @@ class NotificationsViewController: UIViewController {
 
     // MARK: - View Lifecycle
 
+    deinit {
+        stopListeningToNotifications()
+    }
+
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         configureTabBarItem()
@@ -97,6 +101,8 @@ class NotificationsViewController: UIViewController {
         configureTableView()
         configureTableViewCells()
         configureResultsController()
+
+        startListeningToNotifications()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -233,6 +239,19 @@ private extension NotificationsViewController {
 }
 
 
+// MARK: - ResultsController
+//
+extension NotificationsViewController {
+
+    /// Refreshes the Results Controller Predicate, and ensures the UI is in Sync.
+    ///
+    func reloadResultsController() {
+        resultsController.predicate = filter
+        tableView.reloadData()
+    }
+}
+
+
 // MARK: - UITableViewDataSource Conformance
 //
 extension NotificationsViewController: UITableViewDataSource {
@@ -415,6 +434,31 @@ private extension NotificationsViewController {
 }
 
 
+// MARK: - Notifications
+//
+extension NotificationsViewController {
+
+    /// Setup: Notification Hooks
+    ///
+    func startListeningToNotifications() {
+        let nc = NotificationCenter.default
+        nc.addObserver(self, selector: #selector(defaultSiteWasUpdated), name: .StoresManagerDidUpdateDefaultSite, object: nil)
+    }
+
+    /// Tear down the Notifications Hooks
+    ///
+    func stopListeningToNotifications() {
+        NotificationCenter.default.removeObserver(self)
+    }
+
+    /// Default Site Updated Handler
+    ///
+    @objc func defaultSiteWasUpdated() {
+        reloadResultsController()
+    }
+}
+
+
 // MARK: - Finite State Machine Management
 //
 private extension NotificationsViewController {

WooCommerce/Classes/Yosemite/StoresManager.swift

@@ -104,6 +104,8 @@ class StoresManager {
     func updateDefaultStore(storeID: Int) {
         sessionManager.defaultStoreID = storeID
         restoreSessionSiteIfPossible()
+
+        NotificationCenter.default.post(name: .StoresManagerDidUpdateDefaultSite, object: nil)
     }
 }
 

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -126,6 +126,7 @@
 		B59D1EEC2190B08B009D1978 /* Age.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D1EEB2190B08B009D1978 /* Age.swift */; };
 		B59D49CD219B587E006BF0AD /* UILabel+OrderStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D49CC219B587E006BF0AD /* UILabel+OrderStatus.swift */; };
 		B5A0369B214C0E8500774E2C /* CocoaLumberjack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A0369A214C0E8500774E2C /* CocoaLumberjack.swift */; };
+		B5A56BF5219F5AB20065A902 /* NSNotificationName+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A56BF4219F5AB20065A902 /* NSNotificationName+Woo.swift */; };
 		B5A82EE221025C450053ADC8 /* FulfillViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A82EE121025C450053ADC8 /* FulfillViewController.swift */; };
 		B5A82EE521025E550053ADC8 /* FulfillViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5A82EE421025E550053ADC8 /* FulfillViewController.xib */; };
 		B5A82EE7210263460053ADC8 /* UIViewController+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A82EE6210263460053ADC8 /* UIViewController+Helpers.swift */; };
@@ -391,6 +392,7 @@
 		B59D49CC219B587E006BF0AD /* UILabel+OrderStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+OrderStatus.swift"; sourceTree = "<group>"; };
 		B59F38E020D40A24008C1829 /* WooCommerce.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WooCommerce.entitlements; sourceTree = "<group>"; };
 		B5A0369A214C0E8500774E2C /* CocoaLumberjack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CocoaLumberjack.swift; sourceTree = "<group>"; };
+		B5A56BF4219F5AB20065A902 /* NSNotificationName+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSNotificationName+Woo.swift"; sourceTree = "<group>"; };
 		B5A82EE121025C450053ADC8 /* FulfillViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FulfillViewController.swift; sourceTree = "<group>"; };
 		B5A82EE421025E550053ADC8 /* FulfillViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FulfillViewController.xib; sourceTree = "<group>"; };
 		B5A82EE6210263460053ADC8 /* UIViewController+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Helpers.swift"; sourceTree = "<group>"; };
@@ -951,6 +953,7 @@
 				CE021534215BE3AB00C19555 /* LoginNavigationController+Woo.swift */,
 				B59D49CC219B587E006BF0AD /* UILabel+OrderStatus.swift */,
 				B53B3F38219C817800DF1EB6 /* UIStoryboard+Woo.swift */,
+				B5A56BF4219F5AB20065A902 /* NSNotificationName+Woo.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1540,6 +1543,7 @@
 				CE263DE8206ACE3E0015A693 /* MainTabBarController.swift in Sources */,
 				CE14452E2188C11700A991D8 /* ZendeskManager.swift in Sources */,
 				B5BE75DB213F1D1E00909A14 /* OverlayMessageView.swift in Sources */,
+				B5A56BF5219F5AB20065A902 /* NSNotificationName+Woo.swift in Sources */,
 				B541B2152189EEA1008FE7C1 /* Scanner+Helpers.swift in Sources */,
 				743EDD9F214B05350039071B /* TopEarnerStatsItem+Woo.swift in Sources */,
 				CE1EC8EC20B8A3FF009762BF /* LeftImageTableViewCell.swift in Sources */,