Fixes #3991

RCA -

There was a check in `LoadFilesListTask.listRecentFiles()` that only list the file if it is not directory, which is not a case if file is not created in `storage/emulated0/` directory. The recently changed file would always come wrapped in some folder if created in a directory other than `storage/emulated0/`. Which was causing this issue.

Resolution -

In the solution provided it is assumed that we have to only show the files that were modified, hence, only modified/created files are listed and not the folders (as the title suggests ‘Recent Files’).
Here, if the file is wrapped in a directory, the directory is recursively explored to check the files it contains.
As we loop around recursively we go on adding the files that we find in a final list that is to be returned.

In this code, every file that comes from cursor will always be wrapped in some folder and it will be explored recursively and listed.

Co-authored-by: Lalit2-at-420259454397 <i0PyMDN2fLAzHZkUWuyruefG2clLhyinw6Gna7H9WWM=>
Signed-off-by: VishnuSanal <t.v.s10123@gmail.com>

Author: VishnuSanal

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java

@@ -563,16 +563,38 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {
   }
 
   private @Nullable List<LayoutElementParcelable> listRecentFiles() {
-    final Context context = this.context.get();
+    final Context c = context.get();
 
-    if (context == null) {
+    if (c == null) {
       cancel(true);
       return null;
     }
 
-    List<LayoutElementParcelable> recentFiles = new ArrayList<>(20);
+    final MainFragment mainFragment = mainFragmentReference.get();
+    MainFragmentViewModel viewModel = mainFragment.getMainFragmentViewModel();
+
+    List<LayoutElementParcelable> recentFiles = new ArrayList<>(40);
+
+    Cursor cursor = getRecentFilesCursor(c);
+    if (cursor == null) return recentFiles;
+    if (cursor.getCount() > 0 && cursor.moveToFirst()) {
+      do {
+        String filePath = cursor.getString(cursor.getColumnIndex(MediaStore.MediaColumns.DATA));
+        File f = new File(filePath);
+        if (f.isDirectory()) {
+          List<File> files = getFilesFromDirectory(mainFragment, filePath);
+          for (File file : files) compareFileAndAddToList(viewModel, recentFiles, file);
+        } else compareFileAndAddToList(viewModel, recentFiles, f);
+      } while (cursor.moveToNext());
+    }
+    cursor.close();
+    return recentFiles;
+  }
+
+  @Nullable
+  private Cursor getRecentFilesCursor(Context c) {
     final String[] projection = {
-      MediaStore.Files.FileColumns.DATA, MediaStore.Files.FileColumns.DATE_MODIFIED
+      MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DATE_MODIFIED
     };
     final String selection = MediaStore.Files.FileColumns.DATA + " NOT LIKE ?";
     final String[] selectionArgs = new String[] {AppConfig.getTrashBinBasePath() + "%"};
@@ -583,51 +605,78 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {
     try {
       if (SDK_INT >= Q) {
         Bundle queryArgs = new Bundle();
-        queryArgs.putInt(ContentResolver.QUERY_ARG_LIMIT, 20);
+
         queryArgs.putStringArray(
             ContentResolver.QUERY_ARG_SORT_COLUMNS,
-            new String[] {MediaStore.Files.FileColumns.DATE_MODIFIED});
+            new String[] {MediaStore.MediaColumns.DATE_MODIFIED});
         queryArgs.putInt(
             ContentResolver.QUERY_ARG_SORT_DIRECTION,
             ContentResolver.QUERY_SORT_DIRECTION_DESCENDING);
+        queryArgs.putInt(ContentResolver.QUERY_ARG_LIMIT, 100);
         queryArgs.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, selection);
         queryArgs.putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, selectionArgs);
         cursor =
-            context
-                .getContentResolver()
+            c.getContentResolver()
                 .query(MediaStore.Files.getContentUri("external"), projection, queryArgs, null);
       } else {
         cursor =
-            context
-                .getContentResolver()
+            c.getContentResolver()
                 .query(
                     MediaStore.Files.getContentUri("external"),
                     projection,
                     selection,
                     selectionArgs,
-                    MediaStore.Files.FileColumns.DATE_MODIFIED + " DESC LIMIT 20");
+                    MediaStore.MediaColumns.DATE_MODIFIED + " DESC LIMIT 100");
       }
     } catch (SecurityException e) {
       // Storage permission denied; treat as no recent files instead of crashing.
       return recentFiles;
     }
-    if (cursor == null) return recentFiles;
-    if (cursor.getCount() > 0 && cursor.moveToFirst()) {
-      do {
-        String path = cursor.getString(cursor.getColumnIndex(MediaStore.Files.FileColumns.DATA));
-        File f = new File(path);
-        if (d.compareTo(new Date(f.lastModified())) != 1 && !f.isDirectory()) {
-          HybridFileParcelable strings =
-              RootHelper.generateBaseFile(new File(path), showHiddenFiles);
-          if (strings != null) {
-            LayoutElementParcelable parcelable = createListParcelables(strings);
-            if (parcelable != null) recentFiles.add(parcelable);
-          }
+    return cursor;
+  }
+
+  private void compareFileAndAddToList(
+      MainFragmentViewModel viewModel, List<LayoutElementParcelable> recentFiles, File file) {
+    Calendar c = Calendar.getInstance();
+    c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 2);
+    Date d = c.getTime();
+
+    if (d.compareTo(new Date(file.lastModified())) != 1 && !file.isDirectory()) {
+      HybridFileParcelable strings = RootHelper.generateBaseFile(file, showHiddenFiles);
+      if (strings != null) {
+        LayoutElementParcelable parcelable = createListParcelables(strings);
+        if (parcelable != null) {
+          recentFiles.add(parcelable);
+          viewModel.incrementFileCount();
         }
-      } while (cursor.moveToNext());
+      }
     }
-    cursor.close();
-    return recentFiles;
+  }
+
+  /**
+   * fetches the files from directory tree and adds all the files in a list
+   *
+   * @param mainFragment: the main fragment reference
+   * @param filePath: the file filePath
+   * @return List of files in directory tree.
+   */
+  private List<File> getFilesFromDirectory(MainFragment mainFragment, String filePath) {
+
+    List<File> files = new ArrayList<>();
+
+    ListFilesCommand.INSTANCE.listFiles(
+        filePath,
+        mainFragment.requireMainActivity().isRootExplorer(),
+        showHiddenFiles,
+        mode -> {
+          return null;
+        },
+        hybridFileParcelable -> {
+          files.add(hybridFileParcelable.getFile());
+          return null;
+        });
+
+    return files;
   }
 
   private @Nullable List<LayoutElementParcelable> listTrashBinFiles() {