Skip to content

Commit

Permalink
Bugfix. E2EE. Always migrate from 1.2 to 2.0, even with nested folders.
Browse files Browse the repository at this point in the history
Signed-off-by: alex-z <[email protected]>
  • Loading branch information
allexzander authored and mgallien committed May 22, 2024
1 parent 01c28c7 commit 0f87fd4
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/libsync/foldermetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -940,15 +940,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;
}

bool FolderMetadata::moveFromFileDropToFiles()
Expand Down

0 comments on commit 0f87fd4

Please sign in to comment.