Code review changes

Eeems-Org · Oct 12, 2024 · 7ebdbe5 · 7ebdbe5
1 parent f0495ed
commit 7ebdbe5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/shared/liboxide/devicesettings.cpp b/shared/liboxide/devicesettings.cpp
@@ -324,16 +324,15 @@ namespace Oxide {
     }
 
     const QString& DeviceSettings::version(){
-        static QString version = "";
-        if(version.isEmpty()){
-            auto lines = QFile("/usr/share/remarkable/update.conf").readAll().split('\n');
-            for(const QString& line : lines){
-                if(line.startsWith("REMARKABLE_RELEASE_VERSION=")){
-                    version = line.mid(27);
-                    break;
-                }
+        static QString version;
+        static std::once_flag flag;
+        std::call_once(flag, [] {
+            QSettings settings("/usr/share/remarkable/update.conf", QSettings::IniFormat);
+            version = settings.value("REMARKABLE_RELEASE_VERSION").toString();
+            if (version.isEmpty()) {
+                qWarning() << "Failed to read version from update.conf";
             }
-        }
+        });
         return version;
     }
 }
diff --git a/shared/liboxide/oxide_sentry.cpp b/shared/liboxide/oxide_sentry.cpp
@@ -168,7 +168,7 @@ namespace Oxide::Sentry{
         sentry_value_set_by_key(user, "id", sentry_value_new_string(machineId()));
         sentry_set_user(user);
         // Setup context
-        auto version = deviceSettings.version().toStdString();
+        const auto version = deviceSettings.version().toStdString();
         sentry_set_tag("os.version", version.c_str());
         sentry_set_tag("name", name);
         sentry_value_t device = sentry_value_new_object();