Skip to content

Commit 6304fdc

Browse files
committed
address review comments
1 parent 2c5c36b commit 6304fdc

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -536,68 +536,68 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) {
536536
}
537537

538538
private @Nullable List<LayoutElementParcelable> listRecentFiles() {
539-
final Context context = this.context.get();
540-
final MainFragment mainFragment = this.mainFragmentReference.get();
539+
final Context c = context.get();
541540

542-
if (context == null) {
541+
if (c == null) {
543542
cancel(true);
544543
return null;
545544
}
546-
MainFragmentViewModel viewModel = mainFragment.getMainFragmentViewModel();
545+
547546
List<LayoutElementParcelable> recentFiles = new ArrayList<>(40);
548547

549-
Cursor cursor = getCursor(context);
548+
Cursor cursor = getRecentFilesCursor(c);
550549
if (cursor == null) return recentFiles;
551550
if (cursor.getCount() > 0 && cursor.moveToFirst()) {
552551
do {
553-
String path = cursor.getString(cursor.getColumnIndex(MediaStore.Files.FileColumns.DATA));
554-
File f = new File(path);
552+
String filePath = cursor.getString(cursor.getColumnIndex(MediaStore.MediaColumns.DATA));
553+
File f = new File(filePath);
555554
if (f.isDirectory()) {
556555
List<File> files = getFilesFromDirectory(f);
557-
for (File file : files) {
558-
compareFileAndAddToList(viewModel, recentFiles, file);
559-
}
560-
}
556+
for (File file : files)
557+
compareFileAndAddToList(recentFiles, file);
558+
} else compareFileAndAddToList(recentFiles, f);
561559
} while (cursor.moveToNext());
562560
}
563561
cursor.close();
564562
return recentFiles;
565563
}
566564

567565
@Nullable
568-
private Cursor getCursor(Context context) {
566+
private Cursor getRecentFilesCursor(Context c) {
569567
final String[] projection = {
570-
MediaStore.Files.FileColumns.DATA, MediaStore.Files.FileColumns.DATE_MODIFIED
568+
MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DATE_MODIFIED
571569
};
572570
Cursor cursor;
573571
if (SDK_INT >= Q) {
574572
Bundle queryArgs = new Bundle();
575573
queryArgs.putStringArray(
576574
ContentResolver.QUERY_ARG_SORT_COLUMNS,
577-
new String[] {MediaStore.Files.FileColumns.DATE_MODIFIED});
575+
new String[] {MediaStore.MediaColumns.DATE_MODIFIED});
578576
queryArgs.putInt(
579577
ContentResolver.QUERY_ARG_SORT_DIRECTION,
580578
ContentResolver.QUERY_SORT_DIRECTION_DESCENDING);
579+
queryArgs.putInt(
580+
ContentResolver.QUERY_ARG_LIMIT,
581+
100);
581582
cursor =
582-
context
583+
c
583584
.getContentResolver()
584585
.query(MediaStore.Files.getContentUri("external"), projection, queryArgs, null);
585586
} else {
586587
cursor =
587-
context
588+
c
588589
.getContentResolver()
589590
.query(
590591
MediaStore.Files.getContentUri("external"),
591592
projection,
592593
null,
593594
null,
594-
MediaStore.Files.FileColumns.DATE_MODIFIED + " DESC LIMIT 20");
595+
MediaStore.MediaColumns.DATE_MODIFIED + " DESC LIMIT 100");
595596
}
596597
return cursor;
597598
}
598599

599-
private void compareFileAndAddToList(
600-
MainFragmentViewModel viewModel, List<LayoutElementParcelable> recentFiles, File file) {
600+
private void compareFileAndAddToList(List<LayoutElementParcelable> recentFiles, File file) {
601601
Calendar c = Calendar.getInstance();
602602
c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 2);
603603
Date d = c.getTime();
@@ -608,7 +608,6 @@ private void compareFileAndAddToList(
608608
LayoutElementParcelable parcelable = createListParcelables(strings);
609609
if (parcelable != null) {
610610
recentFiles.add(parcelable);
611-
viewModel.incrementFileCount();
612611
}
613612
}
614613
}

0 commit comments

Comments
 (0)