Restore delete functionality for E2EE - fixes #11387

Added test for an encrypted file: - remove functionality *not* filtered - set/unset encryption, move/copy and rename filtered Signed-off-by: Marco Baggio <[email protected]>
nextcloud · Jan 10, 2024 · 65b7513 · 65b7513
1 parent fb3694f
commit 65b7513
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt b/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt
@@ -189,6 +189,10 @@ class FileMenuFilterIT : AbstractIT() {
             mimeType = MimeType.DIRECTORY
         }
 
+        val encryptedFile = OCFile("/foo.md").apply {
+            isEncrypted = true
+        }
+
         configureCapability(capability)
 
         launchActivity<TestActivity>().use {
@@ -227,6 +231,16 @@ class FileMenuFilterIT : AbstractIT() {
                 assertTrue(toHide.contains(R.id.action_unset_encrypted))
                 assertFalse(toHide.contains(R.id.action_encrypted))
                 assertFalse(toHide.contains(R.id.action_remove_file))
+
+                // encrypted file
+                sut = filterFactory.newInstance(encryptedFile, mockComponentsGetter, true, user)
+                toHide = sut.getToHide(false)
+
+                assertTrue(toHide.contains(R.id.action_unset_encrypted))
+                assertTrue(toHide.contains(R.id.action_encrypted))
+                assertTrue(toHide.contains(R.id.action_move_or_copy))
+                assertTrue(toHide.contains(R.id.action_rename_file))
+                assertFalse(toHide.contains(R.id.action_remove_file))
             }
         }
     }

diff --git a/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java
@@ -339,8 +339,7 @@ private void filterSelectAll(List<Integer> toHide, boolean inSingleFileFragment)
     }
 
     private void filterRemove(List<Integer> toHide, boolean synchronizing) {
-        if (files.isEmpty() || synchronizing || containsLockedFile()
-            || containsEncryptedFolder() || containsEncryptedFile()) {
+        if (files.isEmpty() || synchronizing || containsLockedFile() || isEncryptedRoot()) {
             toHide.add(R.id.action_remove_file);
         }
     }
@@ -566,4 +565,8 @@ private boolean isShared() {
         }
         return false;
     }
+
+    private boolean isEncryptedRoot() {
+        return isEncryptedFolder() && !hasEncryptedParent();
+    }
 }