File rpi-imager-noupdates.diff of Package rpi-imager

Overview Repositories Revisions Requests Users Attributes Meta

File rpi-imager-noupdates.diff of Package rpi-imager (Revision 4a3cff3cfa468ec1e0b59327e9bbdd3a)

Currently displaying revision 4a3cff3cfa468ec1e0b59327e9bbdd3a , Show latest

From 66a7902d13f162965e7215e74dd3dc84b9718108 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Mon, 14 Feb 2022 15:01:32 +0100
Subject: [PATCH] Add compile time options for telemetry and updates

---
 CMakeLists.txt  | 15 +++++++++++++++
 config.h        |  1 -
 imagewriter.cpp |  2 ++
 main.qml        |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c560e91..e885d30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,9 @@ if (APPLE)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "" FORCE)
 endif()
 
+OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
+OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
+
 project(rpi-imager LANGUAGES CXX C)
 set(IMAGER_VERSION_MAJOR 1)
 set(IMAGER_VERSION_MINOR 7)
@@ -107,6 +110,18 @@ else()
     message(STATUS "LTO not supported: <${ipoerror}>")
 endif()
 
+if(ENABLE_TELEMETRY)
+    add_definitions(-DTELEMETRY_ENABLED_DEFAULT=true)
+else()
+    add_definitions(-DTELEMETRY_ENABLED_DEFAULT=false)
+endif()
+
+if(ENABLE_CHECK_VERSION)
+    add_definitions(-DCHECK_VERSION_DEFAULT=true)
+else()
+    add_definitions(-DCHECK_VERSION_DEFAULT=false)
+endif()
+
 # Because dependencies are typically not available by default on Windows, build bundled code
 if (WIN32)
     # Target Windows 7 (needed for drivelist module)
diff --git a/config.h b/config.h
index 75a4110..7262339 100644
--- a/config.h
+++ b/config.h
@@ -15,7 +15,6 @@
 
 /* Phone home the name of images downloaded for image popularity ranking */
 #define TELEMETRY_URL                     "https://rpi-imager-stats.raspberrypi.com/downloads"
-#define TELEMETRY_ENABLED_DEFAULT         true
 
 /* Hash algorithm for verifying (uncompressed image) checksum */
 #define OSLIST_HASH_ALGORITHM             QCryptographicHash::Sha256
diff --git a/imagewriter.cpp b/imagewriter.cpp
index a88dfdb..b7f4cb2 100644
--- a/imagewriter.cpp
+++ b/imagewriter.cpp
@@ -1006,6 +1006,8 @@ bool ImageWriter::getBoolSetting(const QString &key)
         return _settings.value(key, TELEMETRY_ENABLED_DEFAULT).toBool();
     else if (key == "eject")
         return _settings.value(key, true).toBool();
+    else if (key == "check_version")
+        return _settings.value(key, CHECK_VERSION_DEFAULT).toBool();
     else
         return _settings.value(key).toBool();
 }
diff --git a/main.qml b/main.qml
index 5046c3f..aef71ed 100644
--- a/main.qml
+++ b/main.qml
@@ -1160,7 +1160,7 @@ ApplicationWindow {
 
             if ("imager" in o) {
                 var imager = o["imager"]
-                if ("latest_version" in imager && "url" in imager) {
+                if (imageWriter.getBoolSetting("check_version") && "latest_version" in imager && "url" in imager) {
                     if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
                         updatepopup.url = imager["url"]
                         updatepopup.openPopup()
-- 
2.34.1

Places

File rpi-imager-noupdates.diff of Package rpi-imager (Revision 4a3cff3cfa468ec1e0b59327e9bbdd3a)

Places