Skip to content

Commit 021a8b9

Browse files
mgallienbackportbot[bot]
authored andcommitted
fix(e2ee): properly propagate the proper encryption metadata version
will enable storing again the proper version of the encryption metadata in client database that will enable again migration on read from version 1.2 to version 2.0 Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
1 parent e65b83d commit 021a8b9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/libsync/discovery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,7 @@ DiscoverySingleDirectoryJob *ProcessDirectoryJob::startAsyncServerQuery()
22902290
const auto alreadyDownloaded = _discoveryData->_statedb->getFileRecord(_dirItem->_file, &record) && record.isValid();
22912291
// we need to make sure we first download all e2ee files/folders before migrating
22922292
_dirItem->_isEncryptedMetadataNeedUpdate = alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
2293-
_dirItem->_e2eEncryptionStatus = SyncFileItem::EncryptionStatus::EncryptedMigratedV2_0;
2293+
_dirItem->_e2eEncryptionStatus = serverJob->currentEncryptionStatus();
22942294
_dirItem->_e2eEncryptionStatusRemote = serverJob->currentEncryptionStatus();
22952295
_dirItem->_e2eEncryptionServerCapability = serverJob->requiredEncryptionStatus();
22962296
qCDebug(lcDisco()) << _dirItem->_e2eEncryptionStatus << _dirItem->_e2eEncryptionServerCapability;

0 commit comments

Comments
 (0)