diff options
| author | allexzander <blackslayer4@gmail.com> | 2021-07-27 15:02:12 +0300 |
|---|---|---|
| committer | Felix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de> | 2021-07-28 10:57:10 +0300 |
| commit | 8122c63ebc4cfc9154e06c343dfe8cab18623dca (patch) | |
| tree | b181b04710648c405f3920e82a5f6a748fa0b576 /src/common | |
| parent | 76308d51554eb95bee39f15d6cf807ddc5c468b0 (diff) | |
Revert Added config parameter that allows to bypass checksum validation failure.
Signed-off-by: allexzander <blackslayer4@gmail.com>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/checksums.cpp | 7 | ||||
| -rw-r--r-- | src/common/checksums.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/common/checksums.cpp b/src/common/checksums.cpp index 79038554f..c604842a3 100644 --- a/src/common/checksums.cpp +++ b/src/common/checksums.cpp @@ -328,7 +328,7 @@ ComputeChecksum *ValidateChecksumHeader::prepareStart(const QByteArray &checksum if (!parseChecksumHeader(checksumHeader, &_expectedChecksumType, &_expectedChecksum)) { qCWarning(lcChecksums) << "Checksum header malformed:" << checksumHeader; - emit validationFailed(tr("The checksum header is malformed."), {}, {}, _filePath); + emit validationFailed(tr("The checksum header is malformed.")); return nullptr; } @@ -341,7 +341,6 @@ ComputeChecksum *ValidateChecksumHeader::prepareStart(const QByteArray &checksum void ValidateChecksumHeader::start(const QString &filePath, const QByteArray &checksumHeader) { - _filePath = filePath; if (auto calculator = prepareStart(checksumHeader)) calculator->start(filePath); } @@ -356,11 +355,11 @@ void ValidateChecksumHeader::slotChecksumCalculated(const QByteArray &checksumTy const QByteArray &checksum) { if (checksumType != _expectedChecksumType) { - emit validationFailed(tr("The checksum header contained an unknown checksum type '%1'").arg(QString::fromLatin1(_expectedChecksumType)), {}, {}, _filePath); + emit validationFailed(tr("The checksum header contained an unknown checksum type '%1'").arg(QString::fromLatin1(_expectedChecksumType))); return; } if (checksum != _expectedChecksum) { - emit validationFailed(tr("The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum)), checksumType, checksum, _filePath); + emit validationFailed(tr("The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum))); return; } emit validated(checksumType, checksum); diff --git a/src/common/checksums.h b/src/common/checksums.h index 843017a43..5c8d39d5c 100644 --- a/src/common/checksums.h +++ b/src/common/checksums.h @@ -163,7 +163,7 @@ public: signals: void validated(const QByteArray &checksumType, const QByteArray &checksum); - void validationFailed(const QString &errMsg, const QByteArray &checksumType, const QByteArray &checksum, const QString &filePath); + void validationFailed(const QString &errMsg); private slots: void slotChecksumCalculated(const QByteArray &checksumType, const QByteArray &checksum); @@ -173,8 +173,6 @@ private: QByteArray _expectedChecksumType; QByteArray _expectedChecksum; - - QString _filePath; }; /** |