Skip to content

Commit

Permalink
ShareDialog : ignore ignoreSslErrors
Browse files Browse the repository at this point in the history
	to ignore handshake errors
  • Loading branch information
grauser committed Dec 31, 2016
1 parent b4f5a06 commit db9e297
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
15 changes: 14 additions & 1 deletion src/Cloud/ShareDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ ShareDialogUploader::wasUploaded()
return false;
}

// just ignore handshake errors
void
ShareDialogUploader::onSslErrors(QNetworkReply *reply, const QList<QSslError>&)
{
reply->ignoreSslErrors();
}

//
// Utility function to create a QByteArray of data in GZIP format
// This is essentially the same as qCompress but creates it in
Expand Down Expand Up @@ -513,6 +520,8 @@ StravaUploader::requestUploadStrava()

// trap network response from access manager
networkManager->disconnect();
connect(networkManager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this,
SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
connect(networkManager, SIGNAL(finished(QNetworkReply*)), this,
SLOT(requestUploadStravaFinished(QNetworkReply*)));
connect(networkManager, SIGNAL(finished(QNetworkReply *)), eventLoop,
Expand Down Expand Up @@ -794,6 +803,7 @@ RideWithGpsUploader::requestUploadRideWithGPS()
QTime rideTime = QTime(hour, minute, second);
QDateTime rideDateTime = QDateTime(rideDate, rideTime);

connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadRideWithGPSFinished(QNetworkReply*)));
connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
QString out, data;
Expand Down Expand Up @@ -975,6 +985,7 @@ TodaysPlanUploader::requestUploadTodaysPlan()
QEventLoop eventLoop;
QNetworkAccessManager networkMgr;

connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadTodaysPlanFinished(QNetworkReply*)));
connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));

Expand Down Expand Up @@ -1029,7 +1040,7 @@ TodaysPlanUploader::requestUploadTodaysPlanFinished(QNetworkReply *reply)

// parse the response
QString response = reply->readAll();
//qDebug() << response;
//qDebug() << "response" << response;
MVJSONReader jsonResponse(string(response.toLatin1()));

// get values
Expand Down Expand Up @@ -1125,6 +1136,7 @@ CyclingAnalyticsUploader::requestUploadCyclingAnalytics()
QEventLoop eventLoop;
QNetworkAccessManager networkMgr;

connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadCyclingAnalyticsFinished(QNetworkReply*)));
connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));

Expand Down Expand Up @@ -1281,6 +1293,7 @@ SelfLoopsUploader::requestUploadSelfLoops()
QEventLoop eventLoop;
QNetworkAccessManager networkMgr;

connect(&networkMgr, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError> & )), this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError> & )));
connect(&networkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestUploadSelfLoopsFinished(QNetworkReply*)));
connect(&networkMgr, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));

Expand Down
4 changes: 4 additions & 0 deletions src/Cloud/ShareDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ class ShareDialogUploader : public QObject {
Context *context;
RideItem *ride;
ShareDialog *parent;

private slots:
void onSslErrors(QNetworkReply *reply, const QList<QSslError>&error);

};

// uploader to strava.com
Expand Down

0 comments on commit db9e297

Please sign in to comment.