From c593dea119b4c5fa77a8b2cc129d048d7d56afa4 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 15 Jun 2015 06:05:00 -0700 Subject: Cloud storage: use preference member instead of hard coded strings This creates the basis to allow other backends to be used with the cloud storage infrastructure. So far this should all just transparently continue to work. A user would have to manually add the cloud_base_url entry to the CloudStorage section in their config file in order to use a different backend server. Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 2 +- qt-ui/subsurfacewebservices.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index fb62f4de2..de7cdbdc1 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -1433,7 +1433,7 @@ QString MainWindow::displayedFilename(QString fullFilename) QFileInfo fileInfo(f); QString fileName(fileInfo.fileName()); - if (fullFilename.contains("https://cloud.subsurface-divelog.org")) + if (fullFilename.contains(prefs.cloud_git_url)) return tr("[cloud storage for] %1").arg(fileName.left(fileName.indexOf('['))); else return fileName; diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index dfaf69468..665bcf43a 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -946,9 +946,9 @@ CloudStorageAuthenticate::CloudStorageAuthenticate(QObject *parent) : QObject(pa userAgent = getUserAgent(); } -#define CLOUDURL "https://cloud.subsurface-divelog.org/" -#define CLOUDBACKENDSTORAGE CLOUDURL "storage" -#define CLOUDBACKENDVERIFY CLOUDURL "verify" +#define CLOUDURL QString(prefs.cloud_base_url) +#define CLOUDBACKENDSTORAGE CLOUDURL + "/storage" +#define CLOUDBACKENDVERIFY CLOUDURL + "/verify" QNetworkReply* CloudStorageAuthenticate::authenticate(QString email, QString password, QString pin) { @@ -1013,7 +1013,7 @@ CheckCloudConnection::CheckCloudConnection(QObject *parent) } -#define TEAPOT "https://cloud.subsurface-divelog.org/make-latte?number-of-shots=3" +#define TEAPOT "/make-latte?number-of-shots=3" #define HTTP_I_AM_A_TEAPOT 418 #define MILK "Linus does not like non-fat milk" bool CheckCloudConnection::checkServer() @@ -1024,7 +1024,7 @@ bool CheckCloudConnection::checkServer() QNetworkRequest request; request.setRawHeader("Accept", "text/plain"); request.setRawHeader("User-Agent", getUserAgent().toUtf8()); - request.setUrl(QString(TEAPOT)); + request.setUrl(QString(prefs.cloud_base_url) + TEAPOT); QNetworkAccessManager *mgr = new QNetworkAccessManager(); QNetworkReply *reply = mgr->get(request); connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); -- cgit v1.2.3-70-g09d2