From 37b08fb84be042311897be4581f821b5f684a01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 18 Dec 2025 15:49:40 +0100 Subject: [PATCH] Update platfrom information for iOS and add more information in the application info --- nymea-app/main.cpp | 14 +++++++++++++- .../android/platformhelperandroid.cpp | 2 +- .../platformintegration/ios/platformhelperios.cpp | 5 +---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index 740bf417..934616f9 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -105,7 +105,19 @@ int main(int argc, char *argv[]) qCInfo(dcApplication()) << "-->" << application.applicationName() << APP_VERSION << QDateTime::currentDateTime().toString(); qCInfo(dcApplication()) << "Command line:" << application.arguments().join(" "); - qCInfo(dcApplication()) << "System:" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion() << PlatformHelper::instance()->deviceManufacturer() << PlatformHelper::instance()->deviceModel(); + qCInfo(dcApplication()) << "System: Device model:" << PlatformHelper::instance()->deviceModel(); + qCInfo(dcApplication()) << " Hostname:" << QSysInfo::machineHostName(); + qCInfo(dcApplication()) << " Product name:" << QSysInfo::prettyProductName(); + qCInfo(dcApplication()) << " Product type:" << QSysInfo::productType(); + qCInfo(dcApplication()) << " Product version:" << QSysInfo::productVersion(); + qCInfo(dcApplication()) << " Kernel type:" << QSysInfo::kernelType(); + qCInfo(dcApplication()) << " Kernel version:" << QSysInfo::kernelVersion(); + qCInfo(dcApplication()) << " Machine uid:" << QSysInfo::machineUniqueId(); + qCInfo(dcApplication()) << " CPU architecture:" << QSysInfo::currentCpuArchitecture(); + qCInfo(dcApplication()) << " Platform: Device:" << PlatformHelper::instance()->device(); + qCInfo(dcApplication()) << " Platform: Device serial:" << PlatformHelper::instance()->deviceSerial(); + qCInfo(dcApplication()) << " Platform: Device manufacturer:" << PlatformHelper::instance()->deviceManufacturer(); + qCInfo(dcApplication()) << "Locale:" << QLocale() << QLocale().name() << QLocale().language(); qCInfo(dcApplication()) << "SSL version:" << QSslSocket::sslLibraryVersionString(); diff --git a/nymea-app/platformintegration/android/platformhelperandroid.cpp b/nymea-app/platformintegration/android/platformhelperandroid.cpp index 125b0c8d..ee7c5a0b 100644 --- a/nymea-app/platformintegration/android/platformhelperandroid.cpp +++ b/nymea-app/platformintegration/android/platformhelperandroid.cpp @@ -119,7 +119,7 @@ void PlatformHelperAndroid::hideSplashScreen() QString PlatformHelperAndroid::machineHostname() const { // QSysInfo::machineHostname always gives "localhost" on android... best we can do here is: - return deviceManufacturer() + " " + deviceModel(); + return deviceManufacturer() + " " + deviceModel(); } QString PlatformHelperAndroid::deviceSerial() const diff --git a/nymea-app/platformintegration/ios/platformhelperios.cpp b/nymea-app/platformintegration/ios/platformhelperios.cpp index 179d7c74..9a5ffbc8 100644 --- a/nymea-app/platformintegration/ios/platformhelperios.cpp +++ b/nymea-app/platformintegration/ios/platformhelperios.cpp @@ -228,10 +228,6 @@ QString PlatformHelperIOS::machineHostname() const return hostName; } - const QString name = deviceName(); - if (!name.isEmpty() && name != "localhost") { - return name; - } // Fall back to something user visible when the OS only reports "localhost". const QString model = deviceModel(); @@ -242,6 +238,7 @@ QString PlatformHelperIOS::machineHostname() const if (manufacturer.isEmpty() || model.startsWith(manufacturer)) { return model; } + return manufacturer + " " + model; }