Skip to content

Commit

Permalink
fix review comments
Browse files Browse the repository at this point in the history
Signed-off-by: alex-z <[email protected]>
  • Loading branch information
allexzander committed Apr 4, 2023
1 parent c09b25b commit 02bbd98
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/libsync/clientsideencryption.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ void FolderMetadata::setupExistingMetadata(const QByteArray& metadata)

_fileDrop = metaDataDoc.object().value("filedrop").toObject();
// for unit tests
_fileDropDoNotErase = metaDataDoc.object().value("filedrop").toObject();
_fileDropFromServer = metaDataDoc.object().value("filedrop").toObject();

// Iterate over the document to store the keys. I'm unsure that the keys are in order,
// perhaps it's better to store a map instead of a vector, perhaps this just doesn't matter.
Expand Down Expand Up @@ -1894,7 +1894,7 @@ bool FolderMetadata::moveFromFileDropToFiles()

QJsonObject FolderMetadata::fileDrop() const
{
return _fileDropDoNotErase;
return _fileDropFromServer;
}

bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &iv, QFile *input, QFile *output, QByteArray& returnTag)
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/clientsideencryption.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class OWNCLOUDSYNC_EXPORT FolderMetadata {
QVector<QPair<QString, QString>> _sharing;
QJsonObject _fileDrop;
// used by unit tests, must get assigned simultaneously with _fileDrop and not erased
QJsonObject _fileDropDoNotErase;
QJsonObject _fileDropFromServer;
bool _isMetadataSetup = false;
bool _encryptedMetadataNeedUpdate = false;
};
Expand Down

0 comments on commit 02bbd98

Please sign in to comment.