From e7ce8214654e0c899608ac0f54e26f2bf5dbdfdb Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 15 Nov 2022 08:40:43 +0100 Subject: [PATCH] Only show "set encrypted" if folder is empty and has no empty files/folder in it Signed-off-by: tobiasKaminsky --- .../java/com/owncloud/android/files/FileMenuFilterIT.kt | 1 + .../java/com/owncloud/android/files/FileMenuFilter.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt b/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt index 16328162e880..ada747c07bce 100644 --- a/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt @@ -77,6 +77,7 @@ class FileMenuFilterIT : AbstractIT() { every { mockOperationsServiceBinder.isSynchronizing(any(), any()) } returns false every { mockComponentsGetter.operationsServiceBinder } returns mockOperationsServiceBinder every { mockStorageManager.getFileById(any()) } returns OCFile("/") + every { mockStorageManager.getFolderContent(any(), any()) } returns ArrayList() } @Test diff --git a/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java index a61325e848ac..b2220fa58acb 100644 --- a/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java +++ b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java @@ -594,7 +594,11 @@ private boolean isEmptyFolder() { if (isSingleSelection()) { OCFile file = files.iterator().next(); - return file.isFolder() && file.getFileLength() == EMPTY_FILE_LENGTH; + boolean noChildren = componentsGetter + .getStorageManager() + .getFolderContent(file, false).size() == EMPTY_FILE_LENGTH; + + return file.isFolder() && file.getFileLength() == EMPTY_FILE_LENGTH && noChildren; } else { return false; }