From 44be7fd4c3e8fc8e0ed10852aa0604a867d883ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:58:03 +0000
Subject: [PATCH 1/3] Bump commons-codec:commons-codec from 1.17.0 to 1.17.1

Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.17.0 to 1.17.1.
- [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.17.0...rel/commons-codec-1.17.1)

---
updated-dependencies:
- dependency-name: commons-codec:commons-codec
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 568a92be4bc..10c77c0d301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.17.0</version>
+                <version>1.17.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-net</groupId>

From 9707496b6ff404718ea4680580d2403b81a115c9 Mon Sep 17 00:00:00 2001
From: Yves Langisch <yla@iterate.ch>
Date: Tue, 16 Jul 2024 19:22:45 +0200
Subject: [PATCH 2/3] Do not cache results from a canceled list worker as it
 may be incomplete.

---
 core/src/main/java/ch/cyberduck/core/worker/ListWorker.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/ch/cyberduck/core/worker/ListWorker.java b/core/src/main/java/ch/cyberduck/core/worker/ListWorker.java
index 28741ea94ac..35eb6d1d2f7 100644
--- a/core/src/main/java/ch/cyberduck/core/worker/ListWorker.java
+++ b/core/src/main/java/ch/cyberduck/core/worker/ListWorker.java
@@ -96,6 +96,10 @@ protected boolean isCached() {
 
     @Override
     public void cleanup(final AttributedList<Path> list) {
+        // Do not cache results from a canceled list worker as it may be incomplete
+        if(this.isCanceled()) {
+            return;
+        }
         // Update the working directory if listing is successful
         if(!(AttributedList.<Path>emptyList() == list)) {
             // Cache directory listing
@@ -106,7 +110,7 @@ public void cleanup(final AttributedList<Path> list) {
     @Override
     public String getActivity() {
         return MessageFormat.format(LocaleFactory.localizedString("Listing directory {0}", "Status"),
-            directory.getName());
+                directory.getName());
     }
 
     @Override

From 29b52c3fbb8f99d1e68a52cfe7782fb834685565 Mon Sep 17 00:00:00 2001
From: David Kocher <dkocher@iterate.ch>
Date: Wed, 17 Jul 2024 12:25:03 +0200
Subject: [PATCH 3/3] Extend from trash interface.

---
 .../java/ch/cyberduck/core/googledrive/DriveTrashFeature.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveTrashFeature.java b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveTrashFeature.java
index 42206dd10a2..7262c92c31c 100644
--- a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveTrashFeature.java
+++ b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveTrashFeature.java
@@ -22,7 +22,7 @@
 import ch.cyberduck.core.exception.AccessDeniedException;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.UnsupportedException;
-import ch.cyberduck.core.features.Delete;
+import ch.cyberduck.core.features.Trash;
 import ch.cyberduck.core.preferences.HostPreferences;
 import ch.cyberduck.core.transfer.TransferStatus;
 
@@ -37,7 +37,7 @@
 
 import com.google.api.services.drive.model.File;
 
-public class DriveTrashFeature implements Delete {
+public class DriveTrashFeature implements Trash {
     private static final Logger log = LogManager.getLogger(DriveTrashFeature.class);
 
     private final DriveSession session;