Skip to content

Deleted files view should respect show hidden files setting #17653

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

Open
mohitsatr wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

Deleted files view should respect show hidden files setting #17653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void setTrashbinFiles(List<TrashbinFile> trashbinFiles, boolean clear) {
if (clear) {
files.clear();
}

filterHiddenFiles(trashbinFiles);
files.addAll(trashbinFiles);

files = preferences.getSortOrderByType(FileSortOrder.Type.trashBinView,
Expand All @@ -106,6 +106,19 @@ public void setTrashbinFiles(List<TrashbinFile> trashbinFiles, boolean clear) {
notifyDataSetChanged();
}

private void filterHiddenFiles(List<TrashbinFile> files) {
if (!preferences.isShowHiddenFilesEnabled()) {
List<TrashbinFile> hiddenFiles = files.stream()
.filter(TrashbinFile::isHidden)
.toList();
List<String> hiddenFileNames = hiddenFiles.stream()
.map(TrashbinFile::getFileName)
.toList();
files.removeAll(hiddenFiles);
Log_OC.d(TAG, "Filtered Hidden files: " + hiddenFileNames);
}
}

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
Expand Down