Merge pull request #16505 from iterate-ch/bugfix/GH-14101

Fix #14101.
iterate-ch · Nov 7, 2024 · 38336d1 · 38336d1
2 parents b40b014 + a00f520
commit 38336d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/worker/DeleteWorker.java b/core/src/main/java/ch/cyberduck/core/worker/DeleteWorker.java
@@ -117,7 +117,7 @@ public List<Path> run(final Session<?> session) throws BackgroundException {
         }
         // Iterate again to delete any files that can be omitted when recursive operation is supported
         if(delete.isRecursive()) {
-            recursive.keySet().removeIf(f -> recursive.keySet().stream().anyMatch(f::isChild));
+            recursive.keySet().removeIf(f -> !f.getType().contains(Path.Type.decrypted) && recursive.keySet().stream().anyMatch(f::isChild));
         }
         final HostPreferences preferences = new HostPreferences(session.getHost());
         if(preferences.getBoolean("versioning.enable") && preferences.getBoolean("versioning.delete.enable")) {
@@ -177,7 +177,7 @@ protected Map<Path, TransferStatus> compile(final Delete delete, final ListServi
             recursive.put(file, new TransferStatus().withLockId(this.getLockId(file)));
         }
         else if(file.isDirectory()) {
-            if(!delete.isRecursive()) {
+            if(!delete.isRecursive() || file.getType().contains(Path.Type.decrypted)) {
                 for(Path child : list.list(file, listener).filter(filter)) {
                     if(this.isCanceled()) {
                         throw new ConnectionCanceledException();