Fix recent files sort query

TeamAmaze · Sep 13, 2020 · c36672f · c36672f
1 parent 51a039c
commit c36672f
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java
@@ -385,10 +385,6 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {
     }
     cursor.close();
     Collections.sort(docs, (lhs, rhs) -> -1 * Long.valueOf(lhs.date).compareTo(rhs.date));
-    if (docs.size() > 20)
-      for (int i = docs.size() - 1; i > 20; i--) {
-        docs.remove(i);
-      }
     return docs;
   }
 
@@ -441,17 +437,20 @@ private ArrayList<LayoutElementParcelable> listRecent() {
   }
 
   private ArrayList<LayoutElementParcelable> listRecentFiles() {
-    ArrayList<LayoutElementParcelable> recentFiles = new ArrayList<>();
-    final String[] projection = {
-      MediaStore.Files.FileColumns.DATA, MediaStore.Files.FileColumns.DATE_MODIFIED
-    };
+    ArrayList<LayoutElementParcelable> recentFiles = new ArrayList<>(20);
+    final String[] projection = {MediaStore.Files.FileColumns.DATA};
     Calendar c = Calendar.getInstance();
     c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 2);
     Date d = c.getTime();
     Cursor cursor =
         this.context
             .getContentResolver()
-            .query(MediaStore.Files.getContentUri("external"), projection, null, null, null);
+            .query(
+                MediaStore.Files.getContentUri("external"),
+                projection,
+                null,
+                null,
+                MediaStore.Files.FileColumns.DATE_MODIFIED + " DESC LIMIT 20");
     if (cursor == null) return recentFiles;
     if (cursor.getCount() > 0 && cursor.moveToFirst()) {
       do {
@@ -468,7 +467,6 @@ private ArrayList<LayoutElementParcelable> listRecentFiles() {
       } while (cursor.moveToNext());
     }
     cursor.close();
-    Collections.sort(recentFiles, (lhs, rhs) -> -1 * Long.valueOf(lhs.date).compareTo(rhs.date));
     return recentFiles;
   }