From 51bd94b613609bb1f6186250aec1d7a877ee9093 Mon Sep 17 00:00:00 2001
From: Fernando Sanz <fsanz@izertis.com>
Date: Tue, 18 Jan 2022 09:14:45 +0100
Subject: [PATCH] Filtering has been controlled on all screens

---
 .../ui/files/filelist/MainFileListFragment.kt | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListFragment.kt
index 53f70de123b..adecff0897c 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListFragment.kt
@@ -29,7 +29,6 @@ import android.widget.TextView
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.snackbar.Snackbar
@@ -157,10 +156,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
         mainFileListViewModel.getFilesListStatusLiveData.observe(viewLifecycleOwner, Event.EventObserver {
             it.onSuccess { data ->
                 updateFileListData(filesList = data ?: emptyList())
-                val sortedFiles = mainFileListViewModel.sortList(files)
-                fileListAdapter.updateFileList(filesToAdd = sortedFiles)
-                registerListAdapterDataObserver()
-                binding.swipeRefreshMainFileList.cancel()
             }
         })
 
@@ -186,6 +181,14 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
         })
     }
 
+    private fun updateFileListData(filesList: List<OCFile>) {
+        files = filesList
+        val sortedFiles = mainFileListViewModel.sortList(files)
+        fileListAdapter.updateFileList(filesToAdd = sortedFiles)
+        registerListAdapterDataObserver()
+        binding.swipeRefreshMainFileList.cancel()
+    }
+
     fun listDirectory(directory: OCFile) {
         mainFileListViewModel.listDirectory(directory = directory)
     }
@@ -221,7 +224,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
         fileListAdapter.notifyItemRangeChanged(0, fileListAdapter.itemCount)
     }
 
-
     override fun onSortSelected(sortType: SortType) {
         binding.optionsLayout.sortTypeSelected = sortType
 
@@ -252,13 +254,6 @@ class MainFileListFragment : Fragment(), SortDialogListener, SortOptionsView.Sor
         _binding = null
     }
 
-    private fun updateFileListData(filesList: List<OCFile>) {
-        files = filesList
-        fileListAdapter.updateFileList(filesToAdd = files)
-        registerListAdapterDataObserver()
-        binding.swipeRefreshMainFileList.cancel()
-    }
-
     fun updateFileListOption(newFileListOption: FileListOption) {
         fileListOption = newFileListOption
         when (newFileListOption) {