]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
properly preserve the format of e2ee metadata during DB operations
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Wed, 5 Apr 2023 15:56:48 +0000 (17:56 +0200)
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 12 Apr 2023 13:46:51 +0000 (15:46 +0200)
before this patch we may put the e2ee version format to v1.2 when it was
not the case

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
src/libsync/syncfileitem.cpp

index ee2805e72d01685b96a8be46baa5720b35f2595a..3b7ab96906948a7f96500d5ec990b92ca8c334d3 100644 (file)
@@ -49,7 +49,7 @@ SyncJournalFileRecord SyncFileItem::toSyncJournalFileRecordWithInode(const QStri
     rec._serverHasIgnoredFiles = _serverHasIgnoredFiles;
     rec._checksumHeader = _checksumHeader;
     rec._e2eMangledName = _encryptedFileName.toUtf8();
-    rec._isE2eEncrypted = isEncrypted() ? SyncJournalFileRecord::EncryptionStatus::EncryptedMigratedV1_2 : SyncJournalFileRecord::EncryptionStatus::NotEncrypted;
+    rec._isE2eEncrypted = static_cast<SyncJournalFileRecord::EncryptionStatus>(_isEncrypted);
     rec._lockstate._locked = _locked == LockStatus::LockedItem;
     rec._lockstate._lockOwnerDisplayName = _lockOwnerDisplayName;
     rec._lockstate._lockOwnerId = _lockOwnerId;