dont change sorting logic

Signed-off-by: alperozturk <[email protected]>

# Conflicts:
#	app/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java

Author: alperozturk96

app/src/androidTest/java/com/nextcloud/utils/FileSortOrderTests.kt

@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import androidx.annotation.NonNull;
@@ -67,6 +68,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private Set<File> checkedFiles;
     private ViewThemeUtils viewThemeUtils;
     private boolean isWithinEncryptedFolder;
+    private final ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
 
     private static final int VIEWTYPE_ITEM = 0;
     private static final int VIEWTYPE_FOOTER = 1;
@@ -372,7 +374,7 @@ public void swapDirectory(final File directory) {
         mFiles.clear();
         mFilesAll.clear();
 
-        Executors.newSingleThreadExecutor().execute(() -> {
+        singleThreadExecutor.execute(() -> {
             // Load first page of folders
             List<File> firstPage = FileHelper.INSTANCE.listDirectoryEntries(directory, currentOffset, PAGE_SIZE, true);
 
@@ -442,15 +444,25 @@ private void notifyItemRange(List<File> updatedList) {
         });
     }
 
+    private final Object filesLock = new Object();
+
     @SuppressLint("NotifyDataSetChanged")
     public void setSortOrder(FileSortOrder sortOrder) {
         localFileListFragmentInterface.setLoading(true);
-        final Handler uiHandler = new Handler(Looper.getMainLooper());
-        Executors.newSingleThreadExecutor().execute(() -> {
-            preferences.setSortOrder(FileSortOrder.Type.localFileListView, sortOrder);
-            mFiles = sortOrder.sortLocalFiles(mFiles);
+        singleThreadExecutor.execute(() -> {
+            List<File> sortedCopy;
+            synchronized (filesLock) {
+                sortedCopy = new ArrayList<>(mFiles);
+            }
+
+            sortedCopy = sortOrder.sortLocalFiles(sortedCopy);
 
-            uiHandler.post(() -> {
+            List<File> finalSortedCopy = sortedCopy;
+            new Handler(Looper.getMainLooper()).post(() -> {
+                synchronized (filesLock) {
+                    mFiles = finalSortedCopy;
+                    mFilesAll = new ArrayList<>(finalSortedCopy);
+                }
                 notifyDataSetChanged();
                 localFileListFragmentInterface.setLoading(false);
             });
@@ -591,4 +603,8 @@ public void setFiles(List<File> newFiles) {
         notifyDataSetChanged();
         localFileListFragmentInterface.setLoading(false);
     }
+
+    public void cleanup() {
+        singleThreadExecutor.shutdown();
+    }
 }

app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java

@@ -26,11 +26,10 @@ class FileSortOrderByDate(name: String, ascending: Boolean) : FileSortOrder(name
         favoritesFirst: Boolean
     ): MutableList<OCFile> {
         val multiplier = if (isAscending) 1 else -1
-        val copy = files.toMutableList()
-        copy.sortWith { o1: OCFile, o2: OCFile ->
+        files.sortWith { o1: OCFile, o2: OCFile ->
             multiplier * o1.modificationTimestamp.compareTo(o2.modificationTimestamp)
         }
-        return super.sortCloudFiles(copy, foldersBeforeFiles, favoritesFirst)
+        return super.sortCloudFiles(files, foldersBeforeFiles, favoritesFirst)
     }
 
     /**
@@ -40,11 +39,10 @@ class FileSortOrderByDate(name: String, ascending: Boolean) : FileSortOrder(name
      */
     override fun sortTrashbinFiles(files: MutableList<TrashbinFile>): List<TrashbinFile> {
         val multiplier = if (isAscending) 1 else -1
-        val copy = files.toMutableList()
-        copy.sortWith { o1: TrashbinFile, o2: TrashbinFile ->
+        files.sortWith { o1: TrashbinFile, o2: TrashbinFile ->
             multiplier * o1.deletionTimestamp.compareTo(o2.deletionTimestamp)
         }
-        return super.sortTrashbinFiles(copy)
+        return super.sortTrashbinFiles(files)
     }
 
     /**
@@ -54,10 +52,9 @@ class FileSortOrderByDate(name: String, ascending: Boolean) : FileSortOrder(name
      */
     override fun sortLocalFiles(files: MutableList<File>): List<File> {
         val multiplier = if (isAscending) 1 else -1
-        val copy = files.toMutableList()
-        copy.sortWith { o1: File, o2: File ->
+        files.sortWith { o1: File, o2: File ->
             multiplier * o1.lastModified().compareTo(o2.lastModified())
         }
-        return copy
+        return files
     }
 }