From 971d0efda9a53349b1e34414f4488adf72419acf Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 26 Sep 2018 18:11:16 +0300 Subject: [PATCH] Support toggling installs of beta versions. --- Telegram/SourceFiles/boxes/about_box.cpp | 4 ++-- Telegram/SourceFiles/core/changelogs.cpp | 2 +- .../SourceFiles/core/crash_report_window.cpp | 2 +- Telegram/SourceFiles/core/crash_reports.cpp | 2 +- Telegram/SourceFiles/core/update_checker.cpp | 4 ++-- Telegram/SourceFiles/facades.cpp | 16 ++++++++++------ Telegram/SourceFiles/intro/introphone.cpp | 2 +- Telegram/SourceFiles/logs.cpp | 14 ++++++++++++-- Telegram/SourceFiles/settings.cpp | 2 +- Telegram/SourceFiles/settings.h | 2 +- 10 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index f79bed396..cda2b2e4d 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/update_checker.h" AboutBox::AboutBox(QWidget *parent) -: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cBetaVersion() ? " beta" : "") + (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString())), st::aboutVersionLink) +: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (AppBetaVersion ? " beta" : "") + (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString())), st::aboutVersionLink) , _text1(this, lang(lng_about_text_1), Ui::FlatLabel::InitType::Rich, st::aboutLabel) , _text2(this, lang(lng_about_text_2), Ui::FlatLabel::InitType::Rich, st::aboutLabel) , _text3(this, st::aboutLabel) { @@ -99,7 +99,7 @@ QString telegramFaqLink() { QString currentVersionText() { auto result = QString::fromLatin1(AppVersionStr.c_str()); - if (cBetaVersion()) { + if (AppBetaVersion) { result += " beta"; } if (cAlphaVersion()) { diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 21289e44a..6f7ed0530 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -118,7 +118,7 @@ void Changelogs::requestCloudLogs() { } void Changelogs::addLocalLogs() { - if (cBetaVersion() || cAlphaVersion()) { + if (AppBetaVersion || cAlphaVersion()) { addBetaLogs(); } if (!_addedSomeLocal) { diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp index d29a200ce..3015f308a 100644 --- a/Telegram/SourceFiles/core/crash_report_window.cpp +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -228,7 +228,7 @@ LastCrashedWindow::LastCrashedWindow() : std::make_unique(this)) { excludeReportUsername(); - if (!cBetaVersion() && !cAlphaVersion()) { // currently accept crash reports only from testers + if (!cInstallBetaVersion() && !cAlphaVersion()) { // currently accept crash reports only from testers _sendingState = SendingNoReport; } if (_sendingState != SendingNoReport) { diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp index 47e54a96b..46992e718 100644 --- a/Telegram/SourceFiles/core/crash_reports.cpp +++ b/Telegram/SourceFiles/core/crash_reports.cpp @@ -310,7 +310,7 @@ void StartCatching() { #ifndef TDESKTOP_DISABLE_CRASH_REPORTS ProcessAnnotations["Binary"] = cExeName().toUtf8().constData(); ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData(); - ProcessAnnotations["Version"] = (cAlphaVersion() ? qsl("%1 alpha").arg(cAlphaVersion()) : (cBetaVersion() ? qsl("%1 beta") : qsl("%1")).arg(AppVersion)).toUtf8().constData(); + ProcessAnnotations["Version"] = (cAlphaVersion() ? qsl("%1 alpha").arg(cAlphaVersion()) : (AppBetaVersion ? qsl("%1 beta") : qsl("%1")).arg(AppVersion)).toUtf8().constData(); ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData(); ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData(); ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData(); diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp index df5509ca7..1abe33b9f 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp @@ -398,7 +398,7 @@ bool UnpackUpdate(const QString &filepath) { } if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature RSA_free(pbKey); - if (cBetaVersion() || cAlphaVersion()) { // try other public key, if we are in beta or alpha version + if (cInstallBetaVersion() || cAlphaVersion()) { // try other public key, if we are in beta or alpha version pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast(AppBetaVersion ? UpdatesPublicKey : UpdatesPublicBetaKey), -1), 0, 0, 0); if (!pbKey) { LOG(("Update Error: cant read public rsa key!")); @@ -655,7 +655,7 @@ bool ParseCommonMap( const auto list = [&]() -> std::vector { if (cAlphaVersion()) { return { "alpha", "beta", "stable" }; - } else if (cBetaVersion()) { + } else if (cInstallBetaVersion()) { return { "beta", "stable" }; } return { "stable" }; diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index b548b2c50..8bcc08454 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -447,14 +447,18 @@ void WorkingDirReady() { && QFile(cWorkingDir() + qsl("tdata/withdebug")).exists()) { Logs::SetDebugEnabled(true); } + const auto installBetaPath = cWorkingDir() + qsl("tdata/devversion"); if (cAlphaVersion()) { - cSetBetaVersion(false); - } else if (!cBetaVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) { - cSetBetaVersion(true); + cSetInstallBetaVersion(false); + } else if (QFile(installBetaPath).exists()) { + QFile f(installBetaPath); + if (f.open(QIODevice::ReadOnly)) { + cSetInstallBetaVersion(f.read(1) != "0"); + } } else if (AppBetaVersion) { - QFile f(cWorkingDir() + qsl("tdata/devversion")); - if (!f.exists() && f.open(QIODevice::WriteOnly)) { - f.write("1"); + QFile f(installBetaPath); + if (f.open(QIODevice::WriteOnly)) { + f.write(cInstallBetaVersion() ? "1" : "0"); } } diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp index 7946d503a..906d0dd66 100644 --- a/Telegram/SourceFiles/intro/introphone.cpp +++ b/Telegram/SourceFiles/intro/introphone.cpp @@ -25,7 +25,7 @@ namespace { void SendToBannedHelp(const QString &phone) { const auto version = QString::fromLatin1(AppVersionStr.c_str()) - + (cBetaVersion() ? " beta" : "") + + (AppBetaVersion ? " beta" : "") + (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString()); const auto subject = qsl("Banned phone number: ") + phone; diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index a862adae7..32367886a 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -397,14 +397,24 @@ void start(not_null launcher) { LogsData = 0; } - LOG(("Launched version: %1, beta: %2, alpha: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cBetaVersion())).arg(cAlphaVersion()).arg(Logs::b(DebugEnabled())).arg(Logs::b(cTestMode()))); + LOG(("Launched version: %1, " + "install beta: %2, " + "alpha: %3, " + "debug mode: %4, " + "test dc: %5" + ).arg(AppVersion + ).arg(Logs::b(cInstallBetaVersion()) + ).arg(cAlphaVersion() + ).arg(Logs::b(DebugEnabled()) + ).arg(Logs::b(cTestMode()))); LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName())); LOG(("Initial working dir: %1").arg(initialWorkingDir)); LOG(("Working dir: %1").arg(cWorkingDir())); LOG(("Command line: %1").arg(launcher->argumentsString())); if (!LogsData) { - LOG(("FATAL: Could not open '%1' for writing log!").arg(_logsFilePath(LogDataMain, qsl("_startXX")))); + LOG(("FATAL: Could not open '%1' for writing log!" + ).arg(_logsFilePath(LogDataMain, qsl("_startXX")))); return; } diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index e934b51bf..48c947d0b 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL bool gRtl = false; Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight; -bool gBetaVersion = AppBetaVersion; +bool gInstallBetaVersion = AppBetaVersion; uint64 gAlphaVersion = AppAlphaVersion; uint64 gRealAlphaVersion = AppAlphaVersion; QByteArray gAlphaPrivateKey; diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index 4b32b4246..0db5b7f76 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -28,7 +28,7 @@ inline bool rtl() { return cRtl(); } -DeclareSetting(bool, BetaVersion); +DeclareSetting(bool, InstallBetaVersion); DeclareSetting(uint64, AlphaVersion); DeclareSetting(uint64, RealAlphaVersion); DeclareSetting(QByteArray, AlphaPrivateKey);