From fcb3d318bbdf8cebda6394b030f9cfb8ab661675 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 4 Jul 2024 20:57:28 +0100 Subject: [PATCH 1/2] Make version URL configurable --- cmake/Definitions.cmake | 5 +++++ src/gui/src/VersionChecker.cpp | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index a791c9003c..58f614ddb8 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -25,6 +25,11 @@ macro(configure_definitions) configure_ninja() configure_options() + if(NOT DEFINED VERSION_URL) + set(VERSION_URL "https://api.symless.com/version?version=v1") + endif() + add_definitions(-DSYNERGY_VERSION_URL="${VERSION_URL}") + if(ENABLE_LICENSING) message(STATUS "Licensing enabled") add_definitions(-DSYNERGY_ENABLE_LICENSING=1) diff --git a/src/gui/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp index 139d5fbef3..09763956ec 100644 --- a/src/gui/src/VersionChecker.cpp +++ b/src/gui/src/VersionChecker.cpp @@ -24,8 +24,6 @@ #include #include -#define VERSION_URL "https://api.symless.com/version" - VersionChecker::VersionChecker() { m_manager = new QNetworkAccessManager(this); @@ -36,7 +34,7 @@ VersionChecker::VersionChecker() { VersionChecker::~VersionChecker() { delete m_manager; } void VersionChecker::checkLatest() { - auto request = QNetworkRequest(QUrl(VERSION_URL)); + auto request = QNetworkRequest(QUrl(SYNERGY_VERSION_URL)); request.setHeader(QNetworkRequest::UserAgentHeader, QString("Synergy (") + SYNERGY_VERSION + ") " + QSysInfo::prettyProductName()); From d67d171be359e315e95816ebeba867df4a10bfa9 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 4 Jul 2024 21:13:08 +0100 Subject: [PATCH 2/2] Updated ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7092d95541..8d180cb956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ Enhancements: - #7361 Re-implement packaging for GitHub workflows (Linux) - #7363 Schedule CI daily at 5am to detect code rot early - #7364 Format all source with Clang and introduce lint workflow +- #7368 Make version check URL v1-specific and configurable # 1.14.6