diff --git a/.gitmodules b/.gitmodules index c7b202e09..ad822b27d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ url = https://github.com/desktop-app/lib_rpl.git [submodule "Telegram/lib_base"] path = Telegram/lib_base - url = https://github.com/kotatogram/lib_base.git + url = https://github.com/desktop-app/lib_base.git [submodule "Telegram/codegen"] path = Telegram/codegen url = https://github.com/desktop-app/codegen.git diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp index bb97b402a..a9fc52cb7 100644 --- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp @@ -41,7 +41,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/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp index f73e4b2b5..5c493d933 100644 --- a/Telegram/SourceFiles/main/main_account.cpp +++ b/Telegram/SourceFiles/main/main_account.cpp @@ -426,8 +426,8 @@ void Account::startMtp(std::unique_ptr 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::Mode::Normal, std::move(fields)); @@ -572,8 +572,8 @@ void Account::destroyMtpKeys(MTP::AuthKeysList &&keys) { destroyFields.mainDcId = MTP::Instance::Fields::kNoneMainDc; destroyFields.config = std::make_unique(_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::Mode::KeysDestroyer, std::move(destroyFields)); diff --git a/Telegram/lib_base b/Telegram/lib_base index 085d51119..e5a3b470d 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 085d51119970b1d1a68ae53b014bf378e23b9be8 +Subproject commit e5a3b470d6524cdeb3e2deb92f04b0d290ceec24