diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-05-13 19:06:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 19:06:47 +0200 |
| commit | d5c6a1b4d1e6d052e42366d19ffa0047168e030d (patch) | |
| tree | 8ba9746a188c39003213839825552543e3f1a48f /launcher/minecraft/services/SkinUpload.cpp | |
| parent | c5aff7cc1ef43a1326bd3ce0c83e29669e2ff43f (diff) | |
| parent | 6b6d6a01dc9cf05715f01e3a549740b169ef9ae3 (diff) | |
| download | PrismLauncher-d5c6a1b4d1e6d052e42366d19ffa0047168e030d.tar.gz PrismLauncher-d5c6a1b4d1e6d052e42366d19ffa0047168e030d.tar.bz2 PrismLauncher-d5c6a1b4d1e6d052e42366d19ffa0047168e030d.zip | |
Merge pull request #1007 from Ryex/fix/network_and_signals
Diffstat (limited to 'launcher/minecraft/services/SkinUpload.cpp')
| -rw-r--r-- | launcher/minecraft/services/SkinUpload.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/launcher/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp index c7987875..711f8739 100644 --- a/launcher/minecraft/services/SkinUpload.cpp +++ b/launcher/minecraft/services/SkinUpload.cpp @@ -78,13 +78,14 @@ void SkinUpload::executeTask() m_reply = shared_qobject_ptr<QNetworkReply>(rep); setStatus(tr("Uploading skin")); - connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - connect(rep, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError))); + connect(rep, &QNetworkReply::uploadProgress, this, &SkinUpload::setProgress); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15 + connect(rep, &QNetworkReply::errorOccurred, this, &SkinUpload::downloadError); #else - connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError))); + connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &SkinUpload::downloadError); #endif - connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished())); + connect(rep, &QNetworkReply::sslErrors, this, &SkinUpload::sslErrors); + connect(rep, &QNetworkReply::finished, this, &SkinUpload::downloadFinished); } void SkinUpload::downloadError(QNetworkReply::NetworkError error) @@ -94,6 +95,17 @@ void SkinUpload::downloadError(QNetworkReply::NetworkError error) emitFailed(m_reply->errorString()); } +void SkinUpload::sslErrors(const QList<QSslError>& errors) +{ + int i = 1; + for (auto error : errors) { + qCritical() << "Skin Upload SSL Error #" << i << " : " << error.errorString(); + auto cert = error.certificate(); + qCritical() << "Certificate in question:\n" << cert.toText(); + i++; + } +} + void SkinUpload::downloadFinished() { // if the download failed |