mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: change uploadFinish() to include html

Browse source 
diveshareexport wants to show the HTML received
in a positive response, so signal cannot be
compatible with diveLogsDE

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-10 15:45:51 +01:00 • committed by Dirk Hohndel
parent e5f3e927a7
commit fc740f6369
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/uploadDiveShare.cpp
View file

@ -79,9 +79,9 @@ void uploadDiveShare::slot_uploadFinished()
reply->deleteLater(); reply->deleteLater();
timeout.stop(); timeout.stop();
if (reply->error() != 0) { if (reply->error() != 0) {
emit uploadFinish(false, reply->errorString()); emit uploadFinish(false, reply->errorString(), reply->readAll());
} else { } else {
emit uploadFinish(true, tr("Upload successful")); emit uploadFinish(true, tr("Upload successful"), reply->readAll());
} }
} }
@ -95,7 +95,7 @@ void uploadDiveShare::slot_uploadTimeout()
} }
QString err(tr("dive-share.com not responding")); QString err(tr("dive-share.com not responding"));
report_error(err.toUtf8()); report_error(err.toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err, QByteArray());
} }
@ -108,5 +108,5 @@ void uploadDiveShare::slot_uploadError(QNetworkReply::NetworkError error)
} }
QString err(tr("network error %1").arg(error)); QString err(tr("network error %1").arg(error));
report_error(err.toUtf8()); report_error(err.toUtf8());
emit uploadFinish(false, err); emit uploadFinish(false, err, QByteArray());
} }

2
core/uploadDiveShare.h
View file

@ -19,7 +19,7 @@ private slots:
void slot_uploadError(QNetworkReply::NetworkError error); void slot_uploadError(QNetworkReply::NetworkError error);
signals: signals:
void uploadFinish(bool success, const QString &text); void uploadFinish(bool success, const QString &text, const QByteArray &html);
void uploadProgress(qreal percentage, qreal total); void uploadProgress(qreal percentage, qreal total);
void uploadStatus(const QString &text); void uploadStatus(const QString &text);