From 0a4606850132f44cc9f85dc7a12b3f11a9b04723 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 7 Jan 2024 14:35:56 -0800 Subject: [PATCH] remove app uuid This hasn't been used on the backend in a long time (and appears to get stripped out on several platforms). No point in keeping it around. Signed-off-by: Dirk Hohndel --- core/checkcloudconnection.cpp | 1 - core/qthelper.cpp | 13 ------------- core/qthelper.h | 1 - desktop-widgets/updatemanager.cpp | 3 +-- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/core/checkcloudconnection.cpp b/core/checkcloudconnection.cpp index c1e5291fe..96a5587c5 100644 --- a/core/checkcloudconnection.cpp +++ b/core/checkcloudconnection.cpp @@ -42,7 +42,6 @@ bool CheckCloudConnection::checkServer() QNetworkRequest request; request.setRawHeader("Accept", "text/plain"); request.setRawHeader("User-Agent", getUserAgent().toUtf8()); - request.setRawHeader("Client-Id", getUUID().toUtf8()); request.setUrl(QString(prefs.cloud_base_url) + TEAPOT); reply = mgr->get(request); QTimer timer; diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 4d7636763..77cb577ab 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1451,19 +1451,6 @@ void init_proxy() QNetworkProxy::setApplicationProxy(proxy); } -QString getUUID() -{ - QString uuidString; - uuidString = qPrefUpdateManager::uuidString(); - if (uuidString != "") { - QUuid uuid = QUuid::createUuid(); - uuidString = uuid.toString(); - qPrefUpdateManager::set_uuidString(uuidString); - } - uuidString.replace("{", "").replace("}", ""); - return uuidString; -} - void parse_seabear_header(const char *filename, struct xml_params *params) { QFile f(filename); diff --git a/core/qthelper.h b/core/qthelper.h index 66df91b20..59fecf24c 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -44,7 +44,6 @@ QString localFilePath(const QString &originalFilename); int getCloudURL(QString &filename); bool parseGpsText(const QString &gps_text, double *latitude, double *longitude); void init_proxy(); -QString getUUID(); QStringList getWaterTypesAsString(); extern const QStringList videoExtensionsList; QStringList mediaExtensionFilters(); diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp index fa52cad40..6763f16ee 100644 --- a/desktop-widgets/updatemanager.cpp +++ b/desktop-widgets/updatemanager.cpp @@ -41,8 +41,7 @@ void UpdateManager::checkForUpdates(bool automatic) #endif isAutomaticCheck = automatic; QString version = subsurface_canonical_version(); - QString uuidString = getUUID(); - QString url = QString("http://updatecheck.subsurface-divelog.org/updatecheck.html?os=%1&version=%2&uuid=%3").arg(os, version, uuidString); + QString url = QString("http://updatecheck.subsurface-divelog.org/updatecheck.html?os=%1&version=%2").arg(os, version); QNetworkRequest request; request.setUrl(url); request.setRawHeader("Accept", "text/xml");