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

We already have a QNetworkAcessManager global, use it

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-26 12:45:03 -02:00 • committed by Dirk Hohndel
parent ccf29679ae
commit 6575a0b4b8
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
qt-mobile/qmlmanager.cpp
View file

@ -14,14 +14,15 @@
#include "qthelper.h" #include "qthelper.h"
#include "qt-gui.h" #include "qt-gui.h"
#include "git-access.h" #include "git-access.h"
#include "subsurface-core/cloudstorage.h"
QMLManager *QMLManager::m_instance = NULL; QMLManager *QMLManager::m_instance = NULL;
static void appendTextToLogStandalone(const char *text) static void appendTextToLogStandalone(const char *text)
{ {
QMLManager *mgr = QMLManager::instance(); QMLManager *self = QMLManager::instance();
if (mgr) if (self)
mgr->appendTextToLog(QString(text)); self->appendTextToLog(QString(text));
} }
extern "C" int gitProgressCB(int percent) extern "C" int gitProgressCB(int percent)
@ -30,9 +31,9 @@ extern "C" int gitProgressCB(int percent)
if (percent - lastPercent >= 10) { if (percent - lastPercent >= 10) {
lastPercent += 10; lastPercent += 10;
QMLManager *mgr = QMLManager::instance(); QMLManager *self = QMLManager::instance();
if (mgr) if (self)
mgr->loadDiveProgress(percent); self->loadDiveProgress(percent);
} }
// return 0 so that we don't end the download // return 0 so that we don't end the download
return 0; return 0;
@ -41,8 +42,7 @@ extern "C" int gitProgressCB(int percent)
QMLManager::QMLManager() : m_locationServiceEnabled(false), QMLManager::QMLManager() : m_locationServiceEnabled(false),
m_verboseEnabled(false), m_verboseEnabled(false),
m_loadFromCloud(false), m_loadFromCloud(false),
reply(0), reply(0)
mgr(0)
{ {
m_instance = this; m_instance = this;
appendTextToLog(getUserAgent()); appendTextToLog(getUserAgent());
@ -165,15 +165,13 @@ void QMLManager::checkCredentialsAndExecute(execute_function_type execute)
!same_string(prefs.cloud_storage_password, "")) { !same_string(prefs.cloud_storage_password, "")) {
setStartPageText(tr("Testing cloud credentials")); setStartPageText(tr("Testing cloud credentials"));
appendTextToLog("Have credentials, let's see if they are valid"); appendTextToLog("Have credentials, let's see if they are valid");
if (!mgr) connect(manager(), &QNetworkAccessManager::authenticationRequired, this, &QMLManager::provideAuth, Qt::UniqueConnection);
mgr = new QNetworkAccessManager(this); connect(manager(), &QNetworkAccessManager::finished, this, execute, Qt::UniqueConnection);
connect(mgr, &QNetworkAccessManager::authenticationRequired, this, &QMLManager::provideAuth, Qt::UniqueConnection);
connect(mgr, &QNetworkAccessManager::finished, this, execute, Qt::UniqueConnection);
QUrl url(CLOUDREDIRECTURL); QUrl url(CLOUDREDIRECTURL);
request = QNetworkRequest(url); request = QNetworkRequest(url);
request.setRawHeader("User-Agent", getUserAgent().toUtf8()); request.setRawHeader("User-Agent", getUserAgent().toUtf8());
request.setRawHeader("Accept", "text/html"); request.setRawHeader("Accept", "text/html");
reply = mgr->get(request); reply = manager()->get(request);
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError(QNetworkReply::NetworkError))); connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError(QNetworkReply::NetworkError)));
connect(reply, &QNetworkReply::sslErrors, this, &QMLManager::handleSslErrors); connect(reply, &QNetworkReply::sslErrors, this, &QMLManager::handleSslErrors);
} }

1
qt-mobile/qmlmanager.h
View file

@ -105,7 +105,6 @@ private:
static QMLManager *m_instance; static QMLManager *m_instance;
QNetworkReply *reply; QNetworkReply *reply;
QNetworkRequest request; QNetworkRequest request;
QNetworkAccessManager *mgr;
signals: signals:
void cloudUserNameChanged(); void cloudUserNameChanged();