From d4ee56559b175e23ad393e8641b549c2e320a79e Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Mon, 9 Oct 2023 15:54:58 +0200
Subject: [PATCH] Use getShowReason() with branchName. Use getOsVersion(0 and
 getApismVersion().

---
 worker.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/worker.cpp b/worker.cpp
index 84c153e..f2c5879 100644
--- a/worker.cpp
+++ b/worker.cpp
@@ -1089,7 +1089,7 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.versionInfo.reason = "";
     psaInstalled.versionInfo.created = "";
 
-    QStringList versionInfo = m_gc.gitShowReason();
+    QStringList versionInfo = m_gc.gitShowReason(m_branchName);
     if (versionInfo.size() == 3) {
         psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
         psaInstalled.versionInfo.reason = versionInfo.at(1);
@@ -1111,7 +1111,7 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.tariff.info = "N/A";
     psaInstalled.tariff.version = "N/A";
 
-    psaInstalled.hw.linuxVersion = m_osVersion;
+    psaInstalled.hw.linuxVersion = getOsVersion();
     psaInstalled.hw.cpuSerial = m_cpuSerial;
 
     psaInstalled.opkg.blob = m_gc.gitBlob(absPathNameRepositoryOpkg);
@@ -1125,7 +1125,9 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.dc.gitLastCommit = "N/A";
     psaInstalled.dc.size = -1;
 
-    psaInstalled.sw.apismVersion = m_apismVersion;
+    if (std::optional<QString> v = getApismVersion()) {
+        psaInstalled.sw.apismVersion = v.value();
+    }
     psaInstalled.sw.atbQTVersion = m_atbqtVersion;
 
     psaInstalled.pluginVersion.deviceController = m_pluginVersionATBDeciceController;