Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −9
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/libsync/foldermetadata.cpp
View file
Open in desktop
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
Loading