mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11037 from nextcloud/e2eEncryptedOption

Browse source 
Only show "set encrypted" if folder is empty and has no empty files/folder in it
This commit is contained in:
Álvaro Brey 2022-11-16 12:34:34 +01:00 committed by GitHub
commit 13bcd6bfdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt
View file

@ -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<OCFile>()
}
@Test

6
app/src/main/java/com/owncloud/android/files/FileMenuFilter.java
View file

@ -594,7 +594,11 @@ public class FileMenuFilter {
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;
}