Cancel task on changing filters, use correct filter on opening the screen

Author: rafaelks

Rocket.Chat/Controllers/Directory/DirectoryViewController.swift

@@ -247,9 +247,8 @@ extension DirectoryViewController: UISearchBarDelegate {
 
 extension DirectoryViewController: DirectoryFiltersViewDelegate {
 
-    func userDidChangeFilterOption(selected: DirectoryRequestType, workspace: DirectoryWorkspaceType) {
+    func userDidChangeFilterOption(selected: DirectoryRequestType) {
         viewModel.type = selected
-        viewModel.workspace = workspace
 
         tableView.reloadData()
 

Rocket.Chat/Controllers/Directory/DirectoryViewModel.swift

@@ -10,10 +10,12 @@ import Foundation
 
 final class DirectoryViewModel {
 
-    var workspace: DirectoryWorkspaceType = .all {
-        didSet {
-            clear()
+    var workspace: DirectoryWorkspaceType {
+        if UserDefaults.standard.bool(forKey: kDirectoryFilterViewWorkspaceLocalKey) {
+            return .local
         }
+
+        return .all
     }
 
     var type: DirectoryRequestType = .users {
@@ -52,6 +54,7 @@ final class DirectoryViewModel {
     var showing = 0
     var total = 0
 
+    var task: URLSessionTask?
     var isLoadingMore = false
     var isShowingAllData: Bool {
         return showing >= total
@@ -78,6 +81,9 @@ final class DirectoryViewModel {
         currentPage = 0
         showing = 0
         total = 0
+
+        isLoadingMore = false
+        task?.cancel()
     }
 
     func user(at index: Int) -> UnmanagedUser {
@@ -93,13 +99,15 @@ final class DirectoryViewModel {
             return
         }
 
+        self.task?.cancel()
+
         isLoadingMore = true
 
         let requestType = self.type
         let request = DirectoryRequest(query: query, type: requestType, workspace: workspace)
         let options: APIRequestOptionSet = [.paginated(count: pageSize, offset: currentPage * pageSize)]
 
-        API.current()?.fetch(request, options: options) { [weak self] response in
+        let task = API.current()?.fetch(request, options: options) { [weak self] response in
             guard
                 let self = self,
                 case let .resource(resource) = response

Rocket.Chat/Views/Directory/DirectoryFiltersView.swift

@@ -11,7 +11,7 @@ import UIKit
 let kDirectoryFilterViewWorkspaceLocalKey = "kDirectoryFilterViewWorkspaceLocalKey"
 
 protocol DirectoryFiltersViewDelegate: class {
-    func userDidChangeFilterOption(selected: DirectoryRequestType, workspace: DirectoryWorkspaceType)
+    func userDidChangeFilterOption(selected: DirectoryRequestType)
 }
 
 final class DirectoryFiltersView: UIView {
@@ -137,32 +137,21 @@ final class DirectoryFiltersView: UIView {
     }
 
     @IBAction func switchWorkspaceDidChange(_ sender: Any) {
-        delegate?.userDidChangeFilterOption(
-            selected: .users,
-            workspace: switchWorkspace.isOn ? .all : .local
-        )
-
         UserDefaults.standard.set(
             !switchWorkspace.isOn,
             forKey: kDirectoryFilterViewWorkspaceLocalKey
         )
+
+        delegate?.userDidChangeFilterOption(selected: .users)
     }
 
     @IBAction func buttonFilterChannelDidPressed(_ sender: Any) {
-        delegate?.userDidChangeFilterOption(
-            selected: .channels,
-            workspace: switchWorkspace.isOn ? .all : .local
-        )
-
+        delegate?.userDidChangeFilterOption(selected: .channels)
         close()
     }
 
     @IBAction func buttonFilterUserDidPressed(_ sender: Any) {
-        delegate?.userDidChangeFilterOption(
-            selected: .users,
-            workspace: switchWorkspace.isOn ? .all : .local
-        )
-
+        delegate?.userDidChangeFilterOption(selected: .users)
         close()
     }