Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recent files doesn't display recent files #4067

Open
wants to merge 5 commits into
base: release/4.0
Choose a base branch
from
Open

Recent files doesn't display recent files #4067

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b64f74
Fixes #3991
Jan 30, 2024
2c5c36b
Merge branch 'release/4.0' into bugfix/3991
VishnuSanal Oct 13, 2024
6304fdc
address review comments
VishnuSanal Oct 13, 2024
76fa5dc
use `ListFilesCommand#listFiles`
VishnuSanal Oct 13, 2024
0be590d
chore: spotless
VishnuSanal Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 63 additions & 20 deletions app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,23 +536,41 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {

private @Nullable List<LayoutElementParcelable> listRecentFiles() {
final Context context = this.context.get();
final MainFragment mainFragment = this.mainFragmentReference.get();

if (context == null) {
cancel(true);
return null;
}
MainFragmentViewModel viewModel = mainFragment.getMainFragmentViewModel();
List<LayoutElementParcelable> recentFiles = new ArrayList<>(40);

Cursor cursor = getCursor(context);
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 (f.isDirectory()) {
List<File> files = getFilesFromDirectory(f);
for (File file : files) {
compareFileAndAddToList(viewModel, recentFiles, file);
}
}
} while (cursor.moveToNext());
}
cursor.close();
return recentFiles;
}

List<LayoutElementParcelable> recentFiles = new ArrayList<>(20);
@Nullable
private Cursor getCursor(Context context) {
final String[] projection = {
MediaStore.Files.FileColumns.DATA, MediaStore.Files.FileColumns.DATE_MODIFIED
};
Calendar c = Calendar.getInstance();
c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 2);
Date d = c.getTime();
Cursor cursor;
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});
Expand All @@ -574,23 +592,48 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {
null,
MediaStore.Files.FileColumns.DATE_MODIFIED + " DESC LIMIT 20");
}
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;
}

/**
* Recursively fetches the files from directory tree and adds all the files in a list
*
* @param f: File
* @return List of files in directory tree.
*/
private List<File> getFilesFromDirectory(File f) {
List<File> allFilesInDir = new ArrayList<>();
try {
File[] files = f.listFiles();
for (File file : files) {
if (file.isDirectory()) {
getFilesFromDirectory(file);
} else {
allFilesInDir.add(file);
}
}
} catch (Exception exception) {
LOG.error(exception.getLocalizedMessage());
}
return allFilesInDir;
}

private @Nullable List<LayoutElementParcelable> listTrashBinFiles() {
Expand Down
Loading