From d679f121a9d0618f60f69d5cf2a6a77b9c4ab3d9 Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Sun, 11 Sep 2022 05:10:49 +0300
Subject: [PATCH] [Improvement] Use QSysInfo for system info in session

---
 Telegram/SourceFiles/boxes/phone_banned_box.cpp | 2 +-
 Telegram/SourceFiles/boxes/sessions_box.cpp     | 2 +-
 Telegram/SourceFiles/core/core_settings.cpp     | 2 +-
 Telegram/SourceFiles/main/main_account.cpp      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/phone_banned_box.cpp b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
index 68be59594..785c8ca96 100644
--- a/Telegram/SourceFiles/boxes/phone_banned_box.cpp
+++ b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
@@ -32,7 +32,7 @@ I'm trying to use my mobile phone number: ") + phone + qsl("\n\
 But Telegram says it's banned. Please help.\n\
 \n\
 App version: ") + version + qsl("\n\
-OS version: ") + ::Platform::SystemVersionPretty() + qsl("\n\
+OS version: ") + QSysInfo::prettyProductName() + qsl("\n\
 Locale: ") + ::Platform::SystemLanguage();
 
 	const auto url = "mailto:?to="
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index 4328fc443..025572809 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -127,7 +127,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 		object_ptr<Ui::InputField>(
 			box,
 			st::settingsDeviceName,
-			rpl::single(Platform::DeviceModelPretty()),
+			rpl::single(QSysInfo::machineHostName()),
 			Core::App().settings().customDeviceModel()),
 		st::boxRowPadding - style::margins(
 			st::settingsDeviceName.textMargins.left(),
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index daaff5acf..e323388f3 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -1089,7 +1089,7 @@ void Settings::setThirdColumnWidth(int width) {
 
 QString Settings::deviceModel() const {
 	const auto custom = customDeviceModel();
-	return custom.isEmpty() ? Platform::DeviceModelPretty() : custom;
+	return custom.isEmpty() ? QSysInfo::machineHostName() : custom;
 }
 
 rpl::producer<QString> Settings::deviceModelChanges() const {
diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp
index 9a5d284f8..3e99705da 100644
--- a/Telegram/SourceFiles/main/main_account.cpp
+++ b/Telegram/SourceFiles/main/main_account.cpp
@@ -419,8 +419,8 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 
 	auto fields = base::take(_mtpFields);
 	fields.config = std::move(config);
-	fields.deviceModel = Platform::DeviceModelPretty();
-	fields.systemVersion = Platform::SystemVersionPretty();
+	fields.deviceModel = QSysInfo::machineHostName();
+	fields.systemVersion = QSysInfo::prettyProductName();
 	_mtp = std::make_unique<MTP::Instance>(
 		MTP::Instance::Mode::Normal,
 		std::move(fields));
@@ -565,8 +565,8 @@ void Account::destroyMtpKeys(MTP::AuthKeysList &&keys) {
 	destroyFields.mainDcId = MTP::Instance::Fields::kNoneMainDc;
 	destroyFields.config = std::make_unique<MTP::Config>(_mtp->config());
 	destroyFields.keys = std::move(keys);
-	destroyFields.deviceModel = Platform::DeviceModelPretty();
-	destroyFields.systemVersion = Platform::SystemVersionPretty();
+	destroyFields.deviceModel = QSysInfo::machineHostName();
+	destroyFields.systemVersion = QSysInfo::prettyProductName();
 	_mtpForKeysDestroy = std::make_unique<MTP::Instance>(
 		MTP::Instance::Mode::KeysDestroyer,
 		std::move(destroyFields));