Merge pull request #6695 from nextcloud/bugfix/migration-1.2-to-2.0-n…

…estedfolders

Bugfix. E2EE. Always migrate from 1.2 to 2.0, even with nested folders.

src/libsync/foldermetadata.cpp

@@ -955,15 +955,7 @@ bool FolderMetadata::isRootEncryptedFolder() const
 
 bool FolderMetadata::encryptedMetadataNeedUpdate() const
 {
-    // TODO: For now we do not migrated to V2 if a folder has subfolders, remove the following code and only leave "return latestSupportedMetadataVersion() > _existingMetadataVersion;"
-    if (latestSupportedMetadataVersion() <= _existingMetadataVersion) {
-        return false;
-    }
-
-    const auto foundNestedFoldersOrIsNestedFolder = !_isRootEncryptedFolder
-        || std::find_if(std::cbegin(_files), std::cend(_files), [](const auto &file) { return file.isDirectory(); }) != std::cend(_files);
-
-    return !foundNestedFoldersOrIsNestedFolder;
+    return latestSupportedMetadataVersion() > _existingMetadataVersion;
 }
 
 QByteArray FolderMetadata::certificateSha256Fingerprint() const