mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Support toggling installs of beta versions.

Browse Source
This commit is contained in:
John Preston
2018-09-26 18:11:16 +03:00
parent 6e566e0165
commit 971d0efda9
10 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/core/changelogs.cpp
View File

@@ -118,7 +118,7 @@ void Changelogs::requestCloudLogs() {
}
void Changelogs::addLocalLogs() {
if (cBetaVersion() || cAlphaVersion()) {
if (AppBetaVersion || cAlphaVersion()) {
addBetaLogs();
}
if (!_addedSomeLocal) {

2
Telegram/SourceFiles/core/crash_report_window.cpp
View File

@@ -228,7 +228,7 @@ LastCrashedWindow::LastCrashedWindow()
: std::make_unique<UpdaterData>(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) {

2
Telegram/SourceFiles/core/crash_reports.cpp
View File

@@ -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();

4
Telegram/SourceFiles/core/update_checker.cpp
View File

@@ -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<char*>(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<QString> {
if (cAlphaVersion()) {
return { "alpha", "beta", "stable" };
} else if (cBetaVersion()) {
} else if (cInstallBetaVersion()) {
return { "beta", "stable" };
}
return { "stable" };