Merge remote-tracking branch 'origin/master' into develop/10.0

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

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;

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>