Merge pull request #14411 from iterate-ch/bugfix/MD-18856

Fix #14410.

Author: ylangisc

Changelog.txt

@@ -1,6 +1,9 @@
 Cyberduck
 https://cyberduck.io/
 
+8.5.8
+- [Bugfix] Failure reverting previous version in vault (Cryptomator, OneDrive, Google Drive, Dropbox) (#14410)
+
 8.5.7
 - [Bugfix] Cannot create or duplicate files with any suffix (#14263)
 - [Bugfix] Do not use MLST when running with interoperability connection profile (FTP) (#14333)

dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxVersioningFeature.java

@@ -79,20 +79,18 @@ public AttributedList<Path> list(final Path file, final ListProgressListener lis
             final List<FileMetadata> entries = result.getEntries();
             final DropboxAttributesFinderFeature attr = new DropboxAttributesFinderFeature(session);
             for(FileMetadata revision : entries) {
+                if(StringUtils.equals(revision.getRev(), file.attributes().getVersionId())) {
+                    continue;
+                }
                 if(log.isDebugEnabled()) {
                     log.debug(String.format("Found revision %s", revision));
                 }
                 final PathAttributes attributes = attr.toAttributes(revision);
                 attributes.setDuplicate(true);
-                versions.add(new Path(file.getParent(), PathNormalizer.name(revision.getName()), file.getType(),
-                        attributes));
+                versions.add(new Path(file.getParent(), PathNormalizer.name(revision.getName()), file.getType(), attributes));
+                listener.chunk(file.getParent(), versions);
             }
-            return versions.filter(new NullFilter<Path>() {
-                @Override
-                public boolean accept(final Path test) {
-                    return !StringUtils.equals(test.attributes().getVersionId(), file.attributes().getVersionId());
-                }
-            });
+            return versions;
         }
         catch(DbxException e) {
             throw new DropboxExceptionMappingService().map("Failure to read attributes of {0}", e, file);

googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveVersioningFeature.java

@@ -92,6 +92,7 @@ public AttributedList<Path> list(final Path file, final ListProgressListener lis
                         log.debug(String.format("Found revision %s", revision));
                     }
                     versions.add(new Path(file).withAttributes(this.toAttributes(revision)));
+                    listener.chunk(file.getParent(), versions);
                 }
                 page = list.getNextPageToken();
             }

nextcloud/src/main/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeature.java

@@ -119,6 +119,7 @@ public AttributedList<Path> list(final Path file, final ListProgressListener lis
                 attributes.setFileId(file.attributes().getFileId());
                 attributes.setVersionId(PathNormalizer.name(resource.getHref().getPath()));
                 versions.add(new Path(file.getParent(), file.getName(), file.getType(), attributes));
+                listener.chunk(file.getParent(), versions);
             }
             return versions.filter(new TimestampComparator(false));
         }

onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphVersioningFeature.java

@@ -83,6 +83,7 @@ public AttributedList<Path> list(Path file, ListProgressListener listener) throw
             for(final DriveItemVersion version : items.stream().skip(1).collect(Collectors.toList())) {
                 versions.add(new Path(file).withAttributes(attributes.toAttributes(parentMetadata, version)));
             }
+            listener.chunk(file.getParent(), versions);
         }
         catch(OneDriveAPIException e) {
             throw new GraphExceptionMappingService(fileid).map("Failure to read attributes of {0}", e, file);

www/update/changelog.html

@@ -77,11 +77,20 @@
     <strong><a target="_blank" href="https://fosstodon.org/@cyberduck">Follow us</a></strong> on Mastodon.
 </p>
 
+<p>
+    <a target="_blank" href="https://trac.cyberduck.io/milestone/8.5.8"><strong>Version 8.5.8</strong></a>
+</p>
+<ul>
+    <li><span class="label label-warning">Bugfix</span> Failure reverting previous version in vault (Cryptomator, OneDrive, Google Drive, Dropbox) (<a
+            target="_blank" href="https://trac.cyberduck.io/ticket/14410">#14410</a>)</li>
+</ul>
+
 <p>
     <a target="_blank" href="https://trac.cyberduck.io/milestone/8.5.7"><strong>Version 8.5.7</strong></a>
 </p>
 <ul>
-    <li><span class="label label-warning">Bugfix</span> Cannot create or duplicate files with any suffix (#14263)</li>
+    <li><span class="label label-warning">Bugfix</span> Cannot create or duplicate files with any suffix (<a
+            target="_blank" href="https://trac.cyberduck.io/ticket/14263">#14263</a>)</li>
     <li><span class="label label-warning">Bugfix</span> Do not use MLST when running with interoperability connection
         profile (FTP) (<a
                 target="_blank" href="https://trac.cyberduck.io/ticket/14333">#14333</a>)