mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 13:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make encryption job errors provide descriptive error messages

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2022-12-09 19:05:27 +01:00 committed by Claudio Cambra
parent 2b09281594
commit 19d5919b39
4 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsync/clientsideencryptionjobs.cpp
View file

@ -177,7 +177,7 @@ bool UnlockEncryptFolderApiJob::finished()
if (retCode != 200) {
qCInfo(lcCseJob()) << "error unlocking file" << path() << errorString() << retCode;
qCInfo(lcCseJob()) << "Full Error Log" << reply()->readAll();
emit error(_fileId, retCode);
emit error(_fileId, retCode, errorString());
return true;
}
emit success(_fileId);
@ -241,7 +241,7 @@ bool LockEncryptFolderApiJob::finished()
int retCode = reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (retCode != 200) {
qCInfo(lcCseJob()) << "error locking file" << path() << errorString() << retCode;
emit error(_fileId, retCode);
emit error(_fileId, retCode, errorString());
return true;
}
@ -282,7 +282,7 @@ bool SetEncryptionFlagApiJob::finished()
emit success(_fileId);
} else {
qCInfo(lcCseJob()) << "Setting the encrypted flag failed with" << path() << errorString() << retCode;
emit error(_fileId, retCode);
emit error(_fileId, retCode, errorString());
}
return true;
}

12
src/libsync/clientsideencryptionjobs.h
View file

@ -129,7 +129,9 @@ protected:
signals:
void success(const QByteArray &fileId);
void error(const QByteArray &fileId, int httpReturnCode);
void error(const QByteArray &fileId,
const int httpReturnCode,
const QString &errorMessage);
private:
QByteArray _fileId;
@ -150,7 +152,9 @@ protected:
signals:
void success(const QByteArray& fileId, const QByteArray& token);
void error(const QByteArray& fileId, int httpdErrorCode);
void error(const QByteArray& fileId,
const int httpErrorCode,
const QString &errorMessage);
private:
QByteArray _fileId;
@ -175,7 +179,9 @@ protected:
signals:
void success(const QByteArray& fileId);
void error(const QByteArray& fileId, int httpReturnCode);
void error(const QByteArray& fileId,
const int httpReturnCode,
const QString &errorMessage);
private:
QByteArray _fileId;

17
src/libsync/encryptfolderjob.cpp
View file

@ -70,9 +70,12 @@ void EncryptFolderJob::slotEncryptionFlagSuccess(const QByteArray &fileId)
lockJob->start();
}
void EncryptFolderJob::slotEncryptionFlagError(const QByteArray &fileId, int httpErrorCode)
void EncryptFolderJob::slotEncryptionFlagError(const QByteArray &fileId,
const int httpErrorCode,
const QString &errorMessage)
{
qDebug() << "Error on the encryption flag of" << fileId << "HTTP code:" << httpErrorCode;
_errorString = errorMessage;
emit finished(Error);
}
@ -108,7 +111,7 @@ void EncryptFolderJob::slotUploadMetadataSuccess(const QByteArray &folderId)
unlockJob->start();
}
void EncryptFolderJob::slotUpdateMetadataError(const QByteArray &folderId, int httpReturnCode)
void EncryptFolderJob::slotUpdateMetadataError(const QByteArray &folderId, const int httpReturnCode)
{
Q_UNUSED(httpReturnCode);
@ -120,15 +123,21 @@ void EncryptFolderJob::slotUpdateMetadataError(const QByteArray &folderId, int h
unlockJob->start();
}
void EncryptFolderJob::slotLockForEncryptionError(const QByteArray &fileId, int httpErrorCode)
void EncryptFolderJob::slotLockForEncryptionError(const QByteArray &fileId,
const int httpErrorCode,
const QString &errorMessage)
{
qCInfo(lcEncryptFolderJob()) << "Locking error for" << fileId << "HTTP code:" << httpErrorCode;
_errorString = errorMessage;
emit finished(Error);
}
void EncryptFolderJob::slotUnlockFolderError(const QByteArray &fileId, int httpErrorCode)
void EncryptFolderJob::slotUnlockFolderError(const QByteArray &fileId,
const int httpErrorCode,
const QString &errorMessage)
{
qCInfo(lcEncryptFolderJob()) << "Unlocking error for" << fileId << "HTTP code:" << httpErrorCode;
_errorString = errorMessage;
emit finished(Error);
}
void EncryptFolderJob::slotUnlockFolderSuccess(const QByteArray &fileId)

8
src/libsync/encryptfolderjob.h
View file

@ -40,13 +40,13 @@ signals:
private slots:
void slotEncryptionFlagSuccess(const QByteArray &folderId);
void slotEncryptionFlagError(const QByteArray &folderId, int httpReturnCode);
void slotEncryptionFlagError(const QByteArray &folderId, const int httpReturnCode, const QString &errorMessage);
void slotLockForEncryptionSuccess(const QByteArray &folderId, const QByteArray &token);
void slotLockForEncryptionError(const QByteArray &folderId, int httpReturnCode);
void slotLockForEncryptionError(const QByteArray &folderId, const int httpReturnCode, const QString &errorMessage);
void slotUnlockFolderSuccess(const QByteArray &folderId);
void slotUnlockFolderError(const QByteArray &folderId, int httpReturnCode);
void slotUnlockFolderError(const QByteArray &folderId, const int httpReturnCode, const QString &errorMessage);
void slotUploadMetadataSuccess(const QByteArray &folderId);
void slotUpdateMetadataError(const QByteArray &folderId, int httpReturnCode);
void slotUpdateMetadataError(const QByteArray &folderId, const int httpReturnCode);
private:
AccountPtr _account;